Extract parmeter and remove image paths from service memory

Sylius · Nov 12, 2018 · 8852676 · 8852676
1 parent 327ceb5
commit 8852676
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 2 deletions.
diff --git a/src/Sylius/Behat/Resources/config/services.xml b/src/Sylius/Behat/Resources/config/services.xml
@@ -53,7 +53,7 @@
 
         <service id="sylius.behat.checker.image_existence" class="Sylius\Behat\Service\Checker\ImageExistenceChecker">
             <argument type="service" id="__symfony__.sylius.liip.filter_service" />
-            <argument type="string">%__symfony__.kernel.project_dir%/web/</argument>
+            <argument type="string">%__symfony__.sylius_core.public_dir%</argument>
         </service>
 
         <service id="sylius.behat.paypal_api_mocker" class="Sylius\Behat\Service\Mocker\PaypalApiMocker" public="false">

diff --git a/src/Sylius/Bundle/CoreBundle/EventListener/ImagesRemoveListener.php b/src/Sylius/Bundle/CoreBundle/EventListener/ImagesRemoveListener.php
@@ -59,9 +59,10 @@ public function onFlush(OnFlushEventArgs $event): void
 
     public function postFlush(PostFlushEventArgs $event): void
     {
-        foreach ($this->imagesToDelete as $imagePath) {
+        foreach ($this->imagesToDelete as $key => $imagePath) {
             $this->imageUploader->remove($imagePath);
             $this->cacheManager->remove($imagePath, array_keys($this->filterManager->getFilterConfiguration()->all()));
+            unset($this->imagesToDelete[$key]);
         }
     }
 }
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/app/parameters.yml b/src/Sylius/Bundle/CoreBundle/Resources/config/app/parameters.yml
@@ -5,3 +5,4 @@ parameters:
     sylius.cache:
         type: file_system
     sylius.uploader.filesystem: sylius_image
+    sylius_core.public_dir: "%kernel.project_dir%/web"
diff --git a/src/Sylius/Bundle/CoreBundle/spec/EventListener/ImagesRemoveListenerSpec.php b/src/Sylius/Bundle/CoreBundle/spec/EventListener/ImagesRemoveListenerSpec.php
@@ -83,4 +83,35 @@ function it_removes_saved_images_paths(
 
         $this->postFlush($postFlushEvent);
     }
+
+    function it_removes_saved_images_paths_from_both_filesystem_and_service_property(
+        ImageUploaderInterface $imageUploader,
+        CacheManager $cacheManager,
+        FilterManager $filterManager,
+        OnFlushEventArgs $onFlushEvent,
+        PostFlushEventArgs $postFlushEvent,
+        EntityManagerInterface $entityManager,
+        UnitOfWork $unitOfWork,
+        ImageInterface $image,
+        ProductInterface $product,
+        FilterConfiguration $filterConfiguration
+    ): void {
+        $onFlushEvent->getEntityManager()->willReturn($entityManager);
+        $entityManager->getUnitOfWork()->willReturn($unitOfWork);
+        $unitOfWork->getScheduledEntityDeletions()->willReturn([$image, $product]);
+
+        $image->getPath()->willReturn('image/path');
+
+        $this->onFlush($onFlushEvent);
+
+        $imageUploader->remove('image/path')->shouldBeCalledOnce();
+
+        $filterManager->getFilterConfiguration()->willReturn($filterConfiguration);
+        $filterConfiguration->all()->willReturn(['test' => 'Test']);
+
+        $cacheManager->remove('image/path', ['test'])->shouldBeCalledOnce();
+
+        $this->postFlush($postFlushEvent);
+        $this->postFlush($postFlushEvent);
+    }
 }