Merge pull request #2070 from dpfaffenbauer/release/3.0.0

[Release] 3.0.0
coreshop · Sep 14, 2022 · 0ee44a6 · 0ee44a6
2 parents 3302887 + 06d049d
commit 0ee44a6
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 8 deletions.
diff --git a/CHANGELOG-3.0.x.md b/CHANGELOG-3.0.x.md
@@ -1,3 +1,23 @@
+# 3.0.0
+
+CoreShop is now Licenced under CCL and GPLv3! (https://github.com/coreshop/CoreShop/pull/2061)
+
+## Feature
+ - [IndexBundle] clone index, change default name of cloned item (https://github.com/coreshop/CoreShop/pull/2056)
+ - [CartPriceRules] introduce feature to allow cart-price rules based on cart-items (https://github.com/coreshop/CoreShop/pull/2057, https://github.com/coreshop/CoreShop/pull/2060)
+ - [Wishlist] Introduce a persisted wishlist - StorageListBundle now works as a base for Order and Wishlist (https://github.com/coreshop/CoreShop/pull/2030, https://github.com/coreshop/CoreShop/pull/2066)
+ - [Reports] Support filtering for order type (https://github.com/coreshop/CoreShop/pull/2055)
+ - [Symfony] fix Injecting @session is deprecated with Symfony (https://github.com/coreshop/CoreShop/pull/2035)
+ - [AccessManagement] prepare CoreShop for advanced access-management (https://github.com/coreshop/CoreShop/pull/2063)
+ - [Pimcore] 10.5 as min requirement (https://github.com/coreshop/CoreShop/pull/2067)
+
+## Bugs
+ - [VariantBundle] Serializer: Allow $innerObject to be null (https://github.com/coreshop/CoreShop/pull/2058, https://github.com/coreshop/CoreShop/pull/2069)
+ - [DataHub] Fix non unique typename (https://github.com/coreshop/CoreShop/pull/2004)
+ - [Translations] Update admin-translations.yml (https://github.com/coreshop/CoreShop/pull/2064)
+ - [Pimcore UI] Make default Product Unit unselectable (https://github.com/coreshop/CoreShop/pull/2065)
+ - [Variant] allow recursive attributes and variants (https://github.com/coreshop/CoreShop/pull/2068)
+
 # 3.0.0-beta.5
  > This will be the last BETA for the final release.
 

diff --git a/src/CoreShop/Bundle/CoreBundle/Application/Version.php b/src/CoreShop/Bundle/CoreBundle/Application/Version.php
@@ -26,16 +26,16 @@ final class Version
 
     public const RELEASE_VERSION = '0';
 
-    public const EXTRA_VERSION = 'beta.5';
+    public const EXTRA_VERSION = '';
 
     public static function getVersion(): string
     {
-        return sprintf(
-            '%s.%s.%s-%s',
-            self::MAJOR_VERSION,
-            self::MINOR_VERSION,
-            self::RELEASE_VERSION,
-            self::EXTRA_VERSION,
-        );
+        $version = sprintf('%s.%s.%s', self::MAJOR_VERSION, self::MINOR_VERSION, self::RELEASE_VERSION);
+
+        if (self::EXTRA_VERSION !== '') {
+            $version = sprintf('%s-%s', $version, self::EXTRA_VERSION);
+        }
+
+        return $version;
     }
 }