OP-320: CR Updates

BitBagCommerce · Jun 21, 2024 · d997864 · d997864
1 parent 0319049
commit d997864
Show file tree

Hide file tree

Showing 16 changed files with 82 additions and 73 deletions.
diff --git a/spec/Assigner/CollectionsAssignerSpec.php b/spec/Assigner/CollectionsAssignerSpec.php
@@ -1,5 +1,11 @@
 <?php
 
+/*
+ * This file was created by developers working at BitBag
+ * Do you need more information about us and what we do? Visit our https://bitbag.io website!
+ * We are hiring developers from all over the world. Join us and start your new, exciting adventure and become part of us: https://bitbag.io/career
+*/
+
 declare(strict_types=1);
 
 namespace spec\BitBag\SyliusCmsPlugin\Assigner;
@@ -30,9 +36,9 @@ public function it_implements_collections_assigner_interface(): void
 
     public function it_assigns_collections(
         CollectionRepositoryInterface $collectionRepository,
-        CollectionInterface           $aboutCollection,
-        CollectionInterface           $blogCollection,
-        CollectionableInterface       $collectionsAware
+        CollectionInterface $aboutCollection,
+        CollectionInterface $blogCollection,
+        CollectionableInterface $collectionsAware
     ): void
     {
         $collectionRepository->findOneBy(['code' => 'about'])->willReturn($aboutCollection);

diff --git a/spec/Importer/BlockImporterSpec.php b/spec/Importer/BlockImporterSpec.php
@@ -24,13 +24,13 @@
 final class BlockImporterSpec extends ObjectBehavior
 {
     public function let(
-        ResourceResolverInterface            $blockResourceResolver,
-        LocaleContextInterface               $localeContext,
+        ResourceResolverInterface $blockResourceResolver,
+        LocaleContextInterface $localeContext,
         ImporterCollectionsResolverInterface $importerCollectionsResolver,
-        ImporterChannelsResolverInterface    $importerChannelsResolver,
-        ImporterProductsResolverInterface    $importerProductsResolver,
-        ValidatorInterface                   $validator,
-        BlockRepositoryInterface             $blockRepository
+        ImporterChannelsResolverInterface $importerChannelsResolver,
+        ImporterProductsResolverInterface $importerProductsResolver,
+        ValidatorInterface $validator,
+        BlockRepositoryInterface $blockRepository
     ) {
         $this->beConstructedWith(
             $blockResourceResolver,
@@ -50,15 +50,16 @@ public function it_is_initializable()
     }
 
     public function it_imports_block(
-        ResourceResolverInterface            $blockResourceResolver,
-        LocaleContextInterface               $localeContext,
+        ResourceResolverInterface $blockResourceResolver,
+        LocaleContextInterface $localeContext,
         ImporterCollectionsResolverInterface $importerCollectionsResolver,
-        ImporterChannelsResolverInterface    $importerChannelsResolver,
-        ImporterProductsResolverInterface    $importerProductsResolver,
-        ValidatorInterface                   $validator,
-        BlockRepositoryInterface             $blockRepository,
-        BlockInterface                       $block
-    ) {
+        ImporterChannelsResolverInterface $importerChannelsResolver,
+        ImporterProductsResolverInterface $importerProductsResolver,
+        ValidatorInterface $validator,
+        BlockRepositoryInterface $blockRepository,
+        BlockInterface $block
+    )
+    {
         $row = ['name_pl' => 'name', 'content_pl' => 'content', 'link_pl' => 'link', 'code' => 'block_code'];
 
         $blockResourceResolver->getResource('block_code')->willReturn($block);

diff --git a/spec/Importer/MediaImporterSpec.php b/spec/Importer/MediaImporterSpec.php
@@ -23,12 +23,12 @@
 final class MediaImporterSpec extends ObjectBehavior
 {
     public function let(
-        ResourceResolverInterface            $mediaResourceResolver,
-        LocaleContextInterface               $localeContext,
+        ResourceResolverInterface $mediaResourceResolver,
+        LocaleContextInterface $localeContext,
         ImporterCollectionsResolverInterface $importerCollectionsResolver,
-        ImporterProductsResolverInterface    $importerProductsResolver,
-        ValidatorInterface                   $validator,
-        MediaRepositoryInterface             $mediaRepository
+        ImporterProductsResolverInterface $importerProductsResolver,
+        ValidatorInterface $validator,
+        MediaRepositoryInterface $mediaRepository
     ) {
         $this->beConstructedWith(
             $mediaResourceResolver,
@@ -47,14 +47,15 @@ public function it_is_initializable()
     }
 
     public function it_imports_media(
-        ResourceResolverInterface            $mediaResourceResolver,
-        LocaleContextInterface               $localeContext,
+        ResourceResolverInterface $mediaResourceResolver,
+        LocaleContextInterface $localeContext,
         ImporterCollectionsResolverInterface $importerCollectionsResolver,
-        ImporterProductsResolverInterface    $importerProductsResolver,
-        ValidatorInterface                   $validator,
-        MediaRepositoryInterface             $mediaRepository,
-        MediaInterface                       $media
-    ) {
+        ImporterProductsResolverInterface $importerProductsResolver,
+        ValidatorInterface $validator,
+        MediaRepositoryInterface $mediaRepository,
+        MediaInterface $media
+    )
+    {
         $row = ['name_pl' => 'name', 'content_pl' => 'content', 'alt_pl' => 'alt', 'code' => 'media_code'];
 
         $mediaResourceResolver->getResource('media_code')->willReturn($media);

diff --git a/spec/Importer/PageImporterSpec.php b/spec/Importer/PageImporterSpec.php
@@ -27,16 +27,16 @@
 final class PageImporterSpec extends ObjectBehavior
 {
     public function let(
-        ResourceResolverInterface            $pageResourceResolver,
-        LocaleContextInterface               $localeContext,
-        ImageDownloaderInterface             $imageDownloader,
-        FactoryInterface                     $mediaFactory,
-        MediaProviderResolverInterface       $mediaProviderResolver,
+        ResourceResolverInterface $pageResourceResolver,
+        LocaleContextInterface $localeContext,
+        ImageDownloaderInterface $imageDownloader,
+        FactoryInterface $mediaFactory,
+        MediaProviderResolverInterface $mediaProviderResolver,
         ImporterCollectionsResolverInterface $importerCollectionsResolver,
-        ImporterChannelsResolverInterface    $importerChannelsResolver,
-        ImporterProductsResolverInterface    $importerProductsResolver,
-        ValidatorInterface                   $validator,
-        EntityManagerInterface               $entityManager
+        ImporterChannelsResolverInterface $importerChannelsResolver,
+        ImporterProductsResolverInterface $importerProductsResolver,
+        ValidatorInterface $validator,
+        EntityManagerInterface $entityManager
     ) {
         $this->beConstructedWith(
             $pageResourceResolver,
@@ -59,15 +59,16 @@ public function it_is_initializable()
     }
 
     public function it_imports_page_no_url(
-        ResourceResolverInterface            $pageResourceResolver,
-        LocaleContextInterface               $localeContext,
+        ResourceResolverInterface $pageResourceResolver,
+        LocaleContextInterface $localeContext,
         ImporterCollectionsResolverInterface $importerCollectionsResolver,
-        ImporterChannelsResolverInterface    $importerChannelsResolver,
-        ImporterProductsResolverInterface    $importerProductsResolver,
-        ValidatorInterface                   $validator,
-        EntityManagerInterface               $entityManager,
-        PageInterface                        $page,
-        ) {
+        ImporterChannelsResolverInterface $importerChannelsResolver,
+        ImporterProductsResolverInterface $importerProductsResolver,
+        ValidatorInterface $validator,
+        EntityManagerInterface $entityManager,
+        PageInterface $page,
+    )
+    {
         $row = [
             'code' => 'page_code',
             'slug_pl' => 'slug',

diff --git a/spec/Resolver/ImporterCollectionsResolverSpec.php b/spec/Resolver/ImporterCollectionsResolverSpec.php
@@ -30,7 +30,7 @@ public function it_is_initializable()
 
     public function it_resolves_collections_for_collectionable_entity(
         CollectionsAssignerInterface $collectionsAssigner,
-        CollectionableInterface      $collectionable
+        CollectionableInterface $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
+        CollectionableInterface $collectionable
     )
     {
         $collectionsRow = null;

diff --git a/spec/Twig/Runtime/RenderProductPagesRuntimeSpec.php b/spec/Twig/Runtime/RenderProductPagesRuntimeSpec.php
@@ -47,13 +47,13 @@ public function it_implements_render_product_pages_runtime_interface(): void
     }
 
     public function it_renders_product_pages(
-        ChannelContextInterface    $channelContext,
-        ProductInterface           $product,
-        ChannelInterface           $channel,
-        PageRepositoryInterface    $pageRepository,
-        PageInterface              $page,
-        CollectionInterface        $collection,
-        Environment                $templatingEngine,
+        ChannelContextInterface $channelContext,
+        ProductInterface $product,
+        ChannelInterface $channel,
+        PageRepositoryInterface $pageRepository,
+        PageInterface $page,
+        CollectionInterface $collection,
+        Environment $templatingEngine,
         CollectionsSorterInterface $collectionsSorter
     ): void {
         $channel->getCode()->willReturn('WEB');
@@ -68,13 +68,13 @@ public function it_renders_product_pages(
     }
 
     public function it_renders_product_pages_with_collections(
-        ChannelContextInterface    $channelContext,
-        ProductInterface           $product,
-        ChannelInterface           $channel,
-        PageRepositoryInterface    $pageRepository,
-        PageInterface              $page,
-        CollectionInterface        $collection,
-        Environment                $templatingEngine,
+        ChannelContextInterface $channelContext,
+        ProductInterface $product,
+        ChannelInterface $channel,
+        PageRepositoryInterface $pageRepository,
+        PageInterface $page,
+        CollectionInterface $collection,
+        Environment $templatingEngine,
         CollectionsSorterInterface $collectionsSorter
     ): void {
         $channel->getCode()->willReturn('WEB');

diff --git a/src/Entity/Block.php b/src/Entity/Block.php
@@ -17,7 +17,7 @@
 class Block implements BlockInterface
 {
     use ToggleableTrait;
-    use CollectionableTrait;
+    use CollectibleTrait;
     use ProductsAwareTrait;
     use TaxonAwareTrait;
     use ChannelsAwareTrait;

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

diff --git a/src/Entity/Collection.php b/src/Entity/Collection.php
@@ -15,9 +15,9 @@
 
 class Collection implements CollectionInterface
 {
-    use PageableTrait;
+    use PagesCollectionTrait;
     use BlockableTrait;
-    use MediableTrait;
+    use MediaCollectionTrait;
     use TranslatableTrait {
         __construct as private initializeTranslationsCollection;
     }

diff --git a/src/Entity/CollectionInterface.php b/src/Entity/CollectionInterface.php
@@ -16,7 +16,7 @@
 interface CollectionInterface extends
     ResourceInterface,
     TranslatableInterface,
-    PageableInterface,
+    PagesCollectionInterface,
     BlockableInterface,
     MediableInterface
 {

diff --git a/src/Entity/Media.php b/src/Entity/Media.php
@@ -20,7 +20,7 @@
 class Media implements MediaInterface
 {
     use ToggleableTrait;
-    use CollectionableTrait;
+    use CollectibleTrait;
     use ProductsAwareTrait;
     use ChannelsAwareTrait;
     use TranslatableTrait {

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

diff --git a/src/Entity/Page.php b/src/Entity/Page.php
@@ -19,7 +19,7 @@ class Page implements PageInterface
 {
     use ToggleableTrait;
     use ProductsAwareTrait;
-    use CollectionableTrait;
+    use CollectibleTrait;
     use TimestampableTrait;
     use ChannelsAwareTrait;
     use TranslatableTrait {

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

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

diff --git a/tests/Integration/Repository/CollectionRepositoryTest.php b/tests/Integration/Repository/CollectionRepositoryTest.php
@@ -16,7 +16,7 @@
 use BitBag\SyliusCmsPlugin\Repository\CollectionRepositoryInterface;
 use Doctrine\ORM\QueryBuilder;
 
-class CollectionRepositoryTest extends JsonApiTestCase
+final class CollectionRepositoryTest extends JsonApiTestCase
 {
     public function setUp(): void
     {