sulu · alexander-schranz · Jan 28, 2022
diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml
@@ -21,7 +21,7 @@ jobs:
             fail-fast: false
             matrix:
                 include:
-                    - php-version: '7.2'
+                    - php-version: '7.3'
                       coverage: false
                       dependency-versions: 'lowest'
                       env:
@@ -39,6 +39,12 @@ jobs:
                       env:
                           SYMFONY_DEPRECATIONS_HELPER: weak
 
+                    - php-version: '8.1'
+                      coverage: false
+                      dependency-versions: 'highest'
+                      env:
+                          SYMFONY_DEPRECATIONS_HELPER: weak
+
         services:
             mysql:
                 image: mysql:5.7

diff --git a/Content/Application/ContentCopier/ContentCopierInterface.php b/Content/Application/ContentCopier/ContentCopierInterface.php
@@ -20,8 +20,14 @@
 interface ContentCopierInterface
 {
     /**
-     * @param mixed[] $sourceDimensionAttributes
-     * @param mixed[] $targetDimensionAttributes
+     * @param array{
+     *     locale: string,
+     *     stage?: string|null,
+     * } $sourceDimensionAttributes
+     * @param array{
+     *     locale: string,
+     *     stage?: string|null,
+     * } $targetDimensionAttributes
      */
     public function copy(
         ContentRichEntityInterface $sourceContentRichEntity,
@@ -31,7 +37,10 @@ public function copy(
     ): DimensionContentInterface;
 
     /**
-     * @param mixed[] $targetDimensionAttributes
+     * @param array{
+     *     locale: string,
+     *     stage?: string|null,
+     * } $targetDimensionAttributes
      */
     public function copyFromDimensionContentCollection(
         DimensionContentCollectionInterface $dimensionContentCollection,
@@ -40,7 +49,10 @@ public function copyFromDimensionContentCollection(
     ): DimensionContentInterface;
 
     /**
-     * @param mixed[] $targetDimensionAttributes
+     * @param array{
+     *     locale: string,
+     *     stage?: string|null,
+     * } $targetDimensionAttributes
      */
     public function copyFromDimensionContent(
         DimensionContentInterface $dimensionContent,

diff --git a/Content/Application/ContentDataMapper/ContentDataMapperInterface.php b/Content/Application/ContentDataMapper/ContentDataMapperInterface.php
@@ -19,7 +19,10 @@ interface ContentDataMapperInterface
 {
     /**
      * @param array<string, mixed> $data
-     * @param mixed[] $dimensionAttributes
+     * @param array{
+     *     locale: string,
+     *     stage?: string|null,
+     * } $dimensionAttributes
      */
     public function map(
         DimensionContentCollectionInterface $dimensionContentCollection,

diff --git a/Content/Application/ContentDataMapper/DataMapper/RoutableDataMapper.php b/Content/Application/ContentDataMapper/DataMapper/RoutableDataMapper.php
@@ -47,12 +47,20 @@ class RoutableDataMapper implements DataMapperInterface
     private $conflictResolver;
 
     /**
-     * @var array<string, array<mixed>>
+     * @var array<string, array{
+     *      resource_key: string,
+     *      entityClass: string|null,
+     *      options: mixed[]|null,
+     * }>
      */
     private $routeMappings;
 
     /**
-     * @param array<string, array<mixed>> $routeMappings
+     * @param array<string, array{
+     *      resource_key: string,
+     *      entityClass: string|null,
+     *      options: mixed[]|null,
+     * }> $routeMappings
      */
     public function __construct(
         StructureMetadataFactoryInterface $factory,
@@ -130,10 +138,10 @@ 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 */
             $routeGenerationData = \array_merge(
                 $data,
                 [
@@ -153,15 +161,16 @@ public function map(
         }
 
         if (DimensionContentInterface::STAGE_LIVE === $localizedDimensionContent->getStage()) {
-            if (!$localizedDimensionContent->getResourceId()) {
+            $resourceId = $localizedDimensionContent->getResourceId();
+            if (!$resourceId) {
                 // TODO route bundle should work to update the entity later with a resourceId over UPDATE SQL statement
                 throw new \RuntimeException('Expected a LocalizedDimensionContent with a resourceId.');
             }
 
             // route should only be updated in live dimension
             $route = $this->routeManager->createOrUpdateByAttributes(
                 $entityClass,
-                (string) $localizedDimensionContent->getResourceId(),
+                (string) $resourceId,
                 $locale,
                 $routePath,
                 false

diff --git a/Content/Application/ContentDataMapper/DataMapper/SeoDataMapper.php b/Content/Application/ContentDataMapper/DataMapper/SeoDataMapper.php
@@ -18,6 +18,17 @@
 
 class SeoDataMapper implements DataMapperInterface
 {
+    /**
+     * @param array{
+     *     seoTitle?: string|null,
+     *     seoDescription?: string|null,
+     *     seoKeywords?: string|null,
+     *     seoCanonicalUrl?: string|null,
+     *     seoHideInSitemap?: bool,
+     *     seoNoFollow?: bool,
+     *     seoNoIndex?: bool,
+     * } $data
+     */
     public function map(
         DimensionContentInterface $unlocalizedDimensionContent,
         DimensionContentInterface $localizedDimensionContent,
@@ -27,20 +38,12 @@ public function map(
             return;
         }
 
-        $this->setSeoData($localizedDimensionContent, $data);
-    }
-
-    /**
-     * @param mixed[] $data
-     */
-    private function setSeoData(SeoInterface $dimensionContent, array $data): void
-    {
-        $dimensionContent->setSeoTitle($data['seoTitle'] ?? null);
-        $dimensionContent->setSeoDescription($data['seoDescription'] ?? null);
-        $dimensionContent->setSeoKeywords($data['seoKeywords'] ?? null);
-        $dimensionContent->setSeoCanonicalUrl($data['seoCanonicalUrl'] ?? null);
-        $dimensionContent->setSeoHideInSitemap($data['seoHideInSitemap'] ?? false);
-        $dimensionContent->setSeoNoFollow($data['seoNoFollow'] ?? false);
-        $dimensionContent->setSeoNoIndex($data['seoNoIndex'] ?? false);
+        $localizedDimensionContent->setSeoTitle($data['seoTitle'] ?? null);
+        $localizedDimensionContent->setSeoDescription($data['seoDescription'] ?? null);
+        $localizedDimensionContent->setSeoKeywords($data['seoKeywords'] ?? null);
+        $localizedDimensionContent->setSeoCanonicalUrl($data['seoCanonicalUrl'] ?? null);
+        $localizedDimensionContent->setSeoHideInSitemap($data['seoHideInSitemap'] ?? false);
+        $localizedDimensionContent->setSeoNoFollow($data['seoNoFollow'] ?? false);
+        $localizedDimensionContent->setSeoNoIndex($data['seoNoIndex'] ?? false);
     }
 }
diff --git a/Content/Application/ContentDataMapper/DataMapper/WorkflowDataMapper.php b/Content/Application/ContentDataMapper/DataMapper/WorkflowDataMapper.php
@@ -18,6 +18,11 @@
 
 class WorkflowDataMapper implements DataMapperInterface
 {
+    /**
+     * @param array{
+     *     published?: string|null,
+     * } $data
+     */
     public function map(
         DimensionContentInterface $unlocalizedDimensionContent,
         DimensionContentInterface $localizedDimensionContent,
@@ -73,6 +78,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
@@ -91,7 +91,10 @@ public function deindexDimensionContent(DimensionContentInterface $dimensionCont
     }
 
     /**
-     * @param mixed[] $dimensionAttributes
+     * @param array{
+     *    locale?: string|null,
+     *    stage?: string|null,
+     * } $dimensionAttributes
      */
     private function loadDimensionContent(
         ContentRichEntityInterface $contentRichEntity,

diff --git a/Content/Application/ContentIndexer/ContentIndexerInterface.php b/Content/Application/ContentIndexer/ContentIndexerInterface.php
@@ -19,15 +19,21 @@
 interface ContentIndexerInterface
 {
     /**
-     * @param mixed[] $dimensionAttributes
+     * @param array{
+     *    locale?: string,
+     *    stage?: string|null,
+     * } $dimensionAttributes
      */
     public function index(ContentRichEntityInterface $contentRichEntity, array $dimensionAttributes): DimensionContentInterface;
 
     public function indexDimensionContent(DimensionContentInterface $dimensionContent): void;
 
     /**
-     * @param mixed $id
-     * @param mixed[] $dimensionAttributes
+     * @param int|string $id
+     * @param array{
+     *    locale?: string,
+     *    stage?: string|null,
+     * } $dimensionAttributes
      */
     public function deindex(string $resourceKey, $id, array $dimensionAttributes = []): void;
 

diff --git a/Content/Application/ContentManager/ContentManagerInterface.php b/Content/Application/ContentManager/ContentManagerInterface.php
@@ -19,13 +19,19 @@
 interface ContentManagerInterface
 {
     /**
-     * @param mixed[] $dimensionAttributes
+     * @param array{
+     *    locale: string,
+     *    stage?: string|null,
+     * } $dimensionAttributes
      */
     public function resolve(ContentRichEntityInterface $contentRichEntity, array $dimensionAttributes): DimensionContentInterface;
 
     /**
      * @param mixed[] $data
-     * @param mixed[] $dimensionAttributes
+     * @param array{
+     *    locale: string,
+     *    stage?: string|null,
+     * } $dimensionAttributes
      */
     public function persist(ContentRichEntityInterface $contentRichEntity, array $data, array $dimensionAttributes): DimensionContentInterface;
 
@@ -35,8 +41,14 @@ public function persist(ContentRichEntityInterface $contentRichEntity, array $da
     public function normalize(DimensionContentInterface $dimensionContent): array;
 
     /**
-     * @param mixed[] $sourceDimensionAttributes
-     * @param mixed[] $targetDimensionAttributes
+     * @param array{
+     *    locale: string,
+     *    stage?: string|null,
+     * } $sourceDimensionAttributes
+     * @param array{
+     *    locale: string,
+     *    stage?: string|null,
+     * } $targetDimensionAttributes
      */
     public function copy(
         ContentRichEntityInterface $sourceContentRichEntity,
@@ -46,7 +58,10 @@ public function copy(
     ): DimensionContentInterface;
 
     /**
-     * @param mixed[] $dimensionAttributes
+     * @param array{
+     *    locale: string,
+     *    stage?: string|null,
+     * } $dimensionAttributes
      */
     public function applyTransition(
         ContentRichEntityInterface $contentRichEntity,
@@ -55,13 +70,19 @@ public function applyTransition(
     ): DimensionContentInterface;
 
     /**
-     * @param mixed[] $dimensionAttributes
+     * @param array{
+     *    locale?: string,
+     *    stage?: string|null,
+     * } $dimensionAttributes
      */
     public function index(ContentRichEntityInterface $contentRichEntity, array $dimensionAttributes): DimensionContentInterface;
 
     /**
-     * @param mixed $id
-     * @param mixed[] $dimensionAttributes
+     * @param int|string $id
+     * @param array{
+     *    locale?: string,
+     *    stage?: string|null,
+     * } $dimensionAttributes
      */
     public function deindex(string $resourceKey, $id, array $dimensionAttributes = []): void;
 }
diff --git a/Content/Application/ContentMerger/Merger/ExcerptMerger.php b/Content/Application/ContentMerger/Merger/ExcerptMerger.php
@@ -52,15 +52,11 @@ public function merge(object $targetObject, object $sourceObject): void
         }
 
         if ($excerptTags = $sourceObject->getExcerptTags()) {
-            if (!empty($excerptTags)) {
-                $targetObject->setExcerptTags($excerptTags);
-            }
+            $targetObject->setExcerptTags($excerptTags);
         }
 
         if ($excerptCategories = $sourceObject->getExcerptCategories()) {
-            if (!empty($excerptCategories)) {
-                $targetObject->setExcerptCategories($excerptCategories);
-            }
+            $targetObject->setExcerptCategories($excerptCategories);
         }
     }
 }
diff --git a/Content/Application/ContentMetadataInspector/ContentMetadataInspector.php b/Content/Application/ContentMetadataInspector/ContentMetadataInspector.php
@@ -15,6 +15,7 @@
 
 use Doctrine\Common\Util\ClassUtils;
 use Doctrine\ORM\EntityManagerInterface;
+use Sulu\Bundle\ContentBundle\Content\Domain\Model\DimensionContentInterface;
 
 class ContentMetadataInspector implements ContentMetadataInspectorInterface
 {
@@ -33,6 +34,12 @@ public function getDimensionContentClass(string $contentRichEntityClass): string
         $contentRichEntityClass = ClassUtils::getRealClass($contentRichEntityClass);
 
         $classMetadata = $this->entityManager->getClassMetadata($contentRichEntityClass);
+
+        /**
+         * @var array{
+         *      targetEntity: class-string<DimensionContentInterface>
+         * } $associationMapping
+         */
         $associationMapping = $classMetadata->getAssociationMapping('dimensionContents');
 
         return $associationMapping['targetEntity'];
@@ -43,6 +50,12 @@ public function getDimensionContentPropertyName(string $contentRichEntityClass):
         $contentRichEntityClass = ClassUtils::getRealClass($contentRichEntityClass);
 
         $classMetadata = $this->entityManager->getClassMetadata($contentRichEntityClass);
+
+        /**
+         * @var array{
+         *      mappedBy: string
+         * } $associationMapping
+         */
         $associationMapping = $classMetadata->getAssociationMapping('dimensionContents');
 
         return $associationMapping['mappedBy'];

diff --git a/Content/Application/ContentNormalizer/Normalizer/TemplateNormalizer.php b/Content/Application/ContentNormalizer/Normalizer/TemplateNormalizer.php
@@ -17,6 +17,12 @@
 
 class TemplateNormalizer implements NormalizerInterface
 {
+    /**
+     * @param array{
+     *     templateKey: string,
+     *     templateData: mixed[],
+     * } $normalizedData
+     */
     public function enhance(object $object, array $normalizedData): array
     {
         if (!$object instanceof TemplateInterface) {

diff --git a/Content/Application/ContentPersister/ContentPersisterInterface.php b/Content/Application/ContentPersister/ContentPersisterInterface.php
@@ -20,7 +20,10 @@ interface ContentPersisterInterface
 {
     /**
      * @param mixed[] $data
-     * @param mixed[] $dimensionAttributes
+     * @param array{
+     *     locale: string,
+     *     stage?: string|null,
+     * } $dimensionAttributes
      */
     public function persist(ContentRichEntityInterface $contentRichEntity, array $data, array $dimensionAttributes): DimensionContentInterface;
 }
diff --git a/Content/Application/ContentResolver/ContentResolverInterface.php b/Content/Application/ContentResolver/ContentResolverInterface.php
@@ -19,7 +19,10 @@
 interface ContentResolverInterface
 {
     /**
-     * @param mixed[] $dimensionAttributes
+     * @param array{
+     *     locale?: string|null,
+     *     stage?: string|null,
+     * } $dimensionAttributes
      */
     public function resolve(ContentRichEntityInterface $contentRichEntity, array $dimensionAttributes): DimensionContentInterface;
 }