Merge pull request #22 from LaraChimp/feature/laravel-7-support

Support for Laravel 7
LaraChimp · Jul 2, 2020 · 3803797 · 3803797
2 parents 52f9fde + e83a805
commit 3803797
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -34,6 +34,7 @@ Mango Repo is open-sourced software licensed under the [MIT license](http://open
  5.7.x    | 0.3.x
  5.8.x    | 0.4.x
  6.x      | 1.x
+ 7.x      | 2.x
 
 ### Installation
 Install Mango Repo as you would with any other dependency managed by Composer:

diff --git a/composer.json b/composer.json
@@ -11,13 +11,13 @@
     ],
     "require": {
         "php": "^7.2",
-        "illuminate/support": "^6.0",
-        "larachimp/pine-annotations": "^1.0"
+        "illuminate/support": "^7.0",
+        "larachimp/pine-annotations": "^2.0"
     },
     "require-dev": {
-        "mockery/mockery": "^1.1",
-        "orchestra/testbench": "^4.0",
-        "phpunit/phpunit": "^8.0"
+        "mockery/mockery": "^1.3.1",
+        "orchestra/testbench": "^5.0",
+        "phpunit/phpunit": "^8.4|^9.0"
 	},
     "autoload": {
         "psr-4": {

diff --git a/src/Concerns/IsRepositoryBootable.php b/src/Concerns/IsRepositoryBootable.php
@@ -2,8 +2,8 @@
 
 namespace LaraChimp\MangoRepo\Concerns;
 
-use Illuminate\Support\Collection;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Collection;
 use LaraChimp\MangoRepo\Annotations\EloquentModel;
 use LaraChimp\MangoRepo\Exceptions\InvalidModelException;
 use LaraChimp\MangoRepo\Exceptions\UnspecifiedModelException;

diff --git a/src/MangoRepoServiceProvider.php b/src/MangoRepoServiceProvider.php
@@ -3,8 +3,8 @@
 namespace LaraChimp\MangoRepo;
 
 use Illuminate\Support\ServiceProvider as BaseProvider;
-use LaraChimp\PineAnnotations\Support\Reader\AnnotationsReader;
 use LaraChimp\MangoRepo\Contracts\RepositoryInterface as RepositoryContract;
+use LaraChimp\PineAnnotations\Support\Reader\AnnotationsReader;
 
 class MangoRepoServiceProvider extends BaseProvider
 {

diff --git a/tests/AbstractTestCase.php b/tests/AbstractTestCase.php
@@ -2,11 +2,11 @@
 
 namespace LaraChimp\MangoRepo\Tests;
 
-use Orchestra\Testbench\TestCase;
-use Illuminate\Support\Facades\Schema;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 use LaraChimp\MangoRepo\MangoRepoServiceProvider;
 use LaraChimp\PineAnnotations\PineAnnotationsServiceProvider;
+use Orchestra\Testbench\TestCase;
 
 abstract class AbstractTestCase extends TestCase
 {

diff --git a/tests/Fixtures/Models/Scopes/IsActive.php b/tests/Fixtures/Models/Scopes/IsActive.php
@@ -2,9 +2,9 @@
 
 namespace LaraChimp\MangoRepo\Tests\Fixtures\Models\Scopes;
 
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Scope;
-use Illuminate\Database\Eloquent\Builder;
 
 class IsActive implements Scope
 {

diff --git a/tests/Fixtures/Models/User.php b/tests/Fixtures/Models/User.php
@@ -2,8 +2,8 @@
 
 namespace LaraChimp\MangoRepo\Tests\Fixtures\Models;
 
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Model;
 
 class User extends Model
 {

diff --git a/tests/TestRepository.php b/tests/TestRepository.php
@@ -3,9 +3,9 @@
 namespace LaraChimp\MangoRepo\Tests;
 
 use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
 use LaraChimp\MangoRepo\Tests\Fixtures\Models\Foo;
 use LaraChimp\MangoRepo\Tests\Fixtures\Models\User;
-use Illuminate\Foundation\Testing\DatabaseTransactions;
 use LaraChimp\MangoRepo\Tests\Fixtures\Repositories\FooRepository;
 use LaraChimp\MangoRepo\Tests\Fixtures\Repositories\UserRepository;
 

diff --git a/tests/TestRepositoryScopes.php b/tests/TestRepositoryScopes.php
@@ -2,9 +2,9 @@
 
 namespace LaraChimp\MangoRepo\Tests;
 
+use Illuminate\Foundation\Testing\DatabaseTransactions;
 use LaraChimp\MangoRepo\Tests\Fixtures\Models\Bar;
 use LaraChimp\MangoRepo\Tests\Fixtures\Models\User;
-use Illuminate\Foundation\Testing\DatabaseTransactions;
 use LaraChimp\MangoRepo\Tests\Fixtures\Repositories\BarRepository;
 use LaraChimp\MangoRepo\Tests\Fixtures\Repositories\FooRepository;
 use LaraChimp\MangoRepo\Tests\Fixtures\Repositories\UserRepository;