Merge branch 'main' into next

empiricompany · May 15, 2023 · 3a1f906 · 3a1f906
2 parents d468bc2 + 00da425
commit 3a1f906
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/app/code/core/Mage/Core/Model/Cache.php b/app/code/core/Mage/Core/Model/Cache.php
@@ -419,11 +419,10 @@ public function clean($tags = [])
             if (!is_array($tags)) {
                 $tags = [$tags];
             }
-            $res = $this->getFrontend()->clean($mode, $this->_tags($tags));
-        } else {
-            $this->flush();
+            return $this->getFrontend()->clean($mode, $this->_tags($tags));
         }
-        return $res;
+
+        return $this->flush();
     }
 
     /**

diff --git a/app/code/core/Mage/Install/Model/Installer.php b/app/code/core/Mage/Install/Model/Installer.php
@@ -222,7 +222,7 @@ public function createAdministrator($data)
         //to support old logic checking if real data was passed
         if (is_array($data)) {
             $data = $this->validateAndPrepareAdministrator($data);
-            if (is_array(data)) {
+            if (is_array($data)) {
                 throw new Exception(Mage::helper('install')->__('Please correct the user data and try again.'));
             }
         }

diff --git a/phpstan.dist.baseline.neon b/phpstan.dist.baseline.neon
@@ -3215,11 +3215,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Install/Model/Config.php
 
-		-
-			message: "#^Constant data not found\\.$#"
-			count: 1
-			path: app/code/core/Mage/Install/Model/Installer.php
-
 		-
 			message: "#^Method Mage_Install_Model_Installer\\:\\:getDataModel\\(\\) should return Mage_Install_Model_Session but returns Mage_Install_Model_Installer_Data\\|null\\.$#"
 			count: 1