Fixed casting to make tests passing

matomo-org · Oct 29, 2021 · 45a3aa5 · 45a3aa5
1 parent ea7c18c
commit 45a3aa5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 15 deletions.
diff --git a/core/Common.php b/core/Common.php
@@ -543,14 +543,14 @@ public static function getRequestVar($varName, $varDefault = null, $varType = nu
                     $ok    = true;
                 }
             } elseif ($varType === 'integer') {
-                if ((string)$value === (string)(int)$value) {
+                if (!is_array($value) && (string) $value === (string)(int)$value) {
                     $ok = true;
                 }
             } elseif ($varType === 'float') {
                 $valueToCompare = (string)(float)$value;
                 $valueToCompare = Common::forceDotAsSeparatorForDecimalPoint($valueToCompare);
 
-                if ($value === $valueToCompare) {
+                if ((string) $value === $valueToCompare) {
                     $ok = true;
                 }
             } elseif ($varType === 'array') {

diff --git a/core/DataTable.php b/core/DataTable.php
@@ -673,14 +673,12 @@ public function getRowFromLabel($label)
         if (is_int($rowId) && isset($this->rows[$rowId])) {
             return $this->rows[$rowId];
         }
-        if ($rowId === self::ID_SUMMARY_ROW
-            && !empty($this->summaryRow)
-        ) {
+        if ((int) $rowId === self::ID_SUMMARY_ROW && !empty($this->summaryRow)) {
             return $this->summaryRow;
         }
         if (empty($rowId)
             && !empty($this->totalsRow)
-            && $label === $this->totalsRow->getColumn('label')
+            && (string) $label === (string) $this->totalsRow->getColumn('label')
         ) {
             return $this->totalsRow;
         }
@@ -710,9 +708,7 @@ public function getRowIdFromLabel($label)
         if (!isset($this->rowsIndexByLabel[$label])) {
             // in case label is '-1' and there is no normal row w/ that label. Note: this is for BC since
             // in the past, it was possible to get the summary row by searching for the label '-1'
-            if ($label === self::LABEL_SUMMARY_ROW
-                && !is_null($this->summaryRow)
-            ) {
+            if ($label === (string) self::LABEL_SUMMARY_ROW && !is_null($this->summaryRow)) {
                 return self::ID_SUMMARY_ROW;
             }
 
@@ -765,9 +761,7 @@ public function rebuildIndex()
      */
     public function getRowFromId($id)
     {
-        if ($id === self::ID_SUMMARY_ROW
-            && !is_null($this->summaryRow)
-        ) {
+        if ((int) $id === self::ID_SUMMARY_ROW && !is_null($this->summaryRow)) {
             return $this->summaryRow;
         }
 
@@ -1245,9 +1239,7 @@ public static function isEqual(DataTable $table1, DataTable $table2)
 
         foreach ($rows1 as $row1) {
             $row2 = $table2->getRowFromLabel($row1->getColumn('label'));
-            if ($row2 === false
-                || !Row::isEqual($row1, $row2)
-            ) {
+            if ($row2 === false || !Row::isEqual($row1, $row2)) {
                 return false;
             }
         }