Merge pull request #34 from ericdowell/upgrade-laravel

ericdowell · web-flow · commit 33e621a28b7a · 2020-03-08T15:03:19.000-05:00
Laravel Version Update
diff --git a/composer.json b/composer.json
@@ -10,14 +10,14 @@
         }
     ],
     "require": {
-        "php": "^7.1.3",
+        "php": "^7.2.5",
         "ext-json": "*",
-        "laravel/framework": "^5.5|^6.0"
+        "laravel/framework": "^6.0|^7.0|^8.0"
     },
     "require-dev": {
-        "mockery/mockery": "^1.2",
-        "orchestra/testbench": "^4.0",
-        "phpunit/phpunit": "^8.3"
+        "mockery/mockery": "^1.3",
+        "orchestra/testbench": "^5.0",
+        "phpunit/phpunit": "^8.0|^9.0"
     },
     "autoload": {
         "psr-4": {
@@ -33,10 +33,7 @@
         }
     },
     "scripts": {
-        "test": [
-            "@php vendor/orchestra/testbench-core/create-sqlite-db",
-            "phpunit --colors=always"
-        ]
+        "test": "phpunit --colors=always"
     },
     "extra": {
         "laravel": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,23 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
          beStrictAboutTestsThatDoNotTestAnything="false"
          bootstrap="phpunit.php"
          colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
          failOnRisky="true"
          failOnWarning="true"
-         processIsolation="false"
-         stopOnError="false"
-         stopOnFailure="false"
          verbose="true">
     <testsuites>
         <testsuite name="Unit">
             <directory suffix="Test.php">./tests/src/Unit</directory>
         </testsuite>
-
         <testsuite name="Feature">
             <directory suffix="Test.php">./tests/src/Feature</directory>
         </testsuite>
@@ -35,6 +28,6 @@
         <env name="APP_ENV" value="testing"/>
         <env name="APP_DEBUG" value="true"/>
         <env name="APP_KEY" value="base64:oPF0DoJcm8nOjTkN9vk3kZYw6Z0f+cP+poFKhtQZiFU="/>
-        <env name="DB_CONNECTION" value="sqlite"/>
+        <env name="DB_CONNECTION" value="testing"/>
     </php>
 </phpunit>
diff --git a/src/Commands/RegisterUser.php b/src/Commands/RegisterUser.php
@@ -4,12 +4,12 @@
 
 namespace ResourceController\Commands;
 
-use RuntimeException;
-use Illuminate\Support\Arr;
 use Illuminate\Console\Command;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Hash;
-use Illuminate\Database\Eloquent\Model;
+use RuntimeException;
 
 class RegisterUser extends Command
 {
diff --git a/src/Contracts/Models/MediaModel.php b/src/Contracts/Models/MediaModel.php
@@ -4,9 +4,9 @@
 
 namespace ResourceController\Contracts\Models;
 
-use Illuminate\Http\UploadedFile;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Filesystem\FilesystemAdapter;
+use Illuminate\Http\UploadedFile;
 
 interface MediaModel
 {
diff --git a/src/Controllers/AbstractModelController.php b/src/Controllers/AbstractModelController.php
@@ -4,11 +4,11 @@
 
 namespace ResourceController\Controllers;
 
-use Illuminate\Support\Str;
-use Illuminate\Http\Request;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Http\Request;
+use Illuminate\Support\Str;
 use Symfony\Component\HttpFoundation\Response as HttpResponse;
 
 abstract class AbstractModelController extends Controller
diff --git a/src/Controllers/Controller.php b/src/Controllers/Controller.php
@@ -4,10 +4,10 @@
 
 namespace ResourceController\Controllers;
 
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Foundation\Bus\DispatchesJobs;
-use Illuminate\Routing\Controller as BaseController;
 use Illuminate\Foundation\Validation\ValidatesRequests;
-use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+use Illuminate\Routing\Controller as BaseController;
 
 abstract class Controller extends BaseController
 {
diff --git a/src/Controllers/JsonApi/AbstractModelController.php b/src/Controllers/JsonApi/AbstractModelController.php
@@ -4,8 +4,8 @@
 
 namespace ResourceController\Controllers\JsonApi;
 
-use ResourceController\Traits\Controllers\Response\WithJson;
 use ResourceController\Controllers\AbstractModelController as Controller;
+use ResourceController\Traits\Controllers\Response\WithJson;
 
 abstract class AbstractModelController extends Controller
 {
diff --git a/src/Controllers/JsonApi/UserController.php b/src/Controllers/JsonApi/UserController.php
@@ -4,9 +4,9 @@
 
 namespace ResourceController\Controllers\JsonApi;
 
+use ResourceController\Controllers\UserController as Controller;
 use ResourceController\Traits\Controllers\PaginateIndex;
 use ResourceController\Traits\Controllers\Response\WithJson;
-use ResourceController\Controllers\UserController as Controller;
 
 class UserController extends Controller
 {
diff --git a/src/Controllers/JsonHtml/AbstractModelController.php b/src/Controllers/JsonHtml/AbstractModelController.php
@@ -4,10 +4,10 @@
 
 namespace ResourceController\Controllers\JsonHtml;
 
-use Illuminate\Support\Facades\Route;
 use Illuminate\Database\Eloquent\Model;
-use ResourceController\Traits\Controllers\Response\WithHtml;
+use Illuminate\Support\Facades\Route;
 use ResourceController\Controllers\JsonApi\AbstractModelController as JsonAbstractModelController;
+use ResourceController\Traits\Controllers\Response\WithHtml;
 
 abstract class AbstractModelController extends JsonAbstractModelController
 {
diff --git a/src/Controllers/JsonHtml/UserController.php b/src/Controllers/JsonHtml/UserController.php
@@ -4,8 +4,8 @@
 
 namespace ResourceController\Controllers\JsonHtml;
 
-use Illuminate\Support\Facades\Hash;
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Facades\Hash;
 use ResourceController\Traits\Controllers\PaginateIndex;
 
 class UserController extends AbstractModelController
diff --git a/src/Controllers/UserController.php b/src/Controllers/UserController.php
@@ -4,8 +4,8 @@
 
 namespace ResourceController\Controllers;
 
-use Illuminate\Support\Facades\Hash;
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Facades\Hash;
 
 abstract class UserController extends AbstractModelController
 {
diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
@@ -4,8 +4,8 @@
 
 namespace ResourceController;
 
-use ResourceController\Commands\RegisterUser;
 use Illuminate\Support\ServiceProvider as SupportServiceProvider;
+use ResourceController\Commands\RegisterUser;
 
 class ServiceProvider extends SupportServiceProvider
 {
diff --git a/src/Traits/Controllers/AssignOwner.php b/src/Traits/Controllers/AssignOwner.php
@@ -4,10 +4,10 @@
 
 namespace ResourceController\Traits\Controllers;
 
-use Illuminate\Http\Request;
-use Illuminate\Http\JsonResponse;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
 
 trait AssignOwner
 {
diff --git a/src/Traits/Controllers/UploadMediaFile.php b/src/Traits/Controllers/UploadMediaFile.php
@@ -4,11 +4,11 @@
 
 namespace ResourceController\Traits\Controllers;
 
-use RuntimeException;
-use Illuminate\Http\UploadedFile;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Http\UploadedFile;
 use ResourceController\Contracts\Models\MediaModel;
+use RuntimeException;
 
 trait UploadMediaFile
 {
diff --git a/src/Traits/Models/MediaModel.php b/src/Traits/Models/MediaModel.php
@@ -4,11 +4,11 @@
 
 namespace ResourceController\Traits\Models;
 
-use Illuminate\Support\Str;
-use Illuminate\Http\UploadedFile;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Facades\Storage;
 use Illuminate\Filesystem\FilesystemAdapter;
+use Illuminate\Http\UploadedFile;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Str;
 
 /**
  * ResourceController\Traits\Models\MediaModel.
diff --git a/tests/database/factories/TestUserFactory.php b/tests/database/factories/TestUserFactory.php
@@ -2,8 +2,8 @@
 
 declare(strict_types=1);
 
-use Illuminate\Support\Str;
 use Faker\Generator as Faker;
+use Illuminate\Support\Str;
 use ResourceController\Tests\Models\TestUser;
 
 /* @var \Illuminate\Database\Eloquent\Factory $factory */
diff --git a/tests/database/migrations/2014_10_12_000000_create_users_test_table.php b/tests/database/migrations/2014_10_12_000000_create_users_test_table.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class CreateUsersTestTable extends Migration
 {
diff --git a/tests/database/migrations/2018_04_19_021947_create_posts_test_table.php b/tests/database/migrations/2018_04_19_021947_create_posts_test_table.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class CreatePostsTestTable extends Migration
 {
diff --git a/tests/src/Feature/PostTest.php b/tests/src/Feature/PostTest.php
@@ -4,12 +4,12 @@
 
 namespace ResourceController\Tests\Feature;
 
-use Illuminate\Support\Facades\Route;
-use ResourceController\Tests\TestCase;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Foundation\Testing\WithFaker;
+use Illuminate\Support\Facades\Route;
 use ResourceController\Tests\Models\TestPost;
 use ResourceController\Tests\Models\TestUser;
-use Illuminate\Foundation\Testing\RefreshDatabase;
+use ResourceController\Tests\TestCase;
 use ResourceController\Tests\Traits\WithRequestHeaders;
 
 /**
diff --git a/tests/src/Feature/UserTest.php b/tests/src/Feature/UserTest.php
@@ -4,12 +4,12 @@
 
 namespace ResourceController\Tests\Feature;
 
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Foundation\Testing\WithFaker;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Route;
-use ResourceController\Tests\TestCase;
-use Illuminate\Foundation\Testing\WithFaker;
 use ResourceController\Tests\Models\TestUser;
-use Illuminate\Foundation\Testing\RefreshDatabase;
+use ResourceController\Tests\TestCase;
 use ResourceController\Tests\Traits\WithRequestHeaders;
 
 /**
diff --git a/tests/src/Http/Controllers/TestPostController.php b/tests/src/Http/Controllers/TestPostController.php
@@ -4,10 +4,10 @@
 
 namespace ResourceController\Tests\Http\Controllers;
 
-use ResourceController\Tests\Models\TestPost;
-use ResourceController\Traits\Controllers\PaginateIndex;
 use ResourceController\Controllers\JsonApi\AbstractOwnerController;
 use ResourceController\Tests\Http\Requests\TestPost as TestPostRequest;
+use ResourceController\Tests\Models\TestPost;
+use ResourceController\Traits\Controllers\PaginateIndex;
 
 class TestPostController extends AbstractOwnerController
 {
diff --git a/tests/src/Http/Controllers/TestUserController.php b/tests/src/Http/Controllers/TestUserController.php
@@ -4,9 +4,9 @@
 
 namespace ResourceController\Tests\Http\Controllers;
 
-use ResourceController\Tests\Models\TestUser;
 use ResourceController\Controllers\JsonHtml\UserController;
 use ResourceController\Tests\Http\Requests\TestUser as TestUserRequest;
+use ResourceController\Tests\Models\TestUser;
 
 class TestUserController extends UserController
 {
diff --git a/tests/src/Models/TestUser.php b/tests/src/Models/TestUser.php
@@ -4,8 +4,8 @@
 
 namespace ResourceController\Tests\Models;
 
-use Illuminate\Notifications\Notifiable;
 use Illuminate\Foundation\Auth\User as Authenticatable;
+use Illuminate\Notifications\Notifiable;
 
 /**
  * ResourceController\Tests\Models\TestUser.
diff --git a/tests/src/TestCase.php b/tests/src/TestCase.php
@@ -4,9 +4,9 @@
 
 namespace ResourceController\Tests;
 
-use ResourceController\ServiceProvider;
-use Illuminate\Foundation\Testing\TestResponse;
+use Illuminate\Testing\TestResponse;
 use Orchestra\Testbench\TestCase as SupportTestCase;
+use ResourceController\ServiceProvider;
 use ResourceController\Tests\Traits\LoadTestConfiguration;
 
 class TestCase extends SupportTestCase
diff --git a/tests/src/Unit/RegisterUserTest.php b/tests/src/Unit/RegisterUserTest.php
@@ -4,11 +4,11 @@
 
 namespace ResourceController\Tests\Unit;
 
+use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Hash;
-use ResourceController\Tests\TestCase;
 use ResourceController\Commands\RegisterUser;
 use ResourceController\Tests\Models\TestUser;
-use Illuminate\Foundation\Testing\RefreshDatabase;
+use ResourceController\Tests\TestCase;
 
 class RegisterUserTest extends TestCase
 {

Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,9 @@`
`4`	`4`
`5`	`5`	`namespace ResourceController\Contracts\Models;`
`6`	`6`
`7`		`-use Illuminate\Http\UploadedFile;`
`8`	`7`	`use Illuminate\Database\Eloquent\Model;`
`9`	`8`	`use Illuminate\Filesystem\FilesystemAdapter;`
	`9`	`+use Illuminate\Http\UploadedFile;`
`10`	`10`
`11`	`11`	`interface MediaModel`
`12`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@`
`4`	`4`
`5`	`5`	`namespace ResourceController\Controllers\JsonApi;`
`6`	`6`
`7`		`-use ResourceController\Traits\Controllers\Response\WithJson;`
`8`	`7`	`use ResourceController\Controllers\AbstractModelController as Controller;`
	`8`	`+use ResourceController\Traits\Controllers\Response\WithJson;`
`9`	`9`
`10`	`10`	`abstract class AbstractModelController extends Controller`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,9 @@`
`4`	`4`
`5`	`5`	`namespace ResourceController\Controllers\JsonApi;`
`6`	`6`
	`7`	`+use ResourceController\Controllers\UserController as Controller;`
`7`	`8`	`use ResourceController\Traits\Controllers\PaginateIndex;`
`8`	`9`	`use ResourceController\Traits\Controllers\Response\WithJson;`
`9`		`-use ResourceController\Controllers\UserController as Controller;`
`10`	`10`
`11`	`11`	`class UserController extends Controller`
`12`	`12`	`{`