From 5bece6b0816b45d2a56c4a5173a067879cec3c20 Mon Sep 17 00:00:00 2001 From: Isaac Bennetch Date: Wed, 5 Jun 2019 21:46:19 -0400 Subject: [PATCH 1/3] Fix theme tests for 4.9 Signed-off-by: Isaac Bennetch --- test/classes/_data/gen_version_info/theme.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/classes/_data/gen_version_info/theme.json b/test/classes/_data/gen_version_info/theme.json index 3354e13408..d53fd0783c 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": "4.8", + "version": "4.9", "author": "phpMyAdmin developers", "url": "https://www.phpmyadmin.net/", - "supports": ["4.8"] + "supports": ["4.8","4.9"] } From 3d0f481555fc4f85d0b695ad796185696b71aa9b Mon Sep 17 00:00:00 2001 From: Isaac Bennetch Date: Wed, 5 Jun 2019 21:56:52 -0400 Subject: [PATCH 2/3] Finish fixing theme tests for 4.9 Signed-off-by: Isaac Bennetch --- test/classes/ThemeTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/classes/ThemeTest.php b/test/classes/ThemeTest.php index 5109d311a1..869ac61f35 100644 --- a/test/classes/ThemeTest.php +++ b/test/classes/ThemeTest.php @@ -93,7 +93,7 @@ class ThemeTest extends PmaTestCase $this->object->setPath('./test/classes/_data/gen_version_info'); $this->assertTrue($this->object->loadInfo()); $this->assertEquals('Test Theme', $this->object->getName()); - $this->assertEquals('4.8', $this->object->getVersion()); + $this->assertEquals('4.9', $this->object->getVersion()); } /** From 2fe5150548a872df31801949a2e642274ddcf2a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Thu, 6 Jun 2019 16:14:57 -0300 Subject: [PATCH 3/3] Change version to 4.9.1-dev in package.json MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Related to e7b73831e5b0a896d2dbd27f66b4ed7d5b4d1130 Signed-off-by: Maurício Meneghini Fauth --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 96182d4a60..25990532f0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "phpmyadmin", - "version": "4.9.0", + "version": "4.9.1-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/)",