Merge pull request #18715 from kamil-tekiela/fix-real-count

MauricioFauth · web-flow · commit 6f1a3f4cf931 · 2023-09-16T09:22:27.000-03:00
Fix AJAX real-row-count
diff --git a/js/src/database/structure.js b/js/src/database/structure.js
@@ -158,7 +158,7 @@ DatabaseStructure.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/libraries/classes/Controllers/Database/Structure/RealRowCountController.php b/libraries/classes/Controllers/Database/Structure/RealRowCountController.php
@@ -11,8 +11,6 @@
 use PhpMyAdmin\Url;
 use PhpMyAdmin\Util;
 
-use function json_encode;
-
 /**
  * Handles request for real row count on database level view page.
  */
@@ -70,10 +68,10 @@ public function __invoke(): void
                 ->getRealRowCountTable();
             $realRowCountAll[] = [
                 'table' => $table['TABLE_NAME'],
-                'row_count' => $rowCount,
+                '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/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -1075,6 +1075,11 @@ parameters:
 			count: 1
 			path: libraries/classes/Controllers/Database/Structure/FavoriteTableController.php
 
+		-
+			message: "#^Parameter \\#1 \\$value of static method PhpMyAdmin\\\\Util\\:\\:formatNumber\\(\\) expects float\\|int\\|string, int\\|null given\\.$#"
+			count: 1
+			path: libraries/classes/Controllers/Database/Structure/RealRowCountController.php
+
 		-
 			message: "#^Cannot use array destructuring on array\\|null\\.$#"
 			count: 4
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1726,6 +1726,9 @@
     <PossiblyInvalidCast occurrences="1">
       <code>$parameters['table']</code>
     </PossiblyInvalidCast>
+    <PossiblyNullArgument occurrences="1">
+      <code>$rowCount</code>
+    </PossiblyNullArgument>
   </file>
   <file src="libraries/classes/Controllers/Database/Structure/ReplacePrefixController.php">
     <MixedArgument occurrences="1">
diff --git a/test/classes/Controllers/Database/Structure/RealRowCountControllerTest.php b/test/classes/Controllers/Database/Structure/RealRowCountControllerTest.php
@@ -9,8 +9,6 @@
 use PhpMyAdmin\Tests\AbstractTestCase;
 use PhpMyAdmin\Tests\Stubs\ResponseRenderer as ResponseStub;
 
-use function json_encode;
-
 /**
  * @covers \PhpMyAdmin\Controllers\Database\Structure\RealRowCountController
  */
@@ -41,10 +39,10 @@ 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']);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,6 @@`
`11`	`11`	`use PhpMyAdmin\Url;`
`12`	`12`	`use PhpMyAdmin\Util;`
`13`	`13`
`14`		`-use function json_encode;`
`15`		`-`
`16`	`14`	`/**`
`17`	`15`	`* Handles request for real row count on database level view page.`
`18`	`16`	`*/`
`@@ -70,10 +68,10 @@ public function __invoke(): void`
`70`	`68`	`->getRealRowCountTable();`
`71`	`69`	`$realRowCountAll[] = [`
`72`	`70`	`'table' => $table['TABLE_NAME'],`
`73`		`- 'row_count' => $rowCount,`
	`71`	`+ 'row_count' => Util::formatNumber($rowCount, 0),`
`74`	`72`	`];`
`75`	`73`	`}`
`76`	`74`
`77`		`- $this->response->addJSON(['real_row_count_all' => json_encode($realRowCountAll)]);`
	`75`	`+ $this->response->addJSON(['real_row_count_all' => $realRowCountAll]);`
`78`	`76`	`}`
`79`	`77`	`}`