Merge 5902d26 into 8435b81

sulu · Oct 18, 2022 · 46d02fc · 46d02fc
2 parents 8435b81 + 5902d26
commit 46d02fc
Show file tree

Hide file tree

Showing 49 changed files with 470 additions and 248 deletions.
diff --git a/Content/Application/ContentDataMapper/DataMapper/RoutableDataMapper.php b/Content/Application/ContentDataMapper/DataMapper/RoutableDataMapper.php
@@ -130,10 +130,11 @@ public function map(
             throw new \RuntimeException(\sprintf('No route mapping found for "%s".', $resourceKey));
         }
 
+        /** @var string|null $routePath */
         $routePath = $data[$name] ?? null;
 
         if (!$routePath) {
-            /** @var mixed $routeGenerationData */
+            /** @var mixed[] $routeGenerationData */
             $routeGenerationData = \array_merge(
                 $data,
                 [
@@ -161,7 +162,7 @@ public function map(
             // route should only be updated in live dimension
             $route = $this->routeManager->createOrUpdateByAttributes(
                 $entityClass,
-                (string) $localizedDimensionContent->getResourceId(),
+                (string) $localizedDimensionContent->getResourceId(), // @phpstan-ignore-line
                 $locale,
                 $routePath,
                 false
@@ -173,7 +174,7 @@ public function map(
             $route->setPath($routePath);
             $route->setLocale($locale);
             $route->setEntityClass($entityClass);
-            $route->setEntityId((string) $localizedDimensionContent->getResourceId());
+            $route->setEntityId((string) $localizedDimensionContent->getResourceId()); // @phpstan-ignore-line
 
             $routePath = $this->conflictResolver->resolve($route)
                 ->getPath();

diff --git a/Content/Application/ContentDataMapper/DataMapper/SeoDataMapper.php b/Content/Application/ContentDataMapper/DataMapper/SeoDataMapper.php
@@ -27,11 +27,28 @@ public function map(
             return;
         }
 
+        /** @var array{
+         *     seoTitle?: string|null,
+         *     seoDescription?: string|null,
+         *     seoKeywords?: string|null,
+         *     seoCanonicalUrl?: string|null,
+         *     seoHideInSitemap?: bool,
+         *     seoNoFollow?: bool,
+         *     seoNoIndex?: bool,
+         * } $data */
         $this->setSeoData($localizedDimensionContent, $data);
     }
 
     /**
-     * @param mixed[] $data
+     * @param array{
+     *     seoTitle?: string|null,
+     *     seoDescription?: string|null,
+     *     seoKeywords?: string|null,
+     *     seoCanonicalUrl?: string|null,
+     *     seoHideInSitemap?: bool,
+     *     seoNoFollow?: bool,
+     *     seoNoIndex?: bool,
+     * } $data
      */
     private function setSeoData(SeoInterface $dimensionContent, array $data): void
     {

diff --git a/Content/Application/ContentDataMapper/DataMapper/WorkflowDataMapper.php b/Content/Application/ContentDataMapper/DataMapper/WorkflowDataMapper.php
@@ -73,6 +73,7 @@ private function setPublishedToLiveDimension(WorkflowInterface $object, array $d
             return;
         }
 
+        /** @var string|null $published */
         $published = $data['published'] ?? null;
 
         if (!$published) {

diff --git a/Content/Application/ContentIndexer/ContentIndexer.php b/Content/Application/ContentIndexer/ContentIndexer.php
@@ -65,6 +65,7 @@ public function deindex(string $resourceKey, $id, array $dimensionAttributes = [
         $locale = $dimensionAttributes['locale'] ?? null;
         $stage = $dimensionAttributes['stage'] ?? null;
 
+        /** @var scalar $id */
         $search = $this->searchManager->createSearch(\sprintf('__id:"%s"', $id))
             ->indexes($this->getIndexes($resourceKey, $stage));
 

diff --git a/Content/Application/ContentMerger/Merger/ExcerptMerger.php b/Content/Application/ContentMerger/Merger/ExcerptMerger.php
@@ -52,13 +52,13 @@ public function merge(object $targetObject, object $sourceObject): void
         }
 
         if ($excerptTags = $sourceObject->getExcerptTags()) {
-            if (!empty($excerptTags)) {
+            if ([] !== $excerptTags) {
                 $targetObject->setExcerptTags($excerptTags);
             }
         }
 
         if ($excerptCategories = $sourceObject->getExcerptCategories()) {
-            if (!empty($excerptCategories)) {
+            if ([] !== $excerptCategories) {
                 $targetObject->setExcerptCategories($excerptCategories);
             }
         }

diff --git a/Content/Application/ContentNormalizer/Normalizer/TemplateNormalizer.php b/Content/Application/ContentNormalizer/Normalizer/TemplateNormalizer.php
@@ -23,7 +23,9 @@ public function enhance(object $object, array $normalizedData): array
             return $normalizedData;
         }
 
-        $normalizedData = \array_merge($normalizedData['templateData'], $normalizedData);
+        /** @var mixed[] $templateData */
+        $templateData = $normalizedData['templateData'];
+        $normalizedData = \array_merge($templateData, $normalizedData);
         unset($normalizedData['templateData']);
 
         $normalizedData['template'] = $normalizedData['templateKey'];

diff --git a/Content/Application/ContentResolver/ContentResolver.php b/Content/Application/ContentResolver/ContentResolver.php
@@ -39,6 +39,9 @@ public function __construct(
         $this->contentMerger = $contentMerger;
     }
 
+    /**
+     * @param array<string, scalar> $dimensionAttributes
+     */
     public function resolve(ContentRichEntityInterface $contentRichEntity, array $dimensionAttributes): DimensionContentInterface
     {
         $dimensionContentCollection = $this->dimensionContentRepository->load($contentRichEntity, $dimensionAttributes);

diff --git a/Content/Application/ContentWorkflow/ContentWorkflow.php b/Content/Application/ContentWorkflow/ContentWorkflow.php
@@ -86,7 +86,10 @@ public function apply(
          */
 
         $dimensionContentCollection = $this->dimensionContentRepository->load($contentRichEntity, $dimensionAttributes);
+
+        /** @var array<string, bool|float|int|string|null> $dimensionAttributes */
         $dimensionAttributes = $dimensionContentCollection->getDimensionAttributes();
+
         $localizedDimensionContent = $dimensionContentCollection->getDimensionContent($dimensionAttributes);
 
         if (!$localizedDimensionContent) {

diff --git a/Content/Application/DimensionContentCollectionFactory/DimensionContentCollectionFactory.php b/Content/Application/DimensionContentCollectionFactory/DimensionContentCollectionFactory.php
@@ -70,8 +70,10 @@ public function create(
             );
         }
 
-        $localizedDimensionContent = null;
+        /** @var string|null $locale */
         $locale = $dimensionAttributes['locale'] ?? null;
+        $localizedDimensionContent = null;
+
         if ($locale) {
             $localizedDimensionContent = $dimensionContentCollection->getDimensionContent($dimensionAttributes);
 

diff --git a/Content/Domain/Exception/ContentNotFoundException.php b/Content/Domain/Exception/ContentNotFoundException.php
@@ -22,9 +22,12 @@ class ContentNotFoundException extends \Exception
      */
     public function __construct(ContentRichEntityInterface $contentRichEntity, array $dimensionAttributes)
     {
+        /** @var string|int $id */
+        $id = $contentRichEntity->getId();
+
         parent::__construct(\sprintf(
             'Could not load content with id "%s" and attributes: %s',
-            $contentRichEntity->getId(),
+            $id,
             \json_encode($dimensionAttributes)
         ));
     }

diff --git a/Content/Infrastructure/Doctrine/DimensionContentQueryEnhancer.php b/Content/Infrastructure/Doctrine/DimensionContentQueryEnhancer.php
@@ -29,17 +29,6 @@
  */
 class DimensionContentQueryEnhancer
 {
-    /**
-     * @var ContentMetadataInspectorInterface
-     */
-    private $contentMetadataInspector;
-
-    public function __construct(
-        ContentMetadataInspectorInterface $contentMetadataInspector
-    ) {
-        $this->contentMetadataInspector = $contentMetadataInspector;
-    }
-
     /**
      * Withs represents additional selects which can be load to join and select specific sub entities.
      * They are used by groups and fields.

diff --git a/Content/Infrastructure/Doctrine/MetadataLoader.php b/Content/Infrastructure/Doctrine/MetadataLoader.php
@@ -116,6 +116,7 @@ public function loadClassMetadata(LoadClassMetadataEventArgs $event): void
      * @codeCoverageIgnore
      *
      * @param ClassMetadataInfo<object> $metadata
+     * @param class-string<object> $class
      */
     private function addManyToOne(
         LoadClassMetadataEventArgs $event,
@@ -148,6 +149,7 @@ private function addManyToOne(
 
     /**
      * @param ClassMetadataInfo<object> $metadata
+     * @param class-string<object> $class
      */
     private function addManyToMany(
         LoadClassMetadataEventArgs $event,

diff --git a/Content/Infrastructure/Doctrine/RouteRemover.php b/Content/Infrastructure/Doctrine/RouteRemover.php
@@ -82,7 +82,10 @@ public function preRemove(LifecycleEventArgs $event): void
             return;
         }
 
-        foreach ($this->routeRepository->findAllByEntity($entityClass, $object->getId()) as $route) {
+        /** @var string $entityId */
+        $entityId = $object->getId();
+
+        foreach ($this->routeRepository->findAllByEntity($entityClass, $entityId) as $route) {
             $event->getEntityManager()->remove($route);
         }
     }

diff --git a/Content/Infrastructure/Sulu/Admin/ContentViewBuilderFactory.php b/Content/Infrastructure/Sulu/Admin/ContentViewBuilderFactory.php
@@ -298,7 +298,10 @@ private function createSettingsFormView(
     ): ViewBuilderInterface {
         $forms = [];
         foreach ($this->settingsForms as $key => $tag) {
-            if (\is_subclass_of($dimensionContentClass, $tag['instanceOf'])) {
+            /** @var string $instanceOf */
+            $instanceOf = $tag['instanceOf'];
+
+            if (\is_subclass_of($dimensionContentClass, $instanceOf)) {
                 $forms[] = $key;
             }
         }

diff --git a/Content/Infrastructure/Sulu/Preview/ContentObjectProvider.php b/Content/Infrastructure/Sulu/Preview/ContentObjectProvider.php
@@ -98,6 +98,7 @@ public function getObject($id, $locale)
      */
     public function getId($object)
     {
+        /** @var string */
         return $object->getResource()->getId();
     }
 
@@ -153,9 +154,12 @@ public function serialize($object)
      */
     public function deserialize($serializedObject, $objectClass)
     {
+        /** @var mixed[] $data */
         $data = \json_decode($serializedObject, true);
 
+        /** @var string|null $id */
         $id = $data['id'] ?? null;
+        /** @var string|null $locale */
         $locale = $data['locale'] ?? null;
 
         if (!$id || !$locale) {

diff --git a/Content/Infrastructure/Sulu/Search/ContentReindexProvider.php b/Content/Infrastructure/Sulu/Search/ContentReindexProvider.php
@@ -80,6 +80,7 @@ public function provide($classFqn, $offset, $maxResults)
             ->setFirstResult($offset)
             ->setMaxResults($maxResults);
 
+        /** @var ContentRichEntityInterface[] */
         return $queryBuilder->getQuery()->execute();
     }
 
@@ -99,6 +100,7 @@ public function getCount($classFqn)
             ->from($this->contentRichEntityClass, 'contentRichEntity')
             ->select('COUNT(contentRichEntity)');
 
+        /** @var int */
         return $queryBuilder->getQuery()->getSingleScalarResult();
     }
 

diff --git a/Content/Infrastructure/Sulu/Sitemap/ContentSitemapProvider.php b/Content/Infrastructure/Sulu/Sitemap/ContentSitemapProvider.php
@@ -119,6 +119,7 @@ public function build($page, $scheme, $host): array
                 $mainRoute = $entityRoutes[$defaultLocale];
                 unset($entityRoutes[$defaultLocale]);
             } else {
+                /** @var RouteInterface $mainRoute */
                 $mainRoute = \array_shift($entityRoutes);
             }
 
@@ -168,7 +169,7 @@ public function getMaxPage($scheme, $host): int
     /**
      * @param RouteInterface[] $routes
      *
-     * @return mixed[]
+     * @return array<string, array<string, RouteInterface>>
      */
     protected function groupRoutesByEntityId(array $routes): array
     {
@@ -188,7 +189,7 @@ protected function groupRoutesByEntityId(array $routes): array
     }
 
     /**
-     * @return mixed[]
+     * @return RouteInterface[]
      */
     protected function getRoutes(int $limit, int $offset): array
     {
@@ -201,9 +202,8 @@ protected function getRoutes(int $limit, int $offset): array
             ->setFirstResult($offset)
             ->setMaxResults($limit);
 
-        $result = $queryBuilder->getQuery()->getResult();
-
-        return $result;
+        /** @var RouteInterface[] */
+        return $queryBuilder->getQuery()->getResult();
     }
 
     protected function createRoutesQueryBuilder(): QueryBuilder