Merge pull request #520 from BitBagCommerce/feature/OP-438

OP-438: Code cleanup

spec/Assigner/ChannelsAssignerSpec.php

@@ -32,7 +32,7 @@ public function it_assigns_channels(
         ChannelRepositoryInterface $channelRepository,
         ChannelInterface $webChannel,
         ChannelInterface $posChannel,
-        ChannelsAwareInterface $channelsAware
+        ChannelsAwareInterface $channelsAware,
     ): void {
         $channelRepository->findOneBy(['code' => 'web'])->willReturn($webChannel);
         $channelRepository->findOneBy(['code' => 'pos'])->willReturn($posChannel);

spec/Assigner/CollectionsAssignerSpec.php

@@ -38,9 +38,8 @@ public function it_assigns_collections(
         CollectionRepositoryInterface $collectionRepository,
         CollectionInterface $aboutCollection,
         CollectionInterface $blogCollection,
-        CollectibleInterface $collectionsAware
-    ): void
-    {
+        CollectibleInterface $collectionsAware,
+    ): void {
         $collectionRepository->findOneBy(['code' => 'about'])->willReturn($aboutCollection);
         $collectionRepository->findOneBy(['code' => 'blog'])->willReturn($blogCollection);
 

spec/Assigner/LocalesAssignerSpec.php

@@ -38,7 +38,7 @@ public function it_assigns_locales_to_locale_aware_entity(
         RepositoryInterface $localeRepository,
         LocaleAwareInterface $localesAware,
         LocaleInterface $locale1,
-        LocaleInterface $locale2
+        LocaleInterface $locale2,
     ) {
         $locale1->getCode()->willReturn('en_US');
         $locale2->getCode()->willReturn('fr_FR');

spec/Assigner/ProductsAssignerSpec.php

@@ -32,7 +32,7 @@ public function it_assigns_products(
         ProductRepositoryInterface $productRepository,
         ProductInterface $mugProduct,
         ProductInterface $tshirtProduct,
-        ProductsAwareInterface $productsAware
+        ProductsAwareInterface $productsAware,
     ): void {
         $productRepository->findOneBy(['code' => 'mug'])->willReturn($mugProduct);
         $productRepository->findOneBy(['code' => 't-shirt'])->willReturn($tshirtProduct);

spec/Assigner/ProductsInTaxonsAssignerSpec.php

@@ -38,7 +38,7 @@ public function it_assigns_taxons_to_products_in_taxons_aware_entity(
         TaxonRepositoryInterface $taxonRepository,
         ProductsInTaxonsAwareInterface $productsInTaxonsAware,
         TaxonInterface $taxon1,
-        TaxonInterface $taxon2
+        TaxonInterface $taxon2,
     ) {
         $taxon1->getCode()->willReturn('taxon_code_1');
         $taxon2->getCode()->willReturn('taxon_code_2');

spec/Assigner/TaxonsAssignerSpec.php

@@ -32,7 +32,7 @@ public function it_assigns_taxons(
         TaxonRepositoryInterface $taxonRepository,
         TaxonInterface $mugsTaxon,
         TaxonInterface $stickersTaxon,
-        TaxonAwareInterface $taxonsAware
+        TaxonAwareInterface $taxonsAware,
     ): void {
         $taxonRepository->findOneBy(['code' => 'mugs'])->willReturn($mugsTaxon);
         $taxonRepository->findOneBy(['code' => 'stickers'])->willReturn($stickersTaxon);

spec/Controller/Action/Admin/UploadEditorImageActionSpec.php

@@ -26,7 +26,7 @@ final class UploadEditorImageActionSpec extends ObjectBehavior
     public function let(
         MediaProviderResolverInterface $mediaProviderResolver,
         MediaRepositoryInterface $mediaRepository,
-        FactoryInterface $mediaFactory
+        FactoryInterface $mediaFactory,
     ) {
         $this->beConstructedWith($mediaProviderResolver, $mediaRepository, $mediaFactory);
     }
@@ -43,7 +43,7 @@ public function it_uploads_media(
         FileBag $fileBag,
         MediaProviderResolverInterface $mediaProviderResolver,
         ProviderInterface $provider,
-        MediaRepositoryInterface $mediaRepository
+        MediaRepositoryInterface $mediaRepository,
     ): void {
         $uploadedFile = new UploadedFile(__DIR__ . '/../../../../tests/Behat/Resources/images/aston_martin_db_11.jpg', 'aston_martin_db_11.jpg');
 

spec/Entity/BlockSpec.php

@@ -15,8 +15,6 @@
 use BitBag\SyliusCmsPlugin\Entity\CollectionInterface;
 use PhpSpec\ObjectBehavior;
 use Sylius\Component\Core\Model\ChannelInterface;
-use Sylius\Component\Core\Model\ProductInterface;
-use Sylius\Component\Core\Model\TaxonInterface;
 use Sylius\Component\Resource\Model\ResourceInterface;
 
 final class BlockSpec extends ObjectBehavior

spec/Entity/MediaSpec.php

@@ -10,12 +10,11 @@
 
 namespace spec\BitBag\SyliusCmsPlugin\Entity;
 
+use BitBag\SyliusCmsPlugin\Entity\CollectionInterface;
 use BitBag\SyliusCmsPlugin\Entity\Media;
 use BitBag\SyliusCmsPlugin\Entity\MediaInterface;
-use BitBag\SyliusCmsPlugin\Entity\CollectionInterface;
 use PhpSpec\ObjectBehavior;
 use Sylius\Component\Core\Model\ChannelInterface;
-use Sylius\Component\Core\Model\ProductInterface;
 use Sylius\Component\Resource\Model\ResourceInterface;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 

spec/Entity/PageSpec.php

@@ -10,12 +10,11 @@
 
 namespace spec\BitBag\SyliusCmsPlugin\Entity;
 
+use BitBag\SyliusCmsPlugin\Entity\CollectionInterface;
 use BitBag\SyliusCmsPlugin\Entity\Page;
 use BitBag\SyliusCmsPlugin\Entity\PageInterface;
-use BitBag\SyliusCmsPlugin\Entity\CollectionInterface;
 use PhpSpec\ObjectBehavior;
 use Sylius\Component\Core\Model\ChannelInterface;
-use Sylius\Component\Core\Model\ProductInterface;
 use Sylius\Component\Resource\Model\ResourceInterface;
 
 final class PageSpec extends ObjectBehavior

spec/EventListener/MediaUploadListenerSpec.php

@@ -33,7 +33,7 @@ public function it_is_initializable(): void
     public function it_does_not_upload_if_not_media_instance(
         ResourceControllerEvent $event,
         MediaInterface $media,
-        MediaProviderResolverInterface $mediaProviderResolver
+        MediaProviderResolverInterface $mediaProviderResolver,
     ): void {
         $event->getSubject()->willReturn(Argument::any());
 
@@ -44,7 +44,7 @@ public function it_uploads_media(
         ResourceControllerEvent $event,
         MediaInterface $media,
         MediaProviderResolverInterface $mediaProviderResolver,
-        ProviderInterface $provider
+        ProviderInterface $provider,
     ): void {
         $event->getSubject()->willReturn($media);
         $mediaProviderResolver->resolveProvider($media)->willReturn($provider);

spec/Form/DataTransformer/MultipleMediaToCodesTransformerSpec.php

@@ -43,9 +43,8 @@ public function it_transforms_empty_array_to_empty_collection(): void
     public function it_transforms_non_empty_array_to_collection(
         MediaRepositoryInterface $mediaRepository,
         MediaInterface $media1,
-        MediaInterface $media2
-    ): void
-    {
+        MediaInterface $media2,
+    ): void {
         $mediaCodes = ['code1', 'code2'];
         $mediaRepository->findBy(['code' => $mediaCodes])->willReturn([$media1, $media2]);
 
@@ -63,9 +62,8 @@ public function it_reverse_transforms_empty_collection_to_empty_array(): void
 
     public function it_reverse_transforms_collection_to_array_of_media_codes(
         MediaInterface $media1,
-        MediaInterface $media2
-    ): void
-    {
+        MediaInterface $media2,
+    ): void {
         $media1->getCode()->willReturn('code1');
         $media2->getCode()->willReturn('code2');
 

spec/Importer/BlockImporterSpec.php

@@ -14,12 +14,12 @@
 use BitBag\SyliusCmsPlugin\Importer\BlockImporter;
 use BitBag\SyliusCmsPlugin\Importer\BlockImporterInterface;
 use BitBag\SyliusCmsPlugin\Repository\BlockRepositoryInterface;
-use BitBag\SyliusCmsPlugin\Resolver\ImporterChannelsResolverInterface;
-use BitBag\SyliusCmsPlugin\Resolver\ImporterLocalesResolverInterface;
-use BitBag\SyliusCmsPlugin\Resolver\ImporterProductsInTaxonsResolverInterface;
-use BitBag\SyliusCmsPlugin\Resolver\ImporterProductsResolverInterface;
-use BitBag\SyliusCmsPlugin\Resolver\ImporterCollectionsResolverInterface;
-use BitBag\SyliusCmsPlugin\Resolver\ImporterTaxonsResolverInterface;
+use BitBag\SyliusCmsPlugin\Resolver\Importer\ImporterChannelsResolverInterface;
+use BitBag\SyliusCmsPlugin\Resolver\Importer\ImporterCollectionsResolverInterface;
+use BitBag\SyliusCmsPlugin\Resolver\Importer\ImporterLocalesResolverInterface;
+use BitBag\SyliusCmsPlugin\Resolver\Importer\ImporterProductsInTaxonsResolverInterface;
+use BitBag\SyliusCmsPlugin\Resolver\Importer\ImporterProductsResolverInterface;
+use BitBag\SyliusCmsPlugin\Resolver\Importer\ImporterTaxonsResolverInterface;
 use BitBag\SyliusCmsPlugin\Resolver\ResourceResolverInterface;
 use PhpSpec\ObjectBehavior;
 use Symfony\Component\Validator\ConstraintViolationList;
@@ -36,9 +36,8 @@ public function let(
         ImporterTaxonsResolverInterface $importerTaxonsResolver,
         ImporterProductsInTaxonsResolverInterface $importerProductsInTaxonsResolver,
         ValidatorInterface $validator,
-        BlockRepositoryInterface $blockRepository
-    )
-    {
+        BlockRepositoryInterface $blockRepository,
+    ) {
         $this->beConstructedWith(
             $blockResourceResolver,
             $importerCollectionsResolver,
@@ -48,7 +47,7 @@ public function let(
             $importerTaxonsResolver,
             $importerProductsInTaxonsResolver,
             $validator,
-            $blockRepository
+            $blockRepository,
         );
     }
 
@@ -68,9 +67,8 @@ public function it_imports_block(
         ImporterProductsInTaxonsResolverInterface $importerProductsInTaxonsResolver,
         ValidatorInterface $validator,
         BlockRepositoryInterface $blockRepository,
-        BlockInterface $block
-    )
-    {
+        BlockInterface $block,
+    ) {
         $row = ['name' => 'block_name', 'code' => 'block_code', 'enabled' => '1'];
 
         $blockResourceResolver->getResource('block_code')->willReturn($block);

spec/Importer/MediaImporterSpec.php

@@ -12,8 +12,7 @@
 
 use BitBag\SyliusCmsPlugin\Entity\MediaInterface;
 use BitBag\SyliusCmsPlugin\Repository\MediaRepositoryInterface;
-use BitBag\SyliusCmsPlugin\Resolver\ImporterProductsResolverInterface;
-use BitBag\SyliusCmsPlugin\Resolver\ImporterCollectionsResolverInterface;
+use BitBag\SyliusCmsPlugin\Resolver\Importer\ImporterCollectionsResolverInterface;
 use BitBag\SyliusCmsPlugin\Resolver\ResourceResolverInterface;
 use PhpSpec\ObjectBehavior;
 use Sylius\Component\Locale\Context\LocaleContextInterface;
@@ -27,7 +26,7 @@ public function let(
         LocaleContextInterface $localeContext,
         ImporterCollectionsResolverInterface $importerCollectionsResolver,
         ValidatorInterface $validator,
-        MediaRepositoryInterface $mediaRepository
+        MediaRepositoryInterface $mediaRepository,
     ) {
         $this->beConstructedWith(
             $mediaResourceResolver,
@@ -50,9 +49,8 @@ public function it_imports_media(
         ImporterCollectionsResolverInterface $importerCollectionsResolver,
         ValidatorInterface $validator,
         MediaRepositoryInterface $mediaRepository,
-        MediaInterface $media
-    )
-    {
+        MediaInterface $media,
+    ) {
         $row = ['name_pl' => 'name', 'content_pl' => 'content', 'alt_pl' => 'alt', 'code' => 'media_code'];
 
         $mediaResourceResolver->getResource('media_code')->willReturn($media);

spec/Importer/PageImporterSpec.php

@@ -10,17 +10,13 @@
 
 namespace spec\BitBag\SyliusCmsPlugin\Importer;
 
-use BitBag\SyliusCmsPlugin\Downloader\ImageDownloaderInterface;
 use BitBag\SyliusCmsPlugin\Entity\PageInterface;
-use BitBag\SyliusCmsPlugin\Resolver\ImporterChannelsResolverInterface;
-use BitBag\SyliusCmsPlugin\Resolver\ImporterProductsResolverInterface;
-use BitBag\SyliusCmsPlugin\Resolver\ImporterCollectionsResolverInterface;
-use BitBag\SyliusCmsPlugin\Resolver\MediaProviderResolverInterface;
+use BitBag\SyliusCmsPlugin\Resolver\Importer\ImporterChannelsResolverInterface;
+use BitBag\SyliusCmsPlugin\Resolver\Importer\ImporterCollectionsResolverInterface;
 use BitBag\SyliusCmsPlugin\Resolver\ResourceResolverInterface;
 use Doctrine\ORM\EntityManagerInterface;
 use PhpSpec\ObjectBehavior;
 use Sylius\Component\Locale\Context\LocaleContextInterface;
-use Sylius\Component\Resource\Factory\FactoryInterface;
 use Symfony\Component\Validator\ConstraintViolationList;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 
@@ -32,7 +28,7 @@ public function let(
         ImporterCollectionsResolverInterface $importerCollectionsResolver,
         ImporterChannelsResolverInterface $importerChannelsResolver,
         ValidatorInterface $validator,
-        EntityManagerInterface $entityManager
+        EntityManagerInterface $entityManager,
     ) {
         $this->beConstructedWith(
             $pageResourceResolver,
@@ -58,8 +54,7 @@ public function it_imports_page_no_url(
         ValidatorInterface $validator,
         EntityManagerInterface $entityManager,
         PageInterface $page,
-    )
-    {
+    ) {
         $row = [
             'code' => 'page_code',
             'name' => 'page_name',

spec/MediaProvider/GenericProviderSpec.php

@@ -21,7 +21,7 @@ final class GenericProviderSpec extends ObjectBehavior
 {
     public function let(
         MediaUploaderInterface $uploader,
-        Environment $twigEngine
+        Environment $twigEngine,
     ) {
         $this->beConstructedWith($uploader, $twigEngine, '@Template', '/media/');
     }

spec/Menu/ContentManagementMenuBuilderSpec.php

@@ -31,7 +31,7 @@ public function it_is_initializable(): void
     public function it_build_menu(
         MenuBuilderEvent $menuBuilderEvent,
         ItemInterface $menu,
-        ItemInterface $cmsRootMenuItem
+        ItemInterface $cmsRootMenuItem,
     ): void {
         $menuBuilderEvent->getMenu()->willReturn($menu);
         $menu->addChild('bitbag_cms')->willReturn($cmsRootMenuItem);

spec/Menu/MenuReorderSpec.php

@@ -32,21 +32,20 @@ public function it_reorders_menu_items(
         ItemInterface $menu,
         ItemInterface $item1,
         ItemInterface $item2,
-        ItemInterface $item3
-    ): void
-    {
+        ItemInterface $item3,
+    ): void {
         $menu->getChildren()->willReturn([
             'item1' => $item1,
             'item2' => $item2,
-            'item3' => $item3
+            'item3' => $item3,
         ]);
 
         $menu->getChild('item2')->willReturn($item2);
 
         $menu->setChildren([
             'item1' => $item1,
             'item3' => $item3,
-            'item2' => $item2
+            'item2' => $item2,
         ])->shouldBeCalled();
 
         $this->reorder($menu, 'item2', 'item3');
@@ -55,12 +54,11 @@ public function it_reorders_menu_items(
     public function it_does_not_reorder_if_new_item_is_not_found(
         ItemInterface $menu,
         ItemInterface $item1,
-        ItemInterface $item3
-    ): void
-    {
+        ItemInterface $item3,
+    ): void {
         $menu->getChildren()->willReturn([
             'item1' => $item1,
-            'item3' => $item3
+            'item3' => $item3,
         ]);
 
         $menu->getChild('item2')->willReturn(null);
@@ -72,12 +70,11 @@ public function it_does_not_reorder_if_new_item_is_not_found(
     public function it_does_not_reorder_if_target_item_is_not_found(
         ItemInterface $menu,
         ItemInterface $item1,
-        ItemInterface $item2
-    ): void
-    {
+        ItemInterface $item2,
+    ): void {
         $menu->getChildren()->willReturn([
             'item1' => $item1,
-            'item2' => $item2
+            'item2' => $item2,
         ]);
 
         $menu->getChild('item1')->willReturn($item1);
@@ -89,12 +86,11 @@ public function it_does_not_reorder_if_target_item_is_not_found(
     public function it_does_not_modify_menu_when_no_reorder_is_needed(
         ItemInterface $menu,
         ItemInterface $item1,
-        ItemInterface $item2
-    ): void
-    {
+        ItemInterface $item2,
+    ): void {
         $menu->getChildren()->willReturn([
             'item1' => $item1,
-            'item2' => $item2
+            'item2' => $item2,
         ]);
 
         $menu->getChild('item1')->willReturn($item1);

spec/Processor/ImportProcessorSpec.php

@@ -24,7 +24,7 @@ class ImportProcessorSpec extends ObjectBehavior
     public function let(
         ImporterChainInterface $importerChain,
         ReaderInterface $reader,
-        EntityManagerInterface $entityManager
+        EntityManagerInterface $entityManager,
     ) {
         $this->beConstructedWith($importerChain, $reader, $entityManager);
     }
@@ -38,7 +38,7 @@ public function it_processes_import_data(
         ImporterChainInterface $importerChain,
         ReaderInterface $reader,
         EntityManagerInterface $entityManager,
-        ImporterInterface $importer
+        ImporterInterface $importer,
     ) {
         $resourceCode = 'some_resource';
         $filePath = 'path/to/file.csv';
@@ -65,7 +65,7 @@ public function it_throws_exception_when_import_fails(
         ImporterChainInterface $importerChain,
         ReaderInterface $reader,
         EntityManagerInterface $entityManager,
-        ImporterInterface $importer
+        ImporterInterface $importer,
     ) {
         $resourceCode = 'some_resource';
         $filePath = 'path/to/file.csv';