Merge pull request #175 from BitBagCommerce/dev

Prepare 2.0.0 release
BitBagCommerce · Jul 16, 2018 · 4f48af4 · 4f48af4
2 parents 18aa1e2 + d0f5b67
commit 4f48af4
Show file tree

Hide file tree

Showing 31 changed files with 263 additions and 86 deletions.
diff --git a/spec/Assigner/ChannelsAssignerSpec.php b/spec/Assigner/ChannelsAssignerSpec.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace spec\BitBag\SyliusCmsPlugin\Assigner;
+
+use BitBag\SyliusCmsPlugin\Assigner\ChannelsAssigner;
+use BitBag\SyliusCmsPlugin\Assigner\ChannelsAssignerInterface;
+use PhpSpec\ObjectBehavior;
+use Sylius\Component\Channel\Model\ChannelsAwareInterface;
+use Sylius\Component\Channel\Repository\ChannelRepositoryInterface;
+use Sylius\Component\Core\Model\ChannelInterface;
+
+final class ChannelsAssignerSpec extends ObjectBehavior
+{
+    function let(ChannelRepositoryInterface $channelRepository): void
+    {
+        $this->beConstructedWith($channelRepository);
+    }
+
+    function it_is_initializable(): void
+    {
+        $this->shouldHaveType(ChannelsAssigner::class);
+    }
+
+    function it_implements_channels_assigner_interface(): void
+    {
+        $this->shouldHaveType(ChannelsAssignerInterface::class);
+    }
+
+    function it_assigns_channels(
+        ChannelRepositoryInterface $channelRepository,
+        ChannelInterface $webChannel,
+        ChannelInterface $posChannel,
+        ChannelsAwareInterface $channelsAware
+    ): void
+    {
+        $channelRepository->findOneBy(['code' => 'web'])->willReturn($webChannel);
+        $channelRepository->findOneBy(['code' => 'pos'])->willReturn($posChannel);
+
+        $channelsAware->addChannel($webChannel)->shouldBeCalled();
+        $channelsAware->addChannel($posChannel)->shouldBeCalled();
+
+        $this->assign($channelsAware, ['web', 'pos']);
+    }
+}
diff --git a/spec/Assigner/ProductsAssignerSpec.php b/spec/Assigner/ProductsAssignerSpec.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace spec\BitBag\SyliusCmsPlugin\Assigner;
+
+use BitBag\SyliusCmsPlugin\Assigner\ProductsAssigner;
+use BitBag\SyliusCmsPlugin\Assigner\ProductsAssignerInterface;
+use BitBag\SyliusCmsPlugin\Entity\ProductsAwareInterface;
+use PhpSpec\ObjectBehavior;
+use Sylius\Component\Core\Repository\ProductRepositoryInterface;
+use Sylius\Component\Core\Model\ProductInterface;
+
+final class ProductsAssignerSpec extends ObjectBehavior
+{
+    function let(ProductRepositoryInterface $productRepository): void
+    {
+        $this->beConstructedWith($productRepository);
+    }
+
+    function it_is_initializable(): void
+    {
+        $this->shouldHaveType(ProductsAssigner::class);
+    }
+
+    function it_implements_products_assigner_interface(): void
+    {
+        $this->shouldHaveType(ProductsAssignerInterface::class);
+    }
+
+    function it_assigns_products(
+        ProductRepositoryInterface $productRepository,
+        ProductInterface $mugProduct,
+        ProductInterface $tshirtProduct,
+        ProductsAwareInterface $productsAware
+    ): void
+    {
+        $productRepository->findOneBy(['code' => 'mug'])->willReturn($mugProduct);
+        $productRepository->findOneBy(['code' => 't-shirt'])->willReturn($tshirtProduct);
+
+        $productsAware->addProduct($mugProduct)->shouldBeCalled();
+        $productsAware->addProduct($tshirtProduct)->shouldBeCalled();
+
+        $this->assign($productsAware, ['mug', 't-shirt']);
+    }
+}
diff --git a/spec/Assigner/SectionsAssignerSpec.php b/spec/Assigner/SectionsAssignerSpec.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace spec\BitBag\SyliusCmsPlugin\Assigner;
+
+use BitBag\SyliusCmsPlugin\Assigner\SectionsAssigner;
+use BitBag\SyliusCmsPlugin\Assigner\SectionsAssignerInterface;
+use BitBag\SyliusCmsPlugin\Entity\SectionInterface;
+use BitBag\SyliusCmsPlugin\Repository\SectionRepositoryInterface;
+use PhpSpec\ObjectBehavior;
+use BitBag\SyliusCmsPlugin\Entity\SectionableInterface;
+
+final class SectionsAssignerSpec extends ObjectBehavior
+{
+    function let(SectionRepositoryInterface $sectionRepository): void
+    {
+        $this->beConstructedWith($sectionRepository);
+    }
+
+    function it_is_initializable(): void
+    {
+        $this->shouldHaveType(SectionsAssigner::class);
+    }
+
+    function it_implements_sections_assigner_interface(): void
+    {
+        $this->shouldHaveType(SectionsAssignerInterface::class);
+    }
+
+    function it_assigns_sections(
+        SectionRepositoryInterface $sectionRepository,
+        SectionInterface $aboutSection,
+        SectionInterface $blogSection,
+        SectionableInterface $sectionsAware
+    ): void
+    {
+        $sectionRepository->findOneBy(['code' => 'about'])->willReturn($aboutSection);
+        $sectionRepository->findOneBy(['code' => 'blog'])->willReturn($blogSection);
+
+        $sectionsAware->addSection($aboutSection)->shouldBeCalled();
+        $sectionsAware->addSection($blogSection)->shouldBeCalled();
+
+        $this->assign($sectionsAware, ['about', 'blog']);
+    }
+}
diff --git a/spec/Entity/MediaSpec.php b/spec/Entity/MediaSpec.php
@@ -51,9 +51,6 @@ function it_allows_access_via_properties(File $uploadedFile): void
         $this->setFile($uploadedFile);
         $this->getFile()->shouldReturn($uploadedFile);
 
-        $this->setOriginalPath('/media/video');
-        $this->getOriginalPath()->shouldReturn('/media/video');
-
         $this->setMimeType('video/mp4');
         $this->getMimeType()->shouldReturn('video/mp4');
     }

diff --git a/spec/Entity/MediaTranslationSpec.php b/spec/Entity/MediaTranslationSpec.php
@@ -37,7 +37,7 @@ function it_implements_media_translation_interface(): void
         $this->shouldHaveType(TranslationInterface::class);
     }
 
-    function it_allows_access_via_properties(PageImageInterface $pageImage): void
+    function it_allows_access_via_properties(): void
     {
         $this->setName('Video');
         $this->getName()->shouldReturn('Video');

diff --git a/spec/Twig/Parser/ContentParserSpec.php b/spec/Twig/Parser/ContentParserSpec.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace spec\BitBag\SyliusCmsPlugin\Twig\Parser;
+
+use BitBag\SyliusCmsPlugin\Twig\Extension\RenderBlockExtension;
+use BitBag\SyliusCmsPlugin\Twig\Parser\ContentParser;
+use BitBag\SyliusCmsPlugin\Twig\Parser\ContentParserInterface;
+use PhpSpec\ObjectBehavior;
+
+final class ContentParserSpec extends ObjectBehavior
+{
+    function let(\Twig_Environment $twigEnvironment): void
+    {
+        $this->beConstructedWith($twigEnvironment, ['bitbag_cms_render_block']);
+    }
+
+    function it_is_initializable(): void
+    {
+        $this->shouldHaveType(ContentParser::class);
+    }
+
+    function it_implements_content_parser_interface(): void
+    {
+        $this->shouldHaveType(ContentParserInterface::class);
+    }
+
+    function it_parses_string_functions(
+        \Twig_Environment $twigEnvironment,
+        \Twig_Function $renderBlockFunction,
+        RenderBlockExtension $renderBlockExtension
+    ): void
+    {
+        $twigEnvironment->getFunctions()->willReturn([
+            'bitbag_cms_render_block' => $renderBlockFunction,
+        ]);
+        $renderBlockFunction->getCallable()->willReturn([$renderBlockExtension, 'renderBlock']);
+
+        $input = "Let's render! {{ bitbag_cms_render_block('intro', '@BitBagSyliusCmsPlugin/Shop/Block/show.html.twig') }}";
+
+        $renderBlockExtension->renderBlock('intro', '@BitBagSyliusCmsPlugin/Shop/Block/show.html.twig')->shouldBeCalled();
+
+        $this->parse($input);
+    }
+}
diff --git a/src/Assigner/ChannelsAssigner.php b/src/Assigner/ChannelsAssigner.php
@@ -29,7 +29,7 @@ public function __construct(ChannelRepositoryInterface $channelRepository)
     public function assign(ChannelsAwareInterface $channelsAware, array $channelsCodes): void
     {
         foreach ($channelsCodes as $channelCode) {
-            /** @var ChannelInterface $channel */
+            /** @var ChannelInterface $channel|null */
             $channel = $this->channelRepository->findOneBy(['code' => $channelCode]);
 
             if (null !== $channel) {

diff --git a/src/Controller/Action/Admin/ProductSearchAction.php b/src/Controller/Action/Admin/ProductSearchAction.php
@@ -34,8 +34,8 @@ public function __construct(ProductRepositoryInterface $productRepository, ViewH
 
     public function __invoke(Request $request): Response
     {
-        $resource = $this->productRepository->findByNamePart($request->get('phrase', ''));
-        $view = View::create($resource);
+        $product = $this->productRepository->findByNamePart($request->get('phrase', ''));
+        $view = View::create($product);
 
         $this->viewHandler->setExclusionStrategyGroups(['Autocomplete']);
         $view->getContext()->enableMaxDepth();

diff --git a/src/Controller/MediaController.php b/src/Controller/MediaController.php
@@ -16,6 +16,8 @@
 use Sylius\Bundle\ResourceBundle\Controller\ResourceController;
 use Sylius\Component\Resource\ResourceActions;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
+use Symfony\Component\HttpFoundation\File\File;
+use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\ResponseHeaderBag;
@@ -60,9 +62,12 @@ public function downloadMediaAction(Request $request): Response
 
         $this->eventDispatcher->dispatch(ResourceActions::SHOW, $configuration, $media);
 
-        $response = new BinaryFileResponse($media->getOriginalPath());
+        $mediaPath = $this->getParameter('kernel.project_dir') . '/web' . $media->getPath();
+        $mediaFile = new File($mediaPath);
+        $mediaName = $media->getName() . '.' . $mediaFile->guessExtension();
+        $response = new BinaryFileResponse($mediaPath);
 
-        $response->setContentDisposition(ResponseHeaderBag::DISPOSITION_ATTACHMENT);
+        $response->setContentDisposition(ResponseHeaderBag::DISPOSITION_ATTACHMENT, $mediaName);
         $response->headers->set('Content-Type', $media->getMimeType());
 
         return $response;

diff --git a/src/Entity/Media.php b/src/Entity/Media.php
@@ -89,22 +89,8 @@ public function setPath(?string $path): void
         $this->path = $path;
     }
 
-    public function getOriginalPath(): ?string
-    {
-        return $this->originalPath;
-    }
-
-    public function setOriginalPath(?string $originalPath): void
-    {
-        $this->originalPath = $originalPath;
-    }
-
     public function getFile(): ?File
     {
-        if (null === $this->type && null !== $this->path) {
-            $this->file = new File($this->path);
-        }
-
         return $this->file;
     }
 

diff --git a/src/Entity/MediaInterface.php b/src/Entity/MediaInterface.php
@@ -36,10 +36,6 @@ public function getPath(): ?string;
 
     public function setPath(?string $path): void;
 
-    public function getOriginalPath(): ?string;
-
-    public function setOriginalPath(?string $originalPath): void;
-
     public function getFile(): ?File;
 
     public function setFile(?File $file): void;

diff --git a/src/Fixture/Factory/MediaFixtureFactory.php b/src/Fixture/Factory/MediaFixtureFactory.php
@@ -18,6 +18,7 @@
 use BitBag\SyliusCmsPlugin\Entity\MediaTranslationInterface;
 use BitBag\SyliusCmsPlugin\MediaProvider\ProviderInterface;
 use BitBag\SyliusCmsPlugin\Repository\MediaRepositoryInterface;
+use BitBag\SyliusCmsPlugin\Resolver\MediaProviderResolverInterface;
 use Sylius\Component\Resource\Factory\FactoryInterface;
 use Symfony\Component\HttpFoundation\File\File;
 
@@ -29,8 +30,8 @@ final class MediaFixtureFactory implements FixtureFactoryInterface
     /** @var FactoryInterface */
     private $mediaTranslationFactory;
 
-    /** @var ProviderInterface */
-    private $imageProvider;
+    /** @var MediaProviderResolverInterface */
+    private $mediaProviderResolver;
 
     /** @var MediaRepositoryInterface */
     private $mediaRepository;
@@ -44,14 +45,14 @@ final class MediaFixtureFactory implements FixtureFactoryInterface
     public function __construct(
         FactoryInterface $mediaFactory,
         FactoryInterface $mediaTranslationFactory,
-        ProviderInterface $imageProvider,
+        MediaProviderResolverInterface $mediaProviderResolver,
         MediaRepositoryInterface $mediaRepository,
         ProductsAssignerInterface $productsAssigner,
         SectionsAssignerInterface $sectionsAssigner
     ) {
         $this->mediaFactory = $mediaFactory;
         $this->mediaTranslationFactory = $mediaTranslationFactory;
-        $this->imageProvider = $imageProvider;
+        $this->mediaProviderResolver = $mediaProviderResolver;
         $this->mediaRepository = $mediaRepository;
         $this->productsAssigner = $productsAssigner;
         $this->sectionsAssigner = $sectionsAssigner;
@@ -86,7 +87,7 @@ private function createMedia(string $code, array $mediaData): void
         $media->setEnabled($mediaData['enabled']);
         $media->setFile(new File($mediaData['path']));
 
-        $this->imageProvider->upload($media);
+        $this->mediaProviderResolver->resolveProvider($media)->upload($media);
 
         foreach ($mediaData['translations'] as $localeCode => $translation) {
             /** @var MediaTranslationInterface $mediaTranslation */

diff --git a/src/Fixture/Factory/PageFixtureFactory.php b/src/Fixture/Factory/PageFixtureFactory.php
@@ -12,8 +12,8 @@
 
 namespace BitBag\SyliusCmsPlugin\Fixture\Factory;
 
-use BitBag\SyliusCmsPlugin\Entity\PageInterface;
 use BitBag\SyliusCmsPlugin\Entity\PageImage;
+use BitBag\SyliusCmsPlugin\Entity\PageInterface;
 use BitBag\SyliusCmsPlugin\Entity\PageTranslationInterface;
 use BitBag\SyliusCmsPlugin\Entity\SectionInterface;
 use BitBag\SyliusCmsPlugin\Repository\PageRepositoryInterface;
@@ -39,7 +39,7 @@ final class PageFixtureFactory implements FixtureFactoryInterface
     /** @var SectionRepositoryInterface */
     private $sectionRepository;
 
-    /** @var ProductRepositoryInterface */
+    /** @var ImageUploaderInterface */
     private $imageUploader;
 
     /** @var ProductRepositoryInterface */

diff --git a/src/Importer/PageImporter.php b/src/Importer/PageImporter.php
@@ -13,8 +13,8 @@
 namespace BitBag\SyliusCmsPlugin\Importer;
 
 use BitBag\SyliusCmsPlugin\Downloader\ImageDownloaderInterface;
-use BitBag\SyliusCmsPlugin\Entity\PageInterface;
 use BitBag\SyliusCmsPlugin\Entity\PageImage;
+use BitBag\SyliusCmsPlugin\Entity\PageInterface;
 use BitBag\SyliusCmsPlugin\Entity\PageTranslationInterface;
 use BitBag\SyliusCmsPlugin\Resolver\ImporterChannelsResolverInterface;
 use BitBag\SyliusCmsPlugin\Resolver\ImporterProductsResolverInterface;

diff --git a/src/MediaProvider/AbstractProvider.php b/src/MediaProvider/AbstractProvider.php
@@ -49,6 +49,6 @@ public function render(MediaInterface $media, array $options = []): string
 
     public function upload(MediaInterface $media): void
     {
-        $this->uploader->upload($media, $this->pathPrefix);
+        $this->uploader->upload($media,  $this->pathPrefix);
     }
 }
diff --git a/src/Menu/ContentManagementMenuBuilder.php b/src/Menu/ContentManagementMenuBuilder.php
@@ -33,6 +33,14 @@ public function buildMenu(MenuBuilderEvent $menuBuilderEvent): void
             ->setLabelAttribute('icon', 'block layout')
         ;
 
+        $cmsRootMenuItem
+            ->addChild('media', [
+                'route' => 'bitbag_sylius_cms_plugin_admin_media_index',
+            ])
+            ->setLabel('bitbag_sylius_cms_plugin.ui.media')
+            ->setLabelAttribute('icon', 'file')
+        ;
+
         $cmsRootMenuItem
             ->addChild('pages', [
                 'route' => 'bitbag_sylius_cms_plugin_admin_page_index',
@@ -56,13 +64,5 @@ public function buildMenu(MenuBuilderEvent $menuBuilderEvent): void
             ->setLabel('bitbag_sylius_cms_plugin.ui.sections')
             ->setLabelAttribute('icon', 'grid layout')
         ;
-
-        $cmsRootMenuItem
-            ->addChild('media', [
-                'route' => 'bitbag_sylius_cms_plugin_admin_media_index',
-            ])
-            ->setLabel('bitbag_sylius_cms_plugin.ui.media')
-            ->setLabelAttribute('icon', 'file')
-        ;
     }
 }
diff --git a/src/Resources/config/doctrine/Media.orm.yml b/src/Resources/config/doctrine/Media.orm.yml
@@ -22,11 +22,6 @@ BitBag\SyliusCmsPlugin\Entity\Media:
             type: string
             length: 250
             unique: true
-        originalPath:
-            column: original_path
-            type: string
-            length: 250
-            unique: true
         mimeType:
             column: mime_typ
             type: string