Merge pull request #2356 from dpfaffenbauer/release/4.0.0-beta.1

[Release] 4.0.0-beta.1

Author: dpfaffenbauer

.github/workflows/behat.yml

@@ -1,9 +1,9 @@
 name: Behat
 on:
   push:
-    branches: [ '3.0', '3.1', 'next' ]
+    branches: [ '4.0' ]
   pull_request:
-    branches: [ '3.0', '3.1', 'next' ]
+    branches: [ '4.0' ]
   release:
     types: [ created ]
   schedule:

.github/workflows/behat_ui.yml

@@ -1,9 +1,9 @@
 name: Behat UI
 on:
   push:
-    branches: [ '3.0', '3.1', 'next' ]
+    branches: [ '4.0' ]
   pull_request:
-    branches: [ '3.0', '3.1', 'next' ]
+    branches: [ '4.0' ]
   release:
     types: [ created ]
   schedule:

.github/workflows/codestyles.yml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branch: [ '3.0', '3.1', 'next' ]
+        branch: [ '4.0' ]
 
     steps:
       - uses: actions/checkout@v3

.github/workflows/docs.yml

@@ -1,7 +1,7 @@
 name: Docs
 on:
   push:
-    branches: [ 'next' ]
+    branches: [ '4.0' ]
     paths:
       - 'docs/**'
 
@@ -30,8 +30,8 @@ jobs:
 
     - name: Upload Folder
       uses: 'google-github-actions/upload-cloud-storage@v0'
-      if: github.ref == 'refs/heads/next'
+      if: github.ref == 'refs/heads/4.0'
       with:
         path: 'docs/build/'
-        destination: 'cors-wolke-coreshop-docs/next'
+        destination: 'cors-wolke-coreshop-docs/4.0.0'
         parent: false

.github/workflows/docs_next.yml

@@ -8,6 +8,7 @@ on:
             - 2.2
             - 3.0
             - 3.1
+            - 4.0
     release:
         types: [ published ]
 

.github/workflows/gitsplit.yml

@@ -1,9 +1,9 @@
 name: Packages Bundles
 on:
   push:
-    branches: [ '3.0', '3.1', 'next' ]
+    branches: [ '4.0' ]
   pull_request:
-    branches: [ '3.0', '3.1', 'next' ]
+    branches: [ '4.0' ]
   release:
     types: [ created ]
   schedule:

.github/workflows/packages_bundles.yml

@@ -1,9 +1,9 @@
 name: Packages Components
 on:
   push:
-    branches: [ '2.2', '3.0', '3.1', 'next' ]
+    branches: [ '4.0' ]
   pull_request:
-    branches: [ '2.2', '3.0', '3.1', 'next' ]
+    branches: [ '4.0' ]
   release:
     types: [ created ]
   schedule:

.github/workflows/packages_components.yml

@@ -1,9 +1,9 @@
 name: Static Tests (Lint, Stan)
 on:
   push:
-    branches: [ '2.2', '3.0', '3.1', 'next' ]
+    branches: [ '4.0' ]
   pull_request:
-    branches: [ '2.2', '3.0', '3.1', 'next' ]
+    branches: [ '4.0' ]
   release:
     types: [ created ]
   schedule:

.github/workflows/static.yml

@@ -0,0 +1,5 @@
+# 4.0.0-beta.1
+
+> CoreShop 4.0.0 is the same as 3.1.0, but with Pimcore 11 compatibility. Updating CoreShop therefore is quite easy. Since Symfony now doesn't have a full container anymore, we use Service Containers now for our Controllers. So your overwritten Controllers probably need changes.
+
+ - Pimcore 11 Compatibility (https://github.com/coreshop/CoreShop/pull/2252, https://github.com/coreshop/CoreShop/pull/2340, https://github.com/coreshop/CoreShop/pull/2345, https://github.com/coreshop/CoreShop/pull/2352, https://github.com/coreshop/CoreShop/pull/2321, https://github.com/coreshop/CoreShop/pull/2347)

CHANGELOG-4.0.x.md

@@ -2,6 +2,12 @@
 
 Always check this page for some important upgrade notes before updating to the latest coreshop build.
 
+# 4.0.0-beta.1
+
+> CoreShop 4.0.0 is the same as 3.1.0, but with Pimcore 11 compatibility. Updating CoreShop therefore is quite easy. Since Symfony now doesn't have a full container anymore, we use Service Containers now for our Controllers. So your overwritten Controllers probably need changes.
+
+- Pimcore 11 Compatibility (https://github.com/coreshop/CoreShop/pull/2252, https://github.com/coreshop/CoreShop/pull/2340, https://github.com/coreshop/CoreShop/pull/2345, https://github.com/coreshop/CoreShop/pull/2352, https://github.com/coreshop/CoreShop/pull/2321, https://github.com/coreshop/CoreShop/pull/2347)
+
 ## Pimcore 10.6
 If you update to Pimcore 10.6 and you get following error: ```"You have requested a non-existent parameter "coreshop.model.user.class"``` then check if you have this config in your `security.yaml`:
 

docs/docs/01_Getting_Started/02_Upgrade_Notes.md

@@ -20,18 +20,19 @@
 
 final class Version
 {
-    public const MAJOR_VERSION = '3';
+    public const MAJOR_VERSION = '4';
 
-    public const MINOR_VERSION = '1';
+    public const MINOR_VERSION = '0';
 
     public const RELEASE_VERSION = '0';
 
-    public const EXTRA_VERSION = '';
+    public const EXTRA_VERSION = 'beta.1';
 
     public static function getVersion(): string
     {
         $version = sprintf('%s.%s.%s', self::MAJOR_VERSION, self::MINOR_VERSION, self::RELEASE_VERSION);
 
+        /** @psalm-suppress RedundantCondition */
         if (self::EXTRA_VERSION !== '') {
             $version = sprintf('%s-%s', $version, self::EXTRA_VERSION);
         }