Switch to github testing from travisci (#49)

* Switch to github testing

* Also remove styleci

* use correct name for matrix versions

* Adds composer commands

* Create laravel 10 stub

* Fix import

* Fixes internal request closures
Fixes warning about abstract test class (just for neatness)

* Fixes auth test

* Fixes routetest for adapter args

* Fix for phpunit10

* Fix regression for morph event

* Fix overriding original content

.github/workflows/ci.yml

@@ -0,0 +1,44 @@
+name: CI Tests
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - v*
+
+jobs:
+  tests:
+    runs-on: ubuntu-22.04
+
+    strategy:
+      fail-fast: false
+      matrix:
+        stability: [prefer-stable]
+        #versions: [ { php: 8.1, laravel: 10 }, { php: 8.2, laravel: 10 }, { php: 8.3, laravel: 10 },  { php: 8.2, laravel: 11 }, { php: 8.3, laravel: 11 } ]
+        versions: [ { php: 8.1, laravel: 10 }, { php: 8.2, laravel: 10 }, { php: 8.3, laravel: 10 } ]
+
+    name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      # Docs: https://github.com/shivammathur/setup-php
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.versions.php }}
+          extensions: dom, curl, libxml, mbstring, zip
+          ini-values: error_reporting=E_ALL
+          tools: composer:v2
+          # todo: Add
+          coverage: none
+
+      - name: Install dependencies
+        run: |
+          composer require "illuminate/contracts=^${{ matrix.versions.laravel }}" --no-update
+          composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader
+
+      - name: Run phpunit tests
+        run: composer test

.gitignore

@@ -7,3 +7,4 @@ vendor
 .php_cs
 .phpunit.result.cache
 .phpunit.result.cache/
+test-results

composer.json

@@ -68,5 +68,13 @@
         "sort-packages": true
     },
     "minimum-stability": "dev",
-    "prefer-stable": true
+    "prefer-stable": true,
+    "scripts": {
+        "test": [
+            "vendor/bin/phpunit"
+        ],
+        "lint": [
+            "vendor/bin/phpcs"
+        ]
+    }
 }

src/Http/Response.php

@@ -34,6 +34,13 @@ class Response extends IlluminateResponse
      */
     protected $binding;
 
+    /**
+     * Intermedia content that we are working on. The result content should be a string (symfony)
+     * )
+     * @var mixed Content with which we are working
+     */
+    protected $workingContent;
+
     /**
      * Array of registered formatters.
      *
@@ -125,12 +132,12 @@ public static function makeFromJson(JsonResponse $json)
      */
     public function morph($format = 'json')
     {
-        $content = $this->getOriginalContent() ?? '';
+        $this->workingContent = $this->getOriginalContent() ?? '';
 
         $this->fireMorphingEvent();
 
-        if (isset(static::$transformer) && static::$transformer->transformableResponse($content)) {
-            $content = static::$transformer->transform($content);
+        if (isset(static::$transformer) && static::$transformer->transformableResponse($this->workingContent)) {
+            $this->workingContent = static::$transformer->transform($this->workingContent);
         }
 
         $formatter = static::getFormatter($format);
@@ -147,21 +154,21 @@ public function morph($format = 'json')
 
         $this->fireMorphedEvent();
 
-        if ($content instanceof EloquentModel) {
-            $content = $formatter->formatEloquentModel($content);
-        } elseif ($content instanceof EloquentCollection) {
-            $content = $formatter->formatEloquentCollection($content);
-        } elseif (is_array($content) || $content instanceof ArrayObject || $content instanceof Arrayable) {
-            $content = $formatter->formatArray($content);
-        } elseif ($content instanceof stdClass) {
-            $content = $formatter->formatArray((array) $content);
+        if ($this->workingContent instanceof EloquentModel) {
+            $this->workingContent = $formatter->formatEloquentModel($this->workingContent);
+        } elseif ($this->workingContent instanceof EloquentCollection) {
+            $this->workingContent = $formatter->formatEloquentCollection($this->workingContent);
+        } elseif (is_array($this->workingContent) || $this->workingContent instanceof ArrayObject || $this->workingContent instanceof Arrayable) {
+            $this->workingContent = $formatter->formatArray($this->workingContent);
+        } elseif ($this->workingContent instanceof stdClass) {
+            $this->workingContent = $formatter->formatArray((array) $this->workingContent);
         } else {
             if (! empty($defaultContentType)) {
                 $this->headers->set('Content-Type', $defaultContentType);
             }
         }
 
-        $this->content = $content;
+        $this->content = $this->workingContent;
 
         return $this;
     }
@@ -177,7 +184,7 @@ protected function fireMorphedEvent()
             return;
         }
 
-        static::$events->dispatch(new ResponseWasMorphed($this, $this->content));
+        static::$events->dispatch(new ResponseWasMorphed($this, $this->workingContent));
     }
 
     /**
@@ -191,7 +198,7 @@ protected function fireMorphingEvent()
             return;
         }
 
-        static::$events->dispatch(new ResponseIsMorphing($this, $this->content));
+        static::$events->dispatch(new ResponseIsMorphing($this, $this->workingContent));
     }
 
     /**

src/Provider/DingoServiceProvider.php

@@ -2,6 +2,8 @@
 
 namespace Dingo\Api\Provider;
 
+use Illuminate\Routing\CallableDispatcher;
+use Illuminate\Routing\Contracts\CallableDispatcher as CallableDispatcherContract;
 use RuntimeException;
 use Dingo\Api\Auth\Auth;
 use Dingo\Api\Dispatcher;
@@ -55,6 +57,7 @@ public function register()
         $this->registerExceptionHandler();
 
         $this->registerDispatcher();
+        $this->registerCallableDispatcher();
 
         $this->registerAuth();
 
@@ -145,6 +148,13 @@ public function registerDispatcher()
         });
     }
 
+    public function registerCallableDispatcher()
+    {
+        $this->app->singleton(CallableDispatcherContract::class, function ($app) {
+            return new CallableDispatcher($app);
+        });
+    }
+
     /**
      * Register the auth.
      *

src/Provider/LaravelServiceProvider.php

@@ -9,7 +9,7 @@
 use Illuminate\Contracts\Http\Kernel;
 use Dingo\Api\Event\RequestWasMatched;
 use Dingo\Api\Http\Middleware\Request;
-use Illuminate\Foundation\Application;
+use Illuminate\Contracts\Foundation\Application;
 use Dingo\Api\Http\Middleware\RateLimit;
 use Illuminate\Routing\ControllerDispatcher;
 use Dingo\Api\Http\Middleware\PrepareController;

tests/ChecksLaravelVersionTrait.php

@@ -2,6 +2,7 @@
 
 namespace Dingo\Api\Tests;
 
+use Dingo\Api\Tests\Stubs\Application10Stub;
 use Dingo\Api\Tests\Stubs\Application9Stub;
 use Dingo\Api\Tests\Stubs\ApplicationStub;
 use Dingo\Api\Tests\Stubs\Application8Stub;
@@ -55,7 +56,9 @@ private function getApplicationStub()
         $version = str_replace('v', '', $version);
 
         // Return the version stub for the right version
-        if (version_compare($version, '9.0.0', '>=')) {
+        if (version_compare($version, '10.0.0', '>=')) {
+            return new Application10Stub;
+        } else if (version_compare($version, '9.0.0', '>=')) {
             return new Application9Stub;
         } elseif (version_compare($version, '8.0.0', '>=')) {
             return new Application8Stub;

tests/DispatcherTest.php

@@ -21,6 +21,8 @@
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
+use Illuminate\Routing\CallableDispatcher;
+use Illuminate\Routing\Contracts\CallableDispatcher as CallableDispatcherContract;
 use Illuminate\Support\Facades\Request as RequestFacade;
 use Mockery as m;
 use Symfony\Component\HttpKernel\Exception\GoneHttpException;
@@ -67,14 +69,15 @@ public function setUp(): void
 
         $this->transformerFactory = new TransformerFactory($this->container, new TransformerStub);
 
-        $this->adapter = new RoutingAdapterStub;
+        $this->adapter = new RoutingAdapterStub($this->container);
         $this->exception = m::mock(Handler::class);
         $this->router = new Router($this->adapter, $this->exception, $this->container, null, null);
 
         $this->auth = new Auth($this->router, $this->container, []);
         $this->dispatcher = new Dispatcher($this->container, new Filesystem, $this->router, $this->auth);
 
         app()->instance(\Illuminate\Routing\Router::class, $this->adapter);
+        $this->container->singleton(CallableDispatcherContract::class, CallableDispatcher::class);
 
         $this->dispatcher->setSubtype('api');
         $this->dispatcher->setStandardsTree('vnd');

tests/Exception/HandlerTest.php

@@ -162,7 +162,7 @@ public function testExceptionTraceIncludedInResponse()
 
         $object = json_decode($response->getContent());
 
-        $this->assertObjectHasAttribute('debug', $object);
+        $this->assertObjectHasProperty('debug', $object);
     }
 
     public function testHttpExceptionsWithNoMessageUseStatusCodeMessage()

tests/Http/Middleware/AuthTest.php

@@ -40,7 +40,7 @@ class AuthTest extends BaseTestCase
     public function setUp(): void
     {
         $this->container = new Container;
-        $this->adapter = new RoutingAdapterStub;
+        $this->adapter = new RoutingAdapterStub($this->container);
         $this->router = m::mock(Router::class);
         $this->auth = m::mock(Auth::class);
         $this->middleware = new AuthMiddleware($this->router, $this->auth);

tests/Http/ResponseTest.php

@@ -68,7 +68,7 @@ public function testBuildingWithCustomStatusCodeAndHeaders()
     public function testChangingContentWithEvents()
     {
         $this->events->listen(ResponseWasMorphed::class, function ($event) {
-            $event->content['foo'] = 'bam!';
+            $event->content = '{"foo":"bam!"}';
         });
 
         Response::addFormatter('json', new Json);

tests/Routing/Adapter/BaseAdapterTest.php → tests/Routing/Adapter/BaseAdapterTestAbstract.php

@@ -13,7 +13,7 @@
 use Laravel\Lumen\Application;
 use Mockery as m;
 
-abstract class BaseAdapterTest extends BaseTestCase
+abstract class BaseAdapterTestAbstract extends BaseTestCase
 {
     /**
      * @var Container|Application

tests/Routing/Adapter/LaravelTest.php → tests/Routing/Adapter/LaravelTestAbstract.php

@@ -7,7 +7,7 @@
 use Illuminate\Events\Dispatcher;
 use Illuminate\Routing\Router;
 
-class LaravelTest extends BaseAdapterTest
+class LaravelTestAbstract extends BaseAdapterTestAbstract
 {
     public function getAdapterInstance()
     {

tests/Routing/Adapter/LumenTest.php → tests/Routing/Adapter/LumenTestAbstract.php

@@ -9,7 +9,7 @@
 use Illuminate\Http\Request;
 use Laravel\Lumen\Application;
 
-class LumenTest extends BaseAdapterTest
+class LumenTestAbstract extends BaseAdapterTestAbstract
 {
     public function getAdapterInstance()
     {

tests/Routing/RouteTest.php

@@ -25,8 +25,8 @@ class RouteTest extends BaseTestCase
 
     public function setUp(): void
     {
-        $this->adapter = new RoutingAdapterStub;
         $this->container = new Container;
+        $this->adapter = new RoutingAdapterStub($this->container);
     }
 
     public function testCreatingNewRoute()

tests/Routing/RouterTest.php → tests/Routing/RouterTestAbstract.php

@@ -13,7 +13,7 @@
 use Mockery as m;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 
-class RouterTest extends Adapter\BaseAdapterTest
+class RouterTestAbstract extends Adapter\BaseAdapterTestAbstract
 {
     public function getAdapterInstance()
     {

tests/Routing/UrlGeneratorTest.php → tests/Routing/UrlGeneratorTestAbstract.php

@@ -8,7 +8,7 @@
 use Dingo\Api\Tests\Stubs\RoutingControllerStub;
 use Illuminate\Container\Container;
 
-class UrlGeneratorTest extends Adapter\BaseAdapterTest
+class UrlGeneratorTestAbstract extends Adapter\BaseAdapterTestAbstract
 {
     public function getAdapterInstance()
     {