Merge pull request #23 from ray-di/update-qa

Support guzzle 7

Author: koriym

composer.json

@@ -16,7 +16,7 @@
         "aura/sql": "^3.0",
         "bear/resource": "^1.15",
         "doctrine/annotations": "^1.11",
-        "guzzlehttp/guzzle": "^6.3",
+        "guzzlehttp/guzzle": "^6.3 || ^7.0",
         "koriym/query-locator": "^1.4",
         "ray/aop": "^2.10.3",
         "ray/aura-sql-module": "^1.10.0",

src/Annotation/Query.php

@@ -5,7 +5,7 @@
 namespace Ray\Query\Annotation;
 
 use Attribute;
-use Doctrine\Common\Annotations\NamedArgumentConstructorAnnotation;
+use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor;
 use Ray\Query\Exception\QueryTypeException;
 
 /**
@@ -14,9 +14,10 @@
  * @Annotation
  * @Target("METHOD")
  * @psalm-suppress MissingConstructor
+ * @NamedArgumentConstructor
  */
 #[Attribute(Attribute::TARGET_METHOD)]
-final class Query implements NamedArgumentConstructorAnnotation
+final class Query
 {
     /**
      * Query ID

src/QueryInterceptor.php

@@ -8,7 +8,6 @@
 use InvalidArgumentException;
 use Ray\Aop\MethodInterceptor;
 use Ray\Aop\MethodInvocation;
-use Ray\Aop\ReflectionMethod;
 use Ray\Di\InjectorInterface;
 use Ray\Query\Annotation\Query;
 
@@ -32,7 +31,6 @@ public function __construct(InjectorInterface $injector)
      */
     public function invoke(MethodInvocation $invocation)
     {
-        /** @var ReflectionMethod $method */
         $method = $invocation->getMethod();
         /** @var Query $query */
         $query = $method->getAnnotation(Query::class);

src/WebQueryModule.php

@@ -15,12 +15,12 @@ class WebQueryModule extends AbstractModule
     /** @var array<string, mixed> */
     private $guzzleConfig;
 
-    /** @var array<string, string> */
+    /** @var array<string, array{0: string, 1:string}> */
     private $webQueryConfig;
 
     /**
-     * @param array<string, string> $webQueryConfig
-     * @param array<string, mixed>  $guzzleConfig
+     * @param array<string, array{0: string, 1:string}> $webQueryConfig
+     * @param array<string, mixed>                      $guzzleConfig
      */
     public function __construct(array $webQueryConfig, array $guzzleConfig, ?AbstractModule $module = null)
     {
@@ -36,7 +36,6 @@ protected function configure()
     {
         $this->configureClient();
         foreach ($this->webQueryConfig as $name => $value) {
-            /** @var array{0: string, 1: string} $value */
             [$method, $uri] = $value;
             $this->configureWebQuery($name, $method, $uri);
         }

tests/WebQueryModuleTest.php

@@ -20,7 +20,6 @@ protected function setUp(): void
             'bar' => ['GET', 'https://httpbin.org/anything/bar'],
         ];
         $guzzleConfig = [];
-        /** @var array<string, string> $webQueryConfig */
         $this->module = new WebQueryModule($webQueryConfig, $guzzleConfig);
     }