Merge branch '4.0' into 4.1

Author: dpfaffenbauer

CHANGELOG-3.2.x.md

@@ -1,3 +1,7 @@
+# 3.2.17
+* [FrontendBundle] add check if category type is grid or list (https://github.com/coreshop/CoreShop/commit/9d41877773419d05bb6149f5c02a1de6c4ff21d8)
+* [FrontendBundle] add check for currency in switch action (https://github.com/coreshop/CoreShop/commit/f4cbe978a906fa95c426cd7cb953e0434a178d63)
+
 # 3.2.16
 * [PimcoreBundle] fix MultiSelect (check for existing store) by @breakone in https://github.com/coreshop/CoreShop/pull/2754
 * [priceNull - 3.2] - add listener for null/empty price on field by @codingioanniskrikos in https://github.com/coreshop/CoreShop/pull/2757

CHANGELOG-4.0.x.md

@@ -1,3 +1,9 @@
+# 4.0.14
+* [CoreBundle] add payment-provider carrier condition by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2788
+* [Store] fix admin site request resolver by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2793
+* fix reserved key query by @solverat in https://github.com/coreshop/CoreShop/pull/2803
+* [FrontendBundle] fix priority for frontend controller registration by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2807 
+
 # 4.0.13
 * [Resource] fallback locale could be null for newly created entities by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2756
 * fix: CheckoutManager::getNextStep return type by @gander in https://github.com/coreshop/CoreShop/pull/2758

src/CoreShop/Bundle/FrontendBundle/CoreShopFrontendBundle.php

@@ -25,6 +25,7 @@
 use Pimcore\Extension\Bundle\AbstractPimcoreBundle;
 use Pimcore\HttpKernel\Bundle\DependentBundleInterface;
 use Pimcore\HttpKernel\BundleCollection\BundleCollection;
+use Symfony\Component\DependencyInjection\Compiler\PassConfig;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 final class CoreShopFrontendBundle extends AbstractPimcoreBundle implements DependentBundleInterface
@@ -38,7 +39,7 @@ public function build(ContainerBuilder $container): void
     {
         parent::build($container);
 
-        $container->addCompilerPass(new RegisterFrontendControllerPass());
+        $container->addCompilerPass(new RegisterFrontendControllerPass(), PassConfig::TYPE_BEFORE_OPTIMIZATION, 100);
         $container->addCompilerPass(new FrontendInstallerPass());
     }
 

src/CoreShop/Bundle/ProductBundle/Pimcore/Repository/CategoryRepository.php

@@ -39,7 +39,7 @@ public function findChildCategories(CategoryInterface $category): array
 
         if (method_exists($category, 'getChildrenSortBy')) {
             $list->setOrderKey(
-                sprintf('%s ASC', $category->getChildrenSortBy()),
+                sprintf('`%s` ASC', $category->getChildrenSortBy()),
                 false,
             );
         } else {