From 450dc28aed6b32252fc62f7674193936c5c51eb7 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 5 May 2015 07:21:22 -0400 Subject: [PATCH 1/9] 4.4.6-dev Signed-off-by: Marc Delisle --- ChangeLog | 4 +++- README | 2 +- doc/conf.py | 2 +- libraries/Config.class.php | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index f8d9b0e643..fc3a506ece 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,9 @@ phpMyAdmin - ChangeLog ====================== -4.4.5.0 (not yet released) +4.4.6.0 (not yet released) + +4.4.5.0 (2015-05-05) - bug Table overhead stats: missing space before the unit - bug Fix resize icon in Designer - bug #4879 Exit fullscreen in Designer does not change the button text diff --git a/README b/README index 485b99c0d4..6411938f86 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.4.5-dev +Version 4.4.6-dev A set of PHP-scripts to manage MySQL over the web. diff --git a/doc/conf.py b/doc/conf.py index 013ddf0741..750609ea14 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -51,7 +51,7 @@ copyright = u'2012 - 2014, The phpMyAdmin devel team' # built documents. # # The short X.Y version. -version = '4.4.5-dev' +version = '4.4.6-dev' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 498907b580..895925600e 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -114,7 +114,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '4.4.5-dev'); + $this->set('PMA_VERSION', '4.4.6-dev'); /** * @deprecated */ From 93e6af2bad6168dd6ac674fbca59b5f457278c50 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 5 May 2015 07:22:47 -0400 Subject: [PATCH 2/9] 4.4.5 release date Signed-off-by: Marc Delisle --- ChangeLog | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f55154c5f4..f05b826509 100644 --- a/ChangeLog +++ b/ChangeLog @@ -30,7 +30,9 @@ phpMyAdmin - ChangeLog + rfe #1380 Support for Paramaters with raw SQL + rfe #1146 Show original size of truncated columns -4.4.5.0 (not yet released) +4.4.6.0 (not yet released) + +4.4.5.0 (2015-05-05) - bug Table overhead stats: missing space before the unit - bug Fix resize icon in Designer - bug #4879 Exit fullscreen in Designer does not change the button text From 069a2a09e73469315857d0a622ae1af6f1afb5f2 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 5 May 2015 09:18:18 -0400 Subject: [PATCH 3/9] phpunit 4.2: assertTag is deprecated Signed-off-by: Marc Delisle --- .../auth/PMA_AuthenticationCookie_test.php | 100 +++++++----------- 1 file changed, 36 insertions(+), 64 deletions(-) diff --git a/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php b/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php index 83e10a9637..f145d2a284 100644 --- a/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php +++ b/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php @@ -217,79 +217,59 @@ class PMA_AuthenticationCookie_Test extends PHPUnit_Framework_TestCase // assertions - $this->assertTag( - PMA_getTagArray( - 'assertContains( + 'assertTag( - PMA_getTagArray( - '
' - ), + $this->assertContains( + '
', $result ); - $this->assertTag( - PMA_getTagArray( - '
' - ), + $this->assertContains( + '', $result ); - $this->assertTag( - PMA_getTagArray( - 'assertContains( + 'assertTag( - PMA_getTagArray( - '' - ), + $this->assertContains( + '', $result ); - $this->assertTag( - PMA_getTagArray( - '' - ), + $this->assertContains( + '', $result ); - $this->assertTag( - PMA_getTagArray( - '', $result ); - $this->assertTag( - PMA_getTagArray( - '' - ), + $this->assertContains( + '', $result ); - $this->assertTag( - PMA_getTagArray( - '' - ), + $this->assertContains( + '', $result ); - $this->assertTag( - PMA_getTagArray( - '' - ), + $this->assertContains( + '', $result ); @@ -341,33 +321,25 @@ class PMA_AuthenticationCookie_Test extends PHPUnit_Framework_TestCase // assertions - $this->assertTag( - PMA_getTagArray( - 'assertContains( + 'assertTag( - PMA_getTagArray( - '', $result ); - $this->assertTag( - PMA_getTagArray( - '' - ), + $this->assertContains( + '', $result ); - $this->assertTag( - PMA_getTagArray( - '' - ), + $this->assertContains( + '', $result ); From d3338edf87246f868b72a02239a746437e2aeacf Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 5 May 2015 10:04:11 -0400 Subject: [PATCH 4/9] phpunit 4.2: assertTag is deprecated Signed-off-by: Marc Delisle --- libraries/browse_foreigners.lib.php | 6 +- .../auth/PMA_AuthenticationHttp_test.php | 6 +- test/libraries/PMA_FormDisplay_tpl_test.php | 373 +++++------------- test/libraries/PMA_browse_foreigners_test.php | 136 +++---- 4 files changed, 158 insertions(+), 363 deletions(-) diff --git a/libraries/browse_foreigners.lib.php b/libraries/browse_foreigners.lib.php index 7964717975..6a5d1b0892 100644 --- a/libraries/browse_foreigners.lib.php +++ b/libraries/browse_foreigners.lib.php @@ -215,7 +215,11 @@ function PMA_getHtmlForColumnElement($cssClass, $isSelected, $keyname, $description, $title ) { $keyname = htmlspecialchars($keyname); - $output = '' + $output = '' : '') . '' - ), + $this->assertContains( + '', $result ); - $this->assertTag( - PMA_getTagArray( - '' - ), + $this->assertContains( + '', $result ); - $this->assertTag( - PMA_getTagArray( - '' - ), + $this->assertContains( + '', $result ); - $this->assertTag( - PMA_getTagArray( - '' - ), + $this->assertContains( + '', $result ); - $this->assertTag( - PMA_getTagArray( - '' - ), + $this->assertContains( + '', $result ); - $this->assertTag( - PMA_getTagArray( - '' - ), + $this->assertContains( + '', $result ); } @@ -93,23 +81,23 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase PMA_displayTabsTop(array('one', 'two')); $result = ob_get_clean(); - $this->assertTag( - PMA_getTagArray('