Merge pull request #2929 from dpfaffenbauer/pimcore/12.3

[Pimcore] require symfony ^7.0 only

Author: dpfaffenbauer

composer.json

@@ -108,6 +108,7 @@
     "sebastian/diff": "^4.0 | ^5.0 | ^6.0",
     "stof/doctrine-extensions-bundle": "^1.6",
     "sylius/theme-bundle": "^2.2",
+    "symfony/config": "^7.4",
     "symfony/dotenv": "^6.3 || ^7.0",
     "symfony/form": "^6.3 || ^7.0",
     "symfony/http-client": "^6.3 || ^7.0",
@@ -116,7 +117,7 @@
     "symfony/scheduler": "^6.4 || ^7.0",
     "symfony/serializer": "^6.3 || ^7.0",
     "symfony/twig-bundle": "^6.3 || ^7.0",
-    "symfony/webpack-encore-bundle": "^1.17",
+    "symfony/webpack-encore-bundle": "^2.4",
     "webmozart/assert": "^1.10"
   },
   "suggest": {
@@ -141,6 +142,7 @@
     "pimcore/opensearch-client": "^2.0",
     "robertfausk/behat-panther-extension": "^1.0",
     "symfony/panther": "^2.2",
+    "symfony/browser-kit": "^7.0",
     "symfony/runtime": "^6.4 || ^7.0",
     "symplify/easy-coding-standard": "^11.1",
     "vimeo/psalm": "^6.10"

config/packages/security.yaml

@@ -7,8 +7,6 @@ pimcore:
             Pimcore\Model\DataObject\CoreShopUser: coreshop.security.user.password_hasher_factories
 
 security:
-    enable_authenticator_manager: true
-
     providers:
         pimcore_admin:
             id: Pimcore\Security\User\UserProvider

psalm.xml

@@ -222,6 +222,13 @@
             </errorLevel>
         </AmbiguousConstantInheritance>
 
+        <RedundantCastGivenDocblockType>
+            <errorLevel type="info">
+                <file name="src/CoreShop/Bundle/PimcoreBundle/Controller/Admin/DynamicDropdownController.php" />
+                <file name="src/CoreShop/Bundle/CoreBundle/Controller/CustomerTransformerController.php" />
+            </errorLevel>
+        </RedundantCastGivenDocblockType>
+
         <!-- level 5 issues - should be avoided at mosts costs... -->
 
 

src/BehatKernel.php

@@ -33,11 +33,4 @@ public function boot(): void
 
         \Pimcore::setKernel($this);
     }
-
-    protected function build(\Symfony\Component\DependencyInjection\ContainerBuilder $container)
-    {
-        parent::build($container);
-
-        $container->setParameter('pimcore.geoip.db_file', $container->getParameter('kernel.project_dir') . '/var/config/GeoLite2-City.mmdb');
-    }
 }

src/CoreShop/Behat/Context/Domain/CustomerContext.php

@@ -50,7 +50,7 @@ public function iShouldBeLoggedInWithEmail(CustomerInterface $customer): void
      */
     public function itShouldThrowAnErrorDeletingCustomer(CustomerInterface $customer): void
     {
-        Assert::throws(function () use ($customer) {
+        Assert::throws(function () use ($customer): void {
             $customer->delete();
         });
     }

src/CoreShop/Behat/Context/Setup/OptimisticEntityLockContext.php

@@ -44,7 +44,7 @@ public function iLockTheObjectInstanceWithCurrentVersion(Concrete $dataObject):
      */
     public function iUnsuccessfullyLockTheObjectInstanceWithCurrentVersion(Concrete $dataObject): void
     {
-        Assert::throws(function () use ($dataObject) {
+        Assert::throws(function () use ($dataObject): void {
             $this->entityLockManager->lock($dataObject, $dataObject->getValueForFieldName('optimisticLockVersion'));
         }, OptimisticLockException::class);
     }
@@ -55,7 +55,7 @@ public function iUnsuccessfullyLockTheObjectInstanceWithCurrentVersion(Concrete
      */
     public function iUnsuccessfullySaveTheObject(Concrete $dataObject): void
     {
-        Assert::throws(function () use ($dataObject) {
+        Assert::throws(function () use ($dataObject): void {
             $dataObject->save();
         }, OptimisticLockException::class);
     }

src/CoreShop/Bundle/CoreBundle/CoreShopCoreBundle.php

@@ -98,6 +98,9 @@ public static function registerDependentBundles(BundleCollection $collection): v
         $collection->addBundle(new CoreShopWishlistBundle(), 1500);
         $collection->addBundle(new CoreShopClassDefinitionPatchBundle(), 1400);
         $collection->addBundle(new PimcoreCustomReportsBundle(), 20000);
+        /**
+         * @psalm-suppress DeprecatedClass
+         */
         $collection->addBundle(new PimcoreNewsletterBundle(), 20000);
     }
 

src/CoreShop/Bundle/CoreBundle/DependencyInjection/CoreShopCoreExtension.php

@@ -68,6 +68,9 @@ public function load(array $configs, ContainerBuilder $container): void
         $container->setParameter('coreshop.all.dependant.bundles', []);
 
         $this->registerResources('coreshop', CoreShopResourceBundle::DRIVER_DOCTRINE_ORM, $configs['resources'], $container);
+        /**
+         * @psalm-suppress DeprecatedClass
+         */
         $this->registerDependantBundles('coreshop', [PimcoreSimpleBackendSearchBundle::class, PimcoreCustomReportsBundle::class], $container);
 
         if (array_key_exists('pimcore_admin', $configs)) {

src/CoreShop/Bundle/CoreBundle/EventListener/NotificationRules/CustomerListener.php

@@ -91,7 +91,7 @@ public function applyNewsletterConfirmRequestRule(RequestNewsletterConfirmationE
         $customer->setNewsletterToken(hash('md5', $customer->getId() . $customer->getEmail() . mt_rand() . time()));
 
         VersionHelper::useVersioning(
-            function () use ($customer) {
+            function () use ($customer): void {
                 $customer->save();
             },
             false,

src/CoreShop/Bundle/CoreBundle/EventListener/ProductAvailabilityEventListener.php

@@ -122,7 +122,7 @@ private function informCarts(array $cartItems): void
             $cartItem->delete();
 
             VersionHelper::useVersioning(
-                function () use ($cart) {
+                function () use ($cart): void {
                     $cart->setNeedsRecalculation(true);
                     $cart->save();
                 },