wip

Author: rasmuscnielsen

.github/workflows/test.yml

@@ -11,12 +11,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [8.1, 8.2, 8.3]
-        laravel: [10.*, 11.*]
+        php: [8.1, 8.2, 8.3, 8.4]
+        laravel: [10.*, 11.*, 12.*]
         dependency-version: [prefer-lowest, prefer-stable]
         exclude:
           - php: 8.1
             laravel: 11.*
+          - php: 8.1
+            laravel: 12.*
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
 

.gitignore

@@ -3,4 +3,6 @@ composer.phar
 composer.lock
 vendor
 .php_cs.cache
-.phpunit.result.cache
+.phpunit.result.cache
+.phpunit.cache
+.claude

composer.json

@@ -7,15 +7,15 @@
         }
     },
     "require": {
-        "php": "^8.1",
-        "illuminate/container": "^10.0|^11.0",
-        "illuminate/database": "^10.0|^11.0",
-        "illuminate/support": "^10.0|^11.0",
+        "php": "^8.1|^8.2|^8.3|^8.4",
+        "illuminate/container": "^10.0|^11.0|^12.0",
+        "illuminate/database": "^10.0|^11.0|^12.0",
+        "illuminate/support": "^10.0|^11.0|^12.0",
         "spatie/laravel-query-builder": "^5.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.0",
-        "laravel/laravel": "^10.0|^11.0",
+        "phpunit/phpunit": "^10.0|^11.0",
+        "laravel/laravel": "^10.0|^11.0|^12.0",
         "mockery/mockery": "^1.5",
         "makeabledk/laravel-factory-enhanced": "^5.0",
         "fakerphp/faker": "^1.18"

phpunit.xml

@@ -1,25 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         bootstrap="vendor/autoload.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         verbose="true"
-        >
-    <testsuites>
-        <testsuite name="Package Test Suite">
-            <directory suffix="Test.php">./tests/</directory>
-        </testsuite>
-    </testsuites>
-    <php>
-        <ini name="display_errors" value="1" />
-        <server name="APP_ENV" value="testing" />
-        <server name="APP_DEBUG" value="true" />
-        <server name="DB_CONNECTION" value="sqlite" />
-        <server name="DB_DATABASE" value=":memory:" />
-    </php>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" bootstrap="vendor/autoload.php" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
+  <testsuites>
+    <testsuite name="Package Test Suite">
+      <directory suffix="Test.php">./tests/</directory>
+    </testsuite>
+  </testsuites>
+  <php>
+    <ini name="display_errors" value="1"/>
+    <server name="APP_ENV" value="testing"/>
+    <server name="APP_DEBUG" value="true"/>
+    <server name="DB_CONNECTION" value="sqlite"/>
+    <server name="DB_DATABASE" value=":memory:"/>
+  </php>
 </phpunit>

tests/Feature/EndpointHttpTest.php

@@ -132,4 +132,27 @@ public function it_supports_circular_includes()
                 ]],
             ]]);
     }
+
+    /** @test **/
+    public function it_supports_allowed_includes_syntax()
+    {
+
+        $server = factory(User::class)
+            ->with(1, 'teams')
+            ->create();
+
+        $this
+            ->withoutExceptionHandling()
+            ->getJson('/servers?include=databases.server&append=databases.server.internal_ip')
+            ->assertSuccessful()
+            ->assertJson([[
+                'id' => $server->id,
+                'databases' => [[
+                    'server' => [
+                        'id' => $server->id,
+                        'internal_ip' => '127.0.0.1',
+                    ],
+                ]],
+            ]]);
+    }
 }

tests/Stubs/Endpoints/UserEndpoint.php

@@ -4,6 +4,7 @@
 
 use Makeable\ApiEndpoints\Endpoint;
 use Makeable\ApiEndpoints\Tests\Stubs\User;
+use Spatie\QueryBuilder\AllowedInclude;
 
 class UserEndpoint extends Endpoint
 {
@@ -14,7 +15,9 @@ public function __invoke()
         $this
             ->allowedIncludes([
                 'servers' => ServerEndpoint::make(),
+//                'serversCount' => AllowedInclude::count('servers'),
                 'favoriteServers' => ServerEndpoint::make(),
+                AllowedInclude::relationship('teams'),
             ]);
     }
 }