feat(helpers): Improve make function to support more keys

- Enhance the `make` function to recognize additional keys for abstraction
- Update key checks from 3 to 8, improving flexibility in input arrays
- Add reference link for clarity on the implementation
- Modify tests to accommodate new key options for making API responses

Author: guanguans

baselines/loader.neon

@@ -2,5 +2,6 @@ includes:
     - function.alreadyNarrowedType.neon
     - method.nonObject.neon
     - method.notFound.neon
+    - nullCoalesce.variable.neon
     - trait.unused.neon
     - typeCoverage.paramTypeCoverage.neon

baselines/nullCoalesce.variable.neon

@@ -0,0 +1,8 @@
+# total 1 error
+
+parameters:
+    ignoreErrors:
+        -
+            message: '#^Variable \$keys on left side of \?\?\= is never defined\.$#'
+            count: 1
+            path: ../src/Support/helpers.php

src/Support/helpers.php

@@ -18,6 +18,8 @@
 
 if (!\function_exists('Guanguans\LaravelApiResponse\Support\make')) {
     /**
+     * @see https://github.com/yiisoft/yii2/blob/master/framework/BaseYii.php
+     *
      * @param array<string, mixed>|string $abstract
      * @param array<string, mixed> $parameters
      *
@@ -29,18 +31,27 @@ function make(array|string $abstract, array $parameters = []): mixed
             return resolve($abstract, $parameters);
         }
 
-        foreach ($classes = ['__class', '_class', 'class'] as $class) {
-            if (isset($abstract[$class])) {
-                return make(
-                    $abstract[$class],
-                    $parameters + Arr::except($abstract, $class),
-                );
+        foreach (
+            $keys ??= [
+                '__abstract',
+                '__class',
+                '__name',
+                '_abstract',
+                '_class',
+                '_name',
+                'abstract',
+                'class',
+                'name',
+            ] as $key
+        ) {
+            if (isset($abstract[$key])) {
+                return make($abstract[$key], $parameters + Arr::except($abstract, $key));
             }
         }
 
         throw new InvalidArgumentException(\sprintf(
             'The argument of abstract must be an array containing a `%s` element.',
-            implode('` or `', $classes)
+            implode('` or `', $keys)
         ));
     }
 }

tests/Support/HeplersTest.php

@@ -17,7 +17,7 @@
  * @see https://github.com/guanguans/laravel-api-response
  */
 
-use Guanguans\LaravelApiResponse\Contracts\ApiResponseContract;
+use Guanguans\LaravelApiResponse\ApiResponse;
 use Pest\Expectation;
 use function Guanguans\LaravelApiResponse\Support\env_explode;
 use function Guanguans\LaravelApiResponse\Support\make;
@@ -34,9 +34,20 @@
     make([]);
 })->group(__DIR__, __FILE__)->throws(InvalidArgumentException::class);
 
-it('can make api response', function (): void {
-    expect(make(['class' => ApiResponseContract::class]))->toBeInstanceOf(ApiResponseContract::class);
-})->group(__DIR__, __FILE__);
+it('can make api response', function (array|string $abstract): void {
+    expect(make($abstract))->toBeInstanceOf(ApiResponse::class);
+})->group(__DIR__, __FILE__)->with([
+    ['abstract' => ApiResponse::class],
+    ['abstract' => ['__abstract' => ApiResponse::class, 'pipes' => collect(), 'exceptionPipes' => collect()]],
+    ['abstract' => ['__class' => ApiResponse::class, 'pipes' => collect(), 'exceptionPipes' => collect()]],
+    ['abstract' => ['__name' => ApiResponse::class, 'pipes' => collect(), 'exceptionPipes' => collect()]],
+    ['abstract' => ['_abstract' => ApiResponse::class, 'pipes' => collect(), 'exceptionPipes' => collect()]],
+    ['abstract' => ['_class' => ApiResponse::class, 'pipes' => collect(), 'exceptionPipes' => collect()]],
+    ['abstract' => ['_name' => ApiResponse::class, 'pipes' => collect(), 'exceptionPipes' => collect()]],
+    ['abstract' => ['abstract' => ApiResponse::class, 'pipes' => collect(), 'exceptionPipes' => collect()]],
+    ['abstract' => ['class' => ApiResponse::class, 'pipes' => collect(), 'exceptionPipes' => collect()]],
+    ['abstract' => ['name' => ApiResponse::class, 'pipes' => collect(), 'exceptionPipes' => collect()]],
+]);
 
 it('can explode env', function (): void {
     expect([