Design v2

.github/workflows/behat.yml

@@ -43,12 +43,9 @@ jobs:
     strategy:
       matrix:
         php: [ 8.3, 8.4 ]
-        pimcore: [ ^11.5, ^12.0 ]
+        pimcore: [ ^12.0 ]
         jms: [ ^4.0, ^5.0 ]
         dependencies: [ highest ]
-        exclude:
-          - pimcore: ^11.5
-            php: 8.4
 
     services:
       database:
@@ -94,13 +91,6 @@ jobs:
     - name: pimcore/pimcore
       run: |
         composer req pimcore/pimcore:${{ matrix.pimcore }} --no-interaction --no-scripts --no-update
-        if [ "${{ matrix.pimcore }}" == "^11.5" ]; then
-          composer req pimcore/admin-ui-classic-bundle:^1.6 --no-interaction --no-scripts --no-update
-        else
-          composer req pimcore/admin-ui-classic-bundle:^2.0 --no-interaction --no-scripts --no-update
-          composer req payum/payum:1.7.x-dev --no-interaction --no-scripts --no-update
-        fi
-
 
     - if: matrix.dependencies == 'highest'
       name: Install dependencies highest

.github/workflows/behat_ui.yml

@@ -46,12 +46,9 @@ jobs:
     strategy:
       matrix:
         php: [ 8.3, 8.4 ]
-        pimcore: [ ^11.5, ^12.0 ]
+        pimcore: [ ^12.0 ]
         jms: [ ^4.0, ^5.0 ]
         dependencies: [ highest ]
-        exclude:
-          - pimcore: ^11.5
-            php: 8.4
 
     services:
       database:
@@ -102,12 +99,6 @@ jobs:
     - name: pimcore/pimcore
       run: |
         composer req pimcore/pimcore:${{ matrix.pimcore }} --no-interaction --no-scripts --no-update
-        if [ "${{ matrix.pimcore }}" == "^11.5" ]; then
-          composer req pimcore/admin-ui-classic-bundle:^1.6 --no-interaction --no-scripts --no-update
-        else
-          composer req pimcore/admin-ui-classic-bundle:^2.0 --no-interaction --no-scripts --no-update
-          composer req payum/payum:1.7.x-dev --no-interaction --no-scripts --no-update
-        fi
 
     - if: matrix.dependencies == 'highest'
       name: Install dependencies highest

.github/workflows/packages_bundles.yml

@@ -38,12 +38,9 @@ jobs:
       fail-fast: false
       matrix:
         php: [ 8.3, 8.4 ]
-        pimcore: [ ^11.5, ^12.0 ]
+        pimcore: [ ^12.0 ]
         dependencies: [ highest ]
         package: "${{ fromJson(needs.list.outputs.packages) }}"
-        exclude:
-          - pimcore: ^11.5
-            php: 8.4
 
     steps:
     - uses: actions/checkout@v4

.github/workflows/packages_components.yml

@@ -38,12 +38,9 @@ jobs:
       fail-fast: false
       matrix:
         php: [ 8.3, 8.4 ]
-        pimcore: [ ^11.5, ^12.0 ]
+        pimcore: [ ^12.0 ]
         dependencies: [ highest ]
         package: "${{ fromJson(needs.list.outputs.packages) }}"
-        exclude:
-          - pimcore: ^11.5
-            php: 8.4
 
     steps:
     - uses: actions/checkout@v4

.github/workflows/static.yml

@@ -37,9 +37,10 @@ jobs:
     strategy:
       matrix:
         php: [ 8.3, 8.4 ]
-        pimcore: [ ^11.5, ^12.0 ]
+        pimcore: [ ^12.0 ]
         jms: [ ^4.0, ^5.0 ]
         dependencies: [ highest ]
+
     services:
       database:
         image: "mysql:8"

.gitignore

@@ -7,6 +7,7 @@
 *.exe
 *.o
 *.so
+cache
 
 ######################
 # Packages           #

composer.json

@@ -95,31 +95,31 @@
     "gedmo/doctrine-extensions": "^3.11",
     "jms/serializer-bundle": "^5.0",
     "knplabs/knp-menu-bundle": "^3.1",
-    "payum/payum": "^1.7",
+    "payum/payum": "^2.0",
     "payum/payum-bundle": "^2.6",
     "php-http/guzzle7-adapter": "^1.0",
     "php-http/message-factory": "^1.1",
-    "pimcore/admin-ui-classic-bundle": "^1.6 || ^2.0",
+    "pimcore/admin-ui-classic-bundle": "^2.0",
     "pimcore/google-marketing-bundle": "^1.0",
     "pimcore/newsletter-bundle": "^1.0",
-    "pimcore/pimcore": "^11.5 || ^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",
     "stof/doctrine-extensions-bundle": "^1.6",
-    "sylius/theme-bundle": "^2.2",
+    "sylius/theme-bundle": "^2.4",
     "symfony/dotenv": "^6.3",
+    "symfony/form": "^6.3",
     "symfony/http-client": "^6.3",
     "symfony/intl": "^6.3",
     "symfony/notifier": "^6.3",
     "symfony/serializer": "^6.3",
     "symfony/twig-bundle": "^6.3",
-    "symfony/form": "^6.3",
     "webmozart/assert": "^1.10"
   },
   "require-dev": {
     "behat/behat": "^3.8",
-    "behat/mink": "^1.8",
+    "behat/mink": "^1.12",
     "chrome-php/chrome": "^1.11",
     "dbrekelmans/bdi": "^1.0",
     "friends-of-behat/mink-debug-extension": "^2.0",
@@ -139,8 +139,7 @@
     "vimeo/psalm": "^5.23 || ^6.0"
   },
   "conflict": {
-    "twig/twig": ">=3.9.0 <3.14.0",
-    "pimcore/pimcore": "11.3.1"
+    "twig/twig": ">=3.9.0 <3.14.0"
   },
   "autoload": {
     "psr-4": {

config/bundles.php

@@ -3,7 +3,6 @@
 return [
     Pimcore\Bundle\SimpleBackendSearchBundle\PimcoreSimpleBackendSearchBundle::class => ['all' => true],
     Pimcore\Bundle\SeoBundle\PimcoreSeoBundle::class => ['all' => true],
-    Pimcore\Bundle\TinymceBundle\PimcoreTinymceBundle::class => ['all' => true],
     Pimcore\Bundle\ApplicationLoggerBundle\PimcoreApplicationLoggerBundle::class => ['all' => true],
     Pimcore\Bundle\StaticRoutesBundle\PimcoreStaticRoutesBundle::class => ['all' => true],
     Pimcore\Bundle\NewsletterBundle\PimcoreNewsletterBundle::class => ['all' => true],

docs/01_Getting_Started/04_Tests.md

@@ -24,14 +24,14 @@ SYMFONY_ENV=test vendor/bin/phpstan analyse -c phpstan.neon src -l 3 --memory-li
 #### Install Pimcore and CoreShop in Test Env
 
 ```
-APP_ENV=test PIMCORE_TEST_DB_DSN=mysql://root:ROOT@coreshop4.1-db/coreshop4_1___behat PIMCORE_INSTALL_ADMIN_USERNAME=admin PIMCORE_INSTALL_ADMIN_PASSWORD=admin PIMCORE_INSTALL_MYSQL_HOST_SOCKET=coreshop4.1-db PIMCORE_INSTALL_MYSQL_USERNAME=root PIMCORE_INSTALL_MYSQL_PASSWORD=ROOT PIMCORE_INSTALL_MYSQL_DATABASE=coreshop4_1___behat PIMCORE_INSTALL_MYSQL_PORT=3306 PIMCORE_KERNEL_CLASS=Kernel vendor/bin/pimcore-install --env=test --skip-database-config -n
-APP_ENV=test PIMCORE_TEST_DB_DSN=mysql://root:ROOT@coreshop4.1-db/coreshop4_1___behat bin/console coreshop:install
+APP_ENV=test PIMCORE_TEST_DB_DSN=mysql://root:ROOT@db/coreshop5___behat PIMCORE_INSTALL_ADMIN_USERNAME=admin PIMCORE_INSTALL_ADMIN_PASSWORD=admin PIMCORE_INSTALL_MYSQL_HOST_SOCKET=db PIMCORE_INSTALL_MYSQL_USERNAME=root PIMCORE_INSTALL_MYSQL_PASSWORD=ROOT PIMCORE_INSTALL_MYSQL_DATABASE=coreshop5___behat PIMCORE_INSTALL_MYSQL_PORT=3306 PIMCORE_KERNEL_CLASS=Kernel vendor/bin/pimcore-install --env=test --skip-database-config -n
+APP_ENV=test PIMCORE_TEST_DB_DSN=mysql://root:ROOT@db/coreshop5___behat bin/console coreshop:install
 ```
 
 #### BEHAT Domain
 
 ```
-CORESHOP_SKIP_DB_SETUP=1 PIMCORE_TEST_DB_DSN=mysql://root:ROOT@coreshop4.1-db/coreshop4_1___behat vendor/bin/behat -c behat.yml.dist -p default
+CORESHOP_SKIP_DB_SETUP=1 PIMCORE_TEST_DB_DSN=mysql://root:ROOT@coreshop50-db/coreshop5___behat vendor/bin/behat -c behat.yml.dist -p default
 ```
 
 #### BEHAT UI
@@ -41,8 +41,8 @@ vendor/bin/bdi detect drivers
 
 # OUTSIDE CONTAINER
 # Run Symfony Server
-APP_ENV=test PIMCORE_TEST_DB_DSN=mysql://root:[email protected]:3306/coreshop4_1___behat symfony server:start --port=9080 --dir=public --no-tls
+APP_ENV=test PIMCORE_TEST_DB_DSN=mysql://root:[email protected]:3306/coreshop5___behat symfony server:start --port=9080 --dir=public --no-tls
 
 # Run Behat
-CORESHOP_SKIP_DB_SETUP=1 PANTHER_EXTERNAL_BASE_URI=http://127.0.0.1:9080/index_test.php PANTHER_NO_HEADLESS=0 PIMCORE_TEST_DB_DSN=mysql://root:[email protected]:3306/coreshop4_1___behat php -d memory_limit=-1 vendor/bin/behat -c behat.yml.dist -p ui -vvv features/ui/frontend/wishlist/adding_product_to_wishlist.feature 
+CORESHOP_SKIP_DB_SETUP=1 PANTHER_EXTERNAL_BASE_URI=http://127.0.0.1:9080/index_test.php PANTHER_NO_HEADLESS=0 PIMCORE_TEST_DB_DSN=mysql://root:[email protected]:3306/coreshop5___behat php -d memory_limit=-1 vendor/bin/behat -c behat.yml.dist -p ui -vvv features/ui/frontend/wishlist/adding_product_to_wishlist.feature 
 ```

features/ui/frontend/cart/adding_product_to_cart.feature

@@ -11,7 +11,7 @@ Feature: Adding a product to the cart
         Then I should be on the cart summary page
         And I should be notified that the product has been successfully added
         And there should be one item in my cart
-        And this item should have name "TSHIRT"
+        And this item should have name "TShirt"
         And I should see "TShirt" with unit price "€100.00" in my cart
 
     Scenario: Adding a product to the cart as a logged in customer
@@ -23,5 +23,5 @@ Feature: Adding a product to the cart
         Then I should be on the cart summary page
         And I should be notified that the product has been successfully added
         And there should be one item in my cart
-        And this item should have name "RACING CAR"
+        And this item should have name "Racing Car"
         And I should see "Racing Car" with unit price "€1,000.00" in my cart

features/ui/frontend/cart/adding_product_to_cart_with_maximum_qty.feature

@@ -13,19 +13,19 @@ Feature: Adding a product to the cart with maximum Quantity to Order
         Then I should be on the cart summary page
         And I should be notified that the product has been successfully added
         And there should be one item in my cart
-        And this item should have name "TSHIRT"
+        And this item should have name "TShirt"
         And I should see "TShirt" with unit price "€100.00" in my cart
 
     Scenario: Adding product to cart with less than minimum quantity to order
         Given the product "TShirt" has a maximum order quantity of "100"
         When I add 101 of this product to the cart
         Then I should be on the cart summary page
-        And  I should be notified that I can only order a maximum of 100 of TSHIRT
+        And  I should be notified that I can only order a maximum of 100 of TShirt
 
 
     Scenario: Adding product to cart with less than minimum quantity to order with smaller quantities
         Given the product "TShirt" has a maximum order quantity of "2"
         When I add 3 of this product to the cart
         Then I should be on the cart summary page
-        And  I should be notified that I can only order a maximum of 2 of TSHIRT
+        And  I should be notified that I can only order a maximum of 2 of TShirt
 

features/ui/frontend/cart/adding_product_to_cart_with_minimum_qty.feature

@@ -13,19 +13,19 @@ Feature: Adding a product to the cart with minimum Quantity to Order
         Then I should be on the cart summary page
         And I should be notified that the product has been successfully added
         And there should be one item in my cart
-        And this item should have name "TSHIRT"
+        And this item should have name "TShirt"
         And I should see "TShirt" with unit price "€100.00" in my cart
 
     Scenario: Adding product to cart with less than minimum quantity to order
         Given the product "TShirt" has a minimum order quantity of "100"
         When I add 99 of this product to the cart
         Then I should be on the cart summary page
-        And I should be notified that I need to order at least 100 of TSHIRT
+        And I should be notified that I need to order at least 100 of TShirt
 
 
     Scenario: Adding product to cart with less than minimum quantity to order with smaller quantities
         Given the product "TShirt" has a minimum order quantity of "2"
         When I add 1 of this product to the cart
         Then I should be on the cart summary page
-        And I should be notified that I need to order at least 2 of TSHIRT
+        And I should be notified that I need to order at least 2 of TShirt
 

features/ui/frontend/cart/adding_product_to_cart_with_out_of_stock_product.feature

@@ -15,13 +15,13 @@ Feature: Adding a product to the cart with a Product that is tracked and out-of-
         Then I should be on the cart summary page
         And I should be notified that the product has been successfully added
         And there should be one item in my cart
-        And this item should have name "TSHIRT"
+        And this item should have name "TShirt"
         And I should see "TShirt" with unit price "€100.00" in my cart
 
     Scenario: Adding product to cart with more than stocked quantity
         When I add 3 of this product to the cart
         Then I should be on the cart summary page
-        And  I should be notified that TSHIRT does not have sufficient stock
+        And  I should be notified that TShirt does not have sufficient stock
 
     Scenario: Adding product, with on-hold stock, to cart with more than stocked quantity
         Given the product has 2 on hold
@@ -31,5 +31,5 @@ Feature: Adding a product to the cart with a Product that is tracked and out-of-
         Given the product has 1 on hold
         When I add 2 of this product to the cart
         Then I should be on the cart summary page
-        And I should be notified that TSHIRT does not have sufficient stock
+        And I should be notified that TShirt does not have sufficient stock
 

features/ui/frontend/cart/automatic_cart_price_rule.feature

@@ -15,7 +15,7 @@ Feature: Getting an automatic cart price rule
         Then I should be on the cart summary page
         And I should be notified that the product has been successfully added
         And there should be one item in my cart
-        And this item should have name "TSHIRT"
+        And this item should have name "TShirt"
         And I should see "TShirt" with unit price "€100.00" in my cart
         And my cart's total should be "€80.00"
 
@@ -25,6 +25,6 @@ Feature: Getting an automatic cart price rule
         Then I should be on the cart summary page
         And I should be notified that the product has been successfully added
         And there should be one item in my cart
-        And this item should have name "TSHIRT"
+        And this item should have name "TShirt"
         And I should see "TShirt" with unit price "€100.00" in my cart
         And my cart's total should be "€70.00"

features/ui/frontend/cart/keep_cart_after_login.feature

@@ -13,11 +13,11 @@ Feature: Maintaining cart after login
         When I log in as "[email protected]" with "cybertruck" password
         And I see the summary of my cart
         Then there should be one item in my cart
-        And this item should have name "TSHIRT"
+        And this item should have name "TShirt"
 
     Scenario: Having cart maintained after registration
         Given I add this product to the cart
         When I register with email "[email protected]" and password "bigbigbooster"
         And I see the summary of my cart
         Then there should be one item in my cart
-        And this item should have name "TSHIRT"
+        And this item should have name "TShirt"

features/ui/frontend/category/view_category.feature

@@ -56,13 +56,13 @@ Feature: Viewing a product details
     When I switch to category "Coats" on main menu
     Then I should see 3 products in the category list
     And I change order to "Name Descending"
-    And I should see products in order "WINTER COAT,RAIN COAT,JACKET" in list
+    And I should see products in order "Winter Coat,Rain Coat,Jacket" in list
     And I change order to "Name Ascending"
-    And I should see products in order "JACKET,RAIN COAT,WINTER COAT" in list
+    And I should see products in order "Jacket,Rain Coat,Winter Coat" in list
     When I switch to category "Shoes" on left menu
     And I change order to "Name Descending"
-    And I should see products in order "SHOE 2,SHOE" in list
+    And I should see products in order "Shoe 2,Shoe" in list
     And I switch to view to "grid"
-    And I should see products in order "SHOE 2,SHOE" in grid
+    And I should see products in order "Shoe 2,Shoe" in grid
     And I change order to "Name Ascending"
-    And I should see products in order "SHOE,SHOE 2" in grid
+    And I should see products in order "Shoe,Shoe 2" in grid

features/ui/frontend/payment/concurrency.feature

@@ -10,6 +10,7 @@ Feature: Create a new order
     And the site has a tax rule group "AT"
     And the tax rule group has a tax rule for country "Austria" with tax rate "AT"
     And the site has a product "T-Shirt" priced at 2000
+    And the product is active and published and available for store "Austria"
     And the product has the tax rule group "AT"
     And the site has a customer "[email protected]"
     And the customer "[email protected]" has an address with country "Austria", "4600", "Wels", "Freiung", "9-11/N3"

psalm.xml

@@ -5,6 +5,7 @@
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
     findUnusedBaselineEntry="false"
     findUnusedCode="false"
+    ensureOverrideAttribute="false"
 >
     <projectFiles>
         <directory name="src" />
@@ -30,6 +31,11 @@
     </projectFiles>
 
     <issueHandlers>
+        <ClassMustBeFinal>
+            <errorLevel type="info">
+                <directory name="src/CoreShop/*" />
+            </errorLevel>
+        </ClassMustBeFinal>
         <RiskyCast>
             <errorLevel type="info">
                 <directory name="src/CoreShop/*" />
@@ -46,12 +52,6 @@
             </errorLevel>
         </MissingTemplateParam>
         <!-- level 3 issues - slightly lazy code writing, but probably low false-negatives -->
-        <UndefinedDocblockClass>
-            <errorLevel type="suppress">
-                <referencedClass name="UnitEnum" />
-            </errorLevel>
-        </UndefinedDocblockClass>
-
         <DeprecatedClass>
             <errorLevel type="info">
                 <referencedClass name="Doctrine\Common\Persistence\ManagerRegistry" />
@@ -132,6 +132,21 @@
                 <referencedClass name="Pimcore\File" />
             </errorLevel>
         </InternalClass>
+
+        <TooManyTemplateParams>
+            <errorLevel type="info">
+                <file name="src/CoreShop/Bundle/PayumBundle/Action/AuthorizePaymentAction.php" />
+                <file name="src/CoreShop/Bundle/PayumBundle/Action/CapturePaymentAction.php" />
+                <file name="src/CoreShop/Bundle/PayumBundle/Action/ExecuteSameRequestWithPaymentDetailsAction.php" />
+                <file name="src/CoreShop/Bundle/PayumBundle/Action/Offline/StatusAction.php" />
+            </errorLevel>
+        </TooManyTemplateParams>
+
+        <InvalidOperand>
+            <errorLevel type="info">
+                <directory name="src/CoreShop/*" />
+            </errorLevel>
+        </InvalidOperand>
 
         <MissingReturnType errorLevel="info" />
 

src/AppKernel.php

@@ -21,7 +21,7 @@
 use Pimcore\HttpKernel\BundleCollection\BundleCollection;
 use Pimcore\Kernel as PimcoreKernel;
 
-class Kernel extends PimcoreKernel
+final class Kernel extends PimcoreKernel
 {
     public function registerBundlesToCollection(BundleCollection $collection): void
     {