Merge branch 'QA_5_0'

Signed-off-by: William Desportes <williamdes@wdes.fr>

.travis.yml

@@ -28,7 +28,6 @@ after_script:
   - if [ -f vendor/bin/codacycoverage ] ; then php vendor/bin/codacycoverage clover || true ; fi
   - if [ -f php.log ] ; then cat php.log ; fi
   - if [ -f nginx-error.log ] ; then cat nginx-error.log ; fi
-  - if [ -f build/logs/phpunit.json ] ; then ./scripts/phpunit-top-tests build/logs/phpunit.json ; fi
   - if [ -f config.inc.php ] ; then rm -rf config.inc.php; fi
   - if [ "$CI_MODE" = "selenium" ] ; then ~/browserstack/BrowserStackLocal --daemon stop; fi
 

ChangeLog

@@ -32,7 +32,7 @@ phpMyAdmin - ChangeLog
 - issue        Fixed deprecation warning "implode(): Passing glue string after array is deprecated." function on export page
 - issue #15767 Fixed can not copy user account since 5.0 - "error #1133"
 - issue #15772 Fixed error code 500 during pagination of the tables in a database
-- issue        Fix php error "Trying to access array offset on value of type null" on column distinct values feature
+- issue #16009 Fix php error "Trying to access array offset on value of type null" on column distinct values feature
 - issue #15741 Fix fatal javascript error on clicking "Pick from Central Columns"
 - issue #15773 Fixed a view named "views" adds an expand button
 - issue #15432 Fixed names of the pages in the designer should be unique
@@ -83,6 +83,7 @@ phpMyAdmin - ChangeLog
 - issue #15282 Fixed MySQL 8.0 password syntax error when creating a replication user
 - issue #15986 Fixed php fatal error "Uncaught TypeError: array_flip() expects parameter 1 to be array, null given"
 - issue        Fixed php fatal error "Uncaught TypeError: htmlspecialchars() expects parameter 1 to be string, int given"
+- issue        Support phpunit 9.0
 
 5.0.1 (2020-01-07)
 - issue #15719 Fixed error 500 when browsing a table when $cfg['LimitChars'] used a string and not an int value

composer.json

@@ -87,7 +87,7 @@
         "phpstan/extension-installer": "^1.0",
         "phpstan/phpstan": "^0.12.13",
         "phpstan/phpstan-phpunit": "^0.12.6",
-        "phpunit/phpunit": "^7.5 || ^8.0",
+        "phpunit/phpunit": "^7.5 || ^8.0 || ^9.0",
         "pragmarx/google2fa-qrcode": "^1.0.1",
         "samyoul/u2f-php-server": "^1.1",
         "squizlabs/php_codesniffer": "^3.0",

phpunit.xml.dist

@@ -22,7 +22,6 @@
     <logging>
         <log type="coverage-clover" target="build/logs/clover.xml" />
         <log type="junit" target="build/logs/junit.xml" />
-        <log type="json" target="build/logs/phpunit.json" />
     </logging>
 
     <filter>

phpunit.xml.nocoverage

@@ -21,6 +21,5 @@
 
     <logging>
         <log type="junit" target="build/logs/junit.xml" />
-        <log type="json" target="build/logs/phpunit.json" />
     </logging>
 </phpunit>

scripts/phpunit-top-tests

@@ -1,26 +0,0 @@
-#!/usr/bin/env python
-"""
-Prints 10 longest lasting tests from JSON PHPUnit log
-"""
-
-from __future__ import print_function
-
-import json
-import sys
-
-def main(filename):
-    with open(filename) as handle:
-        content = handle.read()
-    data = json.loads(
-        '[' + content.replace('}{', '},{') + ']'
-    )
-    printed = ['test', 'status', 'time']
-    tests = [item for item in data if item['event'] == 'test']
-    for test in sorted(tests, key=lambda item: -item['time'])[:10]:
-        for item in printed:
-            print('{0:10s}: {1}'.format(item, test[item]))
-        print()
-
-
-if __name__ == '__main__':
-    main(*sys.argv[1:])