diff --git a/CHANGELOG-7.0.md b/CHANGELOG-7.0.md index 4c495d935c..2a2ca81bf4 100644 --- a/CHANGELOG-7.0.md +++ b/CHANGELOG-7.0.md @@ -6,6 +6,10 @@ This changelog references the relevant changes (bug and security fixes) done in To get the diff for a specific change, go to https://github.com/kunstmaan/KunstmaanBundlesCMS/commit/XXX where XXX is the change hash To get the diff between two versions, go to https://github.com/kunstmaan/KunstmaanBundlesCMS/compare/7.0.0...7.0.1 +## 7.0.2 / 2024-04-01 + +* [AllBundles] Convert extra phpdoc return types [#3382](https://github.com/Kunstmaan/KunstmaanBundlesCMS/pull/3382) ([@acrobat](https://github.com/acrobat)) + ## 7.0.1 / 2024-03-31 * [GeneratorBundle] FE setup fixes for cms-skeleton install [#3373](https://github.com/Kunstmaan/KunstmaanBundlesCMS/pull/3373) ([@acrobat](https://github.com/acrobat)) diff --git a/src/Kunstmaan/AdminBundle/Form/MediaTokenTransformer.php b/src/Kunstmaan/AdminBundle/Form/MediaTokenTransformer.php index a2aa15396a..0273962b90 100644 --- a/src/Kunstmaan/AdminBundle/Form/MediaTokenTransformer.php +++ b/src/Kunstmaan/AdminBundle/Form/MediaTokenTransformer.php @@ -7,10 +7,7 @@ class MediaTokenTransformer implements DataTransformerInterface { - /** - * @return string - */ - public function transform($content) + public function transform($content): string { if ($content === null || !$content || !trim($content)) { return ''; @@ -38,10 +35,7 @@ function (Crawler $node) { } } - /** - * @return string - */ - public function reverseTransform($content) + public function reverseTransform($content): string { if ($content === null || !trim($content)) { return ''; diff --git a/src/Kunstmaan/AdminBundle/Helper/Security/Acl/Voter/AclVoter.php b/src/Kunstmaan/AdminBundle/Helper/Security/Acl/Voter/AclVoter.php index 60f22436c4..c3e42dc906 100644 --- a/src/Kunstmaan/AdminBundle/Helper/Security/Acl/Voter/AclVoter.php +++ b/src/Kunstmaan/AdminBundle/Helper/Security/Acl/Voter/AclVoter.php @@ -35,10 +35,7 @@ public function __construct(AclProviderInterface $aclProvider, ObjectIdentityRet $this->permissionsEnabled = $permissionsEnabled; } - /** - * @return int - */ - public function vote(TokenInterface $token, $object, array $attributes) + public function vote(TokenInterface $token, $object, array $attributes): int { $attributeIsSupported = false; foreach ($attributes as $attribute) { diff --git a/src/Kunstmaan/ArticleBundle/Router/TagCategoryRouter.php b/src/Kunstmaan/ArticleBundle/Router/TagCategoryRouter.php index 119da19305..b9294b2db6 100644 --- a/src/Kunstmaan/ArticleBundle/Router/TagCategoryRouter.php +++ b/src/Kunstmaan/ArticleBundle/Router/TagCategoryRouter.php @@ -8,10 +8,7 @@ class TagCategoryRouter extends SlugRouter { - /** - * @return \Symfony\Component\Routing\RouteCollection - */ - public function getRouteCollection() + public function getRouteCollection(): RouteCollection { if (!\is_null($this->routeCollection)) { return $this->routeCollection; diff --git a/src/Kunstmaan/MultiDomainBundle/Router/DomainBasedLocaleRouter.php b/src/Kunstmaan/MultiDomainBundle/Router/DomainBasedLocaleRouter.php index 0281b39f88..4a3a872192 100644 --- a/src/Kunstmaan/MultiDomainBundle/Router/DomainBasedLocaleRouter.php +++ b/src/Kunstmaan/MultiDomainBundle/Router/DomainBasedLocaleRouter.php @@ -169,10 +169,8 @@ private function getReverseLocaleMap(): array * Getter for routeCollection * * Override slug router - * - * @return \Symfony\Component\Routing\RouteCollection */ - public function getRouteCollection() + public function getRouteCollection(): RouteCollection { if (($this->otherSite && $this->isMultiLanguage($this->otherSite['host'])) || (!$this->otherSite && $this->isMultiLanguage())) { if (!$this->routeCollectionMultiLanguage) { diff --git a/src/Kunstmaan/NodeBundle/Router/SlugRouter.php b/src/Kunstmaan/NodeBundle/Router/SlugRouter.php index 8cba2b1d13..070fa0947c 100644 --- a/src/Kunstmaan/NodeBundle/Router/SlugRouter.php +++ b/src/Kunstmaan/NodeBundle/Router/SlugRouter.php @@ -106,10 +106,7 @@ public function getContext(): RequestContext return $this->context; } - /** - * @return void - */ - public function setContext(RequestContext $context) + public function setContext(RequestContext $context): void { $this->context = $context; } @@ -131,12 +128,7 @@ public function generate($name, $parameters = [], $referenceType = UrlGenerator: return $this->urlGenerator->generate($name, $parameters, $referenceType); } - /** - * Getter for routeCollection - * - * @return \Symfony\Component\Routing\RouteCollection - */ - public function getRouteCollection() + public function getRouteCollection(): RouteCollection { if (\is_null($this->routeCollection)) { $this->routeCollection = new RouteCollection(); diff --git a/src/Kunstmaan/RedirectBundle/Router/RedirectRouter.php b/src/Kunstmaan/RedirectBundle/Router/RedirectRouter.php index a6e52f032f..ecbf790d84 100644 --- a/src/Kunstmaan/RedirectBundle/Router/RedirectRouter.php +++ b/src/Kunstmaan/RedirectBundle/Router/RedirectRouter.php @@ -88,10 +88,8 @@ public function match($pathinfo): array /** * Gets the RouteCollection instance associated with this Router. - * - * @return \Symfony\Component\Routing\RouteCollection A RouteCollection instance */ - public function getRouteCollection() + public function getRouteCollection(): RouteCollection { // The route collection will always be populated with matched redirects based on the current request. If this // method is called before the url matching has been executed, the collection will be empty. @@ -103,10 +101,7 @@ public function getContext(): RequestContext return $this->context; } - /** - * @return void - */ - public function setContext(RequestContext $context) + public function setContext(RequestContext $context): void { $this->context = $context; } diff --git a/src/Kunstmaan/TranslatorBundle/Service/Translator/Translator.php b/src/Kunstmaan/TranslatorBundle/Service/Translator/Translator.php index 8cfdddce74..71f42d9e4b 100644 --- a/src/Kunstmaan/TranslatorBundle/Service/Translator/Translator.php +++ b/src/Kunstmaan/TranslatorBundle/Service/Translator/Translator.php @@ -89,10 +89,7 @@ public function addResources($resources) } } - /** - * @return void - */ - protected function loadCatalogue($locale) + protected function loadCatalogue($locale): void { if ($this->options['debug'] === true) { $this->options['cache_dir'] = null; // disable caching for debug