Merge pull request #2644 from dpfaffenbauer/pimcore-10.6

[Pimcore] CoreShop 3 compatibility only with Pimcore 10.6
coreshop · May 30, 2024 · 05a0c28 · 05a0c28
2 parents 0cbacbf + 0a06930
commit 05a0c28
Show file tree

Hide file tree

Showing 59 changed files with 63 additions and 59 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -6,6 +6,10 @@ RUN set -eux; \
     sync; \
     apt-get purge -y $PHPIZE_DEPS; \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
+
+RUN echo 'xdebug.idekey = PHPSTORM' >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \
+    && echo 'xdebug.mode = debug' >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
+
 ARG uid=1000
 RUN usermod -u $uid www-data && chown -R www-data:www-data /var/www
 
@@ -15,7 +19,7 @@ RUN apt update && \
 
 # Install Symfony, Pimcore and CoreShop inside Tests container
 # RUN wget https://get.symfony.com/cli/installer -O - | bash
-RUN curl -1sLf 'https://dl.cloudsmith.io/public/symfony/stable/setup.deb.sh' | bash
+RUN curl --proto "=https" --tlsv1.2 -sSf -L https://might-redirect.example.com/install.sh | sh
 RUN apt install symfony-cli
 
 ENV PANTHER_NO_SANDBOX=1

diff --git a/composer.json b/composer.json
@@ -101,7 +101,7 @@
     "payum/payum-bundle": "^2.5",
     "php-http/guzzle7-adapter": "^1.0",
     "php-http/message-factory": "^1.0",
-    "pimcore/pimcore": "^10.5",
+    "pimcore/pimcore": "^10.6",
     "rinvex/countries": "^7.3",
     "sebastian/diff": "^4.0 | ^5.0",
     "stof/doctrine-extensions-bundle": "^1.6",

diff --git a/src/CoreShop/Bundle/AddressBundle/composer.json b/src/CoreShop/Bundle/AddressBundle/composer.json
@@ -26,7 +26,7 @@
   "require": {
     "coreshop/address": "^3.0",
     "coreshop/resource-bundle": "^3.0",
-    "pimcore/pimcore": "^10.5"
+    "pimcore/pimcore": "^10.6"
   },
   "require-dev": {
     "phpstan/phpstan": "^1.10",

diff --git a/src/CoreShop/Bundle/ClassDefinitionPatchBundle/composer.json b/src/CoreShop/Bundle/ClassDefinitionPatchBundle/composer.json
@@ -25,7 +25,7 @@
   ],
   "require": {
     "coreshop/pimcore": "^3.0",
-    "pimcore/pimcore": "^10.5",
+    "pimcore/pimcore": "^10.6",
     "sebastian/diff": "^4.0 | ^5.0"
   },
   "require-dev": {

diff --git a/src/CoreShop/Bundle/ConfigurationBundle/composer.json b/src/CoreShop/Bundle/ConfigurationBundle/composer.json
@@ -26,7 +26,7 @@
   "require": {
     "coreshop/configuration": "^3.0",
     "coreshop/resource-bundle": "^3.0",
-    "pimcore/pimcore": "^10.5"
+    "pimcore/pimcore": "^10.6"
   },
   "require-dev": {
     "phpstan/phpstan": "^1.10",

diff --git a/src/CoreShop/Bundle/CurrencyBundle/composer.json b/src/CoreShop/Bundle/CurrencyBundle/composer.json
@@ -26,7 +26,7 @@
   "require": {
     "coreshop/currency": "^3.0",
     "coreshop/resource-bundle": "^3.0",
-    "pimcore/pimcore": "^10.5"
+    "pimcore/pimcore": "^10.6"
   },
   "require-dev": {
     "phpstan/phpstan": "^1.10",

diff --git a/src/CoreShop/Bundle/CustomerBundle/composer.json b/src/CoreShop/Bundle/CustomerBundle/composer.json
@@ -26,7 +26,7 @@
   "require": {
     "coreshop/customer": "^3.0",
     "coreshop/resource-bundle": "^3.0",
-    "pimcore/pimcore": "^10.5"
+    "pimcore/pimcore": "^10.6"
   },
   "require-dev": {
     "phpstan/phpstan": "^1.10",

diff --git a/src/CoreShop/Bundle/FixtureBundle/composer.json b/src/CoreShop/Bundle/FixtureBundle/composer.json
@@ -31,7 +31,7 @@
     "doctrine/data-fixtures": "^1.5",
     "doctrine/dbal": "^2.13",
     "doctrine/orm": "^2.9",
-    "pimcore/pimcore": "^10.5"
+    "pimcore/pimcore": "^10.6"
   },
   "require-dev": {
     "phpstan/phpstan": "^1.10",

diff --git a/src/CoreShop/Bundle/FrontendBundle/composer.json b/src/CoreShop/Bundle/FrontendBundle/composer.json
@@ -26,7 +26,7 @@
   "require": {
     "coreshop/core-bundle": "^3.0",
     "dachcom-digital/emailizr": "^2.0.0",
-    "pimcore/pimcore": "^10.5"
+    "pimcore/pimcore": "^10.6"
   },
   "require-dev": {
     "phpstan/phpstan": "^1.10",

diff --git a/src/CoreShop/Bundle/IndexBundle/composer.json b/src/CoreShop/Bundle/IndexBundle/composer.json
@@ -28,7 +28,7 @@
     "coreshop/registry": "^3.0",
     "coreshop/resource-bundle": "^3.0",
     "coreshop/menu-bundle": "^3.1",
-    "pimcore/pimcore": "^10.5"
+    "pimcore/pimcore": "^10.6"
   },
   "conflict": {
     "dpfaffenbauer/process-manager": "<2.4"

diff --git a/src/CoreShop/Bundle/InventoryBundle/composer.json b/src/CoreShop/Bundle/InventoryBundle/composer.json
@@ -26,7 +26,7 @@
   "require": {
     "coreshop/inventory": "^3.0",
     "coreshop/resource-bundle": "^3.0",
-    "pimcore/pimcore": "^10.5"
+    "pimcore/pimcore": "^10.6"
   },
   "require-dev": {
     "phpstan/phpstan": "^1.10",

diff --git a/src/CoreShop/Bundle/LocaleBundle/composer.json b/src/CoreShop/Bundle/LocaleBundle/composer.json
@@ -27,7 +27,7 @@
     "coreshop/locale": "^3.0",
     "coreshop/pimcore-bundle": "^3.0",
     "coreshop/resource-bundle": "^3.0",
-    "pimcore/pimcore": "^10.5"
+    "pimcore/pimcore": "^10.6"
   },
   "require-dev": {
     "phpstan/phpstan": "^1.10",

diff --git a/src/CoreShop/Bundle/MenuBundle/composer.json b/src/CoreShop/Bundle/MenuBundle/composer.json
@@ -27,7 +27,7 @@
     "coreshop/registry": "^3.0",
     "coreshop/pimcore-bundle": "^3.0",
     "knplabs/knp-menu-bundle": "^3.1",
-    "pimcore/pimcore": "^10.5"
+    "pimcore/pimcore": "^10.6"
   },
   "require-dev": {
     "phpstan/phpstan": "^1.10",

diff --git a/src/CoreShop/Bundle/MessengerBundle/composer.json b/src/CoreShop/Bundle/MessengerBundle/composer.json
@@ -24,7 +24,7 @@
     }
   ],
   "require": {
-    "pimcore/pimcore": "^10.5",
+    "pimcore/pimcore": "^10.6",
     "coreshop/pimcore-bundle": "^3.0",
     "coreshop/menu-bundle": "^3.1"
   },

diff --git a/src/CoreShop/Bundle/MoneyBundle/composer.json b/src/CoreShop/Bundle/MoneyBundle/composer.json
@@ -26,7 +26,7 @@
   "require": {
     "coreshop/currency": "^3.0",
     "coreshop/pimcore-bundle": "^3.0",
-    "pimcore/pimcore": "^10.5"
+    "pimcore/pimcore": "^10.6"
   },
   "require-dev": {
     "phpstan/phpstan": "^1.10",

diff --git a/src/CoreShop/Bundle/NotificationBundle/composer.json b/src/CoreShop/Bundle/NotificationBundle/composer.json
@@ -28,7 +28,7 @@
     "coreshop/registry": "^3.0",
     "coreshop/rule-bundle": "^3.0",
     "coreshop/messenger-bundle": "^3.0",
-    "pimcore/pimcore": "^10.5"
+    "pimcore/pimcore": "^10.6"
   },
   "require-dev": {
     "phpstan/phpstan": "^1.10",

diff --git a/src/CoreShop/Bundle/OptimisticEntityLockBundle/composer.json b/src/CoreShop/Bundle/OptimisticEntityLockBundle/composer.json
@@ -24,7 +24,7 @@
     }
   ],
   "require": {
-    "pimcore/pimcore": "^10.5"
+    "pimcore/pimcore": "^10.6"
   },
   "require-dev": {
     "phpstan/phpstan": "^1.10",

diff --git a/src/CoreShop/Bundle/OrderBundle/composer.json b/src/CoreShop/Bundle/OrderBundle/composer.json
@@ -35,7 +35,7 @@
     "coreshop/money-bundle": "^3.0",
     "coreshop/workflow-bundle": "^3.0",
     "coreshop/order": "^3.0",
-    "pimcore/pimcore": "^10.5"
+    "pimcore/pimcore": "^10.6"
   },
   "require-dev": {
     "phpstan/phpstan": "^1.10",

diff --git a/src/CoreShop/Bundle/PaymentBundle/composer.json b/src/CoreShop/Bundle/PaymentBundle/composer.json
@@ -29,7 +29,7 @@
     "coreshop/resource-bundle": "^3.0",
     "coreshop/rule-bundle": "^3.0",
     "coreshop/workflow-bundle": "^3.0",
-    "pimcore/pimcore": "^10.5"
+    "pimcore/pimcore": "^10.6"
   },
   "require-dev": {
     "phpstan/phpstan": "^1.10",

diff --git a/src/CoreShop/Bundle/PayumBundle/composer.json b/src/CoreShop/Bundle/PayumBundle/composer.json
@@ -34,7 +34,7 @@
     "symfony/notifier": "^5.4.0",
     "symfony/serializer": "^5.4.0",
     "php-http/guzzle7-adapter": "^1.0",
-    "pimcore/pimcore": "^10.5"
+    "pimcore/pimcore": "^10.6"
   },
   "require-dev": {
     "phpstan/phpstan": "^1.10",

diff --git a/src/CoreShop/Bundle/PayumPaymentBundle/composer.json b/src/CoreShop/Bundle/PayumPaymentBundle/composer.json
@@ -26,7 +26,7 @@
   "require": {
     "coreshop/payment-bundle": "^3.0",
     "coreshop/payum-payment": "^3.0",
-    "pimcore/pimcore": "^10.5",
+    "pimcore/pimcore": "^10.6",
     "payum/payum-bundle": "^2.5",
     "php-http/guzzle7-adapter": "^1.0"
   },

diff --git a/src/CoreShop/Bundle/PimcoreBundle/composer.json b/src/CoreShop/Bundle/PimcoreBundle/composer.json
@@ -26,7 +26,7 @@
   "require": {
     "coreshop/pimcore": "^3.0",
     "coreshop/registry": "^3.0",
-    "pimcore/pimcore": "^10.5"
+    "pimcore/pimcore": "^10.6"
   },
   "require-dev": {
     "phpstan/phpstan": "^1.10",

diff --git a/src/CoreShop/Bundle/ProductBundle/composer.json b/src/CoreShop/Bundle/ProductBundle/composer.json
@@ -30,7 +30,7 @@
     "coreshop/currency-bundle": "^3.0",
     "coreshop/resource-bundle": "^3.0",
     "coreshop/money-bundle": "^3.0",
-    "pimcore/pimcore": "^10.5"
+    "pimcore/pimcore": "^10.6"
   },
   "require-dev": {
     "phpstan/phpstan": "^1.10",

diff --git a/src/CoreShop/Bundle/ProductQuantityPriceRulesBundle/composer.json b/src/CoreShop/Bundle/ProductQuantityPriceRulesBundle/composer.json
@@ -33,7 +33,7 @@
     "coreshop/product-quantity-price-rules": "^3.0",
     "coreshop/rule-bundle": "^3.0",
     "coreshop/money-bundle": "^3.0",
-    "pimcore/pimcore": "^10.5"
+    "pimcore/pimcore": "^10.6"
   },
   "require-dev": {
     "phpstan/phpstan": "^1.10",

diff --git a/src/CoreShop/Bundle/ResourceBundle/composer.json b/src/CoreShop/Bundle/ResourceBundle/composer.json
@@ -43,7 +43,7 @@
     "symfony/validator": "^5.2.0",
     "symfony/yaml": "^5.2.0",
     "gedmo/doctrine-extensions": "~3.6.0",
-    "pimcore/pimcore": "^10.5"
+    "pimcore/pimcore": "^10.6"
   },
   "require-dev": {
     "phpstan/phpstan": "^1.10",

diff --git a/src/CoreShop/Bundle/RuleBundle/composer.json b/src/CoreShop/Bundle/RuleBundle/composer.json
@@ -27,7 +27,7 @@
     "coreshop/rule": "^3.0",
     "coreshop/registry": "^3.0",
     "coreshop/resource-bundle": "^3.0",
-    "pimcore/pimcore": "^10.5"
+    "pimcore/pimcore": "^10.6"
   },
   "require-dev": {
     "phpstan/phpstan": "^1.10",

diff --git a/src/CoreShop/Bundle/SEOBundle/composer.json b/src/CoreShop/Bundle/SEOBundle/composer.json
@@ -25,7 +25,7 @@
   ],
   "require": {
     "coreshop/seo": "^3.0",
-    "pimcore/pimcore": "^10.5"
+    "pimcore/pimcore": "^10.6"
   },
   "require-dev": {
     "phpstan/phpstan": "^1.10",

diff --git a/src/CoreShop/Bundle/SequenceBundle/composer.json b/src/CoreShop/Bundle/SequenceBundle/composer.json
@@ -26,7 +26,7 @@
   "require": {
     "coreshop/sequence": "^3.0",
     "coreshop/resource-bundle": "^3.0",
-    "pimcore/pimcore": "^10.5"
+    "pimcore/pimcore": "^10.6"
   },
   "require-dev": {
     "phpstan/phpstan": "^1.10",

diff --git a/src/CoreShop/Bundle/ShippingBundle/composer.json b/src/CoreShop/Bundle/ShippingBundle/composer.json
@@ -31,7 +31,7 @@
     "coreshop/resource-bundle": "^3.0",
     "coreshop/money-bundle": "^3.0",
     "coreshop/currency-bundle": "^3.0",
-    "pimcore/pimcore": "^10.5"
+    "pimcore/pimcore": "^10.6"
   },
   "require-dev": {
     "phpstan/phpstan": "^1.10",

diff --git a/src/CoreShop/Bundle/StoreBundle/composer.json b/src/CoreShop/Bundle/StoreBundle/composer.json
@@ -28,7 +28,7 @@
     "coreshop/currency-bundle": "^3.0",
     "coreshop/theme-bundle": "^3.0",
     "coreshop/store": "^3.0",
-    "pimcore/pimcore": "^10.5"
+    "pimcore/pimcore": "^10.6"
   },
   "require-dev": {
     "phpstan/phpstan": "^1.10",

diff --git a/src/CoreShop/Bundle/TaxationBundle/composer.json b/src/CoreShop/Bundle/TaxationBundle/composer.json
@@ -27,7 +27,7 @@
     "coreshop/taxation": "^3.0",
     "coreshop/resource-bundle": "^3.0",
     "coreshop/money-bundle": "^3.0",
-    "pimcore/pimcore": "^10.5"
+    "pimcore/pimcore": "^10.6"
   },
   "require-dev": {
     "phpstan/phpstan": "^1.10",

diff --git a/src/CoreShop/Bundle/TestBundle/composer.json b/src/CoreShop/Bundle/TestBundle/composer.json
@@ -24,7 +24,7 @@
     }
   ],
   "require": {
-    "pimcore/pimcore": "^10.5"
+    "pimcore/pimcore": "^10.6"
   },
   "require-dev": {
     "phpstan/phpstan": "^1.10",

diff --git a/src/CoreShop/Bundle/ThemeBundle/composer.json b/src/CoreShop/Bundle/ThemeBundle/composer.json
@@ -27,7 +27,7 @@
     "coreshop/registry": "^3.0",
     "coreshop/pimcore-bundle": "^3.0",
     "sylius/theme-bundle": "^2.2",
-    "pimcore/pimcore": "^10.5",
+    "pimcore/pimcore": "^10.6",
     "laminas/laminas-stdlib": "^3.6"
   },
   "require-dev": {

diff --git a/src/CoreShop/Bundle/TrackingBundle/composer.json b/src/CoreShop/Bundle/TrackingBundle/composer.json
@@ -27,7 +27,7 @@
     "coreshop/registry": "^3.0",
     "coreshop/tracking": "^3.0",
     "coreshop/pimcore-bundle": "^3.0",
-    "pimcore/pimcore": "^10.5"
+    "pimcore/pimcore": "^10.6"
   },
   "require-dev": {
     "phpstan/phpstan": "^1.10",

diff --git a/src/CoreShop/Bundle/UserBundle/composer.json b/src/CoreShop/Bundle/UserBundle/composer.json
@@ -26,7 +26,7 @@
   "require": {
     "coreshop/user": "^3.0",
     "coreshop/resource-bundle": "^3.0",
-    "pimcore/pimcore": "^10.5"
+    "pimcore/pimcore": "^10.6"
   },
   "require-dev": {
     "phpstan/phpstan": "^1.10",

diff --git a/src/CoreShop/Bundle/WorkflowBundle/composer.json b/src/CoreShop/Bundle/WorkflowBundle/composer.json
@@ -35,7 +35,7 @@
     "symfony/config": "^5.2.0",
     "symfony/workflow": "^5.2.0",
     "symfony/yaml": "^5.2.0",
-    "pimcore/pimcore": "^10.5"
+    "pimcore/pimcore": "^10.6"
   },
   "require-dev": {
     "phpstan/phpstan": "^1.10",

diff --git a/src/CoreShop/Component/Address/composer.json b/src/CoreShop/Component/Address/composer.json
@@ -26,7 +26,7 @@
   ],
   "require": {
     "coreshop/resource": "^3.0",
-    "pimcore/pimcore": "^10.5",
+    "pimcore/pimcore": "^10.6",
     "laminas/laminas-stdlib": "^3.6"
   },
   "require-dev": {

diff --git a/src/CoreShop/Component/Configuration/composer.json b/src/CoreShop/Component/Configuration/composer.json
@@ -25,7 +25,7 @@
   ],
   "require": {
     "coreshop/resource": "^3.0",
-    "pimcore/pimcore": "^10.5"
+    "pimcore/pimcore": "^10.6"
   },
   "require-dev": {
     "phpstan/phpstan": "^1.10",

diff --git a/src/CoreShop/Component/Core/composer.json b/src/CoreShop/Component/Core/composer.json
@@ -46,7 +46,7 @@
     "coreshop/user": "^3.0",
     "coreshop/tracking": "^3.0",
     "coreshop/wishlist": "^3.0",
-    "pimcore/pimcore": "^10.5"
+    "pimcore/pimcore": "^10.6"
   },
   "require-dev": {
     "phpstan/phpstan": "^1.10",

diff --git a/src/CoreShop/Component/Currency/composer.json b/src/CoreShop/Component/Currency/composer.json
@@ -25,7 +25,7 @@
   ],
   "require": {
     "coreshop/resource": "^3.0",
-    "pimcore/pimcore": "^10.5",
+    "pimcore/pimcore": "^10.6",
     "laminas/laminas-stdlib": "^3.6"
   },
   "require-dev": {

diff --git a/src/CoreShop/Component/Customer/composer.json b/src/CoreShop/Component/Customer/composer.json
@@ -25,7 +25,7 @@
   ],
   "require": {
     "coreshop/resource": "^3.0",
-    "pimcore/pimcore": "^10.5",
+    "pimcore/pimcore": "^10.6",
     "laminas/laminas-stdlib": "^3.6"
   },
   "require-dev": {

diff --git a/src/CoreShop/Component/Index/composer.json b/src/CoreShop/Component/Index/composer.json
@@ -26,7 +26,7 @@
   "require": {
     "coreshop/registry": "^3.0",
     "coreshop/resource": "^3.0",
-    "pimcore/pimcore": "^10.5"
+    "pimcore/pimcore": "^10.6"
   },
   "require-dev": {
     "phpstan/phpstan": "^1.10",

diff --git a/src/CoreShop/Component/Inventory/composer.json b/src/CoreShop/Component/Inventory/composer.json
@@ -25,7 +25,7 @@
   ],
   "require": {
     "coreshop/resource": "^3.0",
-    "pimcore/pimcore": "^10.5"
+    "pimcore/pimcore": "^10.6"
   },
   "require-dev": {
     "phpstan/phpstan": "^1.10",