Merge pull request #145 from matesich/gallery-issue

fixed emulation issue for media gallery entries

Author: AleksandrsKondratjevs

src/Model/Resolver/Product/MediaGalleryEntries.php

@@ -71,9 +71,6 @@ protected function getImageOfType(
         $imageId,
         $type
     ) {
-        $storeId = $this->storeManager->getStore()->getId();
-        $this->emulation->startEnvironmentEmulation($storeId, Area::AREA_FRONTEND, true);
-
         $image = $this->helperFactory->init($mediaGalleryEntry, $imageId, ['type' => $type])
             ->setImageFile($mediaGalleryEntry->getData('file'))
             ->constrainOnly(true)
@@ -83,8 +80,6 @@ protected function getImageOfType(
 
         $url = $image->getUrl();
 
-        $this->emulation->stopEnvironmentEmulation();
-
         return [
             'url' => $url,
             'type' => $type
@@ -116,6 +111,9 @@ public function resolve(
         $mediaGalleryEntries = [];
 
         if (!empty($product->getMediaGalleryEntries())) {
+            $storeId = $this->storeManager->getStore()->getId();
+            $this->emulation->startEnvironmentEmulation($storeId, Area::AREA_FRONTEND, true);
+
             foreach ($product->getMediaGalleryEntries() as $key => $entry) {
                 $thumbnail = $this->getImageOfType($entry, 'scandipwa_media_thumbnail', 'thumbnail');
                 $base = $this->getImageOfType($entry, 'scandipwa_media_base', 'small_image');
@@ -127,6 +125,8 @@ public function resolve(
                         = $entry->getExtensionAttributes()->getVideoContent()->getData();
                 }
             }
+
+            $this->emulation->stopEnvironmentEmulation();
         }
 
         $result = function () use ($mediaGalleryEntries) {