Prepare for version 6.0.0-dev

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>

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
 

README

@@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================
 
-Version 5.3.0-dev
+Version 6.0.0-dev
 
 A web interface for MySQL and MariaDB.
 

composer.json

@@ -117,7 +117,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.3.x-dev"
+            "dev-master": "6.0.x-dev"
         }
     },
     "scripts": {

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
 

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;
 }

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 <developers@phpmyadmin.net> (https://www.phpmyadmin.net/team/)",

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"

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());
     }
 
     /**

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"]
 }

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"]
 }

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"]
 }

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"]
 }

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"]
 }