Merge pull request #19535 from kamil-tekiela/getPartialText

MauricioFauth · web-flow · commit 6b6f4237ceb5 · 2025-01-24T15:10:53.000-03:00
Split up getPartialText()
diff --git a/src/Display/Results.php b/src/Display/Results.php
@@ -2711,11 +2711,7 @@ private function getDataCellForGeometryColumns(
 
             // Convert to WKT format
             $wktval = Gis::convertToWellKnownText($column);
-            [
-                $isFieldTruncated,
-                $displayedColumn,
-                // skip 3rd param
-            ] = $this->getPartialText($wktval);
+            $displayedColumn = $this->getPartialText($wktval);
 
             return $this->getRowData(
                 $class,
@@ -2729,7 +2725,7 @@ private function getDataCellForGeometryColumns(
                 '',
                 $whereComparison,
                 $transformOptions,
-                $isFieldTruncated,
+                $displayedColumn !== $wktval,
             );
         }
 
@@ -2739,11 +2735,7 @@ private function getDataCellForGeometryColumns(
             $whereComparison = ' = ' . $column;
 
             $wkbval = substr(bin2hex($column), 8);
-            [
-                $isFieldTruncated,
-                $displayedColumn,
-                // skip 3rd param
-            ] = $this->getPartialText($wkbval);
+            $displayedColumn = $this->getPartialText($wkbval);
 
             return $this->getRowData(
                 $class,
@@ -2757,7 +2749,7 @@ private function getDataCellForGeometryColumns(
                 '',
                 $whereComparison,
                 $transformOptions,
-                $isFieldTruncated,
+                $displayedColumn !== $wkbval,
             );
         }
 
@@ -2799,8 +2791,6 @@ private function getDataCellForNonNumericColumns(
         array $transformOptions,
         StatementInfo $statementInfo,
     ): string {
-        $originalLength = 0;
-
         $bIsText = $transformationPlugin !== null && ! str_contains($transformationPlugin::getMIMEType(), 'Text');
 
         // disable inline grid editing
@@ -2831,15 +2821,17 @@ private function getDataCellForNonNumericColumns(
 
         // Cut all fields to \PhpMyAdmin\Config::getInstance()->settings['LimitChars']
         // (unless it's a link-type transformation or binary)
+        $originalLength = 0;
         $originalDataForWhereClause = $column;
         $displayedColumn = $column;
         $isFieldTruncated = false;
         if (
-            ! ($transformationPlugin !== null
-            && str_contains($transformationPlugin::getName(), 'Link'))
+            ! ($transformationPlugin !== null && str_contains($transformationPlugin::getName(), 'Link'))
             && ! $meta->isBinary()
         ) {
-            [$isFieldTruncated, $column, $originalLength] = $this->getPartialText($column);
+            $originalLength = mb_strlen($displayedColumn);
+            $column = $this->getPartialText($displayedColumn);
+            $isFieldTruncated = $column !== $displayedColumn;
         }
 
         if ($meta->isMappedTypeBit) {
@@ -3702,11 +3694,9 @@ private function handleNonPrintableContents(
                 $result = '0x' . bin2hex($content);
             }
 
-            [
-                $isTruncated,
-                $result,
-                // skip 3rd param
-            ] = $this->getPartialText($result);
+            $preTruncation = $result;
+            $result = $this->getPartialText($result);
+            $isTruncated = $result !== $preTruncation;
         }
 
         /* Create link to download */
@@ -3752,9 +3742,7 @@ private function getFromForeign(ForeignKeyRelatedTable $fieldInfo, string $where
         }
 
         // Truncate values that are too long, see: #17902
-        [, $dispval] = $this->getPartialText($dispval);
-
-        return $dispval;
+        return $this->getPartialText($dispval);
     }
 
     /**
@@ -3908,23 +3896,16 @@ private function getRowData(
      * @see handleNonPrintableContents(), getDataCellForGeometryColumns(), getDataCellForNonNumericColumns
      *
      * @param string $str string to be truncated
-     *
-     * @return mixed[]
-     * @psalm-return array{bool, string, int}
      */
-    private function getPartialText(string $str): array
+    private function getPartialText(string $str): string
     {
-        $originalLength = mb_strlen($str);
         if (
-            $originalLength > $this->config->settings['LimitChars']
+            mb_strlen($str) > $this->config->settings['LimitChars']
             && $_SESSION['tmpval']['pftext'] === self::DISPLAY_PARTIAL_TEXT
         ) {
-            $str = mb_substr($str, 0, $this->config->settings['LimitChars']) . '...';
-            $truncated = true;
-        } else {
-            $truncated = false;
+            return mb_substr($str, 0, $this->config->settings['LimitChars']) . '...';
         }
 
-        return [$truncated, $str, $originalLength];
+        return $str;
     }
 }
diff --git a/tests/unit/Display/ResultsTest.php b/tests/unit/Display/ResultsTest.php
@@ -344,23 +344,23 @@ public function testSetHighlightedColumnGlobalField(): void
     public static function dataProviderForTestGetPartialText(): array
     {
         return [
-            ['P', 10, 'foo', [false, 'foo', 3]],
-            ['P', 1, 'foo', [true, 'f...', 3]],
-            ['F', 10, 'foo', [false, 'foo', 3]],
-            ['F', 1, 'foo', [false, 'foo', 3]],
+            ['P', 10, 'foo', 'foo'],
+            ['P', 1, 'foo', 'f...'],
+            ['F', 10, 'foo', 'foo'],
+            ['F', 1, 'foo', 'foo'],
         ];
     }
 
     /**
      * Test getPartialText
      *
-     * @param string  $pftext     Partial or Full text
-     * @param int     $limitChars Partial or Full text
-     * @param string  $str        the string to be tested
-     * @param mixed[] $output     return value of getPartialText
+     * @param string $pftext     Partial or Full text
+     * @param int    $limitChars Partial or Full text
+     * @param string $str        the string to be tested
+     * @param string $output     return value of getPartialText
      */
     #[DataProvider('dataProviderForTestGetPartialText')]
-    public function testGetPartialText(string $pftext, int $limitChars, string $str, array $output): void
+    public function testGetPartialText(string $pftext, int $limitChars, string $str, string $output): void
     {
         $_SESSION['tmpval']['pftext'] = $pftext;
         Config::getInstance()->settings['LimitChars'] = $limitChars;
