Merge pull request #19585 from kamil-tekiela/Minor-fixes

MauricioFauth · web-flow · commit eb3dbc494734 · 2025-02-17T17:38:50.000-03:00
Minor fixes
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -6474,12 +6474,6 @@ parameters:
 			count: 2
 			path: src/Display/Results.php
 
-		-
-			message: '#^Offset 3 does not exist on array\{string\|null, string\|null, string\|null\}\.$#'
-			identifier: offsetAccess.notFound
-			count: 1
-			path: src/Display/Results.php
-
 		-
 			message: '#^Only booleans are allowed in &&, array\<mixed\>\|bool given on the left side\.$#'
 			identifier: booleanAnd.leftNotBoolean
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -4023,15 +4023,6 @@
       <code><![CDATA[$linkingUrlParams]]></code>
       <code><![CDATA[$sortExpressionNoDirection]]></code>
     </InvalidArgument>
-    <InvalidArrayOffset>
-      <code><![CDATA[$delUrlParams]]></code>
-    </InvalidArrayOffset>
-    <InvalidReturnStatement>
-      <code><![CDATA[[$deleteUrl, $deleteString, $jsConf, $urlParams]]]></code>
-    </InvalidReturnStatement>
-    <InvalidReturnType>
-      <code><![CDATA[array{?string, ?string, ?string}]]></code>
-    </InvalidReturnType>
     <MixedArgument>
       <code><![CDATA[$_SESSION['tmpval']['max_rows']]]></code>
       <code><![CDATA[$_SESSION['tmpval']['pos'] / $_SESSION['tmpval']['max_rows']]]></code>
@@ -4221,14 +4212,6 @@
       <code><![CDATA[$this->numRows > 0 ? $this->numRows - 1 : 0]]></code>
       <code><![CDATA[$this->numRows > 0 ? $this->numRows - 1 : 0]]></code>
     </PossiblyInvalidArgument>
-    <PossiblyInvalidOperand>
-      <code><![CDATA[$editCopyUrlParams]]></code>
-      <code><![CDATA[$editCopyUrlParams]]></code>
-      <code><![CDATA[$editCopyUrlParams]]></code>
-      <code><![CDATA[$editCopyUrlParams]]></code>
-      <code><![CDATA[$editCopyUrlParams]]></code>
-      <code><![CDATA[$editCopyUrlParams]]></code>
-    </PossiblyInvalidOperand>
     <PossiblyNullArgument>
       <code><![CDATA[$oneKey->refTableName]]></code>
       <code><![CDATA[$statementInfo->parser->list]]></code>
diff --git a/src/Display/Results.php b/src/Display/Results.php
@@ -484,12 +484,11 @@ private function setDisplayPartsForSelect(DisplayParts $displayParts): DisplayPa
      *
      * @see     getTable()
      *
-     * @return array<int, DisplayParts|int|mixed> the first element is a {@see DisplayParts} object
+     * @return array{DisplayParts, int} the first element is a {@see DisplayParts} object
      *               the second element is the total number of rows returned
      *               by the SQL query without any programmatically appended
      *               LIMIT clause (just a copy of $unlim_num_rows if it exists,
      *               else computed inside this function)
-     * @psalm-return array{DisplayParts, int}
      */
     private function setDisplayPartsAndTotal(DisplayParts $displayParts): array
     {
@@ -1875,13 +1874,11 @@ private function getTableBody(
 
                 // 1.2.1 Modify link(s) - update row case
                 if ($displayParts->hasEditLink) {
-                    [
-                        $editUrl,
-                        $copyUrl,
-                        $editString,
-                        $copyString,
-                        $editCopyUrlParams,
-                    ] = $this->getModifiedLinks($whereClause, $clauseIsUnique, $urlSqlQuery);
+                    $editCopyUrlParams = $this->getUrlParams($whereClause, $clauseIsUnique, $urlSqlQuery);
+                    $editUrl = Url::getFromRoute('/table/change');
+                    $copyUrl = Url::getFromRoute('/table/change');
+                    $editString = $this->getActionLinkContent('b_edit', __('Edit'));
+                    $copyString = $this->getActionLinkContent('b_insrow', __('Copy'));
                 }
 
                 // 1.2.2 Delete/Kill link(s)
@@ -2440,23 +2437,10 @@ private function getRepeatingHeaders(): string
         return $headerHtml;
     }
 
-    /**
-     * Get modified links
-     *
-     * @see     getTableBody()
-     *
-     * @param string $whereClause    the where clause of the sql
-     * @param bool   $clauseIsUnique the unique condition of clause
-     * @param string $urlSqlQuery    the analyzed sql query
-     *
-     * @return array<int,string|array<string, bool|string>>
-     */
-    private function getModifiedLinks(
-        string $whereClause,
-        bool $clauseIsUnique,
-        string $urlSqlQuery,
-    ): array {
-        $urlParams = [
+    /** @return (string|bool)[] */
+    private function getUrlParams(string $whereClause, bool $clauseIsUnique, string $urlSqlQuery): array
+    {
+        return [
             'db' => $this->db,
             'table' => $this->table,
             'where_clause' => $whereClause,
@@ -2466,21 +2450,6 @@ private function getModifiedLinks(
             'sql_signature' => Core::signSqlQuery($urlSqlQuery),
             'goto' => Url::getFromRoute('/sql'),
         ];
-
-        $editUrl = Url::getFromRoute('/table/change');
-
-        $copyUrl = Url::getFromRoute('/table/change');
-
-        $editStr = $this->getActionLinkContent(
-            'b_edit',
-            __('Edit'),
-        );
-        $copyStr = $this->getActionLinkContent(
-            'b_insrow',
-            __('Copy'),
-        );
-
-        return [$editUrl, $copyUrl, $editStr, $copyStr, $urlParams];
     }
 
     /**
@@ -2493,8 +2462,7 @@ private function getModifiedLinks(
      * @param string $urlSqlQuery    the analyzed sql query
      * @param int    $processId      Process ID
      *
-     * @return mixed[]  $del_url, $del_str, $js_conf
-     * @psalm-return array{?string, ?string, ?string}
+     * @return array{?string, ?string, ?string, string[]|null}
      */
     private function getDeleteAndKillLinks(
         string $whereClause,
@@ -2563,7 +2531,7 @@ private function getDeleteAndKillLinks(
     /**
      * Get content inside the table row action links (Edit/Copy/Delete)
      *
-     * @see     getModifiedLinks(), getDeleteAndKillLinks()
+     * @see     getDeleteAndKillLinks()
      *
      * @param string $icon        The name of the file to get
      * @param string $displayText The text displaying after the image icon
