Fix invalid error handling from Expo: error is not an int but a string (

#10) * Fix invalid error handling from Expo: error is not an int but a string * Append error code and cast empty data array Co-authored-by: Joris Berthelot <[email protected]> Co-authored-by: ctwillie <[email protected]>
ctwillie · Oct 26, 2021 · 040f5d0 · 040f5d0
1 parent 242df3b
commit 040f5d0
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 7 deletions.
diff --git a/src/ExpoErrorManager.php b/src/ExpoErrorManager.php
@@ -55,8 +55,15 @@ public function getErrorFromResult(array $response, int $statusCode): ExpoExcept
         }
 
         $error = $response['errors'][0];
+        $message = $error['message'];
+        $code = $error['code'];
 
-        return new ExpoException($error['message'], $error['code']);
+        if (is_string($code)) {
+            $message = "{$code}: {$message}";
+            $code = $statusCode;
+        }
+
+        return new ExpoException($message, $code);
     }
 
     /**

diff --git a/src/ExpoMessage.php b/src/ExpoMessage.php
@@ -173,9 +173,13 @@ public function setTo($tokens): self
      */
     public function setData($data = null): self
     {
+        if (gettype($data) === 'array' && empty($data)) {
+            $data = new \stdClass();
+        }
+
         if ($data !== null && ! is_object($data) && ! Utils::isAssoc($data)) {
             throw new ExpoMessageException(sprintf(
-                'Message data must be either an associative array, object or null. % given',
+                'Message data must be either an associative array, object or null. %s given',
                 gettype($data)
             ));
         }

diff --git a/tests/ExpoErrorManagerTest.php b/tests/ExpoErrorManagerTest.php
@@ -17,7 +17,7 @@ class ExpoErrorManagerTest extends TestCase
         'errors' => [
             [
                 'message' => 'Some expo error',
-                'code' => 400,
+                'code' => 'VALIDATION_ERROR',
             ],
         ],
     ];
@@ -71,7 +71,11 @@ public function get_error_from_result_returns_exception()
             $exception
         );
         $this->assertSame(
-            $this->errorResponse['errors'][0]['message'],
+            sprintf(
+                '%s: %s',
+                $this->errorResponse['errors'][0]['code'],
+                $this->errorResponse['errors'][0]['message']
+            ),
             $exception->getMessage()
         );
         $this->assertSame(400, $exception->getCode());

diff --git a/tests/ExpoMessageTest.php b/tests/ExpoMessageTest.php
@@ -67,7 +67,7 @@ public function throws_exception_if_data_is_not_null_object_or_assoc_array()
         $data = ['foo'];
 
         $this->expectExceptionMessage(sprintf(
-            'Message data must be either an associative array, object or null. % given',
+            'Message data must be either an associative array, object or null. %s given',
             gettype($data)
         ));
 
@@ -80,15 +80,15 @@ public function can_create_message_from_array()
         $message = (new ExpoMessage([
             'title' => 'test title',
             'body' => 'test body',
-            'data' => ['test' => 'data'],
+            'data' => [],
             'to' => ['ExponentPushToken[valid-token]', 'invalid-token]'],
         ]))->toArray();
         $expected = [
             'mutableContent' => false,
             'priority' => 'default',
             'title' => 'test title',
             'body' => 'test body',
-            'data' => ['test' => 'data'],
+            'data' => new \stdClass(),
             'to' => ['ExponentPushToken[valid-token]'],
         ];