Merge remote-tracking branch 'upstream/master' into issue-1125-better…

…-uniq-email
stakovicz · Nov 19, 2024 · 25f6c19 · 25f6c19
2 parents 0c5104e + e460eea
commit 25f6c19
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 39 deletions.
diff --git a/phpstan.neon b/phpstan.neon
@@ -14,3 +14,10 @@ parameters:
             # Ces fichiers utilisent des alias de classes
             - sources/AppBundle/Twig/AssetsExtension.php
             - sources/AppBundle/Twig/TwigExtension.php
+
+    ignoreErrors:
+        -
+            message: '#^Method AppBundle\\Controller\\SiteBaseController\:\:render\(\) overrides @final method Symfony\\Bundle\\FrameworkBundle\\Controller\\Controller\:\:render\(\)\.$#'
+            identifier: method.parentMethodFinalByPhpDoc
+            count: 1
+            path: sources/AppBundle/Controller/SiteBaseController.php
diff --git a/sources/Afup/Bootstrap/Simpletest/Functional.php b/sources/Afup/Bootstrap/Simpletest/Functional.php
diff --git a/sources/Afup/Bootstrap/Simpletest/Unit.php b/sources/Afup/Bootstrap/Simpletest/Unit.php
diff --git a/sources/Afup/Utils/Configuration.php b/sources/Afup/Utils/Configuration.php
@@ -61,6 +61,6 @@ private function loadSymfonyParameters(): array
 
     public function obtenir($cle)
     {
-        return self::$values[$cle];
+        return self::$values[$cle] ?? null;
     }
 }
diff --git a/sources/AppBundle/Controller/SiteBaseController.php b/sources/AppBundle/Controller/SiteBaseController.php
@@ -25,9 +25,6 @@ public function setDefaultBlocks(array $blocks)
         $this->defaultBlocks = $blocks;
     }
 
-    /**
-     * @param Configuration $conf
-     */
     public function setConfiguration(Configuration $conf)
     {
         $this->legacyConfiguration = $conf;