feat: add shopware 6.6 compatibility (#67)

---------

Co-authored-by: tinect <[email protected]>

.github/workflows/code-style.yml

@@ -0,0 +1,18 @@
+name: Code Style
+on:
+  workflow_dispatch:
+  pull_request:
+  push:
+    branches:
+      - main
+
+jobs:
+  cs:
+    if: github.event_name != 'schedule'
+    uses: shopware/github-actions/.github/workflows/cs-fixer.yml@main
+  phpstan:
+    uses: shopware/github-actions/.github/workflows/phpstan.yml@main
+    with:
+      extensionName: FroshProductCompare
+      shopwareVersion: v6.6.0.0-rc1
+

.gitignore

@@ -7,3 +7,4 @@ phpstan.neon
 src/Resources/public/administration/frosh-product-compare.*.hot-update.js
 frosh-product-compare.js
 frosh-product-compare.css
+node_modules

.shopware-extension.yml

@@ -54,4 +54,10 @@ store:
           priority: 4
           activate:
             de: true
-            en: true
+            en: true
+
+build:
+  zip:
+    assets:
+      npm_strict: true
+

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "frosh/product-compare",
     "description": "A Simple Product Compare plugin for Shopware 6",
-    "version": "2.0.0",
+    "version": "3.0.0",
     "type": "shopware-platform-plugin",
     "license": "MIT",
     "authors": [
@@ -15,8 +15,8 @@
         }
     ],
     "require": {
-        "shopware/core": "^6.5",
-        "shopware/storefront": "^6.5"
+        "shopware/core": "~6.6",
+        "shopware/storefront": "~6.6"
     },
     "extra": {
         "shopware-plugin-class": "Frosh\\FroshProductCompare\\FroshProductCompare",

src/Controller/CompareProductController.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Frosh\FroshProductCompare\Controller;
 
@@ -8,16 +10,15 @@
 use Shopware\Storefront\Page\GenericPageLoaderInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Routing\Attribute\Route;
 
 #[Route(defaults: ['_routeScope' => ['storefront']])]
 class CompareProductController extends StorefrontController
 {
     public function __construct(
         private readonly CompareProductPageLoader $compareProductPageLoader,
         private readonly GenericPageLoaderInterface $genericPageLoader
-    ) {
-    }
+    ) {}
 
     #[Route(path: '/compare', name: 'frontend.compare.page', options: ['seo' => false], defaults: ['_httpCache' => false], methods: ['GET'])]
     public function comparePage(Request $request, SalesChannelContext $context): Response

src/CrossSellingComparable/CrossSellingComparableCollection.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Frosh\FroshProductCompare\CrossSellingComparable;
 

src/CrossSellingComparable/CrossSellingComparableDefinition.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Frosh\FroshProductCompare\CrossSellingComparable;
 

src/CrossSellingComparable/CrossSellingComparableEntity.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Frosh\FroshProductCompare\CrossSellingComparable;
 

src/DAL/Extension/ProductCrossSellingEntityExtension.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Frosh\FroshProductCompare\DAL\Extension;
 

src/FroshProductCompare.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Frosh\FroshProductCompare;
 

src/Migration/Migration1594488930CrossSellingComparable.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Frosh\FroshProductCompare\Migration;
 
@@ -28,7 +30,5 @@ public function update(Connection $connection): void
         ');
     }
 
-    public function updateDestructive(Connection $connection): void
-    {
-    }
+    public function updateDestructive(Connection $connection): void {}
 }

src/Page/CompareProductPage.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Frosh\FroshProductCompare\Page;
 

src/Page/CompareProductPageLoader.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Frosh\FroshProductCompare\Page;
 
@@ -33,8 +35,7 @@ public function __construct(
         private readonly EntityRepository $customFieldRepository,
         private readonly SystemConfigService $systemConfigService,
         private readonly ProductReviewLoader $productReviewLoader
-    ) {
-    }
+    ) {}
 
     /**
      * @param array<string> $productIds

src/Resources/app/administration/src/extension/sw-product/component/sw-product-cross-selling-form/sw-product-cross-selling-form.html.twig

@@ -1,18 +1,17 @@
 {% block sw_prduct_cross_selling_form_active_field %}
     {% parent %}
-    <sw-field
-        v-model="crossSelling.extensions.crossSellingComparable.isComparable"
-        type="switch"
+    <sw-switch-field
+        v-model:value="crossSelling.extensions.crossSellingComparable.isComparable"
         class="sw-product-detail-cross-selling__comparable-switch"
         :label="$tc('frosh-product-compare.crossSelling.compareLayout')">
-    </sw-field>
+    </sw-switch-field>
 {% endblock %}
 
 {% block sw_prduct_cross_selling_form_limit_field %}
     <sw-number-field
         numberType="int"
         :disabled="crossSelling.extensions.crossSellingComparable.isComparable"
         :label="$tc('sw-product.crossselling.inputCrossSellingLimit')"
-        v-model="crossSelling.limit">
+        v-model:value="crossSelling.limit">
     </sw-number-field>
 {% endblock %}

src/Resources/app/storefront/package.json

@@ -0,0 +1,5 @@
+{
+  "devDependencies": {
+    "@friendsofshopware/storefront-types": "^0.1.1"
+  }
+}

src/Resources/app/storefront/src/helper/compare-local-storage.helper.js → src/Resources/app/storefront/src/helper/compare-local-storage.helper.ts

@@ -1,15 +1,13 @@
-import Storage from 'src/helper/storage/storage.helper';
-
 class CompareLocalStorageHelper {
     static key = 'compare-widget-added-products';
 
     static maximumCompareProducts = 4;
 
     static getAddedProductsList() {
-        let products = Storage.getItem(this.key);
+        let products;
 
         try {
-            products = JSON.parse(products) || [];
+            products = JSON.parse(window.localStorage.getItem(this.key)) || [];
         } catch {
             this.clear();
             products = {};
@@ -60,13 +58,13 @@ class CompareLocalStorageHelper {
     }
 
     static persist(products) {
-        Storage.setItem(this.key, JSON.stringify(products));
+        window.localStorage.setItem(this.key, JSON.stringify(products));
 
         document.$emitter.publish('changedProductCompare', { products });
     }
 
     static clear() {
-        Storage.setItem(this.key, null);
+        window.localStorage.removeItem(this.key);
     }
 
     static _checkCompareProductStorage(products) {

src/Resources/app/storefront/src/main.ts

@@ -0,0 +1,7 @@
+import CompareWidgetPlugin from './plugin/compare-widget.plugin';
+import AddToCompareButtonPlugin from './plugin/add-to-compare-button.plugin';
+import CompareFloatPlugin from './plugin/compare-float.plugin';
+
+window.PluginManager.register('AddToCompareButton', AddToCompareButtonPlugin, '[data-add-to-compare-button]');
+window.PluginManager.register('CompareWidget', CompareWidgetPlugin, '[data-compare-widget]');
+window.PluginManager.register('CompareFloat', CompareFloatPlugin, '[data-compare-float]');

src/Resources/app/storefront/src/plugin/add-to-compare-button.plugin.js

@@ -1,7 +1,6 @@
-import Plugin from 'src/plugin-system/plugin.class';
 import CompareLocalStorageHelper from '../helper/compare-local-storage.helper';
 
-export default class AddToCompareButtonPlugin extends Plugin {
+export default class AddToCompareButtonPlugin extends window.PluginBaseClass {
     static options = {
         isAddedToCompareClass: 'is-added-to-compare'
     };

src/Resources/app/storefront/src/plugin/compare-float.plugin.js

@@ -1,10 +1,8 @@
-import Plugin from 'src/plugin-system/plugin.class';
-import DeviceDetection from 'src/helper/device-detection.helper';
 import AjaxOffcanvas from 'src/plugin/offcanvas/ajax-offcanvas.plugin';
 import PseudoModalUtil from 'src/utility/modal-extension/pseudo-modal.util';
 import CompareLocalStorageHelper from '../helper/compare-local-storage.helper';
 
-export default class CompareFloatPlugin extends Plugin {
+export default class CompareFloatPlugin extends window.PluginBaseClass {
     static options = {
         buttonSelector: '.js-compare-float-button'
     };
@@ -36,7 +34,7 @@ export default class CompareFloatPlugin extends Plugin {
      * @private
      */
     _registerEvents() {
-        const submitEvent = (DeviceDetection.isTouchDevice()) ? 'touchstart' : 'click';
+        const submitEvent = ('ontouchstart' in document.documentElement) ? 'touchstart' : 'click';
 
         if (this._button) {
             this._button.addEventListener(submitEvent, () => {

src/Resources/app/storefront/src/plugin/compare-widget.plugin.js

@@ -1,11 +1,8 @@
-import Plugin from 'src/plugin-system/plugin.class';
-import HttpClient from 'src/service/http-client.service';
 import ElementLoadingIndicatorUtil from 'src/utility/loading-indicator/element-loading-indicator.util';
 import CompareLocalStorageHelper from '../helper/compare-local-storage.helper';
 
-export default class CompareWidgetPlugin extends Plugin {
+export default class CompareWidgetPlugin extends window.PluginBaseClass {
     init() {
-        this._client = new HttpClient();
         this._clearBtn = this.el.querySelector('.btn-clear');
         this._printBtn = this.el.querySelector('.btn-printer');
         this.registerShowDifferencesBtnEvent();
@@ -54,13 +51,19 @@ export default class CompareWidgetPlugin extends Plugin {
 
         ElementLoadingIndicatorUtil.create(this.el);
 
-        this._client.post(window.router['frontend.compare.content'], JSON.stringify(data), (response) => {
+        fetch(window.router['frontend.compare.content'], {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            body: JSON.stringify(data),
+        }).then(r => r.text()).then((text) => {
             ElementLoadingIndicatorUtil.remove(this.el);
 
-            this.renderCompareProducts(response);
+            this.renderCompareProducts(text);
 
-            this.$emitter.publish('insertStoredContent', { response });
-        });
+            this.$emitter.publish('insertStoredContent', { response: text });
+        })
     }
 
     renderCompareProducts(html) {

src/Resources/app/storefront/tsconfig.json

@@ -0,0 +1,7 @@
+{
+  "compilerOptions": {
+    "types": ["@friendsofshopware/storefront-types"],
+    "target": "ES2020",
+    "module": "CommonJS"
+  }
+}

src/Resources/config/routes.xml

@@ -5,5 +5,5 @@
         xsi:schemaLocation="http://symfony.com/schema/routing
     http://symfony.com/schema/routing/routing-1.0.xsd">
 
-    <import resource="../../Controller" type="annotation" />
+    <import resource="../../Controller" type="attribute" />
 </routes>

src/Subscriber/FroshCrossSellingProductListingSubscriber.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Frosh\FroshProductCompare\Subscriber;
 
@@ -25,8 +27,7 @@ class FroshCrossSellingProductListingSubscriber implements EventSubscriberInterf
     public function __construct(
         private readonly CompareProductPageLoader $compareProductPageLoader,
         private readonly ProductGatewayInterface $productGateway
-    ) {
-    }
+    ) {}
 
     public static function getSubscribedEvents(): array
     {

src/Subscriber/FroshProductGatewayCriteriaSubscriber.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Frosh\FroshProductCompare\Subscriber;