Merge branch '4.1' into next

coreshop · Jan 20, 2025 · f879126 · f879126
2 parents 09cca3f + 28c75de
commit f879126
Show file tree

Hide file tree

Showing 194 changed files with 2,332 additions and 1,434 deletions.
diff --git a/CHANGELOG-3.2.x.md b/CHANGELOG-3.2.x.md
@@ -1,3 +1,11 @@
+# 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
+* [ResourceBundle] Version Marshalling for FieldCollections by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2768
+
+# 3.2.15
+* [PayumBundle] remove payment_state processing to confirm orders by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2743
+
 # 3.2.14
 * [Pimcore] introduce LocalizedFallbackHelper by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2723
 * [Translations] add missing translations by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2721

diff --git a/CHANGELOG-4.0.x.md b/CHANGELOG-4.0.x.md
@@ -1,3 +1,25 @@
+# 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
+* Added action price casting to int by @twin-elements in https://github.com/coreshop/CoreShop/pull/2760
+* [ResourceBundle/OrderBundle] fix order grid-configs and add a new CoreShop Resource Field Getter Operator by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2762
+* [Store] optimize Store Context resolving with fallback and admin/non-admin by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2766
+* [Store] optimize Store Context resolving with fallback and admin/non-admin also for area bricks by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2769
+* [CoreBundle] allow to pass site to link generation by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2772
+
+# 4.0.12
+
+* [PayumBundle] remove payment_state processing to confirm orders by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2743
+* [Docs] Upgrade guide: Mention emergency recovery if major version got updated without updating to latest minor version first by @BlackbitDevs in https://github.com/coreshop/CoreShop/pull/2745
+* [Core] allow multiple store-values by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2747
+* [CoreBundle] fix quantity price rules customerGroups condition by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2750
+
+## 4.0.11
+
+* [Pimcore] use getCount() instead of getTotalCount() for BatchListing by @hethehe in https://github.com/coreshop/CoreShop/pull/2715
+* [Store] fix cached store context by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2727
+* [Twig] twig >= 3.14 is compatible again by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2719
+
 ## 4.0.10
 
 * [PimcoreBundle] respect user language for grid filter labels (#2694) by @benwalch in https://github.com/coreshop/CoreShop/pull/2695

diff --git a/CHANGELOG-4.1.x.md b/CHANGELOG-4.1.x.md
@@ -1,3 +1,18 @@
+## 4.1.0
+* [Registry] require registry 4.1 in all bundles by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2748
+* Update CartController - remove Argument Injection by @steinerCors in https://github.com/coreshop/CoreShop/pull/2741
+* [Frontend] introduce template installer and better define best-practice by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2739
+
+## 4.1.0-RC2
+
+> **Important** The FrontendBundle is now disabled by default. We added a migration to enable it
+> Please check if it actually is enabled in the bundles.php file
+> If you don't need it, feel free to disable it.
+* [ResourceBundle] check also for empty "pimcore_class_name" by @breakone in https://github.com/coreshop/CoreShop/pull/2716
+* [CoreBundle] implement name functions and add migration for order-name and wishlist-name by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2717
+* [Pimcore] introduce the Printable by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2720
+* [Printable] further improvements to new printable feature by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2724
+
 ## 4.1.0-RC1 
 
 > **Important**: Dependency to dachcom-digital/emailizr has been removed due to licensing issues with GPL and CCL. If

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe
 
 ## Enforcement
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at info@coreshop.org. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at info@coreshop.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
 
 Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -6,7 +6,7 @@ We use GitHub issues exclusively to track all bugs and features.
 
 * [Open an issue](https://github.com/coreshop/CoreShop/issues) here on GitHub. 
 If you can, **please provide a fix and create a pull request (PR) instead**; this will automatically create an issue for you.
-* Report security issues only to info@coreshop.org 
+* Report security issues only to info@coreshop.com 
 * Please be patient as not all items will be tested immediately - remember, CoreShop is open source and free of charge. 
 * Occasionally we'll close issues if they appear stale or are too vague - please don't take this personally! 
 Please feel free to re-open issues we've closed if there's something we've missed and they still need to be addressed.

diff --git a/LICENSE.md b/LICENSE.md
@@ -27,7 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 Alternatively, commercial and supported versions of the program - also known as
 Commercial Distributions - must be used in accordance with the terms and conditions
 contained in a separate written agreement between you and CoreShop GmbH.
-For more information about the CoreShop Commercial License (CCL) please contact info@coreshop.org.
+For more information about the CoreShop Commercial License (CCL) please contact info@coreshop.com.
 
 
 Please see also (files in this directory):  

diff --git a/README.md b/README.md
@@ -6,16 +6,16 @@
 [![Software License](https://img.shields.io/badge/license-GPLv3-brightgreen.svg?style=flat)](LICENSE.md)
 [![Latest Pre-Release](https://img.shields.io/packagist/vpre/coreshop/core-shop.svg)](https://www.packagist.org/packages/coreshop/core-shop)
 
-[![CoreShop](etc/illustration.png 'CoreShop')](https://www.coreshop.org)
+[![CoreShop](etc/illustration.png 'CoreShop')](https://www.coreshop.com)
 
 CoreShop harnesses Pimcore's advanced features for unmatched efficiency and customization in your online store. Dive
 into a seamless blend of cutting-edge technology and user-friendly interfaces, crafting an eCommerce experience that
 transcends ordinary transactions.
 
 # Further Information
 
-- [Website](https://www.coreshop.org)
-- [Documentation](https://docs.coreshop.org/latest)
+- [Website](https://www.coreshop.com)
+- [Documentation](https://docs.coreshop.com/latest)
 - [Pimcore Github](https://github.com/pimcore/pimcore)
 
 # Requirements
@@ -24,13 +24,13 @@ transcends ordinary transactions.
 
 # Installation
 
-Read our Documentation for the Installation Guide [here](https://docs.coreshop.org/CoreShop/Getting_Started/Installation)
+Read our Documentation for the Installation Guide [here](https://docs.coreshop.com/CoreShop/Getting_Started/Installation)
 
 # Demo
 
-Discover the full potential of CoreShop through our interactive demos. Read more about this [here](https://docs.coreshop.org/CoreShop/Getting_Started/Demo)
+Discover the full potential of CoreShop through our interactive demos. Read more about this [here](https://docs.coreshop.com/CoreShop/Getting_Started/Demo)
 
 ## Copyright and license
 
-Copyright: [CoreShop GmbH](https://www.coreshop.org)
+Copyright: [CoreShop GmbH](https://www.coreshop.com)
 For licensing details please visit [LICENSE.md](LICENSE.md)
diff --git a/composer.json b/composer.json
@@ -14,8 +14,8 @@
   "authors": [
     {
       "name": "CoreShop Team",
-      "email": "info@coreshop.org",
-      "homepage": "https://www.coreshop.org/",
+      "email": "info@coreshop.com",
+      "homepage": "https://www.coreshop.com/",
       "role": "Developer"
     },
     {

diff --git a/docs/01_Getting_Started/00_Installation.md b/docs/01_Getting_Started/00_Installation.md
@@ -13,6 +13,7 @@ CoreShop:
     return [
        ...
         CoreShop\Bundle\CoreBundle\CoreShopCoreBundle::class => ['all' => true],
+        CoreShop\Bundle\FrontendBundle\CoreShopFrontendBundle::class => ['all' => true],
     ];
     ```
 3. To configure the CoreShop Password Hasher, create or update the `config/packages/pimcore.yaml` and add:

diff --git a/docs/01_Getting_Started/02_Upgrade_Guide.md b/docs/01_Getting_Started/02_Upgrade_Guide.md
@@ -0,0 +1,18 @@
+# Upgrade Guide
+
+Please check the [Upgrade_Notes](02_Upgrade_Notes.md) Guide for changes and for potential breaking changes.
+
+We follow similar approach to updates as Pimcore does. So always update to the latest Minor release version first before 
+updating to the next Major release version. This means that if you are on 3.2.1 and want to update to 4.0, you should update
+to the latest 3.2.x release first and then update to 4.0 or 4.1.
+
+## Migration Files
+To keep things tidy, we remove migration between major versions. This means that if you are on 3.2.1 and you update to 4.0
+directly, you might miss migrations. Always update to the latest Minor release version first before updating to the next Major!
+
+This also means that if you do major updates, you will have old migrations in your Database. You can manually remove those
+if you want to keep your Migrations Table clean.
+
+If you already updated the major version and recognize that some migrations from your previous version to latest minor release version are missing, you can compare the database structure via
+`bin/console doctrine:schema:update --dump-sql`
+Please manually review the SQL statements before executing
diff --git a/docs/01_Getting_Started/index.md b/docs/01_Getting_Started/index.md
@@ -5,5 +5,6 @@ This section provides a quick tutorial to get started with CoreShop. It covers t
 1. **Installation of Pimcore**: [Installation Guide](./00_Installation.md)
 2. **Architecture Overview**: [Architecture Overview](./01_Architecture_Overview.md)
 3. **Upgrade Notes**: [Upgrade Notes](./02_Upgrade_Notes.md)
-4. **UI Documentation**: [User Interface Documentation](../02_User_Documentation/index.md)
-5. **Developer Documentation**: [Developer Documentation](../03_Development/index.md)
+4. **Upgrade Guide**: [Upgrade Guide](02_Upgrade_Guide.md)
+5. **UI Documentation**: [User Interface Documentation](../02_User_Documentation/index.md)
+6. **Developer Documentation**: [Developer Documentation](../03_Development/index.md)
diff --git a/docs/03_Development/15_Frontend_Bundle/02_Best_Practices.md b/docs/03_Development/15_Frontend_Bundle/02_Best_Practices.md
@@ -0,0 +1,35 @@
+# Best Practices for Frontend in CoreShop
+
+We learned a lot over the years and want to share our best practices with you. This guide will help you to get the most 
+out of CoreShop and to avoid common pitfalls.
+
+## Server Side Rendering
+If you do PHP Server Side Rendering with Twig, you should enable the Frontend Bundle in bundles.php:
+
+```php
+// config/bundles.php
+return [
+    // ...
+    CoreShop\Bundle\FrontendBundle\CoreShopFrontendBundle::class => ['all' => true],
+];
+```
+
+### Templates
+Symfony allows to override Bundle templates by placing them in the `templates` directory. This is something we don't recommend!
+We, at CoreShop, sometimes change Templates, add templates, or rename them. Sometimes on accident, sometimes on purpose.
+
+To not run into any issues with CoreShop Demo Files to be loaded, we recommend to copy the Templates from the Demo Frontend.
+There is also a new command for that:
+
+```bash
+php bin/console coreshop:frontend:install
+```
+
+This will copy all the templates from CoreShop into `coreshop` and it also replaces all the Bundle Prefixes. That way, you
+can be sure that you are using the correct templates.
+
+This command also creates a configuration to change the `TemplateConfigurator` to use your app template paths and not the
+FrontendBundle paths.
+
+## Headless
+If you are going headless, you can simply not enable the Frontend Bundle and do whatever need for your Headless API.
diff --git a/docs/03_Development/15_Frontend_Bundle/index.md b/docs/03_Development/15_Frontend_Bundle/index.md
@@ -20,42 +20,4 @@ is meant as a Demo and not as a production-ready store.
 
 ## Best Practice
 
-Best practice is not to use any Templates from the Demo Frontend, but to create your own Templates and use the
-Controllers from the Demo Frontend.
-
-## Copy Templates
-
-To copy the Templates from the Demo Frontend, you can use the following command:
-
-```bash
-cp -R vendor/coreshop/core-shop/src/CoreShop/Bundle/FrontendBundle/Resources/views templates/coreshop
-```
-
-Overwrite the `TemplateConfiguratorInterface` by creating a new Service and decorate the original one:
-
-```php
-<?php
-// src/CoreShop/TemplateConfigurator/TemplateConfigurator.php
-declare(strict_types=1);
-
-namespace App\CoreShop\TemplateConfigurator;
-
-use CoreShop\Bundle\FrontendBundle\TemplateConfigurator\TemplateConfiguratorInterface;
-
-class TemplateConfigurator implements TemplateConfiguratorInterface
-{
-    public function findTemplate(string $templateName): string
-    {
-        return sprintf('coreshop/%s.twig', $templateName);
-    }
-}
-```
-
-And configure the new Service:
-
-```yaml
-# config/services.yaml
-services:
-  App\CoreShop\TemplateConfigurator\TemplateConfigurator:
-    decorates: 'CoreShop\Bundle\FrontendBundle\TemplateConfigurator\TemplateConfigurator'
-```
+We have a separate Guide how we recommend you use the Frontend Bundle: [Best Practices](02_Best_Practices.md)
diff --git a/src/AppKernel.php b/src/AppKernel.php
@@ -26,6 +26,7 @@ class Kernel extends PimcoreKernel
     public function registerBundlesToCollection(BundleCollection $collection): void
     {
         $collection->addBundle(new \CoreShop\Bundle\CoreBundle\CoreShopCoreBundle(), 1000);
+        $collection->addBundle(new \CoreShop\Bundle\FrontendBundle\CoreShopFrontendBundle(), 1800);
         $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
@@ -23,6 +23,7 @@ class BehatKernel extends PimcoreKernel
     public function registerBundlesToCollection(\Pimcore\HttpKernel\BundleCollection\BundleCollection $collection): void
     {
         $collection->addBundle(new \CoreShop\Bundle\CoreBundle\CoreShopCoreBundle(), 1000);
+        $collection->addBundle(new \CoreShop\Bundle\FrontendBundle\CoreShopFrontendBundle(), 1800);
         $collection->addBundle(new \FriendsOfBehat\SymfonyExtension\Bundle\FriendsOfBehatSymfonyExtensionBundle());
         $collection->addBundle(new \CoreShop\Bundle\TestBundle\CoreShopTestBundle(), 0);
     }

diff --git a/src/CoreShop/Bundle/AddressBundle/LICENSE.md b/src/CoreShop/Bundle/AddressBundle/LICENSE.md
@@ -27,7 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 Alternatively, commercial and supported versions of the program - also known as
 Commercial Distributions - must be used in accordance with the terms and conditions
 contained in a separate written agreement between you and CoreShop GmbH.
-For more information about the CoreShop Commercial License (CCL) please contact info@coreshop.org.
+For more information about the CoreShop Commercial License (CCL) please contact info@coreshop.com.
 
 
 Please see also (files in this directory):  

diff --git a/src/CoreShop/Bundle/AddressBundle/composer.json b/src/CoreShop/Bundle/AddressBundle/composer.json
@@ -12,8 +12,8 @@
   "authors": [
     {
       "name": "CoreShop Team",
-      "email": "info@coreshop.org",
-      "homepage": "https://www.coreshop.org/",
+      "email": "info@coreshop.com",
+      "homepage": "https://www.coreshop.com/",
       "role": "Developer"
     },
     {
@@ -48,7 +48,7 @@
   "prefer-stable": true,
   "extra": {
     "branch-alias": {
-      "dev-master": "4.0-dev"
+      "dev-master": "4.1-dev"
     }
   },
   "config": {

diff --git a/src/CoreShop/Bundle/ClassDefinitionPatchBundle/LICENSE.md b/src/CoreShop/Bundle/ClassDefinitionPatchBundle/LICENSE.md
@@ -27,7 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 Alternatively, commercial and supported versions of the program - also known as
 Commercial Distributions - must be used in accordance with the terms and conditions
 contained in a separate written agreement between you and CoreShop GmbH.
-For more information about the CoreShop Commercial License (CCL) please contact info@coreshop.org.
+For more information about the CoreShop Commercial License (CCL) please contact info@coreshop.com.
 
 
 Please see also (files in this directory):  

diff --git a/src/CoreShop/Bundle/ClassDefinitionPatchBundle/composer.json b/src/CoreShop/Bundle/ClassDefinitionPatchBundle/composer.json
@@ -12,8 +12,8 @@
   "authors": [
     {
       "name": "CoreShop Team",
-      "email": "info@coreshop.org",
-      "homepage": "https://www.coreshop.org/",
+      "email": "info@coreshop.com",
+      "homepage": "https://www.coreshop.com/",
       "role": "Developer"
     },
     {
@@ -48,7 +48,7 @@
   "prefer-stable": true,
   "extra": {
     "branch-alias": {
-      "dev-master": "4.0-dev"
+      "dev-master": "4.1-dev"
     }
   },
   "config": {

diff --git a/src/CoreShop/Bundle/ConfigurationBundle/LICENSE.md b/src/CoreShop/Bundle/ConfigurationBundle/LICENSE.md
@@ -27,7 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 Alternatively, commercial and supported versions of the program - also known as
 Commercial Distributions - must be used in accordance with the terms and conditions
 contained in a separate written agreement between you and CoreShop GmbH.
-For more information about the CoreShop Commercial License (CCL) please contact info@coreshop.org.
+For more information about the CoreShop Commercial License (CCL) please contact info@coreshop.com.
 
 
 Please see also (files in this directory):  

diff --git a/src/CoreShop/Bundle/ConfigurationBundle/composer.json b/src/CoreShop/Bundle/ConfigurationBundle/composer.json
@@ -12,8 +12,8 @@
   "authors": [
     {
       "name": "CoreShop Team",
-      "email": "info@coreshop.org",
-      "homepage": "https://www.coreshop.org/",
+      "email": "info@coreshop.com",
+      "homepage": "https://www.coreshop.com/",
       "role": "Developer"
     },
     {
@@ -48,7 +48,7 @@
   "prefer-stable": true,
   "extra": {
     "branch-alias": {
-      "dev-master": "4.0-dev"
+      "dev-master": "4.1-dev"
     }
   },
   "config": {

diff --git a/src/CoreShop/Bundle/CoreBundle/Application/Version.php b/src/CoreShop/Bundle/CoreBundle/Application/Version.php
@@ -26,7 +26,7 @@ final class Version
 
     public const RELEASE_VERSION = '0';
 
-    public const EXTRA_VERSION = 'RC1';
+    public const EXTRA_VERSION = '';
 
     public static function getVersion(): string
     {