Fixed PHPStan

Progi1984 · Progi1984 · commit 34629d9fdcb5 · 2022-02-08T10:25:36.000+01:00
diff --git a/classes/Handler/ModuleHandler.php b/classes/Handler/ModuleHandler.php
@@ -33,7 +33,7 @@ public function isModuleEnabled($moduleName)
     {
         $module = Module::getInstanceByName($moduleName);
 
-        if (false === $module) {
+        if (!($module instanceof Module)) {
             return false;
         }
 
@@ -78,7 +78,7 @@ public function uninstallModule($moduleName)
 
         $oldModule = Module::getInstanceByName($moduleName);
 
-        if (false === $oldModule) {
+        if (!($oldModule instanceof Module)) {
             return false;
         }
 
diff --git a/tests/phpstan/phpstan-1.6.1.18.neon b/tests/phpstan/phpstan-1.6.1.18.neon
@@ -3,3 +3,4 @@ includes:
 
 parameters:
 	ignoreErrors:
+		- '#PrestaShop\\Module\\Ps_Googleanalytics\\Handler\\ModuleHandler::uninstallModule\(\) calls parent::uninstall\(\) but PrestaShop\\Module\\Ps_Googleanalytics\\Handler\\ModuleHandler does not extend any class.#'
diff --git a/tests/phpstan/phpstan-1.7.1.2.neon b/tests/phpstan/phpstan-1.7.1.2.neon
@@ -2,5 +2,5 @@ includes:
 	- %currentWorkingDirectory%/tests/phpstan/phpstan.neon
 
 parameters:
-  ignoreErrors:
-    - '#Call to method assign\(\) on an unknown class Smarty_Data.#'
+	ignoreErrors:
+		- '#PrestaShop\\Module\\Ps_Googleanalytics\\Handler\\ModuleHandler::uninstallModule\(\) calls parent::uninstall\(\) but PrestaShop\\Module\\Ps_Googleanalytics\\Handler\\ModuleHandler does not extend any class.#'
diff --git a/tests/phpstan/phpstan-1.7.2.5.neon b/tests/phpstan/phpstan-1.7.2.5.neon
@@ -2,5 +2,5 @@ includes:
 	- %currentWorkingDirectory%/tests/phpstan/phpstan.neon
 
 parameters:
-  ignoreErrors:
-    - '#Call to method assign\(\) on an unknown class Smarty_Data.#'
+	ignoreErrors:
+		- '#PrestaShop\\Module\\Ps_Googleanalytics\\Handler\\ModuleHandler::uninstallModule\(\) calls parent::uninstall\(\) but PrestaShop\\Module\\Ps_Googleanalytics\\Handler\\ModuleHandler does not extend any class.#'
diff --git a/tests/phpstan/phpstan-1.7.3.4.neon b/tests/phpstan/phpstan-1.7.3.4.neon
@@ -2,5 +2,5 @@ includes:
 	- %currentWorkingDirectory%/tests/phpstan/phpstan.neon
 
 parameters:
-  ignoreErrors:
-    - '#Call to method assign\(\) on an unknown class Smarty_Data.#'
+	ignoreErrors:
+		- '#PrestaShop\\Module\\Ps_Googleanalytics\\Handler\\ModuleHandler::uninstallModule\(\) calls parent::uninstall\(\) but PrestaShop\\Module\\Ps_Googleanalytics\\Handler\\ModuleHandler does not extend any class.#'
diff --git a/tests/phpstan/phpstan-1.7.4.4.neon b/tests/phpstan/phpstan-1.7.4.4.neon
@@ -1,2 +1,6 @@
 includes:
 	- %currentWorkingDirectory%/tests/phpstan/phpstan.neon
+
+parameters:
+	ignoreErrors:
+		- '#PrestaShop\\Module\\Ps_Googleanalytics\\Handler\\ModuleHandler::uninstallModule\(\) calls parent::uninstall\(\) but PrestaShop\\Module\\Ps_Googleanalytics\\Handler\\ModuleHandler does not extend any class.#'
diff --git a/tests/phpstan/phpstan-1.7.5.1.neon b/tests/phpstan/phpstan-1.7.5.1.neon
@@ -1,2 +1,6 @@
 includes:
 	- %currentWorkingDirectory%/tests/phpstan/phpstan.neon
+
+parameters:
+	ignoreErrors:
+		- '#PrestaShop\\Module\\Ps_Googleanalytics\\Handler\\ModuleHandler::uninstallModule\(\) calls parent::uninstall\(\) but PrestaShop\\Module\\Ps_Googleanalytics\\Handler\\ModuleHandler does not extend any class.#'
diff --git a/tests/phpstan/phpstan-1.7.6.neon b/tests/phpstan/phpstan-1.7.6.neon
@@ -1,2 +1,6 @@
 includes:
 	- %currentWorkingDirectory%/tests/phpstan/phpstan.neon
+
+parameters:
+	ignoreErrors:
+		- '#PrestaShop\\Module\\Ps_Googleanalytics\\Handler\\ModuleHandler::uninstallModule\(\) calls parent::uninstall\(\) but PrestaShop\\Module\\Ps_Googleanalytics\\Handler\\ModuleHandler does not extend any class.#'
diff --git a/tests/phpstan/phpstan-1.7.7.neon b/tests/phpstan/phpstan-1.7.7.neon
@@ -1,2 +1,6 @@
 includes:
 	- %currentWorkingDirectory%/tests/phpstan/phpstan.neon
+
+parameters:
+	ignoreErrors:
+		- '#PrestaShop\\Module\\Ps_Googleanalytics\\Handler\\ModuleHandler::uninstallModule\(\) calls parent::uninstall\(\) but PrestaShop\\Module\\Ps_Googleanalytics\\Handler\\ModuleHandler does not extend any class.#'
diff --git a/tests/phpstan/phpstan-1.7.8.neon b/tests/phpstan/phpstan-1.7.8.neon
@@ -1,2 +1,6 @@
 includes:
 	- %currentWorkingDirectory%/tests/phpstan/phpstan.neon
+
+parameters:
+	ignoreErrors:
+		- '#PrestaShop\\Module\\Ps_Googleanalytics\\Handler\\ModuleHandler::uninstallModule\(\) calls parent::uninstall\(\) but PrestaShop\\Module\\Ps_Googleanalytics\\Handler\\ModuleHandler does not extend any class.#'
diff --git a/tests/phpstan/phpstan-latest.neon b/tests/phpstan/phpstan-latest.neon
@@ -1,2 +1,6 @@
 includes:
 	- %currentWorkingDirectory%/tests/phpstan/phpstan.neon
+
+parameters:
+	ignoreErrors:
+		- '#PrestaShop\\Module\\Ps_Googleanalytics\\Handler\\ModuleHandler::uninstallModule\(\) calls parent::uninstall\(\) but PrestaShop\\Module\\Ps_Googleanalytics\\Handler\\ModuleHandler does not extend any class.#'

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public function isModuleEnabled($moduleName)`
`33`	`33`	`{`
`34`	`34`	`$module = Module::getInstanceByName($moduleName);`
`35`	`35`
`36`		`- if (false === $module) {`
	`36`	`+ if (!($module instanceof Module)) {`
`37`	`37`	`return false;`
`38`	`38`	`}`
`39`	`39`
`@@ -78,7 +78,7 @@ public function uninstallModule($moduleName)`
`78`	`78`
`79`	`79`	`$oldModule = Module::getInstanceByName($moduleName);`
`80`	`80`
`81`		`- if (false === $oldModule) {`
	`81`	`+ if (!($oldModule instanceof Module)) {`
`82`	`82`	`return false;`
`83`	`83`	`}`
`84`	`84`
Original file line number	Diff line number	Diff line change
`@@ -3,3 +3,4 @@ includes:`
`3`	`3`
`4`	`4`	`parameters:`
`5`	`5`	`ignoreErrors:`
	`6`	`+ - '#PrestaShop\\Module\\Ps_Googleanalytics\\Handler\\ModuleHandler::uninstallModule\(\) calls parent::uninstall\(\) but PrestaShop\\Module\\Ps_Googleanalytics\\Handler\\ModuleHandler does not extend any class.#'`