test: success

jiannei · Oct 13, 2023 · 3c1ca0a · 3c1ca0a
1 parent 861c1a7
commit 3c1ca0a
Show file tree

Hide file tree

Showing 5 changed files with 190 additions and 233 deletions.
diff --git a/src/Support/Facades/Format.php b/src/Support/Facades/Format.php
@@ -11,6 +11,7 @@
 
 namespace Jiannei\Response\Laravel\Support\Facades;
 
+use Illuminate\Contracts\Pagination\Paginator;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Http\Resources\Json\ResourceCollection;
@@ -20,7 +21,7 @@
 
 /**
  * @method static array|\Jiannei\Response\Laravel\Support\Format data($data = null)
- * @method static array paginator(AbstractPaginator|AbstractCursorPaginator $resource)
+ * @method static array paginator(AbstractPaginator|AbstractCursorPaginator|Paginator $resource)
  * @method static array resourceCollection(ResourceCollection $collection)
  * @method static array jsonResource(JsonResource $resource)
  * @method static JsonResponse response()

diff --git a/src/Support/Format.php b/src/Support/Format.php
@@ -19,11 +19,11 @@
 use Illuminate\Pagination\AbstractCursorPaginator;
 use Illuminate\Pagination\AbstractPaginator;
 use Illuminate\Pagination\CursorPaginator;
-use Illuminate\Pagination\Paginator;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Lang;
 use Illuminate\Support\Traits\Macroable;
+use Illuminate\Contracts\Pagination\Paginator;
 
 class Format
 {
@@ -75,10 +75,10 @@ public function data($data = null): static|array
     /**
      * Format paginator data.
      *
-     * @param  AbstractPaginator|AbstractCursorPaginator  $resource
+     * @param  AbstractPaginator|AbstractCursorPaginator|Paginator  $resource
      * @return array
      */
-    public function paginator(AbstractPaginator|AbstractCursorPaginator $resource): array
+    public function paginator(AbstractPaginator|AbstractCursorPaginator|Paginator $resource): array
     {
         return [
             'data' => $resource->toArray()['data'],

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -49,7 +49,7 @@ protected function defineEnvironment($app)
             $config->set('response.locale', 'enums.'.ResponseEnum::class);
         });
 
-        if ($this instanceof \P\Tests\Unit\FormatTest) {
+        if ($this instanceof \P\Tests\Unit\CustomFormatTest) {
             $app['config']->set('response.format', [
                 'class' => \Jiannei\Response\Laravel\Tests\Support\Format::class,
             ]);

diff --git a/tests/Unit/FormatTest.php → tests/Unit/CustomFormatTest.php b/tests/Unit/FormatTest.php → tests/Unit/CustomFormatTest.php