Merge branch '4.0' into next

coreshop · Feb 18, 2024 · 93bba6e · 93bba6e
2 parents a541c84 + a469b89
commit 93bba6e
Show file tree

Hide file tree

Showing 17 changed files with 79 additions and 15 deletions.
diff --git a/.github/workflows/behat.yml b/.github/workflows/behat.yml
@@ -2,10 +2,22 @@ name: Behat
 on:
   push:
     branches: [ '4.0', 'next' ]
+    paths-ignore:
+      - 'docs/**'
+      - '.github/workflows/docs_next.yml'
+      - 'README.md'
   pull_request:
     branches: [ '4.0', 'next' ]
+    paths-ignore:
+      - 'docs/**'
+      - '.github/workflows/docs_next.yml'
+      - 'README.md'
   release:
     types: [ created ]
+    paths-ignore:
+      - 'docs/**'
+      - '.github/workflows/docs.yaml'
+      - 'README.md'
   schedule:
     - cron: "0 1 * * 1"
 

diff --git a/.github/workflows/behat_ui.yml b/.github/workflows/behat_ui.yml
@@ -2,8 +2,16 @@ name: Behat UI
 on:
   push:
     branches: [ '4.0', 'next' ]
+    paths-ignore:
+      - 'docs/**'
+      - '.github/workflows/docs_next.yml'
+      - 'README.md'
   pull_request:
     branches: [ '4.0', 'next' ]
+    paths-ignore:
+      - 'docs/**'
+      - '.github/workflows/docs_next.yml'
+      - 'README.md'
   release:
     types: [ created ]
   schedule:

diff --git a/.github/workflows/gitsplit.yml b/.github/workflows/gitsplit.yml
@@ -9,6 +9,10 @@ on:
             - 3.0
             - 3.1
             - 4.0
+        paths-ignore:
+            - 'docs/**'
+            - '.github/workflows/docs_next.yml'
+            - 'README.md'
     release:
         types: [ published ]
 

diff --git a/.github/workflows/packages_bundles.yml b/.github/workflows/packages_bundles.yml
@@ -2,8 +2,16 @@ name: Packages Bundles
 on:
   push:
     branches: [ '4.0', 'next' ]
+    paths-ignore:
+      - 'docs/**'
+      - '.github/workflows/docs_next.yml'
+      - 'README.md'
   pull_request:
     branches: [ '4.0', 'next' ]
+    paths-ignore:
+      - 'docs/**'
+      - '.github/workflows/docs_next.yml'
+      - 'README.md'
   release:
     types: [ created ]
   schedule:

diff --git a/.github/workflows/packages_components.yml b/.github/workflows/packages_components.yml
@@ -2,8 +2,16 @@ name: Packages Components
 on:
   push:
     branches: [ '4.0', 'next' ]
+    paths-ignore:
+      - 'docs/**'
+      - '.github/workflows/docs_next.yml'
+      - 'README.md'
   pull_request:
     branches: [ '4.0', 'next' ]
+    paths-ignore:
+      - 'docs/**'
+      - '.github/workflows/docs_next.yml'
+      - 'README.md'
   release:
     types: [ created ]
   schedule:

diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
@@ -2,8 +2,16 @@ name: Static Tests (Lint, Stan)
 on:
   push:
     branches: [ '4.0', 'next' ]
+    paths-ignore:
+      - 'docs/**'
+      - '.github/workflows/docs_next.yml'
+      - 'README.md'
   pull_request:
     branches: [ '4.0', 'next' ]
+    paths-ignore:
+      - 'docs/**'
+      - '.github/workflows/docs_next.yml'
+      - 'README.md'
   release:
     types: [ created ]
   schedule:

diff --git a/CHANGELOG-3.2.x.md b/CHANGELOG-3.2.x.md
@@ -1,3 +1,11 @@
+# 3.2.5
+* [Migration] [Migration] fix Staticroute Migration for Pimcore 10 by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2550
+
+# 3.2.4
+* [CoreBundle] fix priority of coreshop_payment_token route by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2542
+* [Frontend] create order-token if not yet exists by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2543
+* [ProductBundle] default return empty array instead of null in preGetData by @breakone in https://github.com/coreshop/CoreShop/pull/2544
+
 # 3.2.3
 * [ProductBundle] fix ClearCachedPriceRulesListener - remove service definition
 

diff --git a/CHANGELOG-4.0.x.md b/CHANGELOG-4.0.x.md
@@ -1,3 +1,8 @@
+# 4.0.3
+
+* [Core] Fixes in DataObject Extensions and Subscribed Services by @solverat in https://github.com/coreshop/CoreShop/pull/2528
+* [MessengerBundle] make FailedMessageDetails and MessageDetails JsonSerializable by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2530
+
 # 4.0.2
 
 * [DataHub] only enable queries for selected entities by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2512

diff --git a/README.md b/README.md
@@ -24,11 +24,11 @@ transcends ordinary transactions.
 
 # Installation
 
-Read our Documentation for the Installation Guide [here](https://docs.coreshop.org/4.0.0/CoreShop/Getting_Started/Installation)
+Read our Documentation for the Installation Guide [here](https://docs.coreshop.org/CoreShop/Getting_Started/Installation)
 
 # Demo
 
-Discover the full potential of CoreShop through our interactive demos. Read more about this [here](https://docs.coreshop.org/4.0.0/CoreShop/Getting_Started/Demo)
+Discover the full potential of CoreShop through our interactive demos. Read more about this [here](https://docs.coreshop.org/CoreShop/Getting_Started/Demo)
 
 ## Copyright and license
 

diff --git a/docs/03_Bundles/Resource_Bundle/01_Custom_Entities.md b/docs/03_Bundles/Resource_Bundle/01_Custom_Entities.md
@@ -6,10 +6,9 @@ First, create your Entity Class. In this case, we create a Translatable Entity.
 
 ### CustomEntityInterface
 
-Create CustomEntityInterface.php in the AppBundle/Model directory.
+Create `CustomEntityInterface.php` in the `AppBundle/Model` directory.
 
 ```php
-
 <?php
 
 interface CustomEntityInterface extends ResourceInterface, TranslatableInterface {
@@ -201,8 +200,9 @@ app_custom_entity:
     alias: app.custom_entity
 ```
 
-GET: /admin/app/custom_entity/list
-GET: /admin/app/custom_entity/get
-POST: /admin/app/custom_entity/add
-POST: /admin/app/custom_entity/save
-DELETE: /admin/app/custom_entity/delete
+It will define the following routes:
+- `GET`: `/admin/app/custom_entity/list`
+- `GET`: `/admin/app/custom_entity/get`
+- `POST`: `/admin/app/custom_entity/add`
+- `POST`: `/admin/app/custom_entity/save`
+- `DELETE`: `/admin/app/custom_entity/delete`
diff --git a/docs/03_Bundles/Resource_Bundle/index.md b/docs/03_Bundles/Resource_Bundle/index.md
@@ -1,4 +1,4 @@
-# Resource Bundle in CoreShop
+# Resource Bundle
 
 The Resource Bundle is a central component of CoreShop, handling the creation, reading, updating, and deleting (CRUD) of
 CoreShop models. It manages Doctrine ORM mappings, translations, routing, event dispatching, serialization, and CRUD

diff --git a/docs/03_Bundles/Sequence_Bundle.md b/docs/03_Bundles/Sequence_Bundle.md
@@ -1,4 +1,4 @@
-# Sequence Bundle in CoreShop
+# Sequence Bundle
 
 The Sequence Bundle is a vital component within CoreShop that facilitates sequence generation, integrating seamlessly
 with Symfony and Doctrine.

diff --git a/docs/03_Bundles/StorageList_Bundle.md b/docs/03_Bundles/StorageList_Bundle.md
@@ -1,4 +1,4 @@
-# Storage List Bundle in CoreShop
+# Storage List Bundle
 
 The Storage List Bundle assists in managing lists and collections of objects, such as carts, wishlists, or compare
 lists, in CoreShop.

diff --git a/docs/03_Bundles/Theme_Bundle.md b/docs/03_Bundles/Theme_Bundle.md
@@ -1,4 +1,4 @@
-# Theme Bundle in CoreShop
+# Theme Bundle
 
 The CoreShop Theme Bundle offers a flexible and extensible approach to managing multiple themes within a Pimcore
 installation.

diff --git a/docs/03_Bundles/Variant_Bundle.md b/docs/03_Bundles/Variant_Bundle.md
@@ -1,4 +1,4 @@
-# Variant Bundle in CoreShop
+# Variant Bundle
 
 The CoreShop Variant Bundle provides a robust framework for managing different variants of a product in your e-commerce
 application.

diff --git a/src/CoreShop/Bundle/CoreBundle/Application/Version.php b/src/CoreShop/Bundle/CoreBundle/Application/Version.php
@@ -24,7 +24,7 @@ final class Version
 
     public const MINOR_VERSION = '0';
 
-    public const RELEASE_VERSION = '2';
+    public const RELEASE_VERSION = '3';
 
     public const EXTRA_VERSION = '';
 

diff --git a/src/CoreShop/Bundle/CoreBundle/Security/AccessVoter.php b/src/CoreShop/Bundle/CoreBundle/Security/AccessVoter.php
@@ -28,6 +28,9 @@ public function __construct(
     ) {
     }
 
+    /**
+     * @phpstan-ignore-next-line
+     */
     protected function supports(string $attribute, $subject): bool
     {
         return str_starts_with($attribute, $this->prefix);