Merge pull request #581 from RossAHC/laravel-7

Upgrade to Laravel 7
owen-it · Mar 23, 2020 · 50b0d9b · 50b0d9b
2 parents 5574786 + 7068e2c
commit 50b0d9b
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 42 deletions.
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -12,7 +12,7 @@ build:
     php72:
       environment:
         php:
-          version: 7.2.0
+          version: 7.2.5
       tests:
         override:
           - php-scrutinizer-run

diff --git a/.styleci.yml b/.styleci.yml
@@ -4,7 +4,6 @@ risky: true
 
 enabled:
   - php_unit_strict
-  - return_type_declaration
 
 disabled:
   - self_accessor
diff --git a/README.md b/README.md
@@ -22,7 +22,8 @@ The package documentation can be found on the [official website](http://www.lara
 ## Version Information
  Version   | Illuminate    | Status                  | PHP Version
 :----------|:--------------|:------------------------|:------------
- 9.x       | 5.8.x - 6.x.x | Active support :rocket: | >= 7.1.3
+ 10.x      | 5.8.x - 7.x.x | Active support :rocket: | >= 7.2.5
+ 9.x       | 5.8.x - 6.x.x | Active support          | >= 7.1.3
  8.x       | 5.2.x - 5.7.x | Active support          | >= 7.0.13
  7.x       | 5.2.x - 5.6.x | End of life             | >= 7.0.13
  6.x       | 5.2.x - 5.6.x | End of life             | >= 7.0.13

diff --git a/composer.json b/composer.json
@@ -39,10 +39,10 @@
         }
     ],
     "require": {
-        "php": ">=7.2",
-        "illuminate/console": "^5.8|^6.0",
-        "illuminate/database": "^5.8|^6.0",
-        "illuminate/filesystem": "^5.8|^6.0"
+        "php": ">=7.2.5",
+        "illuminate/console": "^5.8|^6.0|^7.0",
+        "illuminate/database": "^5.8|^6.0|^7.0",
+        "illuminate/filesystem": "^5.8|^6.0|^7.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^8.0",
@@ -65,7 +65,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "9.0-dev"
+            "dev-master": "10.0-dev"
         },
         "laravel": {
             "providers": [

diff --git a/src/Console/InstallCommand.php b/src/Console/InstallCommand.php
@@ -3,13 +3,11 @@
 namespace OwenIt\Auditing\Console;
 
 use Illuminate\Console\Command;
-use Illuminate\Console\DetectsApplicationNamespace;
+use Illuminate\Container\Container;
 use Illuminate\Support\Str;
 
 class InstallCommand extends Command
 {
-    use DetectsApplicationNamespace;
-
     /**
      * {@inheritdoc}
      */
@@ -43,7 +41,7 @@ public function handle()
      */
     protected function registerAuditingServiceProvider()
     {
-        $namespace = Str::replaceLast('\\', '', $this->getAppNamespace());
+        $namespace = Str::replaceLast('\\', '', Container::getInstance()->getNamespace());
 
         $appConfig = file_get_contents(config_path('app.php'));
 

diff --git a/tests/Functional/AuditingTest.php b/tests/Functional/AuditingTest.php
@@ -3,6 +3,7 @@
 namespace OwenIt\Auditing\Tests\Functional;
 
 use Carbon\Carbon;
+use Illuminate\Foundation\Testing\Assert;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Event;
 use InvalidArgumentException;
@@ -142,7 +143,7 @@ public function itWillAuditTheCreatedEvent()
 
         $this->assertEmpty($audit->old_values);
 
-        $this->assertArraySubset([
+        Assert::assertArraySubset([
             'title'        => 'How To Audit Eloquent Models',
             'content'      => 'N/A',
             'published_at' => null,
@@ -177,13 +178,13 @@ public function itWillAuditTheUpdatedEvent()
 
         $audit = Audit::first();
 
-        $this->assertArraySubset([
+        Assert::assertArraySubset([
             'content'      => 'N/A',
             'published_at' => null,
             'reviewed'     => 0,
         ], $audit->old_values, true);
 
-        $this->assertArraySubset([
+        Assert::assertArraySubset([
             'content'      => 'First step: install the laravel-auditing package.',
             'published_at' => $now->toDateTimeString(),
             'reviewed'     => 1,
@@ -210,7 +211,7 @@ public function itWillAuditTheDeletedEvent()
 
         $audit = Audit::first();
 
-        $this->assertArraySubset([
+        Assert::assertArraySubset([
             'title'        => 'How To Audit Eloquent Models',
             'content'      => 'N/A',
             'published_at' => null,
@@ -244,7 +245,7 @@ public function itWillAuditTheRestoredEvent()
 
         $this->assertEmpty($audit->old_values);
 
-        $this->assertArraySubset([
+        Assert::assertArraySubset([
             'title'        => 'How To Audit Eloquent Models',
             'content'      => 'N/A',
             'published_at' => null,
@@ -344,7 +345,7 @@ public function itWillAuditUsingTheDefaultDriver()
 
         $this->assertEmpty($audit->old_values);
 
-        $this->assertArraySubset([
+        Assert::assertArraySubset([
             'title'        => 'How To Audit Using The Fallback Driver',
             'content'      => 'N/A',
             'published_at' => null,

diff --git a/tests/Unit/AuditTest.php b/tests/Unit/AuditTest.php
@@ -4,6 +4,7 @@
 
 use Carbon\Carbon;
 use DateTimeInterface;
+use Illuminate\Foundation\Testing\Assert;
 use OwenIt\Auditing\Encoders\Base64Encoder;
 use OwenIt\Auditing\Models\Audit;
 use OwenIt\Auditing\Redactors\LeftRedactor;
@@ -31,7 +32,7 @@ public function itResolvesAuditData()
 
         $this->assertCount(15, $resolvedData = $audit->resolveData());
 
-        $this->assertArraySubset([
+        Assert::assertArraySubset([
             'audit_id'         => 1,
             'audit_event'      => 'created',
             'audit_url'        => 'console',
@@ -78,7 +79,7 @@ public function itResolvesAuditDataIncludingUserAttributes()
 
         $this->assertCount(21, $resolvedData = $audit->resolveData());
 
-        $this->assertArraySubset([
+        Assert::assertArraySubset([
             'audit_id'         => 2,
             'audit_event'      => 'created',
             'audit_url'        => 'console',
@@ -159,7 +160,7 @@ public function itReturnsAuditMetadataAsArray()
 
         $this->assertCount(10, $metadata = $audit->getMetadata());
 
-        $this->assertArraySubset([
+        Assert::assertArraySubset([
             'audit_id'         => 1,
             'audit_event'      => 'created',
             'audit_url'        => 'console',
@@ -192,7 +193,7 @@ public function itReturnsAuditMetadataIncludingUserAttributesAsArray()
 
         $this->assertCount(16, $metadata = $audit->getMetadata());
 
-        $this->assertArraySubset([
+        Assert::assertArraySubset([
             'audit_id'         => 2,
             'audit_event'      => 'created',
             'audit_url'        => 'console',
@@ -300,7 +301,7 @@ public function itReturnsAuditableModifiedAttributesAsArray()
 
         $this->assertCount(5, $modified = $audit->getModified());
 
-        $this->assertArraySubset([
+        Assert::assertArraySubset([
             'title' => [
                 'new' => 'HOW TO AUDIT ELOQUENT MODELS',
             ],
@@ -391,7 +392,7 @@ public function itReturnsDecodedAuditableAttributes()
 
         $this->assertCount(3, $modified = $audit->getModified());
 
-        $this->assertArraySubset([
+        Assert::assertArraySubset([
             'title' => [
                 'new' => 'HOW TO AUDIT ELOQUENT MODELS',
                 'old' => 'HOW TO AUDIT MODELS',
@@ -417,8 +418,8 @@ public function itReturnsTags()
             'tags' => 'foo,bar,baz',
         ]);
 
-        $this->assertInternalType('array', $audit->getTags());
-        $this->assertArraySubset([
+        $this->assertIsArray($audit->getTags());
+        Assert::assertArraySubset([
             'foo',
             'bar',
             'baz',
@@ -435,7 +436,7 @@ public function itReturnsEmptyTags()
             'tags' => null,
         ]);
 
-        $this->assertInternalType('array', $audit->getTags());
+        $this->assertIsArray($audit->getTags());
         $this->assertEmpty($audit->getTags());
     }
 }
diff --git a/tests/Unit/AuditableTest.php b/tests/Unit/AuditableTest.php
@@ -4,6 +4,7 @@
 
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Relations\Relation;
+use Illuminate\Foundation\Testing\Assert;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Str;
 use OwenIt\Auditing\Contracts\Auditable;
@@ -115,7 +116,7 @@ public function itReturnsTheDefaultAuditEvents()
     {
         $model = new Article();
 
-        $this->assertArraySubset([
+        Assert::assertArraySubset([
             'created',
             'updated',
             'deleted',
@@ -136,7 +137,7 @@ public function itReturnsTheCustomAuditEventsFromAttribute()
             'archived',
         ];
 
-        $this->assertArraySubset([
+        Assert::assertArraySubset([
             'published' => 'getPublishedEventAttributes',
             'archived',
         ], $model->getAuditEvents(), true);
@@ -155,7 +156,7 @@ public function itReturnsTheCustomAuditEventsFromConfig()
 
         $model = new Article();
 
-        $this->assertArraySubset([
+        Assert::assertArraySubset([
             'published' => 'getPublishedEventAttributes',
             'archived',
         ], $model->getAuditEvents(), true);
@@ -399,7 +400,7 @@ public function itReturnsTheAuditData()
 
         $this->assertCount(11, $auditData = $model->toAudit());
 
-        $this->assertArraySubset([
+        Assert::assertArraySubset([
             'old_values' => [],
             'new_values' => [
                 'title'        => 'How To Audit Eloquent Models',
@@ -458,7 +459,7 @@ public function itReturnsTheAuditDataIncludingUserAttributes(
 
         $this->assertCount(11, $auditData = $model->toAudit());
 
-        $this->assertArraySubset([
+        Assert::assertArraySubset([
             'old_values' => [],
             'new_values' => [
                 'title'        => 'How To Audit Eloquent Models',
@@ -540,7 +541,7 @@ public function itExcludesAttributesFromTheAuditDataWhenInStrictMode()
 
         $this->assertCount(11, $auditData = $model->toAudit());
 
-        $this->assertArraySubset([
+        Assert::assertArraySubset([
             'old_values' => [],
             'new_values' => [
                 'title'   => 'How To Audit Eloquent Models',
@@ -610,7 +611,7 @@ public function itModifiesTheAuditAttributesSuccessfully()
             'reviewed' => Base64Encoder::class,
         ];
 
-        $this->assertArraySubset([
+        Assert::assertArraySubset([
             'old_values' => [
                 'title'        => 'Ho#################',
                 'content'      => '##A',
@@ -654,7 +655,7 @@ public function transformAudit(array $data): array
 
         $this->assertCount(11, $auditData = $model->toAudit());
 
-        $this->assertArraySubset([
+        Assert::assertArraySubset([
             'new_values' => [
                 'title'        => 'How To Audit Eloquent Models',
                 'content'      => 'First step: install the laravel-auditing package.',
@@ -673,7 +674,7 @@ public function itReturnsTheDefaultAttributesToBeIncludedInTheAudit()
     {
         $model = new Article();
 
-        $this->assertArraySubset([], $model->getAuditInclude(), true);
+        Assert::assertArraySubset([], $model->getAuditInclude(), true);
     }
 
     /**
@@ -689,7 +690,7 @@ public function itReturnsTheCustomAttributesToBeIncludedInTheAudit()
             'content',
         ];
 
-        $this->assertArraySubset([
+        Assert::assertArraySubset([
             'title',
             'content',
         ], $model->getAuditInclude(), true);
@@ -703,7 +704,7 @@ public function itReturnsTheDefaultAttributesToBeExcludedFromTheAudit()
     {
         $model = new Article();
 
-        $this->assertArraySubset([], $model->getAuditExclude(), true);
+        Assert::assertArraySubset([], $model->getAuditExclude(), true);
     }
 
     /**
@@ -718,7 +719,7 @@ public function itReturnsTheCustomAttributesToBeExcludedFromTheAudit()
             'published_at',
         ];
 
-        $this->assertArraySubset([
+        Assert::assertArraySubset([
             'published_at',
         ], $model->getAuditExclude(), true);
     }
@@ -879,7 +880,7 @@ public function itReturnsTheDefaultGeneratedAuditTags()
     {
         $model = new Article();
 
-        $this->assertArraySubset([], $model->generateTags(), true);
+        Assert::assertArraySubset([], $model->generateTags(), true);
     }
 
     /**
@@ -898,7 +899,7 @@ public function generateTags(): array
             }
         };
 
-        $this->assertArraySubset([
+        Assert::assertArraySubset([
             'foo',
             'bar',
         ], $model->generateTags(), true);
@@ -1061,7 +1062,7 @@ public function itFailsToTransitionWhenTheAuditableAttributeCompatibilityIsNotMe
                 $e->getMessage()
             );
 
-            $this->assertArraySubset([
+            Assert::assertArraySubset([
                 'subject',
                 'text',
             ], $e->getIncompatibilities(), true);