From 39a953fddd66c6e3d758fcf630fdd6fcc2932c4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 3 Nov 2014 10:11:21 +0100 Subject: [PATCH 1/9] Configure timezone for Travis tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Otherwise date related tests in HHVM fail. Signed-off-by: Michal Čihař --- test/travis.php.ini | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/travis.php.ini b/test/travis.php.ini index 0e8d6a21eb..a78c038af7 100644 --- a/test/travis.php.ini +++ b/test/travis.php.ini @@ -3,3 +3,6 @@ ; Load runkit and enabled override of internals extension=runkit.so runkit.internal_override=1 + +; Configure timezone +date.timezone=UTC From baa51312f530d12bf25e415d56982254d80ae21a Mon Sep 17 00:00:00 2001 From: Dreezerd Date: Mon, 3 Nov 2014 09:49:15 +0100 Subject: [PATCH 2/9] Translated using Weblate (English (United Kingdom)) Currently translated at 91.2% (2713 of 2973 strings) [CI skip] --- po/en_GB.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index 1fc7283d5b..75a2f92117 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -6,16 +6,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.3.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-10-16 12:25-0400\n" -"PO-Revision-Date: 2014-10-01 06:13+0200\n" -"Last-Translator: Robert Readman \n" -"Language-Team: English (United Kingdom) \n" +"PO-Revision-Date: 2014-11-03 09:49+0200\n" +"Last-Translator: Dreezerd \n" +"Language-Team: English (United Kingdom) " +"\n" +"Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: en_GB\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 1.10-dev\n" +"X-Generator: Weblate 2.0-dev\n" #: changelog.php:36 license.php:28 #, php-format @@ -28,7 +28,7 @@ msgstr "" #: db_central_columns.php:85 msgid "The central list of columns for the current database is empty." -msgstr "" +msgstr "The central list of columns for the current database is empty." #: db_central_columns.php:109 #, fuzzy From 6cd819a92efaf0c9124a92045c180f96d0b15aa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 3 Nov 2014 10:13:05 +0100 Subject: [PATCH 3/9] Split up Travis PHP config snippets MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We want to se timezone always, but runkit is available only for some versions. Signed-off-by: Michal Čihař --- .travis.yml | 2 ++ test/travis-timezone.php.ini | 4 ++++ test/travis.php.ini | 3 --- 3 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 test/travis-timezone.php.ini diff --git a/.travis.yml b/.travis.yml index dfabfc5937..1b1b09b980 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,6 +26,8 @@ before_script: composer install --dev --no-interaction ; + phpenv config-add test/travis-timezone.php.ini ; + if [[ $TRAVIS_PHP_VERSION != "hhvm" ]] ; then if [[ $TRAVIS_PHP_VERSION != "5.6" ]] ; then diff --git a/test/travis-timezone.php.ini b/test/travis-timezone.php.ini new file mode 100644 index 0000000000..fc5774d3a1 --- /dev/null +++ b/test/travis-timezone.php.ini @@ -0,0 +1,4 @@ +; PHP configuration tweaks for tests on Travis + +; Configure timezone +date.timezone=UTC diff --git a/test/travis.php.ini b/test/travis.php.ini index a78c038af7..0e8d6a21eb 100644 --- a/test/travis.php.ini +++ b/test/travis.php.ini @@ -3,6 +3,3 @@ ; Load runkit and enabled override of internals extension=runkit.so runkit.internal_override=1 - -; Configure timezone -date.timezone=UTC From a0476824a96ca16b191223882819d641c546bc0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 3 Nov 2014 10:17:50 +0100 Subject: [PATCH 4/9] Add runkit support for PHP 5.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1b1b09b980..b03d75c259 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,9 +30,10 @@ before_script: if [[ $TRAVIS_PHP_VERSION != "hhvm" ]] ; then - if [[ $TRAVIS_PHP_VERSION != "5.6" ]] ; then git clone --depth=1 git://github.com/zenovich/runkit.git ; cd runkit ; + wget https://github.com/zenovich/runkit/pull/71.diff ; + patch -p1 < 71.diff ; phpize ; ./configure ; make ; @@ -40,7 +41,6 @@ before_script: cd .. ; phpenv config-add test/travis.php.ini ; - fi wget https://scrutinizer-ci.com/ocular.phar ; From 11d92ad13e3197fb137f32dd23ff33874101ffbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 3 Nov 2014 10:34:44 +0100 Subject: [PATCH 5/9] This patch works only for 5.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index b03d75c259..b0eb72d447 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,8 +32,10 @@ before_script: git clone --depth=1 git://github.com/zenovich/runkit.git ; cd runkit ; + if [[ $TRAVIS_PHP_VERSION = "5.6" ]] ; then wget https://github.com/zenovich/runkit/pull/71.diff ; patch -p1 < 71.diff ; + fi ; phpize ; ./configure ; make ; From 00f45c7956b4a051650cf20390b09bc6f4fc9460 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 3 Nov 2014 10:39:48 +0100 Subject: [PATCH 6/9] Revert "Split up Travis PHP config snippets" This reverts commit 6cd819a92efaf0c9124a92045c180f96d0b15aa4. --- .travis.yml | 2 -- test/travis-timezone.php.ini | 4 ---- test/travis.php.ini | 3 +++ 3 files changed, 3 insertions(+), 6 deletions(-) delete mode 100644 test/travis-timezone.php.ini diff --git a/.travis.yml b/.travis.yml index 1b1b09b980..dfabfc5937 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,8 +26,6 @@ before_script: composer install --dev --no-interaction ; - phpenv config-add test/travis-timezone.php.ini ; - if [[ $TRAVIS_PHP_VERSION != "hhvm" ]] ; then if [[ $TRAVIS_PHP_VERSION != "5.6" ]] ; then diff --git a/test/travis-timezone.php.ini b/test/travis-timezone.php.ini deleted file mode 100644 index fc5774d3a1..0000000000 --- a/test/travis-timezone.php.ini +++ /dev/null @@ -1,4 +0,0 @@ -; PHP configuration tweaks for tests on Travis - -; Configure timezone -date.timezone=UTC diff --git a/test/travis.php.ini b/test/travis.php.ini index 0e8d6a21eb..a78c038af7 100644 --- a/test/travis.php.ini +++ b/test/travis.php.ini @@ -3,3 +3,6 @@ ; Load runkit and enabled override of internals extension=runkit.so runkit.internal_override=1 + +; Configure timezone +date.timezone=UTC From a42c4b9fab264cc02aa6c037d05db8cbaf1c530e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 3 Nov 2014 10:39:55 +0100 Subject: [PATCH 7/9] Revert "Configure timezone for Travis tests" This reverts commit 39a953fddd66c6e3d758fcf630fdd6fcc2932c4f. --- test/travis.php.ini | 3 --- 1 file changed, 3 deletions(-) diff --git a/test/travis.php.ini b/test/travis.php.ini index a78c038af7..0e8d6a21eb 100644 --- a/test/travis.php.ini +++ b/test/travis.php.ini @@ -3,6 +3,3 @@ ; Load runkit and enabled override of internals extension=runkit.so runkit.internal_override=1 - -; Configure timezone -date.timezone=UTC From a5337bf0eafe378716f988fb21732ca5e957a743 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 3 Nov 2014 10:40:41 +0100 Subject: [PATCH 8/9] Set timezone in PHP snippet MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There is no clean way to adjust HHVM settings from Travis, see https://github.com/travis-ci/travis-ci/issues/2523 Caused by HHVM configuration no longer including timezone settings, see https://github.com/travis-ci/travis-ci/issues/2812 Signed-off-by: Michal Čihař --- test/bootstrap-dist.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/bootstrap-dist.php b/test/bootstrap-dist.php index ad15752d40..209a05ed6f 100644 --- a/test/bootstrap-dist.php +++ b/test/bootstrap-dist.php @@ -9,6 +9,9 @@ // Let PHP complain about all errors error_reporting(E_ALL); +// Ensure PHP has set timezone +date_default_timezone_set('UTC'); + // Adding phpMyAdmin sources to include path set_include_path( get_include_path() . PATH_SEPARATOR . dirname(realpath("../index.php")) From a73486da3da0e41a915d7b3cb28523fae7f04cb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 3 Nov 2014 11:52:16 +0100 Subject: [PATCH 9/9] Add mising space MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- libraries/operations.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/operations.lib.php b/libraries/operations.lib.php index 00335d648f..2e58b33b22 100644 --- a/libraries/operations.lib.php +++ b/libraries/operations.lib.php @@ -157,7 +157,7 @@ function PMA_getHtmlForCopyDatabase($db) $html_output = '
'; $html_output .= '
'; if (isset($_REQUEST['db_collation'])) {