Merge branch 'QA_5_2'

MauricioFauth · MauricioFauth · commit 4750e0f234e6 · 2022-05-11T15:07:07.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
diff --git a/libraries/classes/Display/Results.php b/libraries/classes/Display/Results.php
@@ -3616,12 +3616,11 @@ private function getOffsets()
      *
      * @see     getTable()
      *
-     * @param ResultInterface $dtResult                  the link id associated to the
-     *                                        query which results have to
-     *                                        be displayed
-     * @param string          $sortExpressionNoDirection sort expression without direction
+     * @param ResultInterface $dtResult                  the link id associated to the query
+     *                                                   which results have to be displayed
+     * @param string|null     $sortExpressionNoDirection sort expression without direction
      *
-     * @return string|null html content, null if not found sorted column
+     * @return string
      */
     private function getSortedColumnMessage(
         ResultInterface $dtResult,
@@ -3630,7 +3629,7 @@ private function getSortedColumnMessage(
         $fieldsMeta = $this->properties['fields_meta']; // To use array indexes
 
         if (empty($sortExpressionNoDirection)) {
-            return null;
+            return '';
         }
 
         if (! str_contains($sortExpressionNoDirection, '.')) {
@@ -3655,7 +3654,7 @@ private function getSortedColumnMessage(
         }
 
         if ($sortedColumnIndex === false) {
-            return null;
+            return '';
         }
 
         // fetch first row of the result set
diff --git a/package.json b/package.json
@@ -60,12 +60,7 @@
   },
   "scripts": {
     "postinstall": "yarn run build",
-<<<<<<< HEAD
     "build": "webpack",
-=======
-    "build": "yarn run css-compile --style=compressed && yarn run css-prefix && yarn run css-rtl && yarn run js-compile",
-    "css-compile": "sass themes/pmahomme/scss:themes/pmahomme/css themes/original/scss:themes/original/css themes/metro/scss:themes/metro/css themes/bootstrap/scss:themes/bootstrap/css setup/scss:setup",
->>>>>>> QA_5_2
     "css-lint": "stylelint -s scss \"themes/**/scss/*.scss\" \"setup/scss/*.scss\"",
     "js-lint": "eslint js/src test/javascript test/jest jest.config.js",
     "test": "jest"
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -6350,9 +6350,8 @@
     <PossiblyNullArrayAccess occurrences="1">
       <code>$firstStatement-&gt;order[$key]</code>
     </PossiblyNullArrayAccess>
-    <PossiblyNullOperand occurrences="2">
+    <PossiblyNullOperand occurrences="1">
       <code>$dispval</code>
-      <code>$this-&gt;getSortedColumnMessage($dtResult, $sortExpressionNoDirection[$i])</code>
     </PossiblyNullOperand>
     <RedundantCast occurrences="3">
       <code>(int) $GLOBALS['cfg']['LimitChars']</code>

Original file line number	Diff line number	Diff line change
`@@ -3616,12 +3616,11 @@ private function getOffsets()`
`3616`	`3616`	`*`
`3617`	`3617`	`* @see getTable()`
`3618`	`3618`	`*`
`3619`		`- * @param ResultInterface $dtResult the link id associated to the`
`3620`		`- * query which results have to`
`3621`		`- * be displayed`
`3622`		`- * @param string $sortExpressionNoDirection sort expression without direction`
	`3619`	`+ * @param ResultInterface $dtResult the link id associated to the query`
	`3620`	`+ * which results have to be displayed`
	`3621`	`+ * @param string\|null $sortExpressionNoDirection sort expression without direction`
`3623`	`3622`	`*`
`3624`		`- * @return string\|null html content, null if not found sorted column`
	`3623`	`+ * @return string`
`3625`	`3624`	`*/`
`3626`	`3625`	`private function getSortedColumnMessage(`
`3627`	`3626`	`ResultInterface $dtResult,`
`@@ -3630,7 +3629,7 @@ private function getSortedColumnMessage(`
`3630`	`3629`	`$fieldsMeta = $this->properties['fields_meta']; // To use array indexes`
`3631`	`3630`
`3632`	`3631`	`if (empty($sortExpressionNoDirection)) {`
`3633`		`- return null;`
	`3632`	`+ return '';`
`3634`	`3633`	`}`
`3635`	`3634`
`3636`	`3635`	`if (! str_contains($sortExpressionNoDirection, '.')) {`
`@@ -3655,7 +3654,7 @@ private function getSortedColumnMessage(`
`3655`	`3654`	`}`
`3656`	`3655`
`3657`	`3656`	`if ($sortedColumnIndex === false) {`
`3658`		`- return null;`
	`3657`	`+ return '';`
`3659`	`3658`	`}`
`3660`	`3659`
`3661`	`3660`	`// fetch first row of the result set`