Skip to content

Commit

Permalink
Prepare for version 6.0.0-dev
Browse files Browse the repository at this point in the history
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
  • Loading branch information
MauricioFauth committed Feb 10, 2023
1 parent 98cfc64 commit 20d748e
Show file tree
Hide file tree
Showing 13 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion 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

Expand Down
2 changes: 1 addition & 1 deletion README
@@ -1,7 +1,7 @@
phpMyAdmin - Readme
===================

Version 5.3.0-dev
Version 6.0.0-dev

A web interface for MySQL and MariaDB.

Expand Down
2 changes: 1 addition & 1 deletion composer.json
Expand Up @@ -117,7 +117,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "5.3.x-dev"
"dev-master": "6.0.x-dev"
}
},
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion doc/conf.py
Expand Up @@ -51,7 +51,7 @@
# 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

Expand Down
10 changes: 5 additions & 5 deletions libraries/classes/Version.php
Expand Up @@ -14,12 +14,12 @@
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;
}
2 changes: 1 addition & 1 deletion 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/)",
Expand Down
4 changes: 2 additions & 2 deletions scripts/create-release.sh
Expand Up @@ -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

Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion test/classes/ThemeTest.php
Expand Up @@ -80,7 +80,7 @@ public function testCheckImgPathFull(): void
$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());
}

/**
Expand Down
4 changes: 2 additions & 2 deletions 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"]
}
4 changes: 2 additions & 2 deletions 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"]
}
4 changes: 2 additions & 2 deletions 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"]
}
4 changes: 2 additions & 2 deletions 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"]
}
4 changes: 2 additions & 2 deletions 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"]
}

0 comments on commit 20d748e

Please sign in to comment.