Merge branch 'QA_4_9' into QA_5_0

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

ChangeLog

@@ -53,6 +53,9 @@ phpMyAdmin - ChangeLog
 - issue #14433 Fix "You do not have privileges to manipulate with the users!" on root superadmin
 - issue #15391 Fix GIS polygon of a geometry field is not drawn on "GIS visualization"
 - issue #15311 Fix adjust privileges on copy database fails with MariaDB
+- issue #15477 Fix display referential integrity check for InnoDB
+- issue #15236 Support phpunit 8 in our test suite to help packaging phpMyAdmin on Debian
+- issue #15522 Fix missing image error fills logs, removed ic_b_info icon from icon list
 
 4.9.1 (2019-09-20)
 - issue #15313 Added support for Twig 2

tbl_operations.php

@@ -505,12 +505,8 @@ if (Partition::havePartitioning()) {
 unset($partition_names);
 
 // Referential integrity check
-// The Referential integrity check was intended for the non-InnoDB
-// tables for which the relations are defined in pmadb
-// so I assume that if the current table is InnoDB, I don't display
-// this choice (InnoDB maintains integrity by itself)
 
-if ($cfgRelation['relwork'] && ! $pma_table->isEngine("INNODB")) {
+if ($cfgRelation['relwork']) {
     $dbi->selectDb($db);
     $foreign = $relation->getForeigners($db, $table, '', 'internal');
 

test/classes/ConfigTest.php

@@ -949,6 +949,7 @@ class ConfigTest extends PmaTestCase
     /**
      * Test for isGitRevision
      *
+     * @group git-revision
      * @return void
      */
     public function testIsGitRevisionLocalGitDir()
@@ -1009,6 +1010,7 @@ class ConfigTest extends PmaTestCase
     /**
      * Test for isGitRevision
      *
+     * @group git-revision
      * @return void
      */
     public function testIsGitRevisionExternalGitDir()
@@ -1070,6 +1072,7 @@ class ConfigTest extends PmaTestCase
     /**
      * Test for checkGitRevision packs folder
      *
+     * @group git-revision
      * @return void
      */
     public function testCheckGitRevisionPacksFolder()
@@ -1134,6 +1137,7 @@ class ConfigTest extends PmaTestCase
     /**
      * Test for checkGitRevision packs folder
      *
+     * @group git-revision
      * @return void
      */
     public function testCheckGitRevisionRefFile()
@@ -1189,6 +1193,7 @@ class ConfigTest extends PmaTestCase
     /**
      * Test for checkGitRevision with packs as file
      *
+     * @group git-revision
      * @return void
      */
     public function testCheckGitRevisionPacksFile()

test/classes/InsertEditTest.php

@@ -3455,7 +3455,7 @@ class InsertEditTest extends TestCase
     public function testVerifyWhetherValueCanBeTruncatedAndAppendExtraData()
     {
         $extra_data = ['isNeedToRecheck' => true];
-        $meta = new stdClass();
+
         $_POST['where_clause'][0] = 1;
 
         $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface')
@@ -3503,6 +3503,7 @@ class InsertEditTest extends TestCase
 
         $meta = new stdClass();
         $meta->type = 'timestamp';
+        $meta->flags = '';
         $dbi->expects($this->at(9))
             ->method('getFieldsMeta')
             ->will($this->returnValue([$meta]));

themes/metro/scss/_icons.scss

@@ -131,12 +131,6 @@
   background-image: url('../img/b_index_add.png');
 }
 
-.ic_b_info {
-  background-image: url('../img/b_info.png');
-  width: 11px;
-  height: 11px;
-}
-
 .ic_b_inline_edit {
   background-image: url('../img/b_inline_edit.png');
 }

themes/original/scss/_icons.scss

@@ -131,12 +131,6 @@
   background-image: url('../img/b_index_add.png');
 }
 
-.ic_b_info {
-  background-image: url('../../pmahomme/img/b_info.png');
-  width: 11px;
-  height: 11px;
-}
-
 .ic_b_inline_edit {
   background-image: url('../img/b_inline_edit.png');
 }

themes/pmahomme/scss/_icons.scss

@@ -131,12 +131,6 @@
   background-image: url('../img/b_index_add.png');
 }
 
-.ic_b_info {
-  background-image: url('../img/b_info.png');
-  width: 11px;
-  height: 11px;
-}
-
 .ic_b_inline_edit {
   background-image: url('../img/b_inline_edit.png');
 }