Revert "Silence deprecation from 5.1" and fix the deprecation otherwise

This reverts commit b941c50
facile-it · Jun 12, 2020 · dab43fd · dab43fd
1 parent eb04f46
commit dab43fd
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -5,6 +5,11 @@ parameters:
 			count: 1
 			path: src/WebTestCase.php
 
+		-
+			message: "#^Comparison operation \"\\>\\=\" between 50100 and 50000 is always true\\.$#"
+			count: 1
+			path: tests/App/AppKernel.php
+
 		-
 			message: "#^Parameter \\#1 \\$callable of static method Doctrine\\\\Common\\\\Annotations\\\\AnnotationRegistry\\:\\:registerLoader\\(\\) expects callable\\(\\)\\: mixed, array\\(mixed, 'loadClass'\\) given\\.$#"
 			count: 1
@@ -14,3 +19,4 @@ parameters:
 			message: "#^Call to method PHPUnit\\\\Framework\\\\Assert\\:\\:assertNull\\(\\) with int will always evaluate to false\\.$#"
 			count: 1
 			path: tests/Command/CommandTest.php
+
diff --git a/tests/App/AppKernel.php b/tests/App/AppKernel.php
@@ -28,6 +28,10 @@ public function registerBundles(): array
     public function registerContainerConfiguration(LoaderInterface $loader): void
     {
         $loader->load(__DIR__ . '/config.yml');
+
+        if (self::VERSION_ID >= 50000) {
+            $loader->load(__DIR__ . '/config_5.yml');
+        }
     }
 
     public function getCacheDir(): string

diff --git a/tests/App/config.yml b/tests/App/config.yml
@@ -4,9 +4,7 @@
 framework:
     secret:          secret
     test: ~
-    router:
-        utf8: true
-        resource: "%kernel.project_dir%/tests/App/routing.yml"
+    router:          { resource: "%kernel.project_dir%/tests/App/routing.yml" }
     form:            false
     validation:      false
     csrf_protection: true

diff --git a/tests/App/config_5.yml b/tests/App/config_5.yml
@@ -0,0 +1,3 @@
+framework:
+  router:
+    utf8: true