fix: cleanup code and restrict to sw6.4

FriendsOfShopware · May 12, 2021 · 4bf7de9 · 4bf7de9
1 parent 18e3739
commit 4bf7de9
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 131 deletions.
diff --git a/.github/workflows/pack-plugin.yml b/.github/workflows/pack-plugin.yml
@@ -14,7 +14,7 @@ env:
 jobs:
     pack:
         runs-on: ubuntu-latest
-        container: ghcr.io/friendsofshopware/platform-plugin-dev:v6.3.4
+        container: ghcr.io/friendsofshopware/platform-plugin-dev:v6.4.0
         steps:
             -   name: Checkout
                 uses: actions/checkout@v2.3.1

diff --git a/CHANGELOG_de-DE.md b/CHANGELOG_de-DE.md
@@ -1,3 +1,7 @@
+# 1.0.16
+
+* FEATURE Support für SW6.4
+
 # 1.0.15
 
 * FEATURE Support für SW6.4

diff --git a/CHANGELOG_en-GB.md b/CHANGELOG_en-GB.md
@@ -1,3 +1,7 @@
+# 1.0.16
+
+* FEATURE Better support for SW6.4
+
 # 1.0.15
 
 * FEATURE Add support for SW6.4

diff --git a/composer.json b/composer.json
@@ -11,7 +11,7 @@
         "thumbnail"
     ],
     "description": "This plugins allows you to use variable thumbnails, without having them on storage.",
-    "version": "1.0.15",
+    "version": "1.0.16",
     "type": "shopware-platform-plugin",
     "license": "mit",
     "authors": [
@@ -21,7 +21,7 @@
         }
     ],
     "require": {
-        "shopware/core": "~6.3|~6.4"
+        "shopware/core": "~6.4"
     },
     "extra": {
         "shopware-plugin-class": "Frosh\\ThumbnailProcessor\\FroshPlatformThumbnailProcessor",

diff --git a/src/Resources/config/config.xml b/src/Resources/config/config.xml
@@ -33,26 +33,6 @@
             </helpText>
         </input-field>
 
-        <input-field type="bool">
-            <name>FixListingThumbnailSizes</name>
-            <label>Fix Listing ThumbnailSizes</label>
-            <defaultValue>1</defaultValue>
-            <helpText>
-                There are problems with thumbnail-sizes in storefront.
-                This can help you delivering better matching sizes to the visitor.
-            </helpText>
-        </input-field>
-
-        <input-field type="bool">
-            <name>FixDetailGalleryThumbnailSizes</name>
-            <label>Fix ThumbnailSizes in DetailGallery</label>
-            <defaultValue>1</defaultValue>
-            <helpText>
-                There are problems with thumbnail-sizes in the gallery of the product page.
-                This can help you delivering better matching sizes to the visitor.
-            </helpText>
-        </input-field>
-
         <input-field type="int">
             <name>DefaultContainerMaxSize</name>
             <label>Specific max width of container</label>

diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
@@ -12,7 +12,6 @@
             <argument type="service" id="Frosh\ThumbnailProcessor\Service\ThumbnailUrlTemplateInterface"/>
             <argument type="service" id="request_stack"/>
             <argument type="service" id="Shopware\Core\System\SystemConfig\SystemConfigService"/>
-            <argument>%shopware.filesystem.public.url%</argument>
         </service>
 
         <service id="Frosh\ThumbnailProcessor\Service\ThumbnailUrlTemplateInterface"

diff --git a/src/Resources/views/storefront/component/product/card/box-standard.html.twig b/src/Resources/views/storefront/component/product/card/box-standard.html.twig
diff --git a/src/Resources/views/storefront/component/product/card/box.html.twig b/src/Resources/views/storefront/component/product/card/box.html.twig
diff --git a/src/Resources/views/storefront/element/cms-element-image-gallery.html.twig b/src/Resources/views/storefront/element/cms-element-image-gallery.html.twig
diff --git a/src/Resources/views/storefront/utilities/thumbnail.html.twig b/src/Resources/views/storefront/utilities/thumbnail.html.twig
@@ -24,7 +24,7 @@
             {% set container = 100 %}
             {% set sizes = sizes|merge({ 'xl': (container / columns)|round(0, 'ceil') ~'vw'}) %}
         {% else %}
-            {% set defaultContainerMaxSize = shopware.config.FroshPlatformThumbnailProcessor.config.DefaultContainerMaxSize %}
+            {% set defaultContainerMaxSize = config('FroshPlatformThumbnailProcessor.config.DefaultContainerMaxSize') %}
             {% if defaultContainerMaxSize is defined %}
                 {% set container = defaultContainerMaxSize %}
             {% else %}

diff --git a/src/Service/ThumbnailServiceDecorator.php b/src/Service/ThumbnailServiceDecorator.php
@@ -38,28 +38,15 @@ public function __construct(
         FilesystemInterface $fileSystemPublic,
         FilesystemInterface $fileSystemPrivate,
         UrlGeneratorInterface $urlGenerator,
-        EntityRepositoryInterface $mediaFolderRepository,
-        string $version
+        EntityRepositoryInterface $mediaFolderRepository
     ) {
-
-        if (version_compare($version, '6.4.0.0', '<')) {
-            parent::__construct(
-                $mediaRepository,
-                $thumbnailRepository,
-                $fileSystemPublic,
-                $fileSystemPrivate,
-                $urlGenerator,
-                $mediaFolderRepository
-            );
-        } else {
-            parent::__construct(
-                $thumbnailRepository,
-                $fileSystemPublic,
-                $fileSystemPrivate,
-                $urlGenerator,
-                $mediaFolderRepository
-            );
-        }
+        parent::__construct(
+            $thumbnailRepository,
+            $fileSystemPublic,
+            $fileSystemPrivate,
+            $urlGenerator,
+            $mediaFolderRepository
+        );
 
         $this->mediaRepository = $mediaRepository;
         $this->thumbnailRepository = $thumbnailRepository;