Merge pull request #3 from IDCI-Consulting/feat/symfony-6

BeBlood · web-flow · commit f76b254c2476 · 2022-12-26T16:48:57.000+01:00
Update: Symfony 6 compatibility
diff --git a/Client/GraphQLApiClient.php b/Client/GraphQLApiClient.php
@@ -30,7 +30,7 @@ class GraphQLApiClient implements GraphQLApiClientInterface
     private $translator;
 
     /**
-     * @var RedisCacheHandler
+     * @var AdapterInterface
      */
     private $cache;
 
diff --git a/DependencyInjection/IDCIGraphQLClientExtension.php b/DependencyInjection/IDCIGraphQLClientExtension.php
@@ -21,7 +21,7 @@ public function load(array $configs, ContainerBuilder $container)
         $container->setParameter('idci_graphql_client.clients', $config['clients']);
     }
 
-    public function getAlias()
+    public function getAlias(): string
     {
         return 'idci_graphql_client';
     }
diff --git a/IDCIGraphQLClientBundle.php b/IDCIGraphQLClientBundle.php
@@ -5,6 +5,7 @@
 use IDCI\Bundle\GraphQLClientBundle\DependencyInjection\Compiler\GraphQLApiClientCompilerPass;
 use IDCI\Bundle\GraphQLClientBundle\DependencyInjection\IDCIGraphQLClientExtension;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 class IDCIGraphQLClientBundle extends Bundle
@@ -16,7 +17,7 @@ public function build(ContainerBuilder $container)
         $container->addCompilerPass(new GraphQLApiClientCompilerPass());
     }
 
-    public function getContainerExtension()
+    public function getContainerExtension(): ExtensionInterface
     {
         return new IDCIGraphQLClientExtension();
     }
diff --git a/composer.json b/composer.json
@@ -13,19 +13,17 @@
     ],
     "require": {
         "php": "^7.1 || ^8.0",
-        "symfony/dependency-injection": "^3.3 || ^4.0 || ^5.0",
-        "symfony/framework-bundle": "^3.0 || ^4.0 || ^5.0",
         "cfpinto/graphql": "^0.1.0",
-        "predis/predis": "^1.1",
         "eightpoints/guzzle-bundle": "^8.0",
-        "symfony/monolog-bundle": "^3.3"
+        "symfony/dependency-injection": "^4.0 || ^5.0 || ^6.0",
+        "symfony/framework-bundle": "^4.0 || ^5.0 || ^6.0"
     },
     "suggest": {
-        "cache/adapter-bundle": "^1.2",
-        "liip/monitor-bundle": "^2.12"
+        "liip/monitor-bundle": "^2.12",
+        "symfony/cache": "^4.0 || ^5.0 || ^6.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.0"
+        "phpunit/phpunit": "^9.0"
     },
     "autoload": {
         "psr-4": {

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public function load(array $configs, ContainerBuilder $container)`
`21`	`21`	`$container->setParameter('idci_graphql_client.clients', $config['clients']);`
`22`	`22`	`}`
`23`	`23`
`24`		`- public function getAlias()`
	`24`	`+ public function getAlias(): string`
`25`	`25`	`{`
`26`	`26`	`return 'idci_graphql_client';`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`use IDCI\Bundle\GraphQLClientBundle\DependencyInjection\Compiler\GraphQLApiClientCompilerPass;`
`6`	`6`	`use IDCI\Bundle\GraphQLClientBundle\DependencyInjection\IDCIGraphQLClientExtension;`
`7`	`7`	`use Symfony\Component\DependencyInjection\ContainerBuilder;`
	`8`	`+use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;`
`8`	`9`	`use Symfony\Component\HttpKernel\Bundle\Bundle;`
`9`	`10`
`10`	`11`	`class IDCIGraphQLClientBundle extends Bundle`
`@@ -16,7 +17,7 @@ public function build(ContainerBuilder $container)`
`16`	`17`	`$container->addCompilerPass(new GraphQLApiClientCompilerPass());`
`17`	`18`	`}`
`18`	`19`
`19`		`- public function getContainerExtension()`
	`20`	`+ public function getContainerExtension(): ExtensionInterface`
`20`	`21`	`{`
`21`	`22`	`return new IDCIGraphQLClientExtension();`
`22`	`23`	`}`