Merge pull request #2285 from dpfaffenbauer/pimcore-10.6

[Pimcore] make compatible with Pimcore 10.6
coreshop · May 21, 2023 · b945183 · b945183
2 parents 8cf0136 + be76cda
commit b945183
Show file tree

Hide file tree

Showing 80 changed files with 237 additions and 232 deletions.
diff --git a/.github/workflows/behat.yml b/.github/workflows/behat.yml
@@ -31,7 +31,7 @@ jobs:
     strategy:
       matrix:
         php: [ 8.0, 8.1 ]
-        pimcore: [ ^10.5 ]
+        pimcore: [ ~10.5, ~10.6 ]
         dependencies: [ highest, lowest ]
         exclude:
           - php: 8.1

diff --git a/.github/workflows/behat_ui.yml b/.github/workflows/behat_ui.yml
@@ -32,7 +32,7 @@ jobs:
     strategy:
       matrix:
         php: [ 8.0, 8.1 ]
-        pimcore: [ ^10.5 ]
+        pimcore: [ ~10.5, ~10.6 ]
         dependencies: [ highest, lowest ]
         exclude:
           - php: 8.1

diff --git a/.github/workflows/packages_bundles.yml b/.github/workflows/packages_bundles.yml
@@ -32,7 +32,7 @@ jobs:
       fail-fast: false
       matrix:
         php: [ 8.0, 8.1 ]
-        pimcore: [ ^10.5 ]
+        pimcore: [ ~10.5, ~10.6 ]
         dependencies: [ highest, lowest ]
         package: "${{ fromJson(needs.list.outputs.packages) }}"
         exclude:

diff --git a/.github/workflows/packages_components.yml b/.github/workflows/packages_components.yml
@@ -32,7 +32,7 @@ jobs:
       fail-fast: false
       matrix:
         php: [ 8.0, 8.1 ]
-        pimcore: [ ^10.5 ]
+        pimcore: [ ~10.5, ~10.6 ]
         dependencies: [ highest, lowest ]
         package: "${{ fromJson(needs.list.outputs.packages) }}"
         exclude:

diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
@@ -19,7 +19,7 @@ jobs:
     strategy:
       matrix:
         php: [ 8.0, 8.1 ]
-        pimcore: [ ^10.5 ]
+        pimcore: [ ~10.5, ~10.6 ]
         dependencies: [ highest, lowest ]
         exclude:
           - php: 8.1

diff --git a/composer.json b/composer.json
@@ -99,7 +99,8 @@
     "payum/payum": "^1.7",
     "payum/payum-bundle": "^2.5",
     "php-http/guzzle7-adapter": "^1.0",
-    "pimcore/pimcore": "^10.5",
+    "php-http/message-factory": "^1.0",
+    "pimcore/pimcore": "~10.6.1",
     "rinvex/countries": "^7.3",
     "stof/doctrine-extensions-bundle": "^1.6",
     "sylius/theme-bundle": "^2.2",
@@ -116,10 +117,10 @@
     "friends-of-behat/page-object-extension": "^0.3.2",
     "friends-of-behat/symfony-extension": "^2.1",
     "lakion/mink-debug-extension": "^2.0",
-    "phpstan/phpstan": "^1.5.4",
-    "phpstan/phpstan-doctrine": "^1.3.2",
-    "phpstan/phpstan-symfony": "^1.1.8",
-    "phpstan/phpstan-webmozart-assert": "^1.1.2",
+    "phpstan/phpstan": "^1.10",
+    "phpstan/phpstan-doctrine": "^1.3.40",
+    "phpstan/phpstan-symfony": "^1.3.2",
+    "phpstan/phpstan-webmozart-assert": "^1.2.4",
     "phpunit/phpunit": "^9.5",
     "robertfausk/behat-panther-extension": "^1.0",
     "symfony/panther": "^1.0",

diff --git a/phpstan-package.neon b/phpstan-package.neon
@@ -30,9 +30,6 @@ parameters:
         - '/Constant PIMCORE_DEVMODE not found./'
         - '/Class Zend_Paginator_Adapter_Interface not found and could not be autoloaded./'
 
-        - '/Class LuceneSearchBundle/'
-        - '/unknown class LuceneSearchBundle/'
-        - '/typehint type LuceneSearchBundle/'
         - '/Call to an undefined method Symfony\\Component\\Config\\Definition\\Builder\\NodeDefinition::children\(\)/'
         - '/Call to an undefined method Symfony\\Component\\Config\\Definition\\Builder\\NodeParentInterface/'
         - '/Call to an undefined method Pimcore\\Model\\(.*)::save\(\)./'
@@ -43,18 +40,13 @@ parameters:
         - '/PHPDoc type string of property CoreShop\\Bundle\\PayumBundle\\Request\\GetStatus::\$status is not covariant with PHPDoc type int of overridden property Payum\\Core\\Request\\BaseGetStatus::\$status./'
 
         # Pimcore BC Breaks
-        - '/Class Pimcore\\Model\\DataObject\\ClassDefinition\\Data\\Href not found/'
-        - '/Class Pimcore\\Model\\DataObject\\ClassDefinition\\Data\\Multihref not found/'
         - '/Class Pimcore\\Bundle\\AdminBundle\\Helper\\GridHelperService not found/'
         - '/Class Pimcore\\Model\\DataObject\\LazyLoadedFieldsInterface not found/'
         - '/Class Pimcore\\Model\\DataObject\\ClassDefinition\\Data\\\CustomVersionMarshalInterface not found/'
         - '/Call to method markLazyKeyAsLoaded\(\) on an unknown class Pimcore\\Model\\DataObject\\LazyLoadedFieldsInterface/'
         - '/Call to method isLazyKeyLoaded\(\) on an unknown class Pimcore\\Model\\DataObject\\LazyLoadedFieldsInterface/'
         - '/Access to undefined constant PackageVersions\\Versions::VERSIONS/'
 
-        # BC Breaks that will be resolved with 3.0
-        - '/Method CoreShop\\Bundle\\ThemeBundle\\Service\\ThemeResolverInterface::resolveTheme\(\)/'
-
 includes:
     - ./vendor/phpstan/phpstan-doctrine/extension.neon
     - ./vendor/phpstan/phpstan-webmozart-assert/extension.neon
diff --git a/phpstan.neon b/phpstan.neon
@@ -9,7 +9,6 @@ parameters:
         - '**/DependencyInjection/Configuration.php'
         - '**/Migrations/Version*.php'
         # Ignore cause the file uses external dependencies and will only be used if those dependencies are met
-        - 'CoreShop/Component/SEO/Extractor/LuceneSearchExtractor.php'
         - '**/ProcessManager/IndexListener.php'
         - '**/ProcessManager/IndexProcess.php'
         - '**/DataHub/*.php'
@@ -24,7 +23,6 @@ parameters:
         - '/Constant PIMCORE_CLASS_DIRECTORY not found./'
         - '/Constant PIMCORE_WEB_ROOT not found./'
         - '/Constant PIMCORE_DEVMODE not found./'
-        - '/Class Zend_Paginator_Adapter_Interface not found and could not be autoloaded./'
 
         - '/Call to an undefined method Symfony\\Component\\Config\\Definition\\Builder\\NodeDefinition::children\(\)/'
         - '/Call to an undefined method Symfony\\Component\\Config\\Definition\\Builder\\NodeParentInterface/'
@@ -36,18 +34,13 @@ parameters:
         - '/PHPDoc type string of property CoreShop\\Bundle\\PayumBundle\\Request\\GetStatus::\$status is not covariant with PHPDoc type int of overridden property Payum\\Core\\Request\\BaseGetStatus::\$status./'
 
         # Pimcore BC Breaks
-        - '/Class Pimcore\\Model\\DataObject\\ClassDefinition\\Data\\Href not found/'
-        - '/Class Pimcore\\Model\\DataObject\\ClassDefinition\\Data\\Multihref not found/'
         - '/Class Pimcore\\Bundle\\AdminBundle\\Helper\\GridHelperService not found/'
         - '/Class Pimcore\\Model\\DataObject\\LazyLoadedFieldsInterface not found/'
         - '/Class Pimcore\\Model\\DataObject\\ClassDefinition\\Data\\\CustomVersionMarshalInterface not found/'
         - '/Call to method markLazyKeyAsLoaded\(\) on an unknown class Pimcore\\Model\\DataObject\\LazyLoadedFieldsInterface/'
         - '/Call to method isLazyKeyLoaded\(\) on an unknown class Pimcore\\Model\\DataObject\\LazyLoadedFieldsInterface/'
         - '/Access to undefined constant PackageVersions\\Versions::VERSIONS/'
 
-        # BC Breaks that will be resolved with 3.0
-        - '/Method CoreShop\\Bundle\\ThemeBundle\\Service\\ThemeResolverInterface::resolveTheme(\\)/'
-
 includes:
     - vendor/phpstan/phpstan-doctrine/extension.neon
     - vendor/phpstan/phpstan-symfony/extension.neon

diff --git a/psalm.xml b/psalm.xml
@@ -51,6 +51,12 @@
                 <referencedClass name="Symfony\Component\Security\Core\Role\Role" />
                 <referencedClass name="Symfony\Component\Translation\TranslatorInterface" />
                 <referencedClass name="Symfony\Bundle\WebServerBundle\WebServerBundle" />
+                <referencedClass name="Pimcore\Event\BundleManagerEvents" />
+                <referencedClass name="Pimcore\Event\Model\DataObjectDeleteInfoEvent" />
+                <referencedClass name="Pimcore\Event\AdminEvents" />
+                <referencedClass name="Pimcore\Bundle\AdminBundle\Security\User\TokenStorageUserResolver" />
+                <referencedClass name="Pimcore\Bundle\AdminBundle\Controller\AdminController" />
+                <referencedClass name="Pimcore\Bundle\AdminBundle\Security\User\User" />
             </errorLevel>
         </DeprecatedClass>
         <DeprecatedInterface>
@@ -59,6 +65,7 @@
                 <referencedClass name="Doctrine\Common\Persistence\ObjectRepository" />
                 <referencedClass name="Sylius\Component\Core\Calculator\ProductVariantPriceCalculatorInterface" />
                 <referencedClass name="Symfony\Component\Security\Core\User\AdvancedUserInterface" />
+                <referencedClass name="Pimcore\Bundle\AdminBundle\Controller\AdminControllerInterface" />
             </errorLevel>
         </DeprecatedInterface>
         <DeprecatedMethod>
@@ -72,6 +79,8 @@
                 <referencedMethod name="Symfony\Component\Intl\Intl::getRegionBundle" />
                 <referencedMethod name="Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent::getException" />
                 <referencedMethod name="Symfony\Bundle\FrameworkBundle\Controller\AbstractController::get" />
+                <referencedMethod name="Pimcore\Bundle\AdminBundle\Controller\AdminController::decodeJson" />
+                <referencedMethod name="Pimcore\Bundle\AdminBundle\Controller\AdminController::getAdminUser" />
             </errorLevel>
         </DeprecatedMethod>
 

diff --git a/src/AppKernel.php b/src/AppKernel.php
@@ -25,7 +25,7 @@ class Kernel extends PimcoreKernel
 {
     public function registerBundlesToCollection(BundleCollection $collection)
     {
-        $collection->addBundle(new \CoreShop\Bundle\CoreBundle\CoreShopCoreBundle());
+        $collection->addBundle(new \CoreShop\Bundle\CoreBundle\CoreShopCoreBundle(), 1000);
         $collection->addBundle(new \FriendsOfBehat\SymfonyExtension\Bundle\FriendsOfBehatSymfonyExtensionBundle());
         $collection->addBundle(new \CoreShop\Bundle\TestBundle\CoreShopTestBundle(), 0);
     }

diff --git a/src/BehatKernel.php b/src/BehatKernel.php
@@ -22,7 +22,7 @@ class BehatKernel extends PimcoreKernel
 {
     public function registerBundlesToCollection(\Pimcore\HttpKernel\BundleCollection\BundleCollection $collection)
     {
-        $collection->addBundle(new \CoreShop\Bundle\CoreBundle\CoreShopCoreBundle());
+        $collection->addBundle(new \CoreShop\Bundle\CoreBundle\CoreShopCoreBundle(), 1000);
         $collection->addBundle(new \FriendsOfBehat\SymfonyExtension\Bundle\FriendsOfBehatSymfonyExtensionBundle());
         $collection->addBundle(new \CoreShop\Bundle\TestBundle\CoreShopTestBundle(), 0);
     }

diff --git a/src/CoreShop/Bundle/AddressBundle/composer.json b/src/CoreShop/Bundle/AddressBundle/composer.json
@@ -29,9 +29,9 @@
     "pimcore/pimcore": "^10.5"
   },
   "require-dev": {
-    "phpstan/phpstan": "^1.5.4",
-    "phpstan/phpstan-doctrine": "^1.3.2",
-    "phpstan/phpstan-webmozart-assert": "^1.1.2"
+    "phpstan/phpstan": "^1.10",
+    "phpstan/phpstan-doctrine": "^1.3.40",
+    "phpstan/phpstan-webmozart-assert": "^1.2.4"
   },
   "autoload": {
     "psr-4": {

diff --git a/src/CoreShop/Bundle/ConfigurationBundle/composer.json b/src/CoreShop/Bundle/ConfigurationBundle/composer.json
@@ -29,9 +29,9 @@
     "pimcore/pimcore": "^10.5"
   },
   "require-dev": {
-    "phpstan/phpstan": "^1.5.4",
-    "phpstan/phpstan-doctrine": "^1.3.2",
-    "phpstan/phpstan-webmozart-assert": "^1.1.2"
+    "phpstan/phpstan": "^1.10",
+    "phpstan/phpstan-doctrine": "^1.3.40",
+    "phpstan/phpstan-webmozart-assert": "^1.2.4"
   },
   "autoload": {
     "psr-4": {

diff --git a/src/CoreShop/Bundle/CoreBundle/composer.json b/src/CoreShop/Bundle/CoreBundle/composer.json
@@ -58,9 +58,9 @@
     "pimcore/pimcore": "^10.5"
   },
   "require-dev": {
-    "phpstan/phpstan": "^1.5.4",
-    "phpstan/phpstan-doctrine": "^1.3.2",
-    "phpstan/phpstan-webmozart-assert": "^1.1.2"
+    "phpstan/phpstan": "^1.10",
+    "phpstan/phpstan-doctrine": "^1.3.40",
+    "phpstan/phpstan-webmozart-assert": "^1.2.4"
   },
   "autoload": {
     "psr-4": {

diff --git a/src/CoreShop/Bundle/CurrencyBundle/composer.json b/src/CoreShop/Bundle/CurrencyBundle/composer.json
@@ -29,9 +29,9 @@
     "pimcore/pimcore": "^10.5"
   },
   "require-dev": {
-    "phpstan/phpstan": "^1.5.4",
-    "phpstan/phpstan-doctrine": "^1.3.2",
-    "phpstan/phpstan-webmozart-assert": "^1.1.2"
+    "phpstan/phpstan": "^1.10",
+    "phpstan/phpstan-doctrine": "^1.3.40",
+    "phpstan/phpstan-webmozart-assert": "^1.2.4"
   },
   "autoload": {
     "psr-4": {

diff --git a/src/CoreShop/Bundle/CustomerBundle/composer.json b/src/CoreShop/Bundle/CustomerBundle/composer.json
@@ -29,9 +29,9 @@
     "pimcore/pimcore": "^10.5"
   },
   "require-dev": {
-    "phpstan/phpstan": "^1.5.4",
-    "phpstan/phpstan-doctrine": "^1.3.2",
-    "phpstan/phpstan-webmozart-assert": "^1.1.2"
+    "phpstan/phpstan": "^1.10",
+    "phpstan/phpstan-doctrine": "^1.3.40",
+    "phpstan/phpstan-webmozart-assert": "^1.2.4"
   },
   "autoload": {
     "psr-4": {

diff --git a/src/CoreShop/Bundle/FixtureBundle/composer.json b/src/CoreShop/Bundle/FixtureBundle/composer.json
@@ -34,9 +34,9 @@
     "pimcore/pimcore": "^10.5"
   },
   "require-dev": {
-    "phpstan/phpstan": "^1.5.4",
-    "phpstan/phpstan-doctrine": "^1.3.2",
-    "phpstan/phpstan-webmozart-assert": "^1.1.2"
+    "phpstan/phpstan": "^1.10",
+    "phpstan/phpstan-doctrine": "^1.3.40",
+    "phpstan/phpstan-webmozart-assert": "^1.2.4"
   },
   "autoload": {
     "psr-4": {

diff --git a/src/CoreShop/Bundle/FrontendBundle/composer.json b/src/CoreShop/Bundle/FrontendBundle/composer.json
@@ -29,9 +29,9 @@
     "pimcore/pimcore": "^10.5"
   },
   "require-dev": {
-    "phpstan/phpstan": "^1.5.4",
-    "phpstan/phpstan-doctrine": "^1.3.2",
-    "phpstan/phpstan-webmozart-assert": "^1.1.2"
+    "phpstan/phpstan": "^1.10",
+    "phpstan/phpstan-doctrine": "^1.3.40",
+    "phpstan/phpstan-webmozart-assert": "^1.2.4"
   },
   "autoload": {
     "psr-4": {

diff --git a/src/CoreShop/Bundle/IndexBundle/composer.json b/src/CoreShop/Bundle/IndexBundle/composer.json
@@ -37,9 +37,9 @@
     "dpfaffenbauer/process-manager": "Allows to start Indexing from within Pimcore UI and also tracks the status."
   },
   "require-dev": {
-    "phpstan/phpstan": "^1.5.4",
-    "phpstan/phpstan-doctrine": "^1.3.2",
-    "phpstan/phpstan-webmozart-assert": "^1.1.2"
+    "phpstan/phpstan": "^1.10",
+    "phpstan/phpstan-doctrine": "^1.3.40",
+    "phpstan/phpstan-webmozart-assert": "^1.2.4"
   },
   "autoload": {
     "psr-4": {

diff --git a/src/CoreShop/Bundle/InventoryBundle/composer.json b/src/CoreShop/Bundle/InventoryBundle/composer.json
@@ -29,9 +29,9 @@
     "pimcore/pimcore": "^10.5"
   },
   "require-dev": {
-    "phpstan/phpstan": "^1.5.4",
-    "phpstan/phpstan-doctrine": "^1.3.2",
-    "phpstan/phpstan-webmozart-assert": "^1.1.2"
+    "phpstan/phpstan": "^1.10",
+    "phpstan/phpstan-doctrine": "^1.3.40",
+    "phpstan/phpstan-webmozart-assert": "^1.2.4"
   },
   "autoload": {
     "psr-4": {

diff --git a/src/CoreShop/Bundle/LocaleBundle/composer.json b/src/CoreShop/Bundle/LocaleBundle/composer.json
@@ -30,9 +30,9 @@
     "pimcore/pimcore": "^10.5"
   },
   "require-dev": {
-    "phpstan/phpstan": "^1.5.4",
-    "phpstan/phpstan-doctrine": "^1.3.2",
-    "phpstan/phpstan-webmozart-assert": "^1.1.2"
+    "phpstan/phpstan": "^1.10",
+    "phpstan/phpstan-doctrine": "^1.3.40",
+    "phpstan/phpstan-webmozart-assert": "^1.2.4"
   },
   "autoload": {
     "psr-4": {

diff --git a/src/CoreShop/Bundle/MenuBundle/composer.json b/src/CoreShop/Bundle/MenuBundle/composer.json
@@ -30,9 +30,9 @@
     "pimcore/pimcore": "^10.5"
   },
   "require-dev": {
-    "phpstan/phpstan": "^1.5.4",
-    "phpstan/phpstan-doctrine": "^1.3.2",
-    "phpstan/phpstan-webmozart-assert": "^1.1.2"
+    "phpstan/phpstan": "^1.10",
+    "phpstan/phpstan-doctrine": "^1.3.40",
+    "phpstan/phpstan-webmozart-assert": "^1.2.4"
   },
   "autoload": {
     "psr-4": {

diff --git a/src/CoreShop/Bundle/MessengerBundle/composer.json b/src/CoreShop/Bundle/MessengerBundle/composer.json
@@ -29,9 +29,9 @@
     "coreshop/menu-bundle": "^3.0"
   },
   "require-dev": {
-    "phpstan/phpstan": "^1.5.4",
-    "phpstan/phpstan-doctrine": "^1.3.2",
-    "phpstan/phpstan-webmozart-assert": "^1.1.2"
+    "phpstan/phpstan": "^1.10",
+    "phpstan/phpstan-doctrine": "^1.3.40",
+    "phpstan/phpstan-webmozart-assert": "^1.2.4"
   },
   "autoload": {
     "psr-4": {

diff --git a/src/CoreShop/Bundle/MoneyBundle/composer.json b/src/CoreShop/Bundle/MoneyBundle/composer.json
@@ -29,9 +29,9 @@
     "pimcore/pimcore": "^10.5"
   },
   "require-dev": {
-    "phpstan/phpstan": "^1.5.4",
-    "phpstan/phpstan-doctrine": "^1.3.2",
-    "phpstan/phpstan-webmozart-assert": "^1.1.2"
+    "phpstan/phpstan": "^1.10",
+    "phpstan/phpstan-doctrine": "^1.3.40",
+    "phpstan/phpstan-webmozart-assert": "^1.2.4"
   },
   "autoload": {
     "psr-4": {

diff --git a/src/CoreShop/Bundle/NotificationBundle/composer.json b/src/CoreShop/Bundle/NotificationBundle/composer.json
@@ -31,9 +31,9 @@
     "pimcore/pimcore": "^10.5"
   },
   "require-dev": {
-    "phpstan/phpstan": "^1.5.4",
-    "phpstan/phpstan-doctrine": "^1.3.2",
-    "phpstan/phpstan-webmozart-assert": "^1.1.2"
+    "phpstan/phpstan": "^1.10",
+    "phpstan/phpstan-doctrine": "^1.3.40",
+    "phpstan/phpstan-webmozart-assert": "^1.2.4"
   },
   "autoload": {
     "psr-4": {

diff --git a/src/CoreShop/Bundle/OptimisticEntityLockBundle/composer.json b/src/CoreShop/Bundle/OptimisticEntityLockBundle/composer.json
@@ -27,9 +27,9 @@
     "pimcore/pimcore": "^10.5"
   },
   "require-dev": {
-    "phpstan/phpstan": "^1.5.4",
-    "phpstan/phpstan-doctrine": "^1.3.2",
-    "phpstan/phpstan-webmozart-assert": "^1.1.2"
+    "phpstan/phpstan": "^1.10",
+    "phpstan/phpstan-doctrine": "^1.3.40",
+    "phpstan/phpstan-webmozart-assert": "^1.2.4"
   },
   "autoload": {
     "psr-4": {