Add last fixes before 2.0

BitBagCommerce · Jul 15, 2018 · 290d04d · 290d04d
1 parent 0b669ab
commit 290d04d
Show file tree

Hide file tree

Showing 18 changed files with 63 additions and 64 deletions.
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/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/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

diff --git a/src/Resources/config/services.yml b/src/Resources/config/services.yml
@@ -46,7 +46,6 @@ services:
         class: BitBag\SyliusCmsPlugin\Uploader\MediaUploader
         arguments:
             - "@bitbag_sylius_cms_plugin.media.filesystem"
-            - "%kernel.project_dir%"
 
     bitbag_sylius_cms_plugin.media.filesystem:
         class: Gaufrette\Filesystem

diff --git a/src/Resources/config/services/fixture.yml b/src/Resources/config/services/fixture.yml
@@ -78,7 +78,7 @@ services:
         arguments:
             - "@bitbag_sylius_cms_plugin.factory.media"
             - "@bitbag_sylius_cms_plugin.factory.media_translation"
-            - "@bitbag_sylius_cms_plugin.media_provider.image"
+            - "@bitbag_sylius_cms_plugin.resolver.media_provider"
             - "@bitbag_sylius_cms_plugin.repository.media"
             - "@bitbag_sylius_cms_plugin.assigner.products"
             - "@bitbag_sylius_cms_plugin.assigner.sections"
diff --git a/src/Resources/views/Shop/Media/Show/file.html.twig b/src/Resources/views/Shop/Media/Show/file.html.twig
@@ -1,8 +1,10 @@
 {% if null != media.name %}
-    <h2>{{ media.name }}</h2>
+    <h2>{{ media.name|raw }}</h2>
 {% endif %}
 
-<a class="ui labeled icon button primary" href="{{ path('bitbag_sylius_cms_plugin_shop_media_download', {'code': media.code}) }}">
-     <i class="download icon"></i>
+<p>{{ media.description|raw }}</p>
+
+<a class="ui icon labeled primary button" href="{{ path('bitbag_sylius_cms_plugin_shop_media_download', {'code': media.code}) }}">
+    <i class="download icon"></i>
     {{ 'bitbag_sylius_cms_plugin.ui.download'|trans }}
 </a>
diff --git a/src/Resources/views/Shop/Media/Show/image.html.twig b/src/Resources/views/Shop/Media/Show/image.html.twig
@@ -1,7 +1,5 @@
-{% set path = '/'~media.path %}
-
 <h2>{{ media.name|raw }}</h2>
 
-<img class="ui fluid image" src="{{ path }}" alt="{{ media.name }}"/>
+<img class="ui fluid image" src="{{ media.path }}" alt="{{ media.name }}"/>
 
 <p>{{ media.description|raw }}</p>
diff --git a/src/Resources/views/Shop/Media/Show/video.html.twig b/src/Resources/views/Shop/Media/Show/video.html.twig
@@ -1,9 +1,9 @@
-{% set path = '/'~media.path %}
-
 <div>
     {% if null != media.name %}
-        <h2>{{ media.name }}</h2>
+        <h2>{{ media.name|raw }}</h2>
     {% endif %}
 
-    <video controls width="100%" src="{{ path }}"></video>
+    <video controls width="100%" src="{{ media.path }}"></video>
+
+    <p>{{ media.description|raw }}</p>
 </div>
diff --git a/src/Uploader/MediaUploader.php b/src/Uploader/MediaUploader.php
@@ -22,13 +22,9 @@ final class MediaUploader implements MediaUploaderInterface
     /** @var Filesystem */
     private $filesystem;
 
-    /** @var string */
-    private $projectDir;
-
-    public function __construct(Filesystem $filesystem, string $projectDir)
+    public function __construct(Filesystem $filesystem)
     {
         $this->filesystem = $filesystem;
-        $this->projectDir = $projectDir;
     }
 
     public function upload(MediaInterface $media, string $pathPrefix): void
@@ -51,8 +47,7 @@ public function upload(MediaInterface $media, string $pathPrefix): void
             $path = $this->expandPath($hash . '.' . $file->guessExtension(), $pathPrefix);
         } while ($this->filesystem->has($path));
 
-        $media->setPath($path);
-        $media->setOriginalPath(sprintf('%s/%s', $this->projectDir, $path));
+        $media->setPath('/' . $path);
         $media->setMimeType($file->getMimeType());
 
         $this->filesystem->write(

diff --git a/tests/Application/app/Resources/SyliusShopBundle/views/Homepage/index.html.twig b/tests/Application/app/Resources/SyliusShopBundle/views/Homepage/index.html.twig
@@ -25,12 +25,12 @@
         <div class="ui stackable two column grid">
             <div class="column">
                 <div class="ui fluid segment">
-                    {{ bitbag_cms_render_media('homepage_banner_image_1') }}
+                    {{ bitbag_cms_render_media('homepage_video') }}
                 </div>
             </div>
             <div class="column">
                 <div class="ui fluid segment">
-                    {{ bitbag_cms_render_media('homepage_banner_image_2') }}
+                    {{ bitbag_cms_render_media('homepage_pdf') }}
                 </div>
             </div>
         </div>

diff --git a/tests/Application/app/Resources/fixtures/BitBagOffer.pdf b/tests/Application/app/Resources/fixtures/BitBagOffer.pdf
diff --git a/tests/Application/app/Resources/fixtures/homepage_banner_1.jpeg b/tests/Application/app/Resources/fixtures/homepage_banner_1.jpeg
diff --git a/tests/Application/app/Resources/fixtures/homepage_banner_2.jpeg b/tests/Application/app/Resources/fixtures/homepage_banner_2.jpeg
diff --git a/tests/Application/app/Resources/fixtures/homepage_video.mp4 b/tests/Application/app/Resources/fixtures/homepage_video.mp4
diff --git a/tests/Application/app/config/fixtures.yml b/tests/Application/app/config/fixtures.yml
@@ -85,10 +85,6 @@ sylius_fixtures:
                                                 bitbag_cms_render_block('homepage_banner_image_1')
                                                 bitbag_cms_render_block('homepage_banner_image_2')
                                                 </pre>
-
-                                                <p>
-                                                    The block with this nice woman is linked to another page. Click her and see what happens. No pornography included. I promise <i class="em em-relieved"></i>
-                                                </p>
                             lorem_ipsum:
                                 sections:
                                     - "homepage"
@@ -112,17 +108,43 @@ sylius_fixtures:
                                 translations:
                                     en_US:
                                         name: |
-                                            Some block name
-                            homepage_banner_image_1:
-                                type: image
-                                path: "%fixtures_dir%/homepage_banner_1.jpeg"
+                                            <a href="/en_US/page/about">This is a linked title</a>
+                                        alt: Homepage image media
+                                        description: |
+                                            <h3>Media description</h3>
+                                            <p>
+                                                Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
+                                                tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+                                                quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
+                                            </p>
+                            homepage_video:
+                                type: video
+                                path: "%fixtures_dir%/homepage_video.mp4"
                                 translations:
                                     en_US:
                                         name: |
-                                            <a href="/en_US/page/about">Click me! <i class="em em-kiss"></i></a>
-                            homepage_banner_image_2:
-                                type: image
-                                path: "%fixtures_dir%/homepage_banner_2.jpeg"
+                                            Homepage video media
+                                        alt: Homepage video
+                                        description: |
+                                            <h3>Media description</h3>
+                                            <p>
+                                                Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
+                                                tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+                                                quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
+                                            </p>
+                            homepage_pdf:
+                                type: file
+                                path: "%fixtures_dir%/BitBagOffer.pdf"
+                                translations:
+                                    en_US:
+                                        name: Homepage PDF media
+                                        alt: BitBag offer
+                                        description: |
+                                            <h3>File description</h3>
+                                            <p>
+                                                The below button links to a PDF file.
+                                                Check it out! <i class="em em-slightly-smiling-face"></i>
+                                            </p>
                             size_table:
                                 type: image
                                 path: "%fixtures_dir%/size_table.jpeg"