Merge branch 'QA_5_2'

MauricioFauth · MauricioFauth · commit 62aac3e3b593 · 2023-09-19T11:54:06.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
diff --git a/js/src/database/structure.ts b/js/src/database/structure.ts
@@ -173,7 +173,7 @@ const fetchRealRowCount = function ($target) {
             if (response.success) {
                 // If to update all row counts for a DB.
                 if (response.real_row_count_all) {
-                    $.each(JSON.parse(response.real_row_count_all),
+                    $.each(response.real_row_count_all,
                         function (index, table) {
                             // Update each table row count.
                             $('table.data td[data-table*="' + table.table + '"]')
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -2765,6 +2765,11 @@ parameters:
 			count: 1
 			path: src/Controllers/Database/Structure/RealRowCountController.php
 
+		-
+			message: "#^Parameter \\#1 \\$value of static method PhpMyAdmin\\\\Util\\:\\:formatNumber\\(\\) expects float\\|int\\|string, int\\|null given\\.$#"
+			count: 1
+			path: src/Controllers/Database/Structure/RealRowCountController.php
+
 		-
 			message: "#^Parameter \\#2 \\$db of static method PhpMyAdmin\\\\Util\\:\\:getDbInfo\\(\\) expects string, mixed given\\.$#"
 			count: 1
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1603,6 +1603,9 @@
     <PossiblyInvalidCast>
       <code><![CDATA[$parameters['table']]]></code>
     </PossiblyInvalidCast>
+    <PossiblyNullArgument occurrences="1">
+      <code>$rowCount</code>
+    </PossiblyNullArgument>
   </file>
   <file src="src/Controllers/Database/Structure/ReplacePrefixController.php">
     <MixedArgument>
diff --git a/src/Controllers/Database/Structure/RealRowCountController.php b/src/Controllers/Database/Structure/RealRowCountController.php
@@ -17,7 +17,6 @@
 use PhpMyAdmin\Util;
 
 use function __;
-use function json_encode;
 
 /**
  * Handles request for real row count on database level view page.
@@ -87,9 +86,9 @@ public function __invoke(ServerRequest $request): void
             $rowCount = $this->dbi
                 ->getTable($GLOBALS['db'], $table['TABLE_NAME'])
                 ->getRealRowCountTable();
-            $realRowCountAll[] = ['table' => $table['TABLE_NAME'], 'row_count' => $rowCount];
+            $realRowCountAll[] = ['table' => $table['TABLE_NAME'], 'row_count' => Util::formatNumber($rowCount, 0)];
         }
 
-        $this->response->addJSON(['real_row_count_all' => json_encode($realRowCountAll)]);
+        $this->response->addJSON(['real_row_count_all' => $realRowCountAll]);
     }
 }
diff --git a/test/classes/Controllers/Database/Structure/RealRowCountControllerTest.php b/test/classes/Controllers/Database/Structure/RealRowCountControllerTest.php
@@ -14,8 +14,6 @@
 use PhpMyAdmin\Tests\Stubs\ResponseRenderer as ResponseStub;
 use PHPUnit\Framework\Attributes\CoversClass;
 
-use function json_encode;
-
 #[CoversClass(RealRowCountController::class)]
 class RealRowCountControllerTest extends AbstractTestCase
 {
@@ -49,11 +47,11 @@ public function testRealRowCount(): void
 
         $json = $response->getJSONResult();
         $expected = [
-            ['table' => 'City', 'row_count' => 4079],
-            ['table' => 'Country', 'row_count' => 239],
-            ['table' => 'CountryLanguage', 'row_count' => 984],
+            ['table' => 'City', 'row_count' => '4,079'],
+            ['table' => 'Country', 'row_count' => '239'],
+            ['table' => 'CountryLanguage', 'row_count' => '984'],
         ];
-        $this->assertEquals(json_encode($expected), $json['real_row_count_all']);
+        $this->assertEquals($expected, $json['real_row_count_all']);
 
         $dbiDummy->assertAllSelectsConsumed();
     }

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@`
`17`	`17`	`use PhpMyAdmin\Util;`
`18`	`18`
`19`	`19`	`use function __;`
`20`		`-use function json_encode;`
`21`	`20`
`22`	`21`	`/**`
`23`	`22`	`* Handles request for real row count on database level view page.`
`@@ -87,9 +86,9 @@ public function __invoke(ServerRequest $request): void`
`87`	`86`	`$rowCount = $this->dbi`
`88`	`87`	`->getTable($GLOBALS['db'], $table['TABLE_NAME'])`
`89`	`88`	`->getRealRowCountTable();`
`90`		`- $realRowCountAll[] = ['table' => $table['TABLE_NAME'], 'row_count' => $rowCount];`
	`89`	`+ $realRowCountAll[] = ['table' => $table['TABLE_NAME'], 'row_count' => Util::formatNumber($rowCount, 0)];`
`91`	`90`	`}`
`92`	`91`
`93`		`- $this->response->addJSON(['real_row_count_all' => json_encode($realRowCountAll)]);`
	`92`	`+ $this->response->addJSON(['real_row_count_all' => $realRowCountAll]);`
`94`	`93`	`}`
`95`	`94`	`}`