Merge 22aaf8f into c7ff82a

webonyx · Nov 19, 2021 · daec2fe · daec2fe
2 parents c7ff82a + 22aaf8f
commit daec2fe
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 12 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -596,7 +596,7 @@ parameters:
 			path: tests/Executor/DirectivesTest.php
 
 		-
-			message: "#^Anonymous function should have native return typehint \"class@anonymous/tests/Executor/ExecutorTest\\.php\\:1329\"\\.$#"
+			message: "#^Anonymous function should have native return typehint \"class@anonymous/tests/Executor/ExecutorTest\\.php\\:1331\"\\.$#"
 			count: 1
 			path: tests/Executor/ExecutorTest.php
 

diff --git a/src/Executor/ExecutionResult.php b/src/Executor/ExecutionResult.php
@@ -115,7 +115,7 @@ public function setErrorsHandler(callable $handler)
     /**
      * @return mixed[]
      */
-    public function jsonSerialize()
+    public function jsonSerialize() : array
     {
         return $this->toArray();
     }

diff --git a/src/Language/AST/NodeList.php b/src/Language/AST/NodeList.php
@@ -9,6 +9,7 @@
 use GraphQL\Utils\AST;
 use InvalidArgumentException;
 use IteratorAggregate;
+use ReturnTypeWillChange;
 use Traversable;
 use function array_merge;
 use function array_splice;
@@ -69,6 +70,7 @@ public function offsetExists($offset) : bool
      *
      * @phpstan-return T
      */
+    #[ReturnTypeWillChange]
     public function offsetGet($offset)// : Node
     {
         $item = $this->nodes[$offset];

diff --git a/src/Utils/MixedStore.php b/src/Utils/MixedStore.php
@@ -7,6 +7,7 @@
 use ArrayAccess;
 use GraphQL\Type\Definition\EnumValueDefinition;
 use InvalidArgumentException;
+use ReturnTypeWillChange;
 use SplObjectStorage;
 use function array_key_exists;
 use function array_search;
@@ -90,7 +91,7 @@ public function __construct()
      * <p>
      * The return value will be casted to boolean if non-boolean was returned.
      */
-    public function offsetExists($offset)
+    public function offsetExists($offset) : bool
     {
         if ($offset === false) {
             return $this->falseValueIsSet;
@@ -135,6 +136,7 @@ public function offsetExists($offset)
      *
      * @return mixed Can return all value types.
      */
+    #[ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         if ($offset === true) {
@@ -181,10 +183,8 @@ public function offsetGet($offset)
      * @param mixed $value  <p>
      *  The value to set.
      *  </p>
-     *
-     * @return void
      */
-    public function offsetSet($offset, $value)
+    public function offsetSet($offset, $value) : void
     {
         if ($offset === false) {
             $this->falseValue      = $value;
@@ -217,10 +217,8 @@ public function offsetSet($offset, $value)
      * @param mixed $offset <p>
      * The offset to unset.
      * </p>
-     *
-     * @return void
      */
-    public function offsetUnset($offset)
+    public function offsetUnset($offset) : void
     {
         if ($offset === true) {
             $this->trueValue      = null;

diff --git a/tests/Executor/ExecutorTest.php b/tests/Executor/ExecutorTest.php
@@ -24,6 +24,7 @@
 use GraphQL\Type\Definition\Type;
 use GraphQL\Type\Schema;
 use PHPUnit\Framework\TestCase;
+use ReturnTypeWillChange;
 use stdClass;
 use function count;
 use function json_encode;
@@ -1279,7 +1280,7 @@ public function testDefaultResolverGrabsValuesOffOfCommonPhpDataStructures() : v
                         'type' => $ArrayAccess,
                         'resolve' => static function () : ArrayAccess {
                             return new class implements ArrayAccess {
-                                public function offsetExists($offset)
+                                public function offsetExists($offset) : bool
                                 {
                                     switch ($offset) {
                                         case 'set':
@@ -1289,6 +1290,7 @@ public function offsetExists($offset)
                                     }
                                 }
 
+                                #[ReturnTypeWillChange]
                                 public function offsetGet($offset)
                                 {
                                     switch ($offset) {
@@ -1301,11 +1303,11 @@ public function offsetGet($offset)
                                     }
                                 }
 
-                                public function offsetSet($offset, $value)
+                                public function offsetSet($offset, $value) : void
                                 {
                                 }
 
-                                public function offsetUnset($offset)
+                                public function offsetUnset($offset) : void
                                 {
                                 }
                             };