fixed single entity response parsing

SzuniSOFT · Jun 19, 2019 · 6e3e8ec · 6e3e8ec
1 parent aec5ef1
commit 6e3e8ec
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/src/Internal/Client.php b/src/Internal/Client.php
@@ -410,7 +410,7 @@ public function getProducts()
             );
 
             // Convert response to OOP style.
-            return Collection::wrap(Arr::wrap($payload['Product']))->map(function ($rawProduct) {
+            return Collection::wrap(Arr::wrapNumeric($payload['Product']))->map(function ($rawProduct) {
                 return new Product($rawProduct);
             });
         });

diff --git a/src/Laravel/Support/UnasServiceProvider.php b/src/Laravel/Support/UnasServiceProvider.php
@@ -5,12 +5,27 @@
 
 
 use Illuminate\Contracts\Container\Container;
+use Illuminate\Support\Arr;
 use Illuminate\Support\ServiceProvider;
 use SzuniSoft\Unas\Internal\Client;
 
 class UnasServiceProvider extends ServiceProvider
 {
 
+    public function boot()
+    {
+        Arr::macro('wrapNumeric', function ($arr) {
+
+            $arr = Arr::wrap($arr);
+
+            if (Arr::isAssoc($arr)) {
+                return [$arr];
+            }
+
+            return $arr;
+        });
+    }
+
     public function register()
     {
         $this->registerConfigs();

diff --git a/tests/Client/GetProductTest.php b/tests/Client/GetProductTest.php
@@ -6,13 +6,19 @@
 
 use Illuminate\Foundation\Testing\WithFaker;
 use Illuminate\Support\Collection;
+use SzuniSoft\Unas\Laravel\Support\UnasServiceProvider;
 use SzuniSoft\Unas\Model\Product;
 
 class GetProductTest extends AuthenticatedTestCase
 {
 
     use WithFaker;
 
+    protected function getPackageProviders($app)
+    {
+        return [UnasServiceProvider::class];
+    }
+
     /** @test */
     public function can_return_with_products()
     {