Merge pull request #43 from gjuric/psr_container_2

Allow psr/container 2.0 and Symfony 6

Author: jakzal

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"

tests/Symfony/TestCase/Fixtures/FrameworkBundle/AnotherTestKernel.php

@@ -12,19 +12,19 @@
 
 class AnotherTestKernel extends Kernel
 {
-    public function registerBundles()
+    public function registerBundles(): array
     {
         return [
             new FrameworkBundle(),
         ];
     }
 
-    public function getCacheDir()
+    public function getCacheDir(): string
     {
         return \sys_get_temp_dir().'/ZalasPHPUnitInjector/FrameworkBundle/AnotherTestKernel/cache/'.$this->environment;
     }
 
-    public function getLogDir()
+    public function getLogDir(): string
     {
         return \sys_get_temp_dir().'/ZalasPHPUnitInjector/FrameworkBundle/AnotherTestKernel/logs';
     }

tests/Symfony/TestCase/Fixtures/FrameworkBundle/TestKernel.php

@@ -18,19 +18,19 @@ public function __construct(string $environment, bool $debug)
         parent::__construct($environment, $debug);
     }
 
-    public function registerBundles()
+    public function registerBundles(): array
     {
         return [
             new FrameworkBundle(),
         ];
     }
 
-    public function getCacheDir()
+    public function getCacheDir(): string
     {
         return \sys_get_temp_dir().'/ZalasPHPUnitInjector/FrameworkBundle/TestKernel/cache/'.$this->environment;
     }
 
-    public function getLogDir()
+    public function getLogDir(): string
     {
         return \sys_get_temp_dir().'/ZalasPHPUnitInjector/FrameworkBundle/TestKernel/logs';
     }

tests/Symfony/TestCase/Fixtures/NoFrameworkBundle/AnotherTestKernel.php

@@ -14,17 +14,17 @@
 
 class AnotherTestKernel extends Kernel
 {
-    public function registerBundles()
+    public function registerBundles(): array
     {
         return [];
     }
 
-    public function getCacheDir()
+    public function getCacheDir(): string
     {
         return \sys_get_temp_dir().'/ZalasPHPUnitInjector/NoFrameworkBundle/AnotherTestKernel/cache/'.$this->environment;
     }
 
-    public function getLogDir()
+    public function getLogDir(): string
     {
         return \sys_get_temp_dir().'/ZalasPHPUnitInjector/NoFrameworkBundle/AnotherTestKernel/logs';
     }

tests/Symfony/TestCase/Fixtures/NoFrameworkBundle/TestKernel.php

@@ -19,17 +19,17 @@ public function __construct(string $environment, bool $debug)
         parent::__construct($environment, $debug);
     }
 
-    public function registerBundles()
+    public function registerBundles(): array
     {
         return [];
     }
 
-    public function getCacheDir()
+    public function getCacheDir(): string
     {
         return \sys_get_temp_dir().'/ZalasPHPUnitInjector/NoFrameworkBundle/TestKernel/cache/'.$this->environment;
     }
 
-    public function getLogDir()
+    public function getLogDir(): string
     {
         return \sys_get_temp_dir().'/ZalasPHPUnitInjector/NoFrameworkBundle/TestKernel/logs';
     }

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);
             }

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);
             }