Merge pull request #27 from ray-di/cs

Add Variable-length argument symbol "..." to phpdoc
ray-di · Nov 15, 2021 · 511342e · 511342e
2 parents 26acc60 + 878cb2f
commit 511342e
Show file tree

Hide file tree

Showing 8 changed files with 159 additions and 160 deletions.
diff --git a/composer.json b/composer.json
@@ -15,12 +15,13 @@
         "ext-pdo": "*",
         "aura/sql": "^3.0",
         "bear/resource": "^1.15",
-        "doctrine/annotations": "^1.11",
+        "doctrine/annotations": "^1.12",
         "guzzlehttp/guzzle": "^6.3 || ^7.0",
         "koriym/query-locator": "^1.4",
         "ray/aop": "^2.10.3",
         "ray/aura-sql-module": "^1.10.0",
-        "ray/di": "^2.11"
+        "ray/di": "^2.11",
+        "nikic/php-parser": "^v4.13"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5",

diff --git a/src/QueryInterface.php b/src/QueryInterface.php
@@ -7,7 +7,7 @@
 interface QueryInterface
 {
     /**
-     * @param array<string, mixed> $query
+     * @param array<string, mixed> ...$query
      *
      * @return mixed
      */

diff --git a/src/RowInterface.php b/src/RowInterface.php
@@ -7,7 +7,7 @@
 interface RowInterface extends QueryInterface
 {
     /**
-     * @param array<string, mixed> $query
+     * @param array<string, mixed> ...$query
      *
      * @return iterable<mixed>
      */

diff --git a/src/RowListInterface.php b/src/RowListInterface.php
@@ -7,7 +7,7 @@
 interface RowListInterface extends QueryInterface
 {
     /**
-     * @param array<string, mixed> $query
+     * @param array<string, mixed> ...$query
      *
      * @return iterable<mixed>
      */

diff --git a/src/SqlQueryRow.php b/src/SqlQueryRow.php
@@ -26,11 +26,10 @@ public function __construct(ExtendedPdoInterface $pdo, string $sql)
     }
 
     /**
-     * @param array<string, mixed> $queries
+     * @param array<string, mixed> ...$queries
      */
     public function __invoke(array ...$queries): iterable
     {
-        /** @var array<string, mixed> $query */
         $query = $queries[0];
         $item = $this->pdo->fetchAssoc($this->sql, $query);
         if (! count($item)) {

diff --git a/src/SqlQueryRowList.php b/src/SqlQueryRowList.php
@@ -31,7 +31,7 @@ public function __construct(ExtendedPdoInterface $pdo, string $sql)
     }
 
     /**
-     * @param array<string, mixed> $queries
+     * @param array<string, mixed> ...$queries
      */
     public function __invoke(array ...$queries): iterable
     {
@@ -49,7 +49,6 @@ public function __invoke(array ...$queries): iterable
         $result = null;
         for ($i = 0; $i < $numQueris; $i++) {
             $sql = $sqls[$i];
-            /** @var array<string, mixed> $query */
             $query = $queries[$i];
             $result = $this->pdo->perform($sql, $query);
         }

diff --git a/src/WebQuery.php b/src/WebQuery.php
@@ -31,11 +31,10 @@ public function __construct(ClientInterface $client, string $method, string $uri
     }
 
     /**
-     * @param array<string, mixed> $queries
+     * @param array<string, mixed> ...$queries
      */
     public function __invoke(array ...$queries): iterable
     {
-        /** @var array<string, mixed> $query */
         $query = $queries[0];
         try {
             $response = $this->client->request($this->method, $this->uri, ['query' => $query]);