Merge pull request #18959 from kamil-tekiela/Refactor-getPageIdsAndNames

MauricioFauth · web-flow · commit 917c7a1d1981 · 2024-01-31T16:14:55.000-03:00
Refactor getPageIdsAndNames()
diff --git a/src/Database/Designer.php b/src/Database/Designer.php
@@ -17,7 +17,6 @@
 use stdClass;
 
 use function __;
-use function intval;
 use function is_array;
 use function json_decode;
 use function str_contains;
@@ -74,7 +73,7 @@ public function getHtmlForPageSaveAs(string $db): string
      *
      * @param string $db database name
      *
-     * @return mixed[] array of schema page id and names
+     * @return array<string|null> array of schema page id and names
      */
     private function getPageIdsAndNames(string $db): array
     {
@@ -94,12 +93,7 @@ private function getPageIdsAndNames(string $db): array
             return [];
         }
 
-        $result = [];
-        while ($currPage = $pageRs->fetchAssoc()) {
-            $result[intval($currPage['page_nr'])] = $currPage['page_descr'];
-        }
-
-        return $result;
+        return $pageRs->fetchAllKeyPair();
     }
 
     /**
diff --git a/tests/classes/Database/DesignerTest.php b/tests/classes/Database/DesignerTest.php
@@ -68,13 +68,12 @@ private function mockDatabaseInteraction(string $db): void
             )
             ->willReturn($resultStub);
 
-        $resultStub->expects($this->exactly(3))
-            ->method('fetchAssoc')
-            ->willReturn(
-                ['page_nr' => '1', 'page_descr' => 'page1'],
-                ['page_nr' => '2', 'page_descr' => 'page2'],
-                [],
-            );
+        $resultStub->expects($this->exactly(1))
+            ->method('fetchAllKeyPair')
+            ->willReturn([
+                '1' => 'page1',
+                '2' => 'page2',
+            ]);
 
         $dbi->expects($this->any())->method('quoteString')
             ->willReturnCallback(static fn (string $string): string => "'" . $string . "'");

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@`
`17`	`17`	`use stdClass;`
`18`	`18`
`19`	`19`	`use function __;`
`20`		`-use function intval;`
`21`	`20`	`use function is_array;`
`22`	`21`	`use function json_decode;`
`23`	`22`	`use function str_contains;`
`@@ -74,7 +73,7 @@ public function getHtmlForPageSaveAs(string $db): string`
`74`	`73`	`*`
`75`	`74`	`* @param string $db database name`
`76`	`75`	`*`
`77`		`- * @return mixed[] array of schema page id and names`
	`76`	`+ * @return array<string\|null> array of schema page id and names`
`78`	`77`	`*/`
`79`	`78`	`private function getPageIdsAndNames(string $db): array`
`80`	`79`	`{`
`@@ -94,12 +93,7 @@ private function getPageIdsAndNames(string $db): array`
`94`	`93`	`return [];`
`95`	`94`	`}`
`96`	`95`
`97`		`- $result = [];`
`98`		`- while ($currPage = $pageRs->fetchAssoc()) {`
`99`		`- $result[intval($currPage['page_nr'])] = $currPage['page_descr'];`
`100`		`- }`
`101`		`-`
`102`		`- return $result;`
	`96`	`+ return $pageRs->fetchAllKeyPair();`
`103`	`97`	`}`
`104`	`98`
`105`	`99`	`/**`