[Next] prepare for pimcore 12

coreshop · Jan 22, 2025 · 55dcc34 · 55dcc34
1 parent be18673
commit 55dcc34
Show file tree

Hide file tree

Showing 79 changed files with 853 additions and 112 deletions.
diff --git a/.docker/nginx.conf b/.docker/nginx.conf
@@ -4,7 +4,7 @@
 # }
 
 upstream php-pimcore11 {
-    server coreshop4.1-php:9000;
+    server coreshop50-php-1:9000;
 }
 
 server {

diff --git a/Dockerfile b/Dockerfile
@@ -1,21 +1,17 @@
-FROM pimcore/pimcore:php8.2-debug-latest as dev
+FROM ghcr.io/cors-gmbh/pimcore-docker/php-fpm:8.3-alpine3.21-7.0-LATEST AS dev
 RUN set -eux; \
-    apt-get update; \
-    apt-get install -y $PHPIZE_DEPS libxslt1-dev; \
+    apk update; \
+    apk add $PHPIZE_DEPS libxslt-dev; \
     docker-php-ext-install xsl; \
     sync; \
-    apt-get purge -y $PHPIZE_DEPS; \
-    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
+    rm -rf /var/cache/apk/* /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
-
-FROM dev as behat
-RUN apt update && \
-    apt install -y chromium chromium-driver
+FROM dev AS behat
+RUN apk update && \
+    apk add -y chromium chromium-driver
 
 # Install Symfony, Pimcore and CoreShop inside Tests container
 # RUN wget https://get.symfony.com/cli/installer -O - | bash

diff --git a/composer.json b/composer.json
@@ -93,18 +93,16 @@
     "doctrine/orm": "^2.9",
     "fakerphp/faker": "^1.16",
     "gedmo/doctrine-extensions": "^3.11",
-    "jms/serializer-bundle": "^4.0 | ^5.0",
+    "jms/serializer-bundle": "^5.0",
     "knplabs/knp-menu-bundle": "^3.1",
-    "laminas/laminas-stdlib": "^3.6",
-    "laminas/laminas-zendframework-bridge": "^1.5",
     "payum/payum": "^1.7",
     "payum/payum-bundle": "^2.6",
     "php-http/guzzle7-adapter": "^1.0",
     "php-http/message-factory": "^1.1",
-    "pimcore/admin-ui-classic-bundle": "^1.2 || ^2.0",
+    "pimcore/admin-ui-classic-bundle": "^2.0",
     "pimcore/google-marketing-bundle": "^1.0",
     "pimcore/newsletter-bundle": "^1.0",
-    "pimcore/pimcore": "^11.1 | ^12.0",
+    "pimcore/pimcore": "^12.0",
     "pimcore/web-to-print-bundle": "^1.3",
     "rinvex/countries": "^7.3",
     "sebastian/diff": "^4.0 | ^5.0 | ^6.0",
@@ -141,7 +139,6 @@
     "vimeo/psalm": "^5.23"
   },
   "conflict": {
-    "jms/serializer-bundle": "4.1.0",
     "twig/twig": ">=3.9.0 <3.14.0",
     "pimcore/pimcore": "11.3.1"
   },
@@ -177,6 +174,8 @@
       "dev-next": "5.0-dev"
     }
   },
+  "minimum-stability": "dev",
+  "prefer-stable": true,
   "config": {
     "sort-packages": true,
     "allow-plugins": {

diff --git a/config/preload.php b/config/preload.php
@@ -0,0 +1 @@
+<?php
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -1,4 +1,4 @@
-name: 'coreshop4.1'
+name: 'coreshop5.0'
 
 x-php: &php
   volumes:
@@ -34,8 +34,7 @@ x-php: &php
 
 services:
   db:
-    container_name: coreshop4.1-db
-    image: mariadb:10.5
+    image: mysql:8.4
     working_dir: /application
     command: [ mysqld, --character-set-server=utf8mb4, --collation-server=utf8mb4_general_ci ]
     volumes:
@@ -49,7 +48,6 @@ services:
       - "3306"
 
   nginx:
-    container_name: coreshop4.1-nginx
     image: nginx:stable-alpine
     volumes:
       - .:/var/www/html
@@ -61,7 +59,6 @@ services:
 
   php:
     <<: *php
-    container_name: coreshop4.1-php
     image: coreshop/coreshop:PHP8.2-fpm-debug
     build:
       target: dev
@@ -72,7 +69,6 @@ services:
 
   behat:
     <<: *php
-    container_name: coreshop4.1-behat
     image: coreshop/coreshop:PHP8.2-fpm-debug-behat
     build:
       target: behat
@@ -84,7 +80,7 @@ services:
     depends_on:
       - db
     environment:
-      PIMCORE_TEST_DB_DSN: "mysql://root:ROOT@coreshop4.1-db/coreshop4_1___behat"
+      PIMCORE_TEST_DB_DSN: "mysql://root:ROOT@coreshop5.0-db/coreshop5_0___behat"
       PIMCORE_KERNEL_CLASS: 'Kernel'
     command:
       - bash
@@ -97,7 +93,6 @@ services:
 
   gotenberg:
     image: gotenberg/gotenberg:8
-    container_name: coreshop4.1-gotenberg
 
   chrome:
     image: browserless/chrome
@@ -113,7 +108,6 @@ services:
       - TOKEN=${BROWSERLESS_TOKEN}
       - PORT=3000
       - WORKSPACE_DELETE_EXPIRED=true
-    container_name: coreshop4.1-chrome
     restart: always
 
 volumes:

diff --git a/src/CoreShop/Behat/Context/Domain/CountryContext.php b/src/CoreShop/Behat/Context/Domain/CountryContext.php
@@ -115,7 +115,7 @@ public function thereShouldBeASampleCountryContextLoadedByAttributeAsCountryCont
         $reflection = new \ReflectionClass($this->compositeCountryContext);
         $reflection->getProperty('countryContexts')->setAccessible(true);
         /**
-         * @var \Laminas\Stdlib\PriorityQueue $priorityQueue
+         * @var \CoreShop\Component\Pimcore\PriorityQueue $priorityQueue
          */
         $priorityQueue = $reflection->getProperty('countryContexts')->getValue($this->compositeCountryContext);
 

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": "^11.0 || ^12.0"
+    "pimcore/pimcore": "^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": "^11.0 || ^12.0",
+    "pimcore/pimcore": "^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": "^11.0 || ^12.0"
+    "pimcore/pimcore": "^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": "^11.0 || ^12.0",
+    "pimcore/pimcore": "^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": "^11.0 || ^12.0",
+    "pimcore/pimcore": "^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": "^11.0 || ^12.0",
+    "pimcore/pimcore": "^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": "^11.0 || ^12.0"
+    "pimcore/pimcore": "^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": "^11.0 || ^12.0"
+    "pimcore/pimcore": "^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": "^11.0 || ^12.0"
+    "pimcore/pimcore": "^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": "^11.0 || ^12.0"
+    "pimcore/pimcore": "^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": "^11.0 || ^12.0"
+    "pimcore/pimcore": "^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": "^11.0 || ^12.0",
-    "pimcore/admin-ui-classic-bundle": "^1.0 || ^2.0",
+    "pimcore/pimcore": "^12.0",
+    "pimcore/admin-ui-classic-bundle": "^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": "^11.0 || ^12.0"
+    "pimcore/pimcore": "^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": "^11.0 || ^12.0"
+    "pimcore/pimcore": "^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": "^11.0 || ^12.0"
+    "pimcore/pimcore": "^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": "^11.0 || ^12.0",
+    "pimcore/pimcore": "^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": "^11.0 || ^12.0"
+    "pimcore/pimcore": "^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": "^11.0 || ^12.0"
+    "pimcore/pimcore": "^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": "^11.0 || ^12.0",
+    "pimcore/pimcore": "^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": "^11.0 || ^12.0",
-    "pimcore/admin-ui-classic-bundle": "^1.0 || ^2.0"
+    "pimcore/pimcore": "^12.0",
+    "pimcore/admin-ui-classic-bundle": "^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": "^11.0 || ^12.0"
+    "pimcore/pimcore": "^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": "^11.0 || ^12.0"
+    "pimcore/pimcore": "^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": "^11.0 || ^12.0",
-    "pimcore/admin-ui-classic-bundle": "^1.0 || ^2.0"
+    "pimcore/pimcore": "^12.0",
+    "pimcore/admin-ui-classic-bundle": "^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": "^11.0 || ^12.0"
+    "pimcore/pimcore": "^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": "^11.0 || ^12.0"
+    "pimcore/pimcore": "^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": "^11.0 || ^12.0"
+    "pimcore/pimcore": "^12.0"
   },
   "require-dev": {
     "phpstan/phpstan": "^1.10",