[Next] disable PHP 8.4 for now and allow Pimcore 11

coreshop · Jan 23, 2025 · 75dddba · 75dddba
1 parent 55dcc34
commit 75dddba
Show file tree

Hide file tree

Showing 65 changed files with 74 additions and 75 deletions.
diff --git a/.github/workflows/behat.yml b/.github/workflows/behat.yml
@@ -42,8 +42,8 @@ jobs:
 
     strategy:
       matrix:
-        php: [ 8.3, 8.4 ]
-        pimcore: [ ^12.0 ]
+        php: [ 8.3 ]
+        pimcore: [ ^11.5, ^12.0 ]
         jms: [ ^4.0, ^5.0 ]
         dependencies: [ highest ]
 

diff --git a/.github/workflows/behat_ui.yml b/.github/workflows/behat_ui.yml
@@ -45,8 +45,8 @@ jobs:
 
     strategy:
       matrix:
-        php: [ 8.3, 8.4 ]
-        pimcore: [ ^12.0 ]
+        php: [ 8.3 ]
+        pimcore: [ ^11.5, ^12.0 ]
         jms: [ ^4.0, ^5.0 ]
         dependencies: [ highest ]
 

diff --git a/.github/workflows/packages_bundles.yml b/.github/workflows/packages_bundles.yml
@@ -37,8 +37,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ 8.3, 8.4 ]
-        pimcore: [ ^12.0 ]
+        php: [ 8.3 ]
+        pimcore: [ ^11.5, ^12.0 ]
         dependencies: [ highest ]
         package: "${{ fromJson(needs.list.outputs.packages) }}"
 

diff --git a/.github/workflows/packages_components.yml b/.github/workflows/packages_components.yml
@@ -37,8 +37,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ 8.3, 8.4 ]
-        pimcore: [ ^12.0 ]
+        php: [ 8.3 ]
+        pimcore: [ ^11.5, ^12.0 ]
         dependencies: [ highest ]
         package: "${{ fromJson(needs.list.outputs.packages) }}"
 

diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
@@ -36,8 +36,8 @@ jobs:
 
     strategy:
       matrix:
-        php: [ 8.3, 8.4 ]
-        pimcore: [ ^12.0 ]
+        php: [ 8.3 ]
+        pimcore: [ ^11.5, ^12.0 ]
         jms: [ ^4.0, ^5.0 ]
         dependencies: [ highest ]
     services:

diff --git a/Dockerfile b/Dockerfile
@@ -1,8 +1,9 @@
-FROM ghcr.io/cors-gmbh/pimcore-docker/php-fpm:8.3-alpine3.21-7.0-LATEST AS dev
+FROM ghcr.io/cors-gmbh/pimcore-docker/php-fpm:8.3-alpine3.21-7.1.0 AS dev
 RUN set -eux; \
     apk update; \
     apk add $PHPIZE_DEPS libxslt-dev; \
     docker-php-ext-install xsl; \
+    docker-php-ext-install sockets; \
     sync; \
     rm -rf /var/cache/apk/* /tmp/* /var/tmp/* /usr/share/doc/*
 

diff --git a/composer.json b/composer.json
@@ -99,10 +99,10 @@
     "payum/payum-bundle": "^2.6",
     "php-http/guzzle7-adapter": "^1.0",
     "php-http/message-factory": "^1.1",
-    "pimcore/admin-ui-classic-bundle": "^2.0",
+    "pimcore/admin-ui-classic-bundle": "^1.6 || ^2.0",
     "pimcore/google-marketing-bundle": "^1.0",
     "pimcore/newsletter-bundle": "^1.0",
-    "pimcore/pimcore": "^12.0",
+    "pimcore/pimcore": "^11.5 || ^12.0",
     "pimcore/web-to-print-bundle": "^1.3",
     "rinvex/countries": "^7.3",
     "sebastian/diff": "^4.0 | ^5.0 | ^6.0",

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -59,7 +59,6 @@ services:
 
   php:
     <<: *php
-    image: coreshop/coreshop:PHP8.2-fpm-debug
     build:
       target: dev
       args:
@@ -69,7 +68,6 @@ services:
 
   behat:
     <<: *php
-    image: coreshop/coreshop:PHP8.2-fpm-debug-behat
     build:
       target: behat
       args:

diff --git a/src/CoreShop/Bundle/AddressBundle/composer.json b/src/CoreShop/Bundle/AddressBundle/composer.json
@@ -26,7 +26,7 @@
   "require": {
     "coreshop/address": "^5.0",
     "coreshop/resource-bundle": "^5.0",
-    "pimcore/pimcore": "^12.0"
+    "pimcore/pimcore": "^11.0 || ^12.0"
   },
   "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": "^5.0",
-    "pimcore/pimcore": "^12.0",
+    "pimcore/pimcore": "^11.5 || ^12.0",
     "sebastian/diff": "^4.0 | ^5.0 | ^6.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": "^5.0",
     "coreshop/resource-bundle": "^5.0",
-    "pimcore/pimcore": "^12.0"
+    "pimcore/pimcore": "^11.0 || ^12.0"
   },
   "require-dev": {
     "phpstan/phpstan": "^1.10",

diff --git a/src/CoreShop/Bundle/CoreBundle/composer.json b/src/CoreShop/Bundle/CoreBundle/composer.json
@@ -57,7 +57,7 @@
     "doctrine/doctrine-fixtures-bundle": "^3.4",
     "fakerphp/faker": "^1.16",
     "rinvex/countries": "^7.3",
-    "pimcore/pimcore": "^12.0",
+    "pimcore/pimcore": "^11.5 || ^12.0",
     "pimcore/newsletter-bundle": "^1.0.1"
   },
   "require-dev": {

diff --git a/src/CoreShop/Bundle/CurrencyBundle/composer.json b/src/CoreShop/Bundle/CurrencyBundle/composer.json
@@ -26,7 +26,7 @@
   "require": {
     "coreshop/currency": "^5.0",
     "coreshop/resource-bundle": "^5.0",
-    "pimcore/pimcore": "^12.0",
+    "pimcore/pimcore": "^11.5 || ^12.0",
     "symfony/intl": "^6.3"
   },
   "require-dev": {

diff --git a/src/CoreShop/Bundle/CustomerBundle/composer.json b/src/CoreShop/Bundle/CustomerBundle/composer.json
@@ -26,7 +26,7 @@
   "require": {
     "coreshop/customer": "^5.0",
     "coreshop/resource-bundle": "^5.0",
-    "pimcore/pimcore": "^12.0",
+    "pimcore/pimcore": "^11.5 || ^12.0",
     "pimcore/newsletter-bundle": "^1.0.1"
   },
   "require-dev": {

diff --git a/src/CoreShop/Bundle/FrontendBundle/composer.json b/src/CoreShop/Bundle/FrontendBundle/composer.json
@@ -25,7 +25,7 @@
   ],
   "require": {
     "coreshop/core-bundle": "^5.0",
-    "pimcore/pimcore": "^12.0"
+    "pimcore/pimcore": "^11.0 || ^12.0"
   },
   "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": "^4.1",
     "coreshop/resource-bundle": "^5.0",
     "coreshop/menu-bundle": "^5.0",
-    "pimcore/pimcore": "^12.0"
+    "pimcore/pimcore": "^11.0 || ^12.0"
   },
   "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": "^5.0",
     "coreshop/resource-bundle": "^5.0",
-    "pimcore/pimcore": "^12.0"
+    "pimcore/pimcore": "^11.0 || ^12.0"
   },
   "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": "^5.0",
     "coreshop/pimcore-bundle": "^5.0",
     "coreshop/resource-bundle": "^5.0",
-    "pimcore/pimcore": "^12.0"
+    "pimcore/pimcore": "^11.0 || ^12.0"
   },
   "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": "^4.1",
     "coreshop/pimcore-bundle": "^5.0",
     "knplabs/knp-menu-bundle": "^3.1",
-    "pimcore/pimcore": "^12.0"
+    "pimcore/pimcore": "^11.0 || ^12.0"
   },
   "require-dev": {
     "phpstan/phpstan": "^1.10",

diff --git a/src/CoreShop/Bundle/MessengerBundle/composer.json b/src/CoreShop/Bundle/MessengerBundle/composer.json
@@ -24,8 +24,8 @@
     }
   ],
   "require": {
-    "pimcore/pimcore": "^12.0",
-    "pimcore/admin-ui-classic-bundle": "^2.0",
+    "pimcore/pimcore": "^11.5 || ^12.0",
+    "pimcore/admin-ui-classic-bundle": "^1.6 || ^2.0",
     "coreshop/pimcore-bundle": "^5.0",
     "coreshop/menu-bundle": "^4.0"
   },

diff --git a/src/CoreShop/Bundle/MoneyBundle/composer.json b/src/CoreShop/Bundle/MoneyBundle/composer.json
@@ -27,7 +27,7 @@
     "coreshop/currency": "^5.0",
     "coreshop/pimcore-bundle": "^5.0",
     "symfony/form": "^6.3",
-    "pimcore/pimcore": "^12.0"
+    "pimcore/pimcore": "^11.0 || ^12.0"
   },
   "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": "^4.1",
     "coreshop/rule-bundle": "^5.0",
     "coreshop/messenger-bundle": "^5.0",
-    "pimcore/pimcore": "^12.0"
+    "pimcore/pimcore": "^11.0 || ^12.0"
   },
   "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": "^12.0"
+    "pimcore/pimcore": "^11.0 || ^12.0"
   },
   "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": "^5.0",
     "coreshop/workflow-bundle": "^5.0",
     "coreshop/order": "^5.0",
-    "pimcore/pimcore": "^12.0",
+    "pimcore/pimcore": "^11.5 || ^12.0",
     "pimcore/web-to-print-bundle": "^1.3.0"
   },
   "require-dev": {

diff --git a/src/CoreShop/Bundle/PaymentBundle/composer.json b/src/CoreShop/Bundle/PaymentBundle/composer.json
@@ -29,7 +29,7 @@
     "coreshop/resource-bundle": "^5.0",
     "coreshop/rule-bundle": "^5.0",
     "coreshop/workflow-bundle": "^5.0",
-    "pimcore/pimcore": "^12.0"
+    "pimcore/pimcore": "^11.0 || ^12.0"
   },
   "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": "^6.3",
     "symfony/serializer": "^6.3",
     "php-http/guzzle7-adapter": "^1.0",
-    "pimcore/pimcore": "^12.0"
+    "pimcore/pimcore": "^11.0 || ^12.0"
   },
   "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": "^5.0",
     "coreshop/payum-payment": "^5.0",
-    "pimcore/pimcore": "^12.0",
+    "pimcore/pimcore": "^11.5 || ^12.0",
     "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,8 +26,8 @@
   "require": {
     "coreshop/pimcore": "^5.0",
     "coreshop/registry": "^4.1",
-    "pimcore/pimcore": "^12.0",
-    "pimcore/admin-ui-classic-bundle": "^2.0"
+    "pimcore/pimcore": "^11.5 || ^12.0",
+    "pimcore/admin-ui-classic-bundle": "^1.0 || ^2.0"
   },
   "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": "^5.0",
     "coreshop/resource-bundle": "^5.0",
     "coreshop/money-bundle": "^5.0",
-    "pimcore/pimcore": "^12.0"
+    "pimcore/pimcore": "^11.0 || ^12.0"
   },
   "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": "^5.0",
     "coreshop/rule-bundle": "^5.0",
     "coreshop/money-bundle": "^5.0",
-    "pimcore/pimcore": "^12.0"
+    "pimcore/pimcore": "^11.0 || ^12.0"
   },
   "require-dev": {
     "phpstan/phpstan": "^1.10",

diff --git a/src/CoreShop/Bundle/ResourceBundle/composer.json b/src/CoreShop/Bundle/ResourceBundle/composer.json
@@ -43,8 +43,8 @@
     "symfony/validator": "^6.3",
     "symfony/yaml": "^6.3",
     "gedmo/doctrine-extensions": "^3.11.0",
-    "pimcore/pimcore": "^12.0",
-    "pimcore/admin-ui-classic-bundle": "^2.0"
+    "pimcore/pimcore": "^11.5 || ^12.0",
+    "pimcore/admin-ui-classic-bundle": "^1.0 || ^2.0"
   },
   "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": "^5.0",
     "coreshop/registry": "^4.1",
     "coreshop/resource-bundle": "^5.0",
-    "pimcore/pimcore": "^12.0"
+    "pimcore/pimcore": "^11.0 || ^12.0"
   },
   "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": "^5.0",
-    "pimcore/pimcore": "^12.0"
+    "pimcore/pimcore": "^11.0 || ^12.0"
   },
   "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": "^5.0",
     "coreshop/resource-bundle": "^5.0",
-    "pimcore/pimcore": "^12.0"
+    "pimcore/pimcore": "^11.0 || ^12.0"
   },
   "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": "^5.0",
     "coreshop/money-bundle": "^5.0",
     "coreshop/currency-bundle": "^5.0",
-    "pimcore/pimcore": "^12.0"
+    "pimcore/pimcore": "^11.0 || ^12.0"
   },
   "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": "^5.0",
     "coreshop/theme-bundle": "^5.0",
     "coreshop/store": "^5.0",
-    "pimcore/pimcore": "^12.0"
+    "pimcore/pimcore": "^11.0 || ^12.0"
   },
   "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": "^5.0",
     "coreshop/resource-bundle": "^5.0",
     "coreshop/money-bundle": "^5.0",
-    "pimcore/pimcore": "^12.0"
+    "pimcore/pimcore": "^11.0 || ^12.0"
   },
   "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": "^12.0",
+    "pimcore/pimcore": "^11.5 || ^12.0",
     "pimcore/newsletter-bundle": "^1.0",
     "coreshop/pimcore": "^4.0.0",
     "behat/behat": "^3.8",

diff --git a/src/CoreShop/Bundle/ThemeBundle/composer.json b/src/CoreShop/Bundle/ThemeBundle/composer.json
@@ -27,7 +27,7 @@
     "coreshop/registry": "^4.1",
     "coreshop/pimcore-bundle": "^5.0",
     "sylius/theme-bundle": "^2.2",
-    "pimcore/pimcore": "^12.0"
+    "pimcore/pimcore": "^11.0 || ^12.0"
   },
   "require-dev": {
     "phpstan/phpstan": "^1.10",

diff --git a/src/CoreShop/Bundle/TrackingBundle/composer.json b/src/CoreShop/Bundle/TrackingBundle/composer.json
@@ -27,7 +27,7 @@
     "coreshop/registry": "^4.1",
     "coreshop/tracking": "^5.0",
     "coreshop/pimcore-bundle": "^5.0",
-    "pimcore/pimcore": "^12.0",
+    "pimcore/pimcore": "^11.5 || ^12.0",
     "pimcore/google-marketing-bundle": "^1.0"
   },
   "require-dev": {

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