Fix initialization of Result from Response (#22)

Author: spawnia

CHANGELOG.md

@@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## Unreleased
 
+## v0.4.2
+
+### Fixed
+
+- Fix initialization of Result from Response
+
 ## v0.4.1
 
 ### Changed

examples/simple/sailor.php

@@ -8,7 +8,8 @@
 use Spawnia\Sailor\Testing\MockClient;
 
 return [
-    'simple' => new class extends EndpointConfig {
+    'simple' => new class extends EndpointConfig
+    {
         public function namespace(): string
         {
             return 'Spawnia\Sailor\Simple';

sailor.php

@@ -8,7 +8,8 @@
  * This must return a map from endpoint names to EndpointConfig classes.
  */
 return [
-    'example' => new class extends EndpointConfig {
+    'example' => new class extends EndpointConfig
+    {
         /**
          * Instantiate a client for Sailor to use for querying.
          *

src/Result.php

@@ -44,10 +44,10 @@ public static function fromResponse(Response $response): self
         $instance->errors = $response->errors ?? null;
         $instance->extensions = $response->extensions ?? null;
 
-        if (is_null($response->data)) {
-            $instance->data = null;
-        } else {
+        if (isset($response->data)) {
             $instance->setData($response->data);
+        } else {
+            $instance->data = null;
         }
 
         return $instance;

tests/Unit/IntrospectorTest.php

@@ -27,7 +27,8 @@ class IntrospectorTest extends TestCase
 
     public function testPrintsIntrospection(): void
     {
-        $endpointConfig = new class extends EndpointConfig {
+        $endpointConfig = new class extends EndpointConfig
+        {
             public function makeClient(): Client
             {
                 $mockClient = new MockClient();

tests/Unit/ResultTest.php

@@ -39,4 +39,19 @@ public function testErrorFree(): void
         $this->expectException(ResultErrorsException::class);
         $result->errorFree();
     }
+
+    public function testWithErrors(): void
+    {
+        $result = MyScalarQueryResult::fromStdClass((object) [
+            'errors' => [
+                (object) [
+                    'message' => 'foo',
+                ],
+            ],
+        ]);
+        self::assertNull($result->data);
+        self::assertNotNull($result->errors);
+        self::assertCount(1, $result->errors);
+        self::assertNull($result->extensions);
+    }
 }