Merge branch '0.6' of github.com:sulu/SuluContentBundle into 0.x

Conflicts: .gitignore Content/Application/ContentDataMapper/DataMapper/ExcerptDataMapper.php Content/Application/ContentDataMapper/DataMapper/RoutableDataMapper.php Content/Application/ContentDataMapper/DataMapper/SeoDataMapper.php Content/Application/ContentDataMapper/DataMapper/TemplateDataMapper.php Content/Application/ContentDataMapper/DataMapper/WorkflowDataMapper.php Content/Application/ContentWorkflow/Subscriber/UnpublishTransitionSubscriber.php Content/Application/DimensionContentCollectionFactory/DimensionContentCollectionFactory.php Content/Domain/Model/DimensionContentCollection.php Content/Infrastructure/Doctrine/DimensionContentRepository.php Content/Infrastructure/Sulu/SmartContent/Repository/ContentDataProviderRepository.php Tests/Functional/Integration/ExampleControllerTest.php Tests/Traits/CreateExampleTrait.php Tests/Unit/Content/Application/ContentDataMapper/DataMapper/RoutableDataMapperTest.php Tests/Unit/Content/Application/ContentDataMapper/DataMapper/TemplateDataMapperTest.php Tests/Unit/Content/Application/ContentWorkflow/Subscriber/UnpublishTransitionSubscriberTest.php Tests/Unit/Content/Application/DimensionContentCollectionFactory/DimensionContentCollectionFactoryTest.php Tests/Unit/Content/Infrastructure/Sulu/Preview/ContentObjectProviderTest.php composer.json
sulu · Oct 3, 2022 · 8435b81 · 8435b81
2 parents cc33006 + 16de307
commit 8435b81
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 38 deletions.
diff --git a/.gitignore b/.gitignore
@@ -27,6 +27,7 @@ package-lock.json
 # tests
 Tests/Application/var
 Tests/Application/public/build
+Tests/Application/.env.local
 Tests/Application/.env*.local
 Tests/reports/
 

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,7 @@ 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 +45,7 @@ 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/Infrastructure/Doctrine/MetadataLoader.php b/Content/Infrastructure/Doctrine/MetadataLoader.php
@@ -136,7 +136,7 @@ private function addManyToOne(
             'targetEntity' => $class,
             'joinColumns' => [
                 [
-                    'name' => $namingStrategy->joinKeyColumnName($name),
+                    'name' => $namingStrategy->joinKeyColumnName($name), // @phpstan-ignore-line
                     'referencedColumnName' => $referencedColumnName,
                     'nullable' => $nullable,
                     'onDelete' => 'CASCADE',

diff --git a/Content/Infrastructure/Doctrine/RouteRemover.php b/Content/Infrastructure/Doctrine/RouteRemover.php
@@ -22,6 +22,7 @@
 
 /**
  * @internal
+ *
  * @final
  */
 class RouteRemover implements EventSubscriber

diff --git a/Content/Infrastructure/Sulu/Preview/PreviewDimensionContentCollection.php b/Content/Infrastructure/Sulu/Preview/PreviewDimensionContentCollection.php
@@ -19,6 +19,7 @@
 
 /**
  * @internal
+ *
  * @implements \IteratorAggregate<DimensionContentInterface>
  */
 class PreviewDimensionContentCollection implements \IteratorAggregate, DimensionContentCollectionInterface

diff --git a/Content/Infrastructure/Sulu/Search/ContentSearchMetadataProvider.php b/Content/Infrastructure/Sulu/Search/ContentSearchMetadataProvider.php
@@ -341,7 +341,7 @@ private function mapProperty(PropertyMetadata $property, IndexMetadata $metadata
                     // @codeCoverageIgnoreStart
                     $metadata->setImageUrlField($this->getContentField($property));
                     break;
-                // @codeCoverageIgnoreEnd
+                    // @codeCoverageIgnoreEnd
                 default:
                     // TODO FIXME add test case for this
                     // @codeCoverageIgnoreStart

diff --git a/Tests/Application/config/config.yml b/Tests/Application/config/config.yml
@@ -1,9 +1,6 @@
 framework:
     profiler: { enabled: true, collect: false }
 
-framework:
-    profiler: { enabled: true, collect: false }
-
 doctrine:
     orm:
         mappings:

diff --git a/Tests/Application/public/index.php b/Tests/Application/public/index.php
@@ -13,7 +13,7 @@
 
 use Sulu\Bundle\ContentBundle\Tests\Application\Kernel;
 use Sulu\Component\HttpKernel\SuluKernel;
-use Symfony\Component\Debug\Debug;
+use Symfony\Component\ErrorHandler\Debug;
 use Symfony\Component\HttpFoundation\Request;
 
 // Webserver should run under dev for development

diff --git a/composer.json b/composer.json
@@ -38,7 +38,7 @@
         "coduo/php-matcher": "^3.2 || ^4.0 || ^5.0 || ^6.0",
         "doctrine/data-fixtures": "^1.3.3",
         "doctrine/doctrine-fixtures-bundle": "^2.0 || ^3.0",
-        "friendsofphp/php-cs-fixer": "^2.17 || ^3.1",
+        "friendsofphp/php-cs-fixer": "^3.4",
         "handcraftedinthealps/code-coverage-checker": "^0.2.1",
         "handcraftedinthealps/zendsearch": "^2.0",
         "jackalope/jackalope-doctrine-dbal": "^1.3.4",

diff --git a/depfile.yaml b/depfile.yaml
diff --git a/deptrac.yaml b/deptrac.yaml
@@ -0,0 +1,32 @@
+parameters:
+    paths:
+      - ./Content
+
+    layers:
+      - name: UserInterface
+        collectors:
+          - type: directory
+            regex: UserInterface/.*
+      - name: Infrastructure
+        collectors:
+            - type: directory
+              regex: Infrastructure/.*
+      - name: Application
+        collectors:
+            - type: directory
+              regex: Application/.*
+      - name: Domain
+        collectors:
+            - type: directory
+              regex: Domain/.*
+
+    ruleset:
+        UserInterface:
+            - Application
+            - Domain
+        Infrastructure:
+            - Application
+            - Domain
+        Application:
+            - Domain
+        Domain: ~