From 20d748e841dba5f55c4f3cd5d61be2ffbe470be9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Fri, 10 Feb 2023 16:47:15 -0300 Subject: [PATCH] Prepare for version 6.0.0-dev MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- ChangeLog | 2 +- README | 2 +- composer.json | 2 +- doc/conf.py | 2 +- libraries/classes/Version.php | 10 +++++----- package.json | 2 +- scripts/create-release.sh | 4 ++-- test/classes/ThemeTest.php | 2 +- test/classes/_data/gen_version_info/theme.json | 4 ++-- themes/bootstrap/theme.json | 4 ++-- themes/metro/theme.json | 4 ++-- themes/original/theme.json | 4 ++-- themes/pmahomme/theme.json | 4 ++-- 13 files changed, 23 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index eff0b13e05..dbd0982708 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ phpMyAdmin - ChangeLog ====================== -5.3.0 (not yet released) +6.0.0 (not yet released) - issue #17842 Change js.cookie.js to js.cookie.min.js - issue #17632 Improve tab keypress to text fields on the login form diff --git a/README b/README index 850a1e8ded..4b10264134 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 5.3.0-dev +Version 6.0.0-dev A web interface for MySQL and MariaDB. diff --git a/composer.json b/composer.json index dfb4454547..81ddb34dcc 100644 --- a/composer.json +++ b/composer.json @@ -117,7 +117,7 @@ }, "extra": { "branch-alias": { - "dev-master": "5.3.x-dev" + "dev-master": "6.0.x-dev" } }, "scripts": { diff --git a/doc/conf.py b/doc/conf.py index 2319a0c523..3ca2fd4a6b 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -51,7 +51,7 @@ copyright = u'2012 - 2021, The phpMyAdmin devel team' # built documents. # # The short X.Y version. -version = '5.3.0-dev' +version = '6.0.0-dev' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/classes/Version.php b/libraries/classes/Version.php index 24a8ae8406..e6ba39ac06 100644 --- a/libraries/classes/Version.php +++ b/libraries/classes/Version.php @@ -14,12 +14,12 @@ use const VERSION_SUFFIX; final class Version { // The VERSION_SUFFIX constant is defined at libraries/constants.php - public const VERSION = '5.3.0-dev' . VERSION_SUFFIX; - public const SERIES = '5.3'; - public const MAJOR = 5; - public const MINOR = 3; + public const VERSION = '6.0.0-dev' . VERSION_SUFFIX; + public const SERIES = '6.0'; + public const MAJOR = 6; + public const MINOR = 0; public const PATCH = 0; - public const ID = 50300; + public const ID = 60000; public const PRE_RELEASE_NAME = 'dev'; public const IS_DEV = true; } diff --git a/package.json b/package.json index 2afb008c2f..927060fb89 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "phpmyadmin", - "version": "5.3.0-dev", + "version": "6.0.0-dev", "description": "A web interface for MySQL and MariaDB", "repository": "https://github.com/phpmyadmin/phpmyadmin.git", "author": "The phpMyAdmin Team (https://www.phpmyadmin.net/team/)", diff --git a/scripts/create-release.sh b/scripts/create-release.sh index 9f100b75f4..0435545eff 100755 --- a/scripts/create-release.sh +++ b/scripts/create-release.sh @@ -20,7 +20,7 @@ set -e KITS="all-languages english source" COMPRESSIONS="zip-7z txz tgz" # The version series this script is allowed to handle -VERSION_SERIES="5.3" +VERSION_SERIES="6.0" # Process parameters @@ -473,7 +473,7 @@ if [ -f ./scripts/console ]; then ./scripts/console cache:warmup --routing fi -PHP_REQ=$(sed -n '/"php"/ s/.*"\^\([0-9]\.[0-9]\.[0-9]\).*/\1/p' composer.json) +PHP_REQ=$(sed -n '/"php"/ s/.*"\^\([0-9]\.[0-9]\.[0-9]\|[0-9]\.[0-9]\).*/\1/p' composer.json) if [ -z "$PHP_REQ" ] ; then echo "Failed to figure out required PHP version from composer.json" diff --git a/test/classes/ThemeTest.php b/test/classes/ThemeTest.php index 35c8491811..aacd252a95 100644 --- a/test/classes/ThemeTest.php +++ b/test/classes/ThemeTest.php @@ -80,7 +80,7 @@ class ThemeTest extends AbstractTestCase $this->object->setFsPath(TEST_PATH . 'test/classes/_data/gen_version_info/'); $this->assertTrue($this->object->loadInfo()); $this->assertEquals('Test Theme', $this->object->getName()); - $this->assertEquals('5.3', $this->object->getVersion()); + $this->assertEquals('6.0', $this->object->getVersion()); } /** diff --git a/test/classes/_data/gen_version_info/theme.json b/test/classes/_data/gen_version_info/theme.json index 90e76b7828..83e2a8de8a 100644 --- a/test/classes/_data/gen_version_info/theme.json +++ b/test/classes/_data/gen_version_info/theme.json @@ -1,7 +1,7 @@ { "name": "Test Theme", - "version": "5.3", + "version": "6.0", "author": "phpMyAdmin developers", "url": "https://www.phpmyadmin.net/", - "supports": ["5.2", "5.3"] + "supports": ["6.0"] } diff --git a/themes/bootstrap/theme.json b/themes/bootstrap/theme.json index 8ab3593e72..f21ae1caa5 100644 --- a/themes/bootstrap/theme.json +++ b/themes/bootstrap/theme.json @@ -1,8 +1,8 @@ { "name": "Bootstrap", - "version": "5.3", + "version": "6.0", "description": "Bootstrap theme for phpMyAdmin", "author": "phpMyAdmin developers", "url": "https://www.phpmyadmin.net/", - "supports": ["5.3"] + "supports": ["6.0"] } diff --git a/themes/metro/theme.json b/themes/metro/theme.json index 0092229145..e687403c04 100644 --- a/themes/metro/theme.json +++ b/themes/metro/theme.json @@ -1,8 +1,8 @@ { "name": "Metro", - "version": "5.3", + "version": "6.0", "description": "Metro theme for phpMyAdmin", "author": "phpMyAdmin developers and hplhu", "url": "https://www.phpmyadmin.net/", - "supports": ["5.3"] + "supports": ["6.0"] } diff --git a/themes/original/theme.json b/themes/original/theme.json index f7f458d0b7..965155b795 100644 --- a/themes/original/theme.json +++ b/themes/original/theme.json @@ -1,8 +1,8 @@ { "name": "Original", - "version": "5.3", + "version": "6.0", "description": "Original phpMyAdmin theme", "author": "phpMyAdmin developers", "url": "https://www.phpmyadmin.net/", - "supports": ["5.3"] + "supports": ["6.0"] } diff --git a/themes/pmahomme/theme.json b/themes/pmahomme/theme.json index 728c2cb9d5..b1f2cdb28d 100644 --- a/themes/pmahomme/theme.json +++ b/themes/pmahomme/theme.json @@ -1,8 +1,8 @@ { "name": "pmahomme", - "version": "5.3", + "version": "6.0", "description": "Default phpMyAdmin theme", "author": "phpMyAdmin developers", "url": "https://www.phpmyadmin.net/", - "supports": ["5.3"] + "supports": ["6.0"] }