Allow psr/container 2.0 and Symfony 6

gjuric · gjuric · commit c5921c52f343 · 2022-05-06T10:25:40.000+02:00
diff --git a/composer.json b/composer.json
@@ -5,15 +5,15 @@
     "require": {
         "php": "~8.0.0 || ~8.1.0",
         "phpunit/phpunit": "^9.0",
-        "psr/container": "^1.0",
+        "psr/container": "^1.0 || ^2.0",
         "zalas/injector": "^2.0"
     },
     "require-dev": {
-        "symfony/config": "^4.4.12 || ^5.3",
-        "symfony/dependency-injection": "^4.4.12 || ^5.3",
-        "symfony/http-kernel": "^4.4.12 || ^5.3",
+        "symfony/config": "^4.4.12 || ^5.3 || ^6.0",
+        "symfony/dependency-injection": "^4.4.12 || ^5.3 || ^6.0",
+        "symfony/http-kernel": "^4.4.12 || ^5.3 || ^6.0",
         "zalas/phpunit-globals": "^2.0",
-        "symfony/framework-bundle": "^4.4.12 || ^5.3",
+        "symfony/framework-bundle": "^4.4.12 || ^5.3 || ^6.0",
         "zalas/phpunit-doubles": "^1.5",
         "phpspec/prophecy": "^1.9",
         "phpspec/prophecy-phpunit": "^2.0"
diff --git a/tests/TestListener/ServiceInjectorListenerTest.php b/tests/TestListener/ServiceInjectorListenerTest.php
@@ -72,7 +72,7 @@ public function get($id)
                 };
             }
 
-            public function has($id)
+            public function has($id): bool
             {
                 return \in_array($id, [Service1::class, 'foo.service2'], true);
             }
diff --git a/tests/phar/tests/PharTest.php b/tests/phar/tests/PharTest.php
@@ -31,7 +31,7 @@ public function get($id)
                 };
             }
 
-            public function has($id)
+            public function has($id): bool
             {
                 return \in_array($id, ['foo.service'], true);
             }

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public function get($id)`
`72`	`72`	`};`
`73`	`73`	`}`
`74`	`74`
`75`		`- public function has($id)`
	`75`	`+ public function has($id): bool`
`76`	`76`	`{`
`77`	`77`	`return \in_array($id, [Service1::class, 'foo.service2'], true);`
`78`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public function get($id)`
`31`	`31`	`};`
`32`	`32`	`}`
`33`	`33`
`34`		`- public function has($id)`
	`34`	`+ public function has($id): bool`
`35`	`35`	`{`
`36`	`36`	`return \in_array($id, ['foo.service'], true);`
`37`	`37`	`}`