Merge pull request #75 from TheDragonCode/10.x

Added `dragon-code/support` 6 support

Author: Andrey Helldar

.github/workflows/laravel-7.yml

@@ -8,7 +8,7 @@ jobs:
         strategy:
             fail-fast: true
             matrix:
-                php: [ "7.3", "7.4", "8.0" ]
+                php: [ "8.0" ]
                 laravel: [ "7.0" ]
 
         name: PHP ${{ matrix.php }}

.github/workflows/laravel-8.yml

@@ -8,7 +8,7 @@ jobs:
         strategy:
             fail-fast: true
             matrix:
-                php: [ "7.3", "7.4", "8.0", "8.1" ]
+                php: [ "8.0", "8.1" ]
                 laravel: [ "8.0" ]
 
         name: PHP ${{ matrix.php }}

.github/workflows/symfony-4.yml

@@ -8,7 +8,7 @@ jobs:
         strategy:
             fail-fast: true
             matrix:
-                php: [ "7.3", "7.4", "8.0" ]
+                php: [ "8.0" ]
                 symfony: [ "4.0" ]
 
         name: PHP ${{ matrix.php }}

.github/workflows/symfony-5.yml

@@ -8,7 +8,7 @@ jobs:
         strategy:
             fail-fast: true
             matrix:
-                php: [ "7.3", "7.4", "8.0", "8.1" ]
+                php: [ "8.0", "8.1" ]
                 symfony: [ "5.0" ]
 
         name: PHP ${{ matrix.php }}

composer.json

@@ -25,10 +25,10 @@
         "source": "https://github.com/TheDragonCode/api-response"
     },
     "require": {
-        "php": "^7.2.5 || ^8.0",
+        "php": "^8.0",
         "ext-json": "*",
         "dragon-code/contracts": "^2.2",
-        "dragon-code/support": "^5.0",
+        "dragon-code/support": "^6.0",
         "symfony/http-foundation": "^4.0 || ^5.0 || ^6.0"
     },
     "require-dev": {

src/Concerns/Errors.php

@@ -17,7 +17,7 @@
 
 namespace DragonCode\ApiResponse\Concerns;
 
-use DragonCode\Support\Facades\Helpers\Is;
+use DragonCode\Support\Facades\Types\Is;
 
 trait Errors
 {

src/Parsers/Exception.php

@@ -17,8 +17,8 @@
 
 namespace DragonCode\ApiResponse\Parsers;
 
-use DragonCode\Support\Facades\Helpers\Call;
-use DragonCode\Support\Facades\Helpers\Instance;
+use DragonCode\Support\Facades\Instances\Call;
+use DragonCode\Support\Facades\Instances\Instance;
 use Exception as BaseException;
 use Throwable;
 

src/Parsers/Laravel/Resource.php

@@ -18,7 +18,6 @@
 namespace DragonCode\ApiResponse\Parsers\Laravel;
 
 use DragonCode\ApiResponse\Parsers\Parser;
-use DragonCode\Support\Facades\Helpers\Ables\Arrayable;
 use DragonCode\Support\Facades\Helpers\Arr;
 use Illuminate\Http\JsonResponse;
 
@@ -41,10 +40,10 @@ public function getWith(): array
         $data = $this->resourceData();
 
         if ($this->hasData($data)) {
-            return Arrayable::of($data)
+            return Arr::of($data)
                 ->except('data')
                 ->merge($this->with)
-                ->get();
+                ->toArray();
         }
 
         return $this->with;

src/Parsers/Parser.php

@@ -21,8 +21,8 @@
 use DragonCode\ApiResponse\Services\Response;
 use DragonCode\Contracts\ApiResponse\Parseable;
 use DragonCode\Support\Concerns\Makeable;
-use DragonCode\Support\Facades\Helpers\Instance;
-use DragonCode\Support\Facades\Helpers\Is;
+use DragonCode\Support\Facades\Instances\Instance;
+use DragonCode\Support\Facades\Types\Is;
 use Exception as BaseException;
 
 abstract class Parser implements Parseable

src/Support/Parser.php

@@ -24,8 +24,8 @@
 use DragonCode\ApiResponse\Parsers\Main;
 use DragonCode\Contracts\ApiResponse\Parseable;
 use DragonCode\Support\Concerns\Makeable;
-use DragonCode\Support\Facades\Helpers\Instance;
-use DragonCode\Support\Facades\Helpers\Is;
+use DragonCode\Support\Facades\Instances\Instance;
+use DragonCode\Support\Facades\Types\Is;
 use Exception;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Validation\ValidationException;

src/Wrappers/Resolver.php

@@ -106,6 +106,6 @@ protected function resolveData($data)
             return $data;
         }
 
-        return Arr::toArray($data);
+        return Arr::resolve($data);
     }
 }

src/Wrappers/Wrapper.php

@@ -128,7 +128,7 @@ protected function split(): void
         $with = $this->getWith();
 
         if (is_array($data) || is_object($data)) {
-            $array = Arr::toArray($data);
+            $array = Arr::resolve($data);
 
             if ($this->wrap || ! empty($with) || $this->isError($array)) {
                 $this->setData($this->unpackData($array));

tests/Fixtures/Entities/Response.php

@@ -17,7 +17,7 @@
 
 namespace Tests\Fixtures\Entities;
 
-use DragonCode\Support\Facades\Helpers\Instance;
+use DragonCode\Support\Facades\Instances\Instance;
 use Illuminate\Testing\TestResponse;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Response as MainResponse;