Merge pull request owen-it#489 from squiaios/patch-1

anteriovieira · web-flow · commit eff1fe27f3be · 2019-03-02T21:57:09.000-03:00
Laravel 5.8 support
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -9,22 +9,10 @@ filter:
 
 build:
   nodes:
-    php70:
-      environment:
-        php:
-          version: 7.0.20
-      tests:
-        override:
-          - php-scrutinizer-run
-          -
-            command: vendor/bin/phpunit --coverage-clover=coverage70
-            coverage:
-              file: coverage70
-              format: php-clover
     php71:
       environment:
         php:
-          version: 7.1.12
+          version: 7.1.3
       tests:
         override:
           - php-scrutinizer-run
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,6 @@ env:
 language: php
 
 php:
-    - 7.0
     - 7.1
     - 7.2
 
diff --git a/composer.json b/composer.json
@@ -39,16 +39,15 @@
         }
     ],
     "require": {
-        "php": ">=7.0.13",
-        "illuminate/console": "5.2.* || 5.3.* || 5.4.* || 5.5.* || 5.6.* || 5.7.*",
-        "illuminate/database": "5.2.* || 5.3.* || 5.4.* || 5.5.* || 5.6.* || 5.7.*",
-        "illuminate/filesystem": "5.2.* || 5.3.* || 5.4.* || 5.5.* || 5.6.* || 5.7.*"
+        "php": ">=7.1.3",
+        "illuminate/console": "^5.8",
+        "illuminate/database": "^5.8",
+        "illuminate/filesystem": "^5.8"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.0",
+        "phpunit/phpunit": "^7.5",
         "mockery/mockery": "^1.0",
-        "orchestra/testbench": "^3.5",
-        "orchestra/database": "^3.5"
+        "orchestra/testbench": "^3.8"
     },
     "autoload": {
         "psr-4": {
diff --git a/phpunit.xml b/phpunit.xml
@@ -9,7 +9,6 @@
          processIsolation="false"
          stopOnError="false"
          stopOnFailure="true"
-         syntaxCheck="true"
          verbose="true"
 >
     <testsuites>
diff --git a/src/Auditable.php b/src/Auditable.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Config;
 use OwenIt\Auditing\Contracts\AttributeEncoder;
@@ -93,7 +94,7 @@ protected function resolveAuditExclusions()
         }
 
         // Valid attributes are all those that made it out of the exclusion array
-        $attributes = array_except($this->attributes, $this->excludedAttributes);
+        $attributes = Arr::except($this->attributes, $this->excludedAttributes);
 
         foreach ($attributes as $attribute => $value) {
             // Apart from null, non scalar values will be excluded
@@ -152,8 +153,8 @@ protected function getUpdatedEventAttributes(): array
 
         foreach ($this->getDirty() as $attribute => $value) {
             if ($this->isAttributeAuditable($attribute)) {
-                $old[$attribute] = array_get($this->original, $attribute);
-                $new[$attribute] = array_get($this->attributes, $attribute);
+                $old[$attribute] = Arr::get($this->original, $attribute);
+                $new[$attribute] = Arr::get($this->attributes, $attribute);
             }
         }
 
diff --git a/src/AuditingServiceProvider.php b/src/AuditingServiceProvider.php
@@ -2,17 +2,13 @@
 
 namespace OwenIt\Auditing;
 
+use Illuminate\Contracts\Support\DeferrableProvider;
 use Illuminate\Support\ServiceProvider;
 use OwenIt\Auditing\Console\AuditDriverMakeCommand;
 use OwenIt\Auditing\Contracts\Auditor;
 
-class AuditingServiceProvider extends ServiceProvider
+class AuditingServiceProvider extends ServiceProvider implements DeferrableProvider
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected $defer = true;
-
     /**
      * Bootstrap the service provider.
      *
diff --git a/src/Auditor.php b/src/Auditor.php
@@ -70,7 +70,7 @@ public function execute(Auditable $model)
             $driver->prune($model);
         }
 
-        $this->app->make('events')->fire(
+        $this->app->make('events')->dispatch(
             new Audited($model, $driver, $audit)
         );
     }
diff --git a/tests/AuditingTestCase.php b/tests/AuditingTestCase.php
@@ -2,7 +2,6 @@
 
 namespace OwenIt\Auditing\Tests;
 
-use Orchestra\Database\ConsoleServiceProvider;
 use Orchestra\Testbench\TestCase;
 use OwenIt\Auditing\AuditingServiceProvider;
 use OwenIt\Auditing\Resolvers\IpAddressResolver;
@@ -42,7 +41,7 @@ protected function getEnvironmentSetUp($app)
     /**
      * {@inheritdoc}
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -57,7 +56,6 @@ protected function getPackageProviders($app)
     {
         return [
             AuditingServiceProvider::class,
-            ConsoleServiceProvider::class,
         ];
     }
 }
diff --git a/tests/Functional/CommandTest.php b/tests/Functional/CommandTest.php
@@ -16,9 +16,13 @@ public function itWillGenerateTheAuditDriver()
             $this->app->path()
         );
 
-        $this->assertSame(0, $this->artisan('make:audit-driver', [
-            'name' => 'TestDriver',
-        ]));
+        $this->assertInstanceOf(
+            \Illuminate\Foundation\Testing\PendingCommand::class,
+            $this->artisan('make:audit-driver', [
+                    'name' => 'TestDriver',
+                ]
+            )
+        );
 
         $this->assertFileExists($driverFilePath);
 
diff --git a/tests/Unit/AuditTest.php b/tests/Unit/AuditTest.php
@@ -36,7 +36,7 @@ public function itResolvesAuditData()
             'audit_event'      => 'created',
             'audit_url'        => 'console',
             'audit_ip_address' => '127.0.0.1',
-            'audit_user_agent' => 'Symfony/3.X',
+            'audit_user_agent' => 'Symfony',
             'audit_tags'       => null,
             'audit_created_at' => $audit->created_at->toDateTimeString(),
             'audit_updated_at' => $audit->updated_at->toDateTimeString(),
@@ -83,7 +83,7 @@ public function itResolvesAuditDataIncludingUserAttributes()
             'audit_event'      => 'created',
             'audit_url'        => 'console',
             'audit_ip_address' => '127.0.0.1',
-            'audit_user_agent' => 'Symfony/3.X',
+            'audit_user_agent' => 'Symfony',
             'audit_tags'       => null,
             'audit_created_at' => $audit->created_at->toDateTimeString(),
             'audit_updated_at' => $audit->updated_at->toDateTimeString(),
@@ -164,7 +164,7 @@ public function itReturnsAuditMetadataAsArray()
             'audit_event'      => 'created',
             'audit_url'        => 'console',
             'audit_ip_address' => '127.0.0.1',
-            'audit_user_agent' => 'Symfony/3.X',
+            'audit_user_agent' => 'Symfony',
             'audit_tags'       => null,
             'audit_created_at' => $audit->created_at->toDateTimeString(),
             'audit_updated_at' => $audit->updated_at->toDateTimeString(),
@@ -197,7 +197,7 @@ public function itReturnsAuditMetadataIncludingUserAttributesAsArray()
             'audit_event'      => 'created',
             'audit_url'        => 'console',
             'audit_ip_address' => '127.0.0.1',
-            'audit_user_agent' => 'Symfony/3.X',
+            'audit_user_agent' => 'Symfony',
             'audit_tags'       => null,
             'audit_created_at' => $audit->created_at->toDateTimeString(),
             'audit_updated_at' => $audit->updated_at->toDateTimeString(),
@@ -228,7 +228,7 @@ public function itReturnsAuditMetadataAsJsonString()
     "audit_event": "created",
     "audit_url": "console",
     "audit_ip_address": "127.0.0.1",
-    "audit_user_agent": "Symfony\/3.X",
+    "audit_user_agent": "Symfony",
     "audit_tags": null,
     "audit_created_at": "$audit->created_at",
     "audit_updated_at": "$audit->updated_at",
@@ -265,7 +265,7 @@ public function itReturnsAuditMetadataIncludingUserAttributesAsJsonString()
     "audit_event": "created",
     "audit_url": "console",
     "audit_ip_address": "127.0.0.1",
-    "audit_user_agent": "Symfony\/3.X",
+    "audit_user_agent": "Symfony",
     "audit_tags": null,
     "audit_created_at": "$audit->created_at",
     "audit_updated_at": "$audit->updated_at",
diff --git a/tests/Unit/AuditableTest.php b/tests/Unit/AuditableTest.php
@@ -5,6 +5,7 @@
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Support\Facades\App;
+use Illuminate\Support\Str;
 use OwenIt\Auditing\Contracts\Auditable;
 use OwenIt\Auditing\Encoders\Base64Encoder;
 use OwenIt\Auditing\Exceptions\AuditableTransitionException;
@@ -21,7 +22,7 @@ class AuditableTest extends AuditingTestCase
     /**
      * {@inheritdoc}
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -395,7 +396,7 @@ public function itReturnsTheAuditData()
             'user_type'      => null,
             'url'            => 'console',
             'ip_address'     => '127.0.0.1',
-            'user_agent'     => 'Symfony/3.X',
+            'user_agent'     => 'Symfony',
             'tags'           => null,
         ], $auditData, true);
     }
@@ -454,7 +455,7 @@ public function itReturnsTheAuditDataIncludingUserAttributes(
             'user_type'      => $type,
             'url'            => 'console',
             'ip_address'     => '127.0.0.1',
-            'user_agent'     => 'Symfony/3.X',
+            'user_agent'     => 'Symfony',
             'tags'           => null,
         ], $auditData, true);
     }
@@ -534,7 +535,7 @@ public function itExcludesAttributesFromTheAuditDataWhenInStrictMode()
             'user_type'      => null,
             'url'            => 'console',
             'ip_address'     => '127.0.0.1',
-            'user_agent'     => 'Symfony/3.X',
+            'user_agent'     => 'Symfony',
             'tags'           => null,
         ], $auditData, true);
     }
@@ -625,7 +626,7 @@ public function itTransformsTheAuditData()
 
             public function transformAudit(array $data): array
             {
-                $data['new_values']['slug'] = str_slug($data['new_values']['title']);
+                $data['new_values']['slug'] = Str::slug($data['new_values']['title']);
 
                 return $data;
             }

-Original file line number
+Diff line change
 language: php
 php:
 -    - 7.0
     - 7.1
     - 7.2
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@`
`9`	`9`	`processIsolation="false"`
`10`	`10`	`stopOnError="false"`
`11`	`11`	`stopOnFailure="true"`
`12`		`- syntaxCheck="true"`
`13`	`12`	`verbose="true"`
`14`	`13`	`>`
`15`	`14`	`<testsuites>`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public function execute(Auditable $model)`
`70`	`70`	`$driver->prune($model);`
`71`	`71`	`}`
`72`	`72`
`73`		`- $this->app->make('events')->fire(`
	`73`	`+ $this->app->make('events')->dispatch(`
`74`	`74`	`new Audited($model, $driver, $audit)`
`75`	`75`	`);`
`76`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`
`3`	`3`	`namespace OwenIt\Auditing\Tests;`
`4`	`4`
`5`		`-use Orchestra\Database\ConsoleServiceProvider;`
`6`	`5`	`use Orchestra\Testbench\TestCase;`
`7`	`6`	`use OwenIt\Auditing\AuditingServiceProvider;`
`8`	`7`	`use OwenIt\Auditing\Resolvers\IpAddressResolver;`
`@@ -42,7 +41,7 @@ protected function getEnvironmentSetUp($app)`
`42`	`41`	`/**`
`43`	`42`	`* {@inheritdoc}`
`44`	`43`	`*/`
`45`		`- public function setUp()`
	`44`	`+ public function setUp(): void`
`46`	`45`	`{`
`47`	`46`	`parent::setUp();`
`48`	`47`
`@@ -57,7 +56,6 @@ protected function getPackageProviders($app)`
`57`	`56`	`{`
`58`	`57`	`return [`
`59`	`58`	`AuditingServiceProvider::class,`
`60`		`- ConsoleServiceProvider::class,`
`61`	`59`	`];`
`62`	`60`	`}`
`63`	`61`	`}`