Merge branch 'QA_5_2'

MauricioFauth · MauricioFauth · commit 342ab3f67aed · 2023-02-27T14:36:32.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
diff --git a/ChangeLog b/ChangeLog
@@ -15,6 +15,7 @@ phpMyAdmin - ChangeLog
 - issue #18106 Fix renaming database with a view
 - issue #18120 Fix bug with numerical tables during renaming database
 - issue #16851 Fix ($cfg['Order']) default column order doesn't have have any effect since phpMyAdmin 4.2.0
+- issue #18112 Fix open base dir warning on git version class
 
 5.2.1 (2023-02-07)
 - issue #17522 Fix case where the routes cache file is invalid
diff --git a/composer.json b/composer.json
@@ -61,7 +61,7 @@
         "nikic/fast-route": "^1.3",
         "phpmyadmin/motranslator": "^5.0",
         "phpmyadmin/shapefile": "^3.0.1",
-        "phpmyadmin/sql-parser": "^5.6.0",
+        "phpmyadmin/sql-parser": "dev-master#d906b5906100a6a4bc3c180900b50cbf1ff8ae0a",
         "phpmyadmin/twig-i18n-extension": "^4.0",
         "psr/http-factory": "^1.0",
         "psr/http-message": "^1.0",
diff --git a/libraries/classes/Controllers/HomeController.php b/libraries/classes/Controllers/HomeController.php
@@ -28,6 +28,7 @@
 use function extension_loaded;
 use function file_exists;
 use function ini_get;
+use function is_string;
 use function mb_strlen;
 use function preg_match;
 use function sprintf;
@@ -306,7 +307,12 @@ private function checkRequirements(): void
          * Check if user does not have defined blowfish secret and it is being used.
          */
         if (! empty($_SESSION['encryption_key'])) {
-            $encryptionKeyLength = mb_strlen($GLOBALS['cfg']['blowfish_secret'], '8bit');
+            $encryptionKeyLength = 0;
+            // This can happen if the user did use getenv() to set blowfish_secret
+            if (is_string($GLOBALS['cfg']['blowfish_secret'])) {
+                $encryptionKeyLength = mb_strlen($GLOBALS['cfg']['blowfish_secret'], '8bit');
+            }
+
             if ($encryptionKeyLength < SODIUM_CRYPTO_SECRETBOX_KEYBYTES) {
                 $this->errors[] = [
                     'message' => __(
diff --git a/libraries/classes/DatabaseInterface.php b/libraries/classes/DatabaseInterface.php
@@ -601,11 +601,12 @@ static function ($a, $b) {
      */
     public function getVirtualTables(string $db): array
     {
-        $tablesFull = array_keys($this->getTablesFull($db));
+        /** @var string[] $tablesFull */
+        $tablesFull = array_column($this->getTablesFull($db), 'TABLE_NAME');
         $views = [];
 
         foreach ($tablesFull as $table) {
-            $table = $this->getTable($db, (string) $table);
+            $table = $this->getTable($db, $table);
             if (! $table->isView()) {
                 continue;
             }
diff --git a/libraries/classes/Git.php b/libraries/classes/Git.php
@@ -53,14 +53,20 @@ class Git
      */
     private bool $showGitRevision;
 
+    /**
+     * The path where the to search for .git folders
+     */
+    private string $baseDir;
+
     /**
      * Git has been found and the data fetched
      */
     private bool $hasGit = false;
 
-    public function __construct(bool $showGitRevision)
+    public function __construct(bool $showGitRevision, string|null $baseDir = null)
     {
         $this->showGitRevision = $showGitRevision;
+        $this->baseDir = $baseDir ?? ROOT_PATH;
     }
 
     public function hasGitInformation(): bool
@@ -89,7 +95,7 @@ public function isGitRevision(&$git_location = null): bool
 
         // find out if there is a .git folder
         // or a .git file (--separate-git-dir)
-        $git = '.git';
+        $git = $this->baseDir . '.git';
         if (is_dir($git)) {
             if (! @is_file($git . '/config')) {
                 $_SESSION['git_location'] = null;
diff --git a/libraries/classes/Util.php b/libraries/classes/Util.php
@@ -286,7 +286,9 @@ public static function getTableList($db): array
 
         $tableGroups = [];
 
-        foreach ($tables as $tableName => $table) {
+        foreach ($tables as $table) {
+            /** @var string $tableName */
+            $tableName = $table['TABLE_NAME'];
             $table['Rows'] = self::checkRowCount($db, $table);
 
             // in $group we save the reference to the place in $table_groups
@@ -2224,10 +2226,7 @@ public static function getTablesWhenOpen($db, ResultInterface $dbInfoResult): ar
                 }
 
                 if (count($names) > 0) {
-                    $tables = array_merge(
-                        $tables,
-                        $GLOBALS['dbi']->getTablesFull($db, $names),
-                    );
+                    $tables += $GLOBALS['dbi']->getTablesFull($db, $names);
                 }
 
                 if ($GLOBALS['cfg']['NaturalOrder']) {
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -10745,11 +10745,6 @@ parameters:
 			count: 1
 			path: test/classes/Gis/GisPolygonTest.php
 
-		-
-			message: "#^Casting to string something that's already string\\.$#"
-			count: 2
-			path: test/classes/GitTest.php
-
 		-
 			message: "#^Casting to string something that's already string\\.$#"
 			count: 1
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -2632,6 +2632,9 @@
     <PossiblyUnusedMethod>
       <code>__construct</code>
     </PossiblyUnusedMethod>
+    <RedundantCondition>
+      <code><![CDATA[is_string($GLOBALS['cfg']['blowfish_secret'])]]></code>
+    </RedundantCondition>
     <UnusedVariable>
       <code>$collationsList</code>
     </UnusedVariable>
@@ -15190,8 +15193,6 @@
     </MixedArgument>
     <MixedArgumentTypeCoercion>
       <code>$columnNames</code>
-      <code>$tableName</code>
-      <code>$tableName</code>
       <code><![CDATA[uksort($tables, 'strnatcasecmp')]]></code>
       <code><![CDATA[uksort($tables, 'strnatcasecmp')]]></code>
     </MixedArgumentTypeCoercion>
@@ -15220,6 +15221,7 @@
       <code><![CDATA[$row['Seq_in_index']]]></code>
       <code><![CDATA[$row['Sub_part']]]></code>
       <code><![CDATA[$table['Name']]]></code>
+      <code><![CDATA[$table['TABLE_NAME']]]></code>
     </MixedArrayAccess>
     <MixedArrayAssignment>
       <code><![CDATA[$_SESSION['tmpval']['table_limit_offset']]]></code>
@@ -16629,12 +16631,6 @@
       <code>$queryString</code>
     </MixedAssignment>
   </file>
-  <file src="test/classes/GitTest.php">
-    <RedundantCast>
-      <code><![CDATA[(string) $this->cwd]]></code>
-      <code><![CDATA[(string) $this->testDir]]></code>
-    </RedundantCast>
-  </file>
   <file src="test/classes/HeaderTest.php">
     <MixedInferredReturnType>
       <code>array</code>
diff --git a/test/classes/GitTest.php b/test/classes/GitTest.php

Original file line number	Diff line number	Diff line change
`@@ -601,11 +601,12 @@ static function ($a, $b) {`
`601`	`601`	`*/`
`602`	`602`	`public function getVirtualTables(string $db): array`
`603`	`603`	`{`
`604`		`- $tablesFull = array_keys($this->getTablesFull($db));`
	`604`	`+ /** @var string[] $tablesFull */`
	`605`	`+ $tablesFull = array_column($this->getTablesFull($db), 'TABLE_NAME');`
`605`	`606`	`$views = [];`
`606`	`607`
`607`	`608`	`foreach ($tablesFull as $table) {`
`608`		`- $table = $this->getTable($db, (string) $table);`
	`609`	`+ $table = $this->getTable($db, $table);`
`609`	`610`	`if (! $table->isView()) {`
`610`	`611`	`continue;`
`611`	`612`	`}`