Add CI pipeline + fix multiple env issues

.editorconfig

@@ -0,0 +1,15 @@
+; This file is for unifying the coding style for different editors and IDEs.
+; More information at https://editorconfig.org
+
+root = true
+
+[*]
+charset = utf-8
+indent_size = 4
+indent_style = space
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false

.gitattributes

@@ -0,0 +1,11 @@
+# Path-based git attributes
+# https://www.kernel.org/pub/software/scm/git/docs/gitattributes.html
+
+# Ignore all test and documentation with "export-ignore".
+/.editorconfig      export-ignore
+/.gitattributes     export-ignore
+/.gitignore         export-ignore
+/.styleci.yml       export-ignore
+/.travis.yml        export-ignore
+/phpunit.xml        export-ignore
+/tests              export-ignore

.gitignore

@@ -1,4 +1,6 @@
 /vendor
 .DS_Store
+.php_cs
+.php_cs.cache
 .phpunit.result.cache
 composer.lock

.styleci.yml

@@ -0,0 +1 @@
+preset: laravel

.travis.yml

@@ -0,0 +1,26 @@
+os: linux
+dist: xenial
+language: php
+
+php:
+  - 7.2
+  - 7.3
+  - 7.4
+
+env:
+  jobs:
+    - COMPOSER_FLAGS="--prefer-lowest"
+    - COMPOSER_FLAGS=""
+
+before_install:
+  - travis_retry composer self-update
+
+install:
+  - travis_retry composer update --prefer-source $COMPOSER_FLAGS
+
+script:
+  - phpunit
+
+#branches:
+#  only:
+#    - master

composer.json

@@ -25,10 +25,11 @@
         }
     },
     "require": {
-        "laravel/framework": "^5.4|^6.0|^7.0|^8.0"
+        "laravel/framework": "^6.12|^7.0|^8.0"
     },
     "require-dev": {
-        "orchestra/testbench": "~3.0"
+        "ext-json": "*",
+        "orchestra/testbench": "^4.0|^5.0|^6.0"
     },
     "extra": {
         "laravel": {

helpers.php

@@ -1,6 +1,6 @@
 <?php
 
-if (!function_exists('inertia')) {
+if (! function_exists('inertia')) {
     /**
      * Inertia helper.
      *

phpunit.xml

@@ -1,20 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/7.4/phpunit.xsd"
-         bootstrap="vendor/autoload.php"
-         forceCoversAnnotation="true"
-         beStrictAboutCoversAnnotation="true"
-         beStrictAboutOutputDuringTests="true"
-         beStrictAboutTodoAnnotatedTests="true"
-         verbose="true">
+<phpunit bootstrap="vendor/autoload.php"
+         backupGlobals="false"
+         backupStaticAttributes="false"
+         colors="true"
+         verbose="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false">
     <testsuites>
-        <testsuite name="default">
-            <directory suffix="Test.php">tests</directory>
+        <testsuite name="Test Suite">
+            <directory>tests</directory>
         </testsuite>
     </testsuites>
     <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">src</directory>
+        <whitelist>
+            <directory suffix=".php">src/</directory>
         </whitelist>
     </filter>
 </phpunit>

src/Middleware.php

@@ -12,7 +12,7 @@ public function handle($request, Closure $next)
     {
         $response = $next($request);
 
-        if (!$request->header('X-Inertia')) {
+        if (! $request->header('X-Inertia')) {
             return $response;
         }
 

src/Response.php

@@ -3,11 +3,11 @@
 namespace Inertia;
 
 use Closure;
-use Illuminate\Support\Arr;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Support\Facades\App;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Contracts\Support\Responsable;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Response as ResponseFactory;
 
 class Response implements Responsable

src/ResponseFactory.php

@@ -3,10 +3,10 @@
 namespace Inertia;
 
 use Closure;
+use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Traits\Macroable;
-use Illuminate\Contracts\Support\Arrayable;
 
 class ResponseFactory
 {

src/ServiceProvider.php

@@ -2,10 +2,10 @@
 
 namespace Inertia;
 
+use Illuminate\Contracts\Http\Kernel;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Router;
 use Illuminate\Support\Collection;
-use Illuminate\Contracts\Http\Kernel;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Session;

tests/ControllerTest.php

@@ -2,10 +2,10 @@
 
 namespace Inertia\Tests;
 
-use Inertia\Response;
-use Inertia\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Route;
+use Inertia\Controller;
+use Inertia\Response;
 
 class ControllerTest extends TestCase
 {

tests/MiddlewareTest.php

@@ -2,8 +2,9 @@
 
 namespace Inertia\Tests;
 
-use Illuminate\Foundation\Testing\TestResponse;
+use Illuminate\Foundation\Testing\TestResponse as LegacyTestResponse;
 use Illuminate\Http\Request;
+use Illuminate\Testing\TestResponse;
 use Inertia\Inertia;
 use Inertia\Middleware;
 
@@ -85,6 +86,11 @@ private function makeMockResponse($request)
             return Inertia::render('User/Edit', ['user' => ['name' => 'Jonathan']])->toResponse($request);
         });
 
+        // Laravel <= 6.0
+        if (class_exists(LegacyTestResponse::class)) {
+            return LegacyTestResponse::fromBaseResponse($response);
+        }
+
         return TestResponse::fromBaseResponse($response);
     }
 }

tests/ResponseTest.php

@@ -2,17 +2,18 @@
 
 namespace Inertia\Tests;
 
+use Arr;
 use Illuminate\Contracts\Support\Arrayable;
-use Inertia\Response;
-use Illuminate\View\View;
-use Illuminate\Http\Request;
-use Illuminate\Support\Fluent;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Support\Collection;
-use Illuminate\Http\Response as BaseResponse;
-use Illuminate\Pagination\LengthAwarePaginator;
+use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Http\Resources\Json\ResourceCollection;
+use Illuminate\Http\Response as BaseResponse;
+use Illuminate\Pagination\LengthAwarePaginator;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Fluent;
+use Illuminate\View\View;
+use Inertia\Response;
 
 class ResponseTest extends TestCase
 {
@@ -103,7 +104,7 @@ public function test_lazy_resource_response()
         $page = $response->getData();
 
         $expected = [
-            'data' => $users->take(2),
+            'data' => $users->take(2)->toArray(),
             'links' => [
                 'first' => '/?page=1',
                 'last' => '/?page=2',
@@ -123,9 +124,20 @@ public function test_lazy_resource_response()
 
         $this->assertInstanceOf(JsonResponse::class, $response);
         $this->assertSame('User/Index', $page->component);
-        $this->assertSame(json_encode($expected), json_encode($page->props->users));
         $this->assertSame('/users?page=1', $page->url);
         $this->assertSame('123', $page->version);
+
+        tap(json_decode(json_encode($page->props->users), true), function ($actual) use ($expected) {
+            // On Laravel 8+, new 'links' were added to the 'meta' section for convenience.
+            // We'll just inject these to our expected array to prevent testing issues
+            // on earlier version of Laravel.
+            if (Arr::has($actual, 'meta.links')) {
+                $expected['meta']['links'] = $actual['meta']['links'];
+                ksort($expected['meta']);
+            }
+
+            $this->assertSame($expected, $actual);
+        });
     }
 
     public function test_arrayable_prop_response()
@@ -136,7 +148,6 @@ public function test_arrayable_prop_response()
         $user = (object) ['name' => 'Jonathan'];
 
         $resource = new class($user) implements Arrayable {
-
             public $user;
 
             public function __construct($user)

tests/ServiceProviderTest.php

@@ -3,17 +3,16 @@
 namespace Inertia\Tests;
 
 use Closure;
-use Inertia\Inertia;
-use Inertia\Middleware;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Router;
-use Illuminate\Support\MessageBag;
 use Illuminate\Support\Facades\App;
-use Illuminate\Support\ViewErrorBag;
-use Illuminate\Contracts\Http\Kernel;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\Facades\Route;
 use Illuminate\Support\Facades\Session;
+use Illuminate\Support\MessageBag;
+use Illuminate\Support\ViewErrorBag;
+use Inertia\Inertia;
+use Inertia\Middleware;
 
 class ServiceProviderTest extends TestCase
 {