Rename ContentDimensionInterface to DimensionContentInterface

sulu · Dec 13, 2019 · 4f3f209 · 4f3f209
1 parent f0f66a0
commit 4f3f209
Show file tree

Hide file tree

Showing 59 changed files with 810 additions and 815 deletions.
diff --git a/Content/Application/ContentCopier/ContentCopier.php b/Content/Application/ContentCopier/ContentCopier.php
@@ -17,7 +17,7 @@
 use Sulu\Bundle\ContentBundle\Content\Application\ContentPersister\ContentPersisterInterface;
 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\DimensionContentCollectionInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentRichEntityInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentViewInterface;
 
@@ -67,11 +67,11 @@ public function copy(
     }
 
     public function copyFromContentDimensionCollection(
-        ContentDimensionCollectionInterface $contentDimensionCollection,
+        DimensionContentCollectionInterface $dimensionContentCollection,
         ContentRichEntityInterface $targetContentRichEntity,
         array $targetDimensionAttributes
     ): ContentViewInterface {
-        $sourceContentView = $this->viewFactory->create($contentDimensionCollection);
+        $sourceContentView = $this->viewFactory->create($dimensionContentCollection);
 
         return $this->copyFromContentView($sourceContentView, $targetContentRichEntity, $targetDimensionAttributes);
     }

diff --git a/Content/Application/ContentCopier/ContentCopierInterface.php b/Content/Application/ContentCopier/ContentCopierInterface.php
@@ -13,7 +13,7 @@
 
 namespace Sulu\Bundle\ContentBundle\Content\Application\ContentCopier;
 
-use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentDimensionCollectionInterface;
+use Sulu\Bundle\ContentBundle\Content\Domain\Model\DimensionContentCollectionInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentRichEntityInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentViewInterface;
 
@@ -34,7 +34,7 @@ public function copy(
      * @param mixed[] $targetDimensionAttributes
      */
     public function copyFromContentDimensionCollection(
-        ContentDimensionCollectionInterface $contentDimensionCollection,
+        DimensionContentCollectionInterface $dimensionContentCollection,
         ContentRichEntityInterface $targetContentRichEntity,
         array $targetDimensionAttributes
     ): ContentViewInterface;

diff --git a/Content/Application/ContentLoader/ContentLoader.php b/Content/Application/ContentLoader/ContentLoader.php
@@ -17,7 +17,7 @@
 use Sulu\Bundle\ContentBundle\Content\Domain\Factory\ViewFactoryInterface;
 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\DimensionContentRepositoryInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Repository\DimensionRepositoryInterface;
 
 class ContentLoader implements ContentLoaderInterface
@@ -28,9 +28,9 @@ class ContentLoader implements ContentLoaderInterface
     private $dimensionRepository;
 
     /**
-     * @var ContentDimensionRepositoryInterface
+     * @var DimensionContentRepositoryInterface
      */
-    private $contentDimensionRepository;
+    private $dimensionContentRepository;
 
     /**
      * @var ViewFactoryInterface
@@ -39,11 +39,11 @@ class ContentLoader implements ContentLoaderInterface
 
     public function __construct(
         DimensionRepositoryInterface $dimensionRepository,
-        ContentDimensionRepositoryInterface $contentDimensionRepository,
+        DimensionContentRepositoryInterface $dimensionContentRepository,
         ViewFactoryInterface $viewFactory
     ) {
         $this->dimensionRepository = $dimensionRepository;
-        $this->contentDimensionRepository = $contentDimensionRepository;
+        $this->dimensionContentRepository = $dimensionContentRepository;
         $this->viewFactory = $viewFactory;
     }
 
@@ -55,12 +55,12 @@ public function load(ContentRichEntityInterface $contentRichEntity, array $dimen
             throw new ContentNotFoundException($contentRichEntity, $dimensionAttributes);
         }
 
-        $contentDimensionCollection = $this->contentDimensionRepository->load($contentRichEntity, $dimensionCollection);
+        $dimensionContentCollection = $this->dimensionContentRepository->load($contentRichEntity, $dimensionCollection);
 
-        if (0 === \count($contentDimensionCollection)) {
+        if (0 === \count($dimensionContentCollection)) {
             throw new ContentNotFoundException($contentRichEntity, $dimensionAttributes);
         }
 
-        return $this->viewFactory->create($contentDimensionCollection);
+        return $this->viewFactory->create($dimensionContentCollection);
     }
 }
diff --git a/Content/Application/ContentPersister/ContentPersister.php b/Content/Application/ContentPersister/ContentPersister.php
@@ -14,7 +14,7 @@
 namespace Sulu\Bundle\ContentBundle\Content\Application\ContentPersister;
 
 use Sulu\Bundle\ContentBundle\Content\Application\ViewResolver\ApiViewResolverInterface;
-use Sulu\Bundle\ContentBundle\Content\Domain\Factory\ContentDimensionCollectionFactoryInterface;
+use Sulu\Bundle\ContentBundle\Content\Domain\Factory\DimensionContentCollectionFactoryInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Factory\DimensionCollectionFactoryInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Factory\ViewFactoryInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentRichEntityInterface;
@@ -28,39 +28,34 @@ class ContentPersister implements ContentPersisterInterface
     private $dimensionCollectionFactory;
 
     /**
-     * @var ContentDimensionCollectionFactoryInterface
+     * @var DimensionContentCollectionFactoryInterface
      */
-    private $contentDimensionCollectionFactory;
+    private $dimensionContentCollectionFactory;
 
     /**
      * @var ViewFactoryInterface
      */
     private $viewFactory;
 
-    /**
-     * @var ApiViewResolverInterface
-     */
-    private $viewResolver;
-
     public function __construct(
         DimensionCollectionFactoryInterface $dimensionCollectionFactory,
-        ContentDimensionCollectionFactoryInterface $contentDimensionCollectionFactory,
+        DimensionContentCollectionFactoryInterface $dimensionContentCollectionFactory,
         ViewFactoryInterface $viewFactory
     ) {
         $this->dimensionCollectionFactory = $dimensionCollectionFactory;
-        $this->contentDimensionCollectionFactory = $contentDimensionCollectionFactory;
+        $this->dimensionContentCollectionFactory = $dimensionContentCollectionFactory;
         $this->viewFactory = $viewFactory;
     }
 
     public function persist(ContentRichEntityInterface $contentRichEntity, array $data, array $dimensionAttributes): ContentViewInterface
     {
         $dimensionCollection = $this->dimensionCollectionFactory->create($dimensionAttributes);
-        $contentDimensionCollection = $this->contentDimensionCollectionFactory->create(
+        $dimensionContentCollection = $this->dimensionContentCollectionFactory->create(
             $contentRichEntity,
             $dimensionCollection,
             $data
         );
 
-        return $this->viewFactory->create($contentDimensionCollection);
+        return $this->viewFactory->create($dimensionContentCollection);
     }
 }
diff --git a/Content/Application/ContentWorkflow/ContentWorkflow.php b/Content/Application/ContentWorkflow/ContentWorkflow.php
@@ -20,7 +20,7 @@
 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;
+use Sulu\Bundle\ContentBundle\Content\Domain\Repository\DimensionContentRepositoryInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Repository\DimensionRepositoryInterface;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
@@ -42,9 +42,9 @@ class ContentWorkflow implements ContentWorkflowInterface
     private $dimensionRepository;
 
     /**
-     * @var ContentDimensionRepositoryInterface
+     * @var DimensionContentRepositoryInterface
      */
-    private $contentDimensionRepository;
+    private $dimensionContentRepository;
 
     /**
      * @var ViewFactoryInterface
@@ -63,13 +63,13 @@ class ContentWorkflow implements ContentWorkflowInterface
 
     public function __construct(
         DimensionRepositoryInterface $dimensionRepository,
-        ContentDimensionRepositoryInterface $contentDimensionRepository,
+        DimensionContentRepositoryInterface $dimensionContentRepository,
         ViewFactoryInterface $viewFactory,
         ?Registry $workflowRegistry = null,
         ?EventDispatcherInterface $eventDispatcher = null
     ) {
         $this->dimensionRepository = $dimensionRepository;
-        $this->contentDimensionRepository = $contentDimensionRepository;
+        $this->dimensionContentRepository = $dimensionContentRepository;
         $this->viewFactory = $viewFactory;
         $this->eventDispatcher = $eventDispatcher ?: new EventDispatcher();
         // TODO get workflow from outside
@@ -91,9 +91,9 @@ public function apply(
             throw new ContentNotFoundException($contentRichEntity, $dimensionAttributes);
         }
 
-        $contentDimensionCollection = $this->contentDimensionRepository->load($contentRichEntity, $dimensionCollection);
+        $dimensionContentCollection = $this->dimensionContentRepository->load($contentRichEntity, $dimensionCollection);
 
-        $localizedContentDimension = $contentDimensionCollection->getLocalizedContentDimension();
+        $localizedContentDimension = $dimensionContentCollection->getLocalizedDimensionContent();
 
         if (!$localizedContentDimension) {
             throw new ContentNotFoundException($contentRichEntity, $dimensionAttributes);
@@ -111,7 +111,7 @@ public function apply(
         try {
             $workflow->apply($localizedContentDimension, $transitionName, [
                 'contentRichEntity' => $contentRichEntity,
-                'contentDimensionCollection' => $contentDimensionCollection,
+                'dimensionContentCollection' => $dimensionContentCollection,
                 'dimensionAttributes' => $dimensionAttributes,
             ]);
         } catch (UndefinedTransitionException $e) {
@@ -120,7 +120,7 @@ public function apply(
             throw new ContentInvalidTransitionException($e->getMessage(), $e->getCode(), $e);
         }
 
-        return $this->viewFactory->create($contentDimensionCollection);
+        return $this->viewFactory->create($dimensionContentCollection);
     }
 
     private function getWorkflow(): SymfonyWorkflowInterface

diff --git a/Content/Application/ContentWorkflow/Subscriber/ContentPublishSubscriber.php b/Content/Application/ContentWorkflow/Subscriber/ContentPublishSubscriber.php
@@ -14,8 +14,8 @@
 namespace Sulu\Bundle\ContentBundle\Content\Application\ContentWorkflow\Subscriber;
 
 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\DimensionContentCollectionInterface;
+use Sulu\Bundle\ContentBundle\Content\Domain\Model\DimensionContentInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\ContentRichEntityInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\DimensionInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
@@ -35,24 +35,24 @@ public function __construct(ContentCopierInterface $contentCopier)
 
     public function onPublish(TransitionEvent $transitionEvent): void
     {
-        $contentDimension = $transitionEvent->getSubject();
+        $dimensionContent = $transitionEvent->getSubject();
 
-        if (!$contentDimension instanceof ContentDimensionInterface) {
+        if (!$dimensionContent instanceof DimensionContentInterface) {
             return;
         }
 
         $context = $transitionEvent->getContext();
 
-        $contentDimensionCollection = $context['contentDimensionCollection'] ?? null;
+        $dimensionContentCollection = $context['dimensionContentCollection'] ?? null;
         $dimensionAttributes = $context['dimensionAttributes'] ?? null;
         $contentRichEntity = $context['contentRichEntity'] ?? null;
 
         if (!$dimensionAttributes) {
             throw new \RuntimeException('No "dimensionAttributes" given.');
         }
 
-        if (!$contentDimensionCollection instanceof ContentDimensionCollectionInterface) {
-            throw new \RuntimeException('No "contentDimensionCollection" given.');
+        if (!$dimensionContentCollection instanceof DimensionContentCollectionInterface) {
+            throw new \RuntimeException('No "dimensionContentCollection" given.');
         }
 
         if (!$contentRichEntity instanceof ContentRichEntityInterface) {
@@ -62,7 +62,7 @@ public function onPublish(TransitionEvent $transitionEvent): void
         $dimensionAttributes['stage'] = DimensionInterface::STAGE_LIVE;
 
         $this->contentCopier->copyFromContentDimensionCollection(
-            $contentDimensionCollection,
+            $dimensionContentCollection,
             $contentRichEntity,
             $dimensionAttributes
         );

diff --git a/...ory/ContentDimensionCollectionFactory.php → ...ory/DimensionContentCollectionFactory.php b/...ory/ContentDimensionCollectionFactory.php → ...ory/DimensionContentCollectionFactory.php
@@ -11,26 +11,26 @@
  * with this source code in the file LICENSE.
  */
 
-namespace Sulu\Bundle\ContentBundle\Content\Application\ContentDimensionFactory;
+namespace Sulu\Bundle\ContentBundle\Content\Application\DimensionContentFactory;
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
-use Sulu\Bundle\ContentBundle\Content\Application\ContentDimensionFactory\Mapper\MapperInterface;
-use Sulu\Bundle\ContentBundle\Content\Domain\Factory\ContentDimensionCollectionFactoryInterface;
-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\Application\DimensionContentFactory\Mapper\MapperInterface;
+use Sulu\Bundle\ContentBundle\Content\Domain\Factory\DimensionContentCollectionFactoryInterface;
+use Sulu\Bundle\ContentBundle\Content\Domain\Model\DimensionContentCollection;
+use Sulu\Bundle\ContentBundle\Content\Domain\Model\DimensionContentCollectionInterface;
+use Sulu\Bundle\ContentBundle\Content\Domain\Model\DimensionContentInterface;
 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;
+use Sulu\Bundle\ContentBundle\Content\Domain\Repository\DimensionContentRepositoryInterface;
 
-class ContentDimensionCollectionFactory implements ContentDimensionCollectionFactoryInterface
+class DimensionContentCollectionFactory implements DimensionContentCollectionFactoryInterface
 {
     /**
-     * @var ContentDimensionRepositoryInterface
+     * @var DimensionContentRepositoryInterface
      */
-    private $contentDimensionRepository;
+    private $dimensionContentRepository;
 
     /**
      * @var iterable<MapperInterface>
@@ -40,77 +40,77 @@ class ContentDimensionCollectionFactory implements ContentDimensionCollectionFac
     /**
      * @param iterable<MapperInterface> $mappers
      */
-    public function __construct(ContentDimensionRepositoryInterface $contentDimensionRepository, iterable $mappers)
+    public function __construct(DimensionContentRepositoryInterface $dimensionContentRepository, iterable $mappers)
     {
-        $this->contentDimensionRepository = $contentDimensionRepository;
+        $this->dimensionContentRepository = $dimensionContentRepository;
         $this->mappers = $mappers;
     }
 
     public function create(
         ContentRichEntityInterface $contentRichEntity,
         DimensionCollectionInterface $dimensionCollection,
         array $data
-    ): ContentDimensionCollectionInterface {
-        $contentDimensionCollection = $this->contentDimensionRepository->load($contentRichEntity, $dimensionCollection);
+    ): DimensionContentCollectionInterface {
+        $dimensionContentCollection = $this->dimensionContentRepository->load($contentRichEntity, $dimensionCollection);
 
         $localizedDimension = $dimensionCollection->getLocalizedDimension();
         $unlocalizedDimension = $dimensionCollection->getUnlocalizedDimension();
 
-        $contentDimensions = new ArrayCollection(iterator_to_array($contentDimensionCollection));
+        $dimensionContents = new ArrayCollection(iterator_to_array($dimensionContentCollection));
 
         if (!$unlocalizedDimension) {
             throw new \RuntimeException('The "$dimensionCollection" should contain atleast a unlocalizedDimension.');
         }
 
         $unlocalizedContentDimension = $this->getOrCreateContentDimension(
             $contentRichEntity,
-            $contentDimensions,
+            $dimensionContents,
             $unlocalizedDimension
         );
 
         $localizedContentDimension = null;
         if ($localizedDimension) {
             $localizedContentDimension = $this->getOrCreateContentDimension(
                 $contentRichEntity,
-                $contentDimensions,
+                $dimensionContents,
                 $localizedDimension
             );
         }
 
         // Sort correctly ContentDimensions by given dimensionIds to merge them later correctly
         $orderedContentDimensions = [];
         foreach ($dimensionCollection as $key => $dimension) {
-            $contentDimension = $contentDimensions->filter(function (ContentDimensionInterface $contentDimension) use ($dimension) {
-                return $contentDimension->getDimension()->getId() === $dimension->getId();
+            $dimensionContent = $dimensionContents->filter(function (DimensionContentInterface $dimensionContent) use ($dimension) {
+                return $dimensionContent->getDimension()->getId() === $dimension->getId();
             })->first();
 
-            if ($contentDimension) {
-                $orderedContentDimensions[$key] = $contentDimension;
+            if ($dimensionContent) {
+                $orderedContentDimensions[$key] = $dimensionContent;
             }
         }
 
         foreach ($this->mappers as $mapper) {
             $mapper->map($data, $unlocalizedContentDimension, $localizedContentDimension);
         }
 
-        return new ContentDimensionCollection($orderedContentDimensions, $dimensionCollection);
+        return new DimensionContentCollection($orderedContentDimensions, $dimensionCollection);
     }
 
     private function getOrCreateContentDimension(
         ContentRichEntityInterface $contentRichEntity,
-        Collection $contentDimensions,
+        Collection $dimensionContents,
         DimensionInterface $dimension
-    ): ContentDimensionInterface {
-        $contentDimension = $contentDimensions->filter(function (ContentDimensionInterface $contentDimension) use ($dimension) {
-            return $contentDimension->getDimension()->getId() === $dimension->getId();
+    ): DimensionContentInterface {
+        $dimensionContent = $dimensionContents->filter(function (DimensionContentInterface $dimensionContent) use ($dimension) {
+            return $dimensionContent->getDimension()->getId() === $dimension->getId();
         })->first();
 
-        if (!$contentDimension) {
-            $contentDimension = $contentRichEntity->createDimension($dimension);
-            $contentRichEntity->addDimension($contentDimension);
-            $contentDimensions->add($contentDimension);
+        if (!$dimensionContent) {
+            $dimensionContent = $contentRichEntity->createDimensionContent($dimension);
+            $contentRichEntity->addDimensionContent($dimensionContent);
+            $dimensionContents->add($dimensionContent);
         }
 
-        return $contentDimension;
+        return $dimensionContent;
     }
 }