From a1166228643d42e7ba991ce08801582c9534f9f2 Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Fri, 20 Dec 2024 06:05:17 +0100 Subject: [PATCH] Bump version to v20.11.0 (#4425) * bump version * Typo fix --- app/Mage.php | 4 ++-- .../sql/tax_setup/upgrade-1.6.0.4-1.6.0.5.php | 3 ++- composer.json | 2 +- composer.lock | 16 ++++++++-------- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/app/Mage.php b/app/Mage.php index 7ec0c79cea8..d165e70f4cd 100644 --- a/app/Mage.php +++ b/app/Mage.php @@ -212,8 +212,8 @@ public static function getOpenMageVersionInfo(): array if (self::getOpenMageMajorVersion() === 20) { return [ 'major' => '20', - 'minor' => '10', - 'patch' => '2', + 'minor' => '11', + 'patch' => '0', 'stability' => '', // beta,alpha,rc 'number' => '', // 1,2,3,0.3.7,x.7.z.92 @see https://semver.org/#spec-item-9 ]; diff --git a/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.4-1.6.0.5.php b/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.4-1.6.0.5.php index 72e4c3e3906..804fcc4404c 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.4-1.6.0.5.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.4-1.6.0.5.php @@ -1,4 +1,5 @@ endSetup(); diff --git a/composer.json b/composer.json index 6dcf80d8278..e900f684dfb 100644 --- a/composer.json +++ b/composer.json @@ -30,7 +30,7 @@ "ezyang/htmlpurifier": "^4.17", "magento-hackathon/magento-composer-installer": "^3.1 || ^2.1 || ^4.0", "mklkj/tinymce-i18n": "^24.11", - "openmage/composer-plugin": "^1.1.0", + "openmage/composer-plugin": "^1.1.1", "pelago/emogrifier": "^7.0", "phpseclib/mcrypt_compat": "^2.0.3", "phpseclib/phpseclib": "^3.0.14", diff --git a/composer.lock b/composer.lock index 459261386af..2d5867d6a6a 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "44734bd293947e65642df49415578991", + "content-hash": "726cec3c24c9211dd8f0eeeed8901420", "packages": [ { "name": "colinmollenhour/cache-backend-redis", @@ -603,16 +603,16 @@ }, { "name": "openmage/composer-plugin", - "version": "v1.1.0", + "version": "v1.1.1", "source": { "type": "git", "url": "https://github.com/OpenMage/composer-plugin.git", - "reference": "43369ebbfea5cd6dd07fcaf2d20bcbd4153c7f7c" + "reference": "edb40181d4351b46faa642479cab6a193a0f9977" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/OpenMage/composer-plugin/zipball/43369ebbfea5cd6dd07fcaf2d20bcbd4153c7f7c", - "reference": "43369ebbfea5cd6dd07fcaf2d20bcbd4153c7f7c", + "url": "https://api.github.com/repos/OpenMage/composer-plugin/zipball/edb40181d4351b46faa642479cab6a193a0f9977", + "reference": "edb40181d4351b46faa642479cab6a193a0f9977", "shasum": "" }, "require": { @@ -651,9 +651,9 @@ ], "support": { "issues": "https://github.com/OpenMage/composer-plugin/issues", - "source": "https://github.com/OpenMage/composer-plugin/tree/v1.1.0" + "source": "https://github.com/OpenMage/composer-plugin/tree/v1.1.1" }, - "time": "2024-12-08T23:05:54+00:00" + "time": "2024-12-20T03:09:59+00:00" }, { "name": "paragonie/constant_time_encoding", @@ -7489,7 +7489,7 @@ ], "aliases": [], "minimum-stability": "dev", - "stability-flags": [], + "stability-flags": {}, "prefer-stable": true, "prefer-lowest": false, "platform": {