Merge pull request #2391 from dpfaffenbauer/release/4.0.0-beta.2

dpfaffenbauer · web-flow · commit 09bfffc8a172 · 2023-10-16T14:05:19.000+02:00
[Release] 4.0.0-beta.2
diff --git a/CHANGELOG-4.0.x.md b/CHANGELOG-4.0.x.md
@@ -1,3 +1,6 @@
+# 4.0.0-beta.2
+ - CoreShop 4.0.0 is the same as 3.2.0 will be, it contains all bug-fixes and feature from 3.1 and 3.2
+
 # 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.
diff --git a/src/CoreShop/Bundle/CoreBundle/Application/Version.php b/src/CoreShop/Bundle/CoreBundle/Application/Version.php
@@ -24,9 +24,9 @@ final class Version
 
     public const MINOR_VERSION = '0';
 
-    public const RELEASE_VERSION = '2';
+    public const RELEASE_VERSION = '0';
 
-    public const EXTRA_VERSION = 'beta.1';
+    public const EXTRA_VERSION = 'beta.2';
 
     public static function getVersion(): string
     {

Original file line number	Diff line number	Diff line change
`@@ -24,9 +24,9 @@ final class Version`
`24`	`24`
`25`	`25`	`public const MINOR_VERSION = '0';`
`26`	`26`
`27`		`- public const RELEASE_VERSION = '2';`
	`27`	`+ public const RELEASE_VERSION = '0';`
`28`	`28`
`29`		`- public const EXTRA_VERSION = 'beta.1';`
	`29`	`+ public const EXTRA_VERSION = 'beta.2';`
`30`	`30`
`31`	`31`	`public static function getVersion(): string`
`32`	`32`	`{`