Rename class Content to ContentRichEntity

sulu · Dec 13, 2019 · bcbaba1 · bcbaba1
1 parent 8ac7361
commit bcbaba1
Show file tree

Hide file tree

Showing 30 changed files with 109 additions and 109 deletions.
diff --git a/Content/Application/ContentCopier/ContentCopier.php b/Content/Application/ContentCopier/ContentCopier.php
@@ -18,7 +18,7 @@
 use Sulu\Bundle\ContentBundle\Content\Application\ViewResolver\ApiViewResolverInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Factory\ViewFactoryInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentDimensionCollectionInterface;
-use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentInterface;
+use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentRichEntityInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentViewInterface;
 
 class ContentCopier implements ContentCopierInterface
@@ -56,9 +56,9 @@ public function __construct(
     }
 
     public function copy(
-        ContentInterface $sourceContent,
+        ContentRichEntityInterface $sourceContent,
         array $sourceDimensionAttributes,
-        ContentInterface $targetContent,
+        ContentRichEntityInterface $targetContent,
         array $targetDimensionAttributes
     ): ContentViewInterface {
         $sourceContentView = $this->contentLoader->load($sourceContent, $sourceDimensionAttributes);
@@ -68,7 +68,7 @@ public function copy(
 
     public function copyFromContentDimensionCollection(
         ContentDimensionCollectionInterface $contentDimensionCollection,
-        ContentInterface $targetContent,
+        ContentRichEntityInterface $targetContent,
         array $targetDimensionAttributes
     ): ContentViewInterface {
         $sourceContentView = $this->viewFactory->create($contentDimensionCollection);
@@ -78,7 +78,7 @@ public function copyFromContentDimensionCollection(
 
     public function copyFromContentView(
         ContentViewInterface $sourceContentView,
-        ContentInterface $targetContent,
+        ContentRichEntityInterface $targetContent,
         array $targetDimensionAttributes
     ): ContentViewInterface {
         $data = $this->contentResolver->resolve($sourceContentView);

diff --git a/Content/Application/ContentCopier/ContentCopierInterface.php b/Content/Application/ContentCopier/ContentCopierInterface.php
@@ -14,7 +14,7 @@
 namespace Sulu\Bundle\ContentBundle\Content\Application\ContentCopier;
 
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentDimensionCollectionInterface;
-use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentInterface;
+use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentRichEntityInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentViewInterface;
 
 interface ContentCopierInterface
@@ -24,9 +24,9 @@ interface ContentCopierInterface
      * @param mixed[] $targetDimensionAttributes
      */
     public function copy(
-        ContentInterface $sourceContent,
+        ContentRichEntityInterface $sourceContent,
         array $sourceDimensionAttributes,
-        ContentInterface $targetContent,
+        ContentRichEntityInterface $targetContent,
         array $targetDimensionAttributes
     ): ContentViewInterface;
 
@@ -35,7 +35,7 @@ public function copy(
      */
     public function copyFromContentDimensionCollection(
         ContentDimensionCollectionInterface $contentDimensionCollection,
-        ContentInterface $targetContent,
+        ContentRichEntityInterface $targetContent,
         array $targetDimensionAttributes
     ): ContentViewInterface;
 
@@ -44,7 +44,7 @@ public function copyFromContentDimensionCollection(
      */
     public function copyFromContentView(
         ContentViewInterface $sourceContentView,
-        ContentInterface $targetContent,
+        ContentRichEntityInterface $targetContent,
         array $targetDimensionAttributes
     ): ContentViewInterface;
 }
diff --git a/Content/Application/ContentDimensionFactory/ContentDimensionCollectionFactory.php b/Content/Application/ContentDimensionFactory/ContentDimensionCollectionFactory.php
@@ -20,7 +20,7 @@
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentDimensionCollection;
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentDimensionCollectionInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentDimensionInterface;
-use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentInterface;
+use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentRichEntityInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\DimensionCollectionInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\DimensionInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Repository\ContentDimensionRepositoryInterface;
@@ -47,7 +47,7 @@ public function __construct(ContentDimensionRepositoryInterface $contentDimensio
     }
 
     public function create(
-        ContentInterface $content,
+        ContentRichEntityInterface $content,
         DimensionCollectionInterface $dimensionCollection,
         array $data
     ): ContentDimensionCollectionInterface {
@@ -97,7 +97,7 @@ public function create(
     }
 
     private function getOrCreateContentDimension(
-        ContentInterface $content,
+        ContentRichEntityInterface $content,
         Collection $contentDimensions,
         DimensionInterface $dimension
     ): ContentDimensionInterface {

diff --git a/Content/Application/ContentFacade/ContentFacade.php b/Content/Application/ContentFacade/ContentFacade.php
@@ -18,7 +18,7 @@
 use Sulu\Bundle\ContentBundle\Content\Application\ContentPersister\ContentPersisterInterface;
 use Sulu\Bundle\ContentBundle\Content\Application\ContentWorkflow\ContentWorkflowInterface;
 use Sulu\Bundle\ContentBundle\Content\Application\ViewResolver\ApiViewResolverInterface;
-use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentInterface;
+use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentRichEntityInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentViewInterface;
 
 class ContentFacade implements ContentFacadeInterface
@@ -62,12 +62,12 @@ public function __construct(
         $this->contentWorkflow = $contentWorkflow;
     }
 
-    public function load(ContentInterface $content, array $dimensionAttributes): ContentViewInterface
+    public function load(ContentRichEntityInterface $content, array $dimensionAttributes): ContentViewInterface
     {
         return $this->contentLoader->load($content, $dimensionAttributes);
     }
 
-    public function persist(ContentInterface $content, array $data, array $dimensionAttributes): ContentViewInterface
+    public function persist(ContentRichEntityInterface $content, array $data, array $dimensionAttributes): ContentViewInterface
     {
         return $this->contentPersister->persist($content, $data, $dimensionAttributes);
     }
@@ -78,9 +78,9 @@ public function resolve(ContentViewInterface $contentView): array
     }
 
     public function copy(
-        ContentInterface $sourceContent,
+        ContentRichEntityInterface $sourceContent,
         array $sourceDimensionAttributes,
-        ContentInterface $targetContent,
+        ContentRichEntityInterface $targetContent,
         array $targetDimensionAttributes
     ): ContentViewInterface {
         return $this->contentCopier->copy(
@@ -92,7 +92,7 @@ public function copy(
     }
 
     public function applyTransition(
-        ContentInterface $content,
+        ContentRichEntityInterface $content,
         array $dimensionAttributes,
         string $transitionName
     ): ContentViewInterface {

diff --git a/Content/Application/ContentFacade/ContentFacadeInterface.php b/Content/Application/ContentFacade/ContentFacadeInterface.php
@@ -13,21 +13,21 @@
 
 namespace Sulu\Bundle\ContentBundle\Content\Application\ContentFacade;
 
-use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentInterface;
+use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentRichEntityInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentViewInterface;
 
 interface ContentFacadeInterface
 {
     /**
      * @param mixed[] $dimensionAttributes
      */
-    public function load(ContentInterface $content, array $dimensionAttributes): ContentViewInterface;
+    public function load(ContentRichEntityInterface $content, array $dimensionAttributes): ContentViewInterface;
 
     /**
      * @param mixed[] $data
      * @param mixed[] $dimensionAttributes
      */
-    public function persist(ContentInterface $content, array $data, array $dimensionAttributes): ContentViewInterface;
+    public function persist(ContentRichEntityInterface $content, array $data, array $dimensionAttributes): ContentViewInterface;
 
     /**
      * @return mixed[]
@@ -39,17 +39,17 @@ public function resolve(ContentViewInterface $contentView): array;
      * @param mixed[] $targetDimensionAttributes
      */
     public function copy(
-        ContentInterface $sourceContent,
+        ContentRichEntityInterface $sourceContent,
         array $sourceDimensionAttributes,
-        ContentInterface $targetContent,
+        ContentRichEntityInterface $targetContent,
         array $targetDimensionAttributes
     ): ContentViewInterface;
 
     /**
      * @param mixed[] $dimensionAttributes
      */
     public function applyTransition(
-        ContentInterface $content,
+        ContentRichEntityInterface $content,
         array $dimensionAttributes,
         string $transitionName
     ): ContentViewInterface;

diff --git a/Content/Application/ContentLoader/ContentLoader.php b/Content/Application/ContentLoader/ContentLoader.php
@@ -15,7 +15,7 @@
 
 use Sulu\Bundle\ContentBundle\Content\Domain\Exception\ContentNotFoundException;
 use Sulu\Bundle\ContentBundle\Content\Domain\Factory\ViewFactoryInterface;
-use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentInterface;
+use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentRichEntityInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentViewInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Repository\ContentDimensionRepositoryInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Repository\DimensionRepositoryInterface;
@@ -47,7 +47,7 @@ public function __construct(
         $this->viewFactory = $viewFactory;
     }
 
-    public function load(ContentInterface $content, array $dimensionAttributes): ContentViewInterface
+    public function load(ContentRichEntityInterface $content, array $dimensionAttributes): ContentViewInterface
     {
         $dimensionCollection = $this->dimensionRepository->findByAttributes($dimensionAttributes);
 

diff --git a/Content/Application/ContentLoader/ContentLoaderInterface.php b/Content/Application/ContentLoader/ContentLoaderInterface.php
@@ -13,13 +13,13 @@
 
 namespace Sulu\Bundle\ContentBundle\Content\Application\ContentLoader;
 
-use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentInterface;
+use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentRichEntityInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentViewInterface;
 
 interface ContentLoaderInterface
 {
     /**
      * @param mixed[] $dimensionAttributes
      */
-    public function load(ContentInterface $content, array $dimensionAttributes): ContentViewInterface;
+    public function load(ContentRichEntityInterface $content, array $dimensionAttributes): ContentViewInterface;
 }
diff --git a/Content/Application/ContentPersister/ContentPersister.php b/Content/Application/ContentPersister/ContentPersister.php
@@ -17,7 +17,7 @@
 use Sulu\Bundle\ContentBundle\Content\Domain\Factory\ContentDimensionCollectionFactoryInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Factory\DimensionCollectionFactoryInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Factory\ViewFactoryInterface;
-use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentInterface;
+use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentRichEntityInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentViewInterface;
 
 class ContentPersister implements ContentPersisterInterface
@@ -52,7 +52,7 @@ public function __construct(
         $this->viewFactory = $viewFactory;
     }
 
-    public function persist(ContentInterface $content, array $data, array $dimensionAttributes): ContentViewInterface
+    public function persist(ContentRichEntityInterface $content, array $data, array $dimensionAttributes): ContentViewInterface
     {
         $dimensionCollection = $this->dimensionCollectionFactory->create($dimensionAttributes);
         $contentDimensionCollection = $this->contentDimensionCollectionFactory->create(

diff --git a/Content/Application/ContentPersister/ContentPersisterInterface.php b/Content/Application/ContentPersister/ContentPersisterInterface.php
@@ -13,7 +13,7 @@
 
 namespace Sulu\Bundle\ContentBundle\Content\Application\ContentPersister;
 
-use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentInterface;
+use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentRichEntityInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentViewInterface;
 
 interface ContentPersisterInterface
@@ -22,5 +22,5 @@ interface ContentPersisterInterface
      * @param mixed[] $data
      * @param mixed[] $dimensionAttributes
      */
-    public function persist(ContentInterface $content, array $data, array $dimensionAttributes): ContentViewInterface;
+    public function persist(ContentRichEntityInterface $content, array $data, array $dimensionAttributes): ContentViewInterface;
 }
diff --git a/Content/Application/ContentWorkflow/ContentWorkflow.php b/Content/Application/ContentWorkflow/ContentWorkflow.php
@@ -17,7 +17,7 @@
 use Sulu\Bundle\ContentBundle\Content\Domain\Exception\ContentNotExistTransitionException;
 use Sulu\Bundle\ContentBundle\Content\Domain\Exception\ContentNotFoundException;
 use Sulu\Bundle\ContentBundle\Content\Domain\Factory\ViewFactoryInterface;
-use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentInterface;
+use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentRichEntityInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentViewInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\WorkflowInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Repository\ContentDimensionRepositoryInterface;
@@ -81,7 +81,7 @@ public function __construct(
     }
 
     public function apply(
-        ContentInterface $content,
+        ContentRichEntityInterface $content,
         array $dimensionAttributes,
         string $transitionName
     ): ContentViewInterface {

diff --git a/Content/Application/ContentWorkflow/ContentWorkflowInterface.php b/Content/Application/ContentWorkflow/ContentWorkflowInterface.php
@@ -13,7 +13,7 @@
 
 namespace Sulu\Bundle\ContentBundle\Content\Application\ContentWorkflow;
 
-use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentInterface;
+use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentRichEntityInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentViewInterface;
 
 interface ContentWorkflowInterface
@@ -22,7 +22,7 @@ interface ContentWorkflowInterface
      * @param mixed[] $dimensionAttributes
      */
     public function apply(
-        ContentInterface $content,
+        ContentRichEntityInterface $content,
         array $dimensionAttributes,
         string $transitionName
     ): ContentViewInterface;

diff --git a/Content/Application/ContentWorkflow/Subscriber/ContentPublishSubscriber.php b/Content/Application/ContentWorkflow/Subscriber/ContentPublishSubscriber.php
@@ -16,7 +16,7 @@
 use Sulu\Bundle\ContentBundle\Content\Application\ContentCopier\ContentCopierInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentDimensionCollectionInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentDimensionInterface;
-use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentInterface;
+use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentRichEntityInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\DimensionInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Workflow\Event\TransitionEvent;
@@ -55,7 +55,7 @@ public function onPublish(TransitionEvent $transitionEvent): void
             throw new \RuntimeException('No "contentDimensionCollection" given.');
         }
 
-        if (!$content instanceof ContentInterface) {
+        if (!$content instanceof ContentRichEntityInterface) {
             throw new \RuntimeException('No "contentRichEntity" given.');
         }
 

diff --git a/Content/Domain/Exception/ContentNotFoundException.php b/Content/Domain/Exception/ContentNotFoundException.php
@@ -13,11 +13,11 @@
 
 namespace Sulu\Bundle\ContentBundle\Content\Domain\Exception;
 
-use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentInterface;
+use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentRichEntityInterface;
 
 class ContentNotFoundException extends \Exception
 {
-    public function __construct(ContentInterface $content, array $dimensionAttributes)
+    public function __construct(ContentRichEntityInterface $content, array $dimensionAttributes)
     {
         parent::__construct(sprintf(
             'Could not load content with id "%s" and attributes: %s',

diff --git a/Content/Domain/Factory/ContentDimensionCollectionFactoryInterface.php b/Content/Domain/Factory/ContentDimensionCollectionFactoryInterface.php
@@ -14,7 +14,7 @@
 namespace Sulu\Bundle\ContentBundle\Content\Domain\Factory;
 
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentDimensionCollectionInterface;
-use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentInterface;
+use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentRichEntityInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\DimensionCollectionInterface;
 
 interface ContentDimensionCollectionFactoryInterface
@@ -23,7 +23,7 @@ interface ContentDimensionCollectionFactoryInterface
      * @param array<string, mixed> $data
      */
     public function create(
-        ContentInterface $content,
+        ContentRichEntityInterface $content,
         DimensionCollectionInterface $dimensionCollection,
         array $data
     ): ContentDimensionCollectionInterface;

diff --git a/Content/Domain/Model/AbstractContent.php → ...omain/Model/AbstractContentRichEntity.php b/Content/Domain/Model/AbstractContent.php → ...omain/Model/AbstractContentRichEntity.php
@@ -13,7 +13,7 @@
 
 namespace Sulu\Bundle\ContentBundle\Content\Domain\Model;
 
-abstract class AbstractContent implements ContentInterface
+abstract class AbstractContentRichEntity implements ContentRichEntityInterface
 {
-    use ContentTrait;
+    use ContentRichEntityTrait;
 }
diff --git a/Content/Domain/Model/ContentInterface.php → ...main/Model/ContentRichEntityInterface.php b/Content/Domain/Model/ContentInterface.php → ...main/Model/ContentRichEntityInterface.php
@@ -15,7 +15,7 @@
 
 use Doctrine\Common\Collections\Collection;
 
-interface ContentInterface
+interface ContentRichEntityInterface
 {
     public static function getResourceKey(): string;
 

diff --git a/Content/Domain/Model/ContentTrait.php → ...t/Domain/Model/ContentRichEntityTrait.php b/Content/Domain/Model/ContentTrait.php → ...t/Domain/Model/ContentRichEntityTrait.php
@@ -16,7 +16,7 @@
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 
-trait ContentTrait
+trait ContentRichEntityTrait
 {
     /**
      * @var ContentDimensionInterface[]|ArrayCollection

diff --git a/Content/Domain/Repository/ContentDimensionRepositoryInterface.php b/Content/Domain/Repository/ContentDimensionRepositoryInterface.php
@@ -14,13 +14,13 @@
 namespace Sulu\Bundle\ContentBundle\Content\Domain\Repository;
 
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentDimensionCollectionInterface;
-use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentInterface;
+use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentRichEntityInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\DimensionCollectionInterface;
 
 interface ContentDimensionRepositoryInterface
 {
     public function load(
-        ContentInterface $content,
+        ContentRichEntityInterface $content,
         DimensionCollectionInterface $dimensionCollection
     ): ContentDimensionCollectionInterface;
 }