OP-320: PR fixes

BitBagCommerce · Jun 25, 2024 · 5431c2e · 5431c2e
1 parent d997864
commit 5431c2e
Show file tree

Hide file tree

Showing 15 changed files with 23 additions and 23 deletions.
diff --git a/spec/Assigner/CollectionsAssignerSpec.php b/spec/Assigner/CollectionsAssignerSpec.php
@@ -12,7 +12,7 @@
 
 use BitBag\SyliusCmsPlugin\Assigner\CollectionsAssigner;
 use BitBag\SyliusCmsPlugin\Assigner\CollectionsAssignerInterface;
-use BitBag\SyliusCmsPlugin\Entity\CollectionableInterface;
+use BitBag\SyliusCmsPlugin\Entity\CollectibleInterface;
 use BitBag\SyliusCmsPlugin\Entity\CollectionInterface;
 use BitBag\SyliusCmsPlugin\Repository\CollectionRepositoryInterface;
 use PhpSpec\ObjectBehavior;
@@ -38,7 +38,7 @@ public function it_assigns_collections(
         CollectionRepositoryInterface $collectionRepository,
         CollectionInterface $aboutCollection,
         CollectionInterface $blogCollection,
-        CollectionableInterface $collectionsAware
+        CollectibleInterface $collectionsAware
     ): void
     {
         $collectionRepository->findOneBy(['code' => 'about'])->willReturn($aboutCollection);

diff --git a/spec/Resolver/ImporterCollectionsResolverSpec.php b/spec/Resolver/ImporterCollectionsResolverSpec.php
@@ -11,7 +11,7 @@
 namespace spec\BitBag\SyliusCmsPlugin\Resolver;
 
 use BitBag\SyliusCmsPlugin\Assigner\CollectionsAssignerInterface;
-use BitBag\SyliusCmsPlugin\Entity\CollectionableInterface;
+use BitBag\SyliusCmsPlugin\Entity\CollectibleInterface;
 use BitBag\SyliusCmsPlugin\Resolver\ImporterCollectionsResolver;
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
@@ -30,7 +30,7 @@ public function it_is_initializable()
 
     public function it_resolves_collections_for_collectionable_entity(
         CollectionsAssignerInterface $collectionsAssigner,
-        CollectionableInterface $collectionable
+        CollectibleInterface $collectionable
     ) {
         $collectionsRow = 'collection1, collection2, collection3';
         $collectionsCodes = ['collection1', 'collection2', 'collection3'];
@@ -42,7 +42,7 @@ public function it_resolves_collections_for_collectionable_entity(
 
     public function it_skips_resolution_when_collections_row_is_null(
         CollectionsAssignerInterface $collectionsAssigner,
-        CollectionableInterface $collectionable
+        CollectibleInterface $collectionable
     )
     {
         $collectionsRow = null;

diff --git a/src/Assigner/CollectionsAssigner.php b/src/Assigner/CollectionsAssigner.php
@@ -10,7 +10,7 @@
 
 namespace BitBag\SyliusCmsPlugin\Assigner;
 
-use BitBag\SyliusCmsPlugin\Entity\CollectionableInterface;
+use BitBag\SyliusCmsPlugin\Entity\CollectibleInterface;
 use BitBag\SyliusCmsPlugin\Entity\CollectionInterface;
 use BitBag\SyliusCmsPlugin\Repository\CollectionRepositoryInterface;
 use Webmozart\Assert\Assert;
@@ -21,7 +21,7 @@ public function __construct(private CollectionRepositoryInterface $collectionRep
     {
     }
 
-    public function assign(CollectionableInterface $collectionsAware, array $collectionsCodes): void
+    public function assign(CollectibleInterface $collectionsAware, array $collectionsCodes): void
     {
         foreach ($collectionsCodes as $collectionCode) {
             /** @var CollectionInterface|null $collection */

diff --git a/src/Assigner/CollectionsAssignerInterface.php b/src/Assigner/CollectionsAssignerInterface.php
@@ -10,9 +10,9 @@
 
 namespace BitBag\SyliusCmsPlugin\Assigner;
 
-use BitBag\SyliusCmsPlugin\Entity\CollectionableInterface;
+use BitBag\SyliusCmsPlugin\Entity\CollectibleInterface;
 
 interface CollectionsAssignerInterface
 {
-    public function assign(CollectionableInterface $collectionsAware, array $collectionsCodes): void;
+    public function assign(CollectibleInterface $collectionsAware, array $collectionsCodes): void;
 }
diff --git a/src/Entity/BlockInterface.php b/src/Entity/BlockInterface.php
@@ -21,7 +21,7 @@ interface BlockInterface extends
     ToggleableInterface,
     ProductsAwareInterface,
     TaxonAwareInterface,
-    CollectionableInterface,
+    CollectibleInterface,
     ChannelsAwareInterface,
     ContentableInterface
 {

diff --git a/src/Entity/BlockableInterface.php → src/Entity/BlocksCollectionInterface.php b/src/Entity/BlockableInterface.php → src/Entity/BlocksCollectionInterface.php
@@ -12,7 +12,7 @@
 
 use Doctrine\Common\Collections\Collection;
 
-interface BlockableInterface
+interface BlocksCollectionInterface
 {
     public function initializeBlocksCollection(): void;
 

diff --git a/src/Entity/BlockableTrait.php → src/Entity/BlocksCollectionTrait.php b/src/Entity/BlockableTrait.php → src/Entity/BlocksCollectionTrait.php
@@ -13,7 +13,7 @@
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 
-trait BlockableTrait
+trait BlocksCollectionTrait
 {
     protected Collection $blocks;
 

diff --git a/src/Entity/CollectionableInterface.php → src/Entity/CollectibleInterface.php b/src/Entity/CollectionableInterface.php → src/Entity/CollectibleInterface.php
@@ -12,7 +12,7 @@
 
 use Doctrine\Common\Collections\Collection;
 
-interface CollectionableInterface
+interface CollectibleInterface
 {
     public function initializeCollectionsCollection(): void;
 

diff --git a/src/Entity/Collection.php b/src/Entity/Collection.php
@@ -16,7 +16,7 @@
 class Collection implements CollectionInterface
 {
     use PagesCollectionTrait;
-    use BlockableTrait;
+    use BlocksCollectionTrait;
     use MediaCollectionTrait;
     use TranslatableTrait {
         __construct as private initializeTranslationsCollection;

diff --git a/src/Entity/CollectionInterface.php b/src/Entity/CollectionInterface.php
@@ -17,8 +17,8 @@ interface CollectionInterface extends
     ResourceInterface,
     TranslatableInterface,
     PagesCollectionInterface,
-    BlockableInterface,
-    MediableInterface
+    BlocksCollectionInterface,
+    MediaCollectionInterface
 {
     public function getCode(): ?string;
 

diff --git a/src/Entity/MediableInterface.php → src/Entity/MediaCollectionInterface.php b/src/Entity/MediableInterface.php → src/Entity/MediaCollectionInterface.php
@@ -12,7 +12,7 @@
 
 use Doctrine\Common\Collections\Collection;
 
-interface MediableInterface
+interface MediaCollectionInterface
 {
     public function initializeMediaCollection(): void;
 

diff --git a/src/Entity/MediaInterface.php b/src/Entity/MediaInterface.php
@@ -21,7 +21,7 @@ interface MediaInterface extends
     TranslatableInterface,
     ToggleableInterface,
     ProductsAwareInterface,
-    CollectionableInterface,
+    CollectibleInterface,
     ChannelsAwareInterface,
     ContentableInterface
 {

diff --git a/src/Entity/PageInterface.php b/src/Entity/PageInterface.php
@@ -22,7 +22,7 @@ interface PageInterface extends
     TranslatableInterface,
     ToggleableInterface,
     ProductsAwareInterface,
-    CollectionableInterface,
+    CollectibleInterface,
     TimestampableInterface,
     ChannelsAwareInterface,
     ContentableInterface,

diff --git a/src/Resolver/ImporterCollectionsResolver.php b/src/Resolver/ImporterCollectionsResolver.php
@@ -11,15 +11,15 @@
 namespace BitBag\SyliusCmsPlugin\Resolver;
 
 use BitBag\SyliusCmsPlugin\Assigner\CollectionsAssignerInterface;
-use BitBag\SyliusCmsPlugin\Entity\CollectionableInterface;
+use BitBag\SyliusCmsPlugin\Entity\CollectibleInterface;
 
 final class ImporterCollectionsResolver implements ImporterCollectionsResolverInterface
 {
     public function __construct(private CollectionsAssignerInterface $collectionsAssigner)
     {
     }
 
-    public function resolve(CollectionableInterface $collectionable, ?string $collectionsRow): void
+    public function resolve(CollectibleInterface $collectionable, ?string $collectionsRow): void
     {
         if (null === $collectionsRow) {
             return;

diff --git a/src/Resolver/ImporterCollectionsResolverInterface.php b/src/Resolver/ImporterCollectionsResolverInterface.php
@@ -10,9 +10,9 @@
 
 namespace BitBag\SyliusCmsPlugin\Resolver;
 
-use BitBag\SyliusCmsPlugin\Entity\CollectionableInterface;
+use BitBag\SyliusCmsPlugin\Entity\CollectibleInterface;
 
 interface ImporterCollectionsResolverInterface
 {
-    public function resolve(CollectionableInterface $collectionable, ?string $collectionsRow): void;
+    public function resolve(CollectibleInterface $collectionable, ?string $collectionsRow): void;
 }