fix phpstan ignore errors (afup#1382)

* fix phpstan ignore errors * fix phpstan ignore errors code review
stakovicz · Dec 10, 2023 · d1d9ac2 · d1d9ac2
1 parent 3a0dc7d
commit d1d9ac2
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 13 deletions.
diff --git a/configs/application/config-test.php b/configs/application/config-test.php
@@ -59,3 +59,4 @@
 $configuration['sympa']['directory']='http://127.0.0.1/sympa.php';
 $configuration['sympa']['config_url']='http://127.0.0.1/sympa.php';
 $configuration['sympa']['host'] = 'old.afup.org';
+return $configuration;
diff --git a/configs/application/config.php.dist b/configs/application/config.php.dist
@@ -59,3 +59,4 @@ $configuration['sympa']['mot_de_passe']='sympa';
 $configuration['sympa']['directory']='http://127.0.0.1/sympa.php';
 $configuration['sympa']['config_url']='http://127.0.0.1/sympa.php';
 $configuration['sympa']['host'] = 'old.afup.org';
+return $configuration;
diff --git a/configs/application/config.php.dist-docker b/configs/application/config.php.dist-docker
@@ -59,3 +59,4 @@ $configuration['sympa']['mot_de_passe']='sympa';
 $configuration['sympa']['directory']='http://127.0.0.1/sympa.php';
 $configuration['sympa']['config_url']='http://127.0.0.1/sympa.php';
 $configuration['sympa']['host'] = 'old.afup.org';
+return $configuration;
diff --git a/phpstan.neon b/phpstan.neon
@@ -16,12 +16,3 @@ parameters:
             - sources/AppBundle/Twig/TwigExtension.php
             # Ce fichier est impossible à analyser, des variables globales, du eval, etc.
             - sources/Afup/Utils/Configuration.php
-    ignoreErrors:
-        # Variable globale
-        -
-            message: '#Undefined variable: \$configuration#'
-            path: sources/Afup/Utils/SymfonyKernel.php
-        # Variable globale
-        -
-            message: '#Undefined variable: \$smarty#'
-            path: sources/AppBundle/Controller/LegacyController.php
diff --git a/sources/Afup/Utils/Configuration.php b/sources/Afup/Utils/Configuration.php
@@ -177,7 +177,7 @@ function enregistrer()
         foreach ($valeurs as $valeur) {
             $contenu .= '$configuration' . $valeur . "\n";
         }
-        $contenu .= '?>';
+        $contenu .= 'return $configuration;';
 
         if (!is_writable($this->_chemin_fichier)) {
             return false;

diff --git a/sources/Afup/Utils/SymfonyKernel.php b/sources/Afup/Utils/SymfonyKernel.php
@@ -44,9 +44,7 @@ public function __construct(Request $request = null)
     private function getLegacyConfig()
     {
         // $configuration comes from this file
-        include(__DIR__ . '/../../../configs/application/config.php');
-
-        return $configuration;
+        return include(__DIR__ . '/../../../configs/application/config.php');
     }
 
     /**