Merge branch '1.9.x' into codex/disable-graphql-functional

ChiragAgg5k · web-flow · commit bea7739d7ebc · 2026-04-14T17:21:55.000+05:30
diff --git a/app/controllers/api/graphql.php b/app/controllers/api/graphql.php
@@ -231,7 +231,7 @@ function execute(
     $validations = GraphQL::getStandardValidationRules();
 
     if (System::getEnv('_APP_GRAPHQL_INTROSPECTION', 'enabled') === 'disabled') {
-        $validations[] = new DisableIntrospection();
+        $validations[] = new DisableIntrospection(DisableIntrospection::ENABLED);
     }
 
     if (System::getEnv('_APP_OPTIONS_ABUSE', 'enabled') !== 'disabled') {
diff --git a/composer.json b/composer.json
@@ -92,7 +92,7 @@
         "chillerlan/php-qrcode": "4.3.*",
         "adhocore/jwt": "1.1.*",
         "spomky-labs/otphp": "11.*",
-        "webonyx/graphql-php": "14.11.*",
+        "webonyx/graphql-php": "15.31.*",
         "league/csv": "9.14.*",
         "enshrined/svg-sanitize": "0.22.*"
     },
diff --git a/composer.lock b/composer.lock
diff --git a/src/Appwrite/GraphQL/Promises/Adapter.php b/src/Appwrite/GraphQL/Promises/Adapter.php
@@ -81,8 +81,8 @@ abstract public function createRejected(mixed $reason): GQLPromise;
     /**
      * Create a new promise that resolves when all passed in promises resolve.
      *
-     * @param array $promisesOrValues
+     * @param iterable $promisesOrValues
      * @return GQLPromise
      */
-    abstract public function all(array $promisesOrValues): GQLPromise;
+    abstract public function all(iterable $promisesOrValues): GQLPromise;
 }
diff --git a/src/Appwrite/GraphQL/Promises/Adapter/Swoole.php b/src/Appwrite/GraphQL/Promises/Adapter/Swoole.php
@@ -35,8 +35,12 @@ public function createRejected($reason): GQLPromise
         return new GQLPromise($promise, $this);
     }
 
-    public function all(array $promisesOrValues): GQLPromise
+    public function all(iterable $promisesOrValues): GQLPromise
     {
+        if ($promisesOrValues instanceof \Traversable) {
+            $promisesOrValues = \iterator_to_array($promisesOrValues);
+        }
+
         return new GQLPromise(SwoolePromise::all($promisesOrValues), $this);
     }
 }
diff --git a/src/Appwrite/GraphQL/Types/Assoc.php b/src/Appwrite/GraphQL/Types/Assoc.php
@@ -3,12 +3,13 @@
 namespace Appwrite\GraphQL\Types;
 
 use GraphQL\Language\AST\Node;
+use GraphQL\Language\AST\StringValueNode;
 
 // https://github.com/webonyx/graphql-php/issues/129#issuecomment-309366803
 class Assoc extends Json
 {
-    public $name = 'Assoc';
-    public $description = 'The `Assoc` scalar type represents associative array values.';
+    public string $name = 'Assoc';
+    public ?string $description = 'The `Assoc` scalar type represents associative array values.';
 
     public function serialize($value)
     {
@@ -30,6 +31,10 @@ public function parseValue($value)
 
     public function parseLiteral(Node $valueNode, ?array $variables = null)
     {
-        return \json_decode($valueNode->value, true);
+        if ($valueNode instanceof StringValueNode) {
+            return \json_decode($valueNode->value, true);
+        }
+
+        return parent::parseLiteral($valueNode, $variables);
     }
 }
diff --git a/src/Appwrite/GraphQL/Types/InputFile.php b/src/Appwrite/GraphQL/Types/InputFile.php
@@ -8,8 +8,8 @@
 
 class InputFile extends ScalarType
 {
-    public $name = 'InputFile';
-    public $description = 'The `InputFile` special type represents a file to be uploaded in the same HTTP request as specified by
+    public string $name = 'InputFile';
+    public ?string $description = 'The `InputFile` special type represents a file to be uploaded in the same HTTP request as specified by
  [graphql-multipart-request-spec](https://github.com/jaydenseric/graphql-multipart-request-spec).';
 
     public function serialize($value)
diff --git a/src/Appwrite/GraphQL/Types/Json.php b/src/Appwrite/GraphQL/Types/Json.php
@@ -14,8 +14,8 @@
 // https://github.com/webonyx/graphql-php/issues/129#issuecomment-309366803
 class Json extends ScalarType
 {
-    public $name = 'Json';
-    public $description = 'The `JSON` scalar type represents JSON values as specified by
+    public string $name = 'Json';
+    public ?string $description = 'The `JSON` scalar type represents JSON values as specified by
         [ECMA-404](https://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf).';
 
     public function serialize($value)
diff --git a/tests/unit/GraphQL/BuilderTest.php b/tests/unit/GraphQL/BuilderTest.php
@@ -4,6 +4,7 @@
 
 use Appwrite\GraphQL\Types\Mapper;
 use Appwrite\Utopia\Response;
+use GraphQL\Type\Definition\NamedType;
 use PHPUnit\Framework\TestCase;
 use Swoole\Http\Response as SwooleResponse;
 
@@ -24,6 +25,7 @@ public function testCreateTypeMapping()
     {
         $model = $this->response->getModel(Response::MODEL_TABLE);
         $type = Mapper::model(\ucfirst($model->getType()));
-        $this->assertEquals('Table', $type->name);
+        $this->assertInstanceOf(NamedType::class, $type);
+        $this->assertEquals('Table', $type->name());
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -231,7 +231,7 @@ function execute(`
`231`	`231`	`$validations = GraphQL::getStandardValidationRules();`
`232`	`232`
`233`	`233`	`if (System::getEnv('_APP_GRAPHQL_INTROSPECTION', 'enabled') === 'disabled') {`
`234`		`- $validations[] = new DisableIntrospection();`
	`234`	`+ $validations[] = new DisableIntrospection(DisableIntrospection::ENABLED);`
`235`	`235`	`}`
`236`	`236`
`237`	`237`	`if (System::getEnv('_APP_OPTIONS_ABUSE', 'enabled') !== 'disabled') {`
Original file line number	Diff line number	Diff line change
`@@ -81,8 +81,8 @@ abstract public function createRejected(mixed $reason): GQLPromise;`
`81`	`81`	`/**`
`82`	`82`	`* Create a new promise that resolves when all passed in promises resolve.`
`83`	`83`	`*`
`84`		`- * @param array $promisesOrValues`
	`84`	`+ * @param iterable $promisesOrValues`
`85`	`85`	`* @return GQLPromise`
`86`	`86`	`*/`
`87`		`- abstract public function all(array $promisesOrValues): GQLPromise;`
	`87`	`+ abstract public function all(iterable $promisesOrValues): GQLPromise;`
`88`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,12 @@ public function createRejected($reason): GQLPromise`
`35`	`35`	`return new GQLPromise($promise, $this);`
`36`	`36`	`}`
`37`	`37`
`38`		`- public function all(array $promisesOrValues): GQLPromise`
	`38`	`+ public function all(iterable $promisesOrValues): GQLPromise`
`39`	`39`	`{`
	`40`	`+ if ($promisesOrValues instanceof \Traversable) {`
	`41`	`+ $promisesOrValues = \iterator_to_array($promisesOrValues);`
	`42`	`+ }`
	`43`	`+`
`40`	`44`	`return new GQLPromise(SwoolePromise::all($promisesOrValues), $this);`
`41`	`45`	`}`
`42`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,12 +3,13 @@`
`3`	`3`	`namespace Appwrite\GraphQL\Types;`
`4`	`4`
`5`	`5`	`use GraphQL\Language\AST\Node;`
	`6`	`+use GraphQL\Language\AST\StringValueNode;`
`6`	`7`
`7`	`8`	`// https://github.com/webonyx/graphql-php/issues/129#issuecomment-309366803`
`8`	`9`	`class Assoc extends Json`
`9`	`10`	`{`
`10`		`- public $name = 'Assoc';`
`11`		- public $description = 'The `Assoc` scalar type represents associative array values.';
	`11`	`+ public string $name = 'Assoc';`
	`12`	+ public ?string $description = 'The `Assoc` scalar type represents associative array values.';
`12`	`13`
`13`	`14`	`public function serialize($value)`
`14`	`15`	`{`
`@@ -30,6 +31,10 @@ public function parseValue($value)`
`30`	`31`
`31`	`32`	`public function parseLiteral(Node $valueNode, ?array $variables = null)`
`32`	`33`	`{`
`33`		`- return \json_decode($valueNode->value, true);`
	`34`	`+ if ($valueNode instanceof StringValueNode) {`
	`35`	`+ return \json_decode($valueNode->value, true);`
	`36`	`+ }`
	`37`	`+`
	`38`	`+ return parent::parseLiteral($valueNode, $variables);`
`34`	`39`	`}`
`35`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@`
`8`	`8`
`9`	`9`	`class InputFile extends ScalarType`
`10`	`10`	`{`
`11`		`- public $name = 'InputFile';`
`12`		- public $description = 'The `InputFile` special type represents a file to be uploaded in the same HTTP request as specified by
	`11`	`+ public string $name = 'InputFile';`
	`12`	+ public ?string $description = 'The `InputFile` special type represents a file to be uploaded in the same HTTP request as specified by
`13`	`13`	`[graphql-multipart-request-spec](https://github.com/jaydenseric/graphql-multipart-request-spec).';`
`14`	`14`
`15`	`15`	`public function serialize($value)`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`
`5`	`5`	`use Appwrite\GraphQL\Types\Mapper;`
`6`	`6`	`use Appwrite\Utopia\Response;`
	`7`	`+use GraphQL\Type\Definition\NamedType;`
`7`	`8`	`use PHPUnit\Framework\TestCase;`
`8`	`9`	`use Swoole\Http\Response as SwooleResponse;`
`9`	`10`
`@@ -24,6 +25,7 @@ public function testCreateTypeMapping()`
`24`	`25`	`{`
`25`	`26`	`$model = $this->response->getModel(Response::MODEL_TABLE);`
`26`	`27`	`$type = Mapper::model(\ucfirst($model->getType()));`
`27`		`- $this->assertEquals('Table', $type->name);`
	`28`	`+ $this->assertInstanceOf(NamedType::class, $type);`
	`29`	`+ $this->assertEquals('Table', $type->name());`
`28`	`30`	`}`
`29`	`31`	`}`