Rename createViewInstance to createProjectionInstance (#69)

sulu · Dec 18, 2019 · 5faa1c6 · 5faa1c6
1 parent 66f4145
commit 5faa1c6
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 17 deletions.
diff --git a/Content/Application/ContentProjectionFactory/ContentProjectionFactory.php b/Content/Application/ContentProjectionFactory/ContentProjectionFactory.php
@@ -44,7 +44,7 @@ public function create(DimensionContentCollectionInterface $dimensionContentColl
         $dimensionContentCollectionArray = iterator_to_array($dimensionContentCollection);
         $lastKey = \count($dimensionContentCollectionArray) - 1;
 
-        $contentProjection = $dimensionContentCollectionArray[$lastKey]->createViewInstance();
+        $contentProjection = $dimensionContentCollectionArray[$lastKey]->createProjectionInstance();
 
         foreach ($dimensionContentCollection as $dimensionContent) {
             /** @var MergerInterface $merger */

diff --git a/Content/Domain/Model/DimensionContentInterface.php b/Content/Domain/Model/DimensionContentInterface.php
@@ -22,5 +22,5 @@ public function getId();
 
     public function getDimension(): DimensionInterface;
 
-    public function createViewInstance(): ContentProjectionInterface;
+    public function createProjectionInstance(): ContentProjectionInterface;
 }
diff --git a/Tests/Application/ExampleTestBundle/Entity/Example.php b/Tests/Application/ExampleTestBundle/Entity/Example.php
@@ -42,6 +42,6 @@ public static function getResourceKey(): string
 
     public function createDimensionContent(DimensionInterface $dimension): DimensionContentInterface
     {
-        return new ExampleDimension($this, $dimension);
+        return new ExampleDimensionContent($this, $dimension);
     }
 }
diff --git a/...pleTestBundle/Entity/ExampleDimension.php → ...Bundle/Entity/ExampleDimensionContent.php b/...pleTestBundle/Entity/ExampleDimension.php → ...Bundle/Entity/ExampleDimensionContent.php
@@ -27,7 +27,7 @@
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\WorkflowInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\WorkflowTrait;
 
-class ExampleDimension extends AbstractDimensionContent implements ExcerptInterface, SeoInterface, TemplateInterface, RoutableInterface, WorkflowInterface
+class ExampleDimensionContent extends AbstractDimensionContent implements ExcerptInterface, SeoInterface, TemplateInterface, RoutableInterface, WorkflowInterface
 {
     use ExcerptTrait;
     use SeoTrait;
@@ -84,7 +84,7 @@ public function setTemplateData(array $templateData): void
         $this->parentSetTemplateData($templateData);
     }
 
-    public function createViewInstance(): ContentProjectionInterface
+    public function createProjectionInstance(): ContentProjectionInterface
     {
         $contentProjection = new ExampleView($this->getExample(), $this->dimension);
         $contentProjection->setTitle($this->getTitle());

diff --git a/Tests/Application/ExampleTestBundle/Resources/config/doctrine/Example.orm.xml b/Tests/Application/ExampleTestBundle/Resources/config/doctrine/Example.orm.xml
@@ -7,7 +7,7 @@
             <generator strategy="AUTO"/>
         </id>
 
-        <one-to-many field="dimensionContents" target-entity="Sulu\Bundle\ContentBundle\Tests\Application\ExampleTestBundle\Entity\ExampleDimension" mapped-by="example">
+        <one-to-many field="dimensionContents" target-entity="Sulu\Bundle\ContentBundle\Tests\Application\ExampleTestBundle\Entity\ExampleDimensionContent" mapped-by="example">
             <cascade>
                 <cascade-persist/>
             </cascade>

diff --git a/.../config/doctrine/ExampleDimension.orm.xml → .../doctrine/ExampleDimensionContent.orm.xml b/.../config/doctrine/ExampleDimension.orm.xml → .../doctrine/ExampleDimensionContent.orm.xml
@@ -2,8 +2,8 @@
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
-    <entity name="Sulu\Bundle\ContentBundle\Tests\Application\ExampleTestBundle\Entity\ExampleDimension"
-            table="test_example_dimensions">
+    <entity name="Sulu\Bundle\ContentBundle\Tests\Application\ExampleTestBundle\Entity\ExampleDimensionContent"
+            table="test_example_dimension_contents">
         <id name="id" type="integer" column="id">
             <generator strategy="AUTO"/>
         </id>

diff --git a/Tests/Functional/Content/Infrastructure/Doctrine/DimensionContentRepositoryTest.php b/Tests/Functional/Content/Infrastructure/Doctrine/DimensionContentRepositoryTest.php
@@ -19,7 +19,7 @@
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\DimensionInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Repository\DimensionContentRepositoryInterface;
 use Sulu\Bundle\ContentBundle\Tests\Application\ExampleTestBundle\Entity\Example;
-use Sulu\Bundle\ContentBundle\Tests\Application\ExampleTestBundle\Entity\ExampleDimension;
+use Sulu\Bundle\ContentBundle\Tests\Application\ExampleTestBundle\Entity\ExampleDimensionContent;
 use Sulu\Bundle\ContentBundle\Tests\Functional\BaseTestCase;
 
 class DimensionContentRepositoryTest extends BaseTestCase
@@ -151,9 +151,9 @@ private function createContentRichEntity(): Example
         return $example;
     }
 
-    private function createContentDimension(Example $example, DimensionInterface $dimension): ExampleDimension
+    private function createContentDimension(Example $example, DimensionInterface $dimension): ExampleDimensionContent
     {
-        $exampleDimension = new ExampleDimension($example, $dimension);
+        $exampleDimension = new ExampleDimensionContent($example, $dimension);
         $this->getEntityManager()->persist($exampleDimension);
 
         return $exampleDimension;

diff --git a/Tests/Unit/Content/Application/ContentProjectionFactory/ContentProjectionFactoryTest.php b/Tests/Unit/Content/Application/ContentProjectionFactory/ContentProjectionFactoryTest.php
@@ -45,7 +45,7 @@ public function testCreate(): void
 
         $contentProjection = $this->prophesize(ContentProjectionInterface::class);
 
-        $contentProjectionDimension3->createViewInstance()->willReturn($contentProjection->reveal())->shouldBeCalled();
+        $contentProjectionDimension3->createProjectionInstance()->willReturn($contentProjection->reveal())->shouldBeCalled();
 
         $viewFactory = $this->getViewFactoryInstance();
         $viewFactory->create(new DimensionContentCollection([
@@ -78,7 +78,7 @@ public function testCreateMergers(): void
         $merger3->merge($contentProjection, $contentProjectionDimension2)->shouldBeCalled();
         $merger3->merge($contentProjection, $contentProjectionDimension3)->shouldBeCalled();
 
-        $contentProjectionDimension3->createViewInstance()->willReturn($contentProjection->reveal())->shouldBeCalled();
+        $contentProjectionDimension3->createProjectionInstance()->willReturn($contentProjection->reveal())->shouldBeCalled();
 
         $viewFactory = $this->getViewFactoryInstance([
             $merger1->reveal(),

diff --git a/Tests/Unit/Content/Domain/Model/ContentRichEntityTest.php b/Tests/Unit/Content/Domain/Model/ContentRichEntityTest.php
@@ -61,7 +61,7 @@ public function setId(int $id): void
                 $this->id = $id;
             }
 
-            public function createViewInstance(): ContentProjectionInterface
+            public function createProjectionInstance(): ContentProjectionInterface
             {
                 return new class() extends AbstractContentProjection {
                     public function getContentId()

diff --git a/Tests/Unit/Content/Domain/Model/DimensionContentTest.php b/Tests/Unit/Content/Domain/Model/DimensionContentTest.php
@@ -35,7 +35,7 @@ public function __construct(DimensionInterface $dimension)
                 $this->dimension = $dimension;
             }
 
-            public function createViewInstance(): ContentProjectionInterface
+            public function createProjectionInstance(): ContentProjectionInterface
             {
                 return new class() extends AbstractContentProjection {
                     public function getContentId()

diff --git a/Tests/Unit/Content/Infrastructure/Doctrine/MetadataLoaderTest.php b/Tests/Unit/Content/Infrastructure/Doctrine/MetadataLoaderTest.php
@@ -30,7 +30,7 @@
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\TemplateInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\WorkflowInterface;
 use Sulu\Bundle\ContentBundle\Content\Infrastructure\Doctrine\MetadataLoader;
-use Sulu\Bundle\ContentBundle\Tests\Application\ExampleTestBundle\Entity\ExampleDimension;
+use Sulu\Bundle\ContentBundle\Tests\Application\ExampleTestBundle\Entity\ExampleDimensionContent;
 use Sulu\Bundle\TagBundle\Tag\TagInterface;
 
 class MetadataLoaderTest extends TestCase
@@ -77,7 +77,7 @@ public function testInvalidMetadata(array $interfaces, array $fields, array $man
         $classMetadata->getReflectionClass()->willReturn($reflectionClass->reveal());
         $classMetadata->getTableName()->willReturn('test_example');
         $classMetadata->getIdentifierColumnNames()->willReturn(['id']);
-        $classMetadata->getName()->willReturn(ExampleDimension::class);
+        $classMetadata->getName()->willReturn(ExampleDimensionContent::class);
 
         foreach ($fields as $field => $exist) {
             $classMetadata->hasField($field)->willReturn($exist);