Move classes related to StructureInterface into separate namespace

sulu · Mar 19, 2020 · 5272c0b · 5272c0b
1 parent 1ad7d6c
commit 5272c0b
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 21 deletions.
diff --git a/Content/Infrastructure/Sulu/Route/ContentRouteDefaultsProvider.php b/Content/Infrastructure/Sulu/Route/ContentRouteDefaultsProvider.php
@@ -17,12 +17,13 @@
 use Doctrine\ORM\NoResultException;
 use Sulu\Bundle\ContentBundle\Content\Application\ContentResolver\ContentResolverInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Exception\ContentNotFoundException;
-use Sulu\Bundle\ContentBundle\Content\Domain\Exception\StructureMetadataNotFoundException;
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentProjectionInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentRichEntityInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\DimensionInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\TemplateInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Repository\DimensionRepositoryInterface;
+use Sulu\Bundle\ContentBundle\Content\Infrastructure\Sulu\Structure\ContentStructureBridgeFactory;
+use Sulu\Bundle\ContentBundle\Content\Infrastructure\Sulu\Structure\StructureMetadataNotFoundException;
 use Sulu\Bundle\RouteBundle\Routing\Defaults\RouteDefaultsProviderInterface;
 
 class ContentRouteDefaultsProvider implements RouteDefaultsProviderInterface

diff --git a/...astructure/Sulu/Route/ContentDocument.php → ...ucture/Sulu/Structure/ContentDocument.php b/...astructure/Sulu/Route/ContentDocument.php → ...ucture/Sulu/Structure/ContentDocument.php
@@ -11,7 +11,7 @@
  * with this source code in the file LICENSE.
  */
 
-namespace Sulu\Bundle\ContentBundle\Content\Infrastructure\Sulu\Route;
+namespace Sulu\Bundle\ContentBundle\Content\Infrastructure\Sulu\Structure;
 
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\ExcerptInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\SeoInterface;

diff --git a/...ure/Sulu/Route/ContentStructureBridge.php → ...Sulu/Structure/ContentStructureBridge.php b/...ure/Sulu/Route/ContentStructureBridge.php → ...Sulu/Structure/ContentStructureBridge.php
@@ -11,7 +11,7 @@
  * with this source code in the file LICENSE.
  */
 
-namespace Sulu\Bundle\ContentBundle\Content\Infrastructure\Sulu\Route;
+namespace Sulu\Bundle\ContentBundle\Content\Infrastructure\Sulu\Structure;
 
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\TemplateInterface;
 use Sulu\Component\Content\Compat\Property;

diff --git a/...u/Route/ContentStructureBridgeFactory.php → ...ructure/ContentStructureBridgeFactory.php b/...u/Route/ContentStructureBridgeFactory.php → ...ructure/ContentStructureBridgeFactory.php
@@ -11,9 +11,8 @@
  * with this source code in the file LICENSE.
  */
 
-namespace Sulu\Bundle\ContentBundle\Content\Infrastructure\Sulu\Route;
+namespace Sulu\Bundle\ContentBundle\Content\Infrastructure\Sulu\Structure;
 
-use Sulu\Bundle\ContentBundle\Content\Domain\Exception\StructureMetadataNotFoundException;
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\TemplateInterface;
 use Sulu\Component\Content\Compat\Structure\LegacyPropertyFactory;
 use Sulu\Component\Content\Metadata\Factory\StructureMetadataFactoryInterface;

diff --git a/...on/StructureMetadataNotFoundException.php → ...re/StructureMetadataNotFoundException.php b/...on/StructureMetadataNotFoundException.php → ...re/StructureMetadataNotFoundException.php
@@ -11,7 +11,7 @@
  * with this source code in the file LICENSE.
  */
 
-namespace Sulu\Bundle\ContentBundle\Content\Domain\Exception;
+namespace Sulu\Bundle\ContentBundle\Content\Infrastructure\Sulu\Structure;
 
 class StructureMetadataNotFoundException extends \Exception
 {

diff --git a/Resources/config/services.xml b/Resources/config/services.xml
@@ -77,7 +77,7 @@
         </service>
 
         <!-- Structure Bridge Factory -->
-        <service id="sulu_content.content_structure_bridge_factory" class="Sulu\Bundle\ContentBundle\Content\Infrastructure\Sulu\Route\ContentStructureBridgeFactory">
+        <service id="sulu_content.content_structure_bridge_factory" class="Sulu\Bundle\ContentBundle\Content\Infrastructure\Sulu\Structure\ContentStructureBridgeFactory">
             <argument type="service" id="sulu_page.structure.factory"/>
             <argument type="service" id="sulu_page.compat.structure.legacy_property_factory"/>
         </service>

diff --git a/Tests/Unit/Content/Infrastructure/Sulu/Route/ContentRouteDefaultsProviderTest.php b/Tests/Unit/Content/Infrastructure/Sulu/Route/ContentRouteDefaultsProviderTest.php
@@ -21,16 +21,16 @@
 use Prophecy\Argument;
 use Sulu\Bundle\ContentBundle\Content\Application\ContentResolver\ContentResolverInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Exception\ContentNotFoundException;
-use Sulu\Bundle\ContentBundle\Content\Domain\Exception\StructureMetadataNotFoundException;
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentProjectionInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentRichEntityInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\Dimension;
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\DimensionInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\TemplateInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Repository\DimensionRepositoryInterface;
 use Sulu\Bundle\ContentBundle\Content\Infrastructure\Sulu\Route\ContentRouteDefaultsProvider;
-use Sulu\Bundle\ContentBundle\Content\Infrastructure\Sulu\Route\ContentStructureBridge;
-use Sulu\Bundle\ContentBundle\Content\Infrastructure\Sulu\Route\ContentStructureBridgeFactory;
+use Sulu\Bundle\ContentBundle\Content\Infrastructure\Sulu\Structure\ContentStructureBridge;
+use Sulu\Bundle\ContentBundle\Content\Infrastructure\Sulu\Structure\ContentStructureBridgeFactory;
+use Sulu\Bundle\ContentBundle\Content\Infrastructure\Sulu\Structure\StructureMetadataNotFoundException;
 use Sulu\Bundle\ContentBundle\Tests\Application\ExampleTestBundle\Entity\Example;
 
 class ContentRouteDefaultsProviderTest extends TestCase

diff --git a/...ucture/Sulu/Route/ContentDocumentTest.php → ...re/Sulu/Structure/ContentDocumentTest.php b/...ucture/Sulu/Route/ContentDocumentTest.php → ...re/Sulu/Structure/ContentDocumentTest.php
@@ -11,13 +11,13 @@
  * with this source code in the file LICENSE.
  */
 
-namespace Sulu\Bundle\ContentBundle\Tests\Unit\Content\Infrastructure\Sulu\Route;
+namespace Sulu\Bundle\ContentBundle\Tests\Unit\Content\Infrastructure\Sulu\Structure;
 
 use PHPUnit\Framework\TestCase;
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\ExcerptInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\SeoInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\TemplateInterface;
-use Sulu\Bundle\ContentBundle\Content\Infrastructure\Sulu\Route\ContentDocument;
+use Sulu\Bundle\ContentBundle\Content\Infrastructure\Sulu\Structure\ContentDocument;
 use Sulu\Component\Content\Compat\StructureInterface;
 
 class ContentDocumentTest extends TestCase

diff --git a/...ute/ContentStructureBridgeFactoryTest.php → ...ure/ContentStructureBridgeFactoryTest.php b/...ute/ContentStructureBridgeFactoryTest.php → ...ure/ContentStructureBridgeFactoryTest.php
@@ -11,14 +11,14 @@
  * with this source code in the file LICENSE.
  */
 
-namespace Sulu\Bundle\ContentBundle\Tests\Unit\Content\Infrastructure\Sulu\Route;
+namespace Sulu\Bundle\ContentBundle\Tests\Unit\Content\Infrastructure\Sulu\Structure;
 
 use PHPUnit\Framework\TestCase;
 use Prophecy\Prophecy\ObjectProphecy;
-use Sulu\Bundle\ContentBundle\Content\Domain\Exception\StructureMetadataNotFoundException;
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\TemplateInterface;
-use Sulu\Bundle\ContentBundle\Content\Infrastructure\Sulu\Route\ContentStructureBridge;
-use Sulu\Bundle\ContentBundle\Content\Infrastructure\Sulu\Route\ContentStructureBridgeFactory;
+use Sulu\Bundle\ContentBundle\Content\Infrastructure\Sulu\Structure\ContentStructureBridge;
+use Sulu\Bundle\ContentBundle\Content\Infrastructure\Sulu\Structure\ContentStructureBridgeFactory;
+use Sulu\Bundle\ContentBundle\Content\Infrastructure\Sulu\Structure\StructureMetadataNotFoundException;
 use Sulu\Bundle\ContentBundle\Tests\Unit\Mocks\MockWrapper;
 use Sulu\Bundle\ContentBundle\Tests\Unit\Mocks\TemplateMockWrapperTrait;
 use Sulu\Component\Content\Compat\Structure\LegacyPropertyFactory;

diff --git a/...Sulu/Route/ContentStructureBridgeTest.php → .../Structure/ContentStructureBridgeTest.php b/...Sulu/Route/ContentStructureBridgeTest.php → .../Structure/ContentStructureBridgeTest.php
@@ -11,13 +11,13 @@
  * with this source code in the file LICENSE.
  */
 
-namespace Sulu\Bundle\ContentBundle\Tests\Unit\Content\Infrastructure\Sulu\Route;
+namespace Sulu\Bundle\ContentBundle\Tests\Unit\Content\Infrastructure\Sulu\Structure;
 
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\TemplateInterface;
-use Sulu\Bundle\ContentBundle\Content\Infrastructure\Sulu\Route\ContentDocument;
-use Sulu\Bundle\ContentBundle\Content\Infrastructure\Sulu\Route\ContentStructureBridge;
+use Sulu\Bundle\ContentBundle\Content\Infrastructure\Sulu\Structure\ContentDocument;
+use Sulu\Bundle\ContentBundle\Content\Infrastructure\Sulu\Structure\ContentStructureBridge;
 use Sulu\Component\Content\Compat\Property;
 use Sulu\Component\Content\Compat\Structure\LegacyPropertyFactory;
 use Sulu\Component\Content\Compat\StructureInterface;

diff --git a/phpstan.neon b/phpstan.neon
@@ -29,9 +29,9 @@ parameters:
         - message: "#^Parameter \\#1 \\$x of method Doctrine\\\\Common\\\\Collections\\\\ExpressionBuilder\\:\\:orX\\(\\) expects array\\<int, mixed\\>\\|null, Doctrine\\\\Common\\\\Collections\\\\Expr\\\\Comparison given\\.$#"
           count: 1
           path: Content/Infrastructure/Doctrine/DimensionRepository.php
-        - message: "#^Method Sulu\\\\Bundle\\\\ContentBundle\\\\Content\\\\Infrastructure\\\\Sulu\\\\Route\\\\ContentDocument\\:\\:getStructure\\(\\) should return Sulu\\\\Component\\\\Content\\\\Document\\\\Structure\\\\StructureInterface but returns null\\.$#"
+        - message: "#^Method Sulu\\\\Bundle\\\\ContentBundle\\\\Content\\\\Infrastructure\\\\Sulu\\\\Structure\\\\ContentDocument\\:\\:getStructure\\(\\) should return Sulu\\\\Component\\\\Content\\\\Document\\\\Structure\\\\StructureInterface but returns null\\.$#"
           count: 1
-          path: Content/Infrastructure/Sulu/Route/ContentDocument.php
+          path: Content/Infrastructure/Sulu/Structure/ContentDocument.php
         - message: "#^Negated boolean expression is always true\\.$#"
           count: 8
           path: Tests/Functional/Content/Infrastructure/Doctrine/DimensionRepositoryTest.php