style changes, minor refactorings

Author: ralphschindler

src/Commands/Create.php

@@ -2,7 +2,6 @@
 
 namespace Spatie\DbSnapshots\Commands;
 
-use DB;
 use Carbon\Carbon;
 use Illuminate\Console\Command;
 use Spatie\DbSnapshots\Helpers\Format;
@@ -24,13 +23,13 @@ public function handle()
 
         $snapshotName = $this->argument('name') ?: Carbon::now()->format('Y-m-d_H-i-s');
 
-        $compress = $this->option('compress');
+        $compress = $this->option('compress', null);
 
         $snapshot = app(SnapshotFactory::class)->create(
             $snapshotName,
             config('db-snapshots.disk'),
             $connectionName,
-            $compress ?: null
+            ($compress !== null) ? $compress : (bool) config('db-snapshots.compress', false)
         );
 
         $size = Format::humanReadableSize($snapshot->size());

src/Snapshot.php

@@ -23,7 +23,7 @@ class Snapshot
     public $name;
 
     /** @var string */
-    public $compressionExt = null;
+    public $compressionExtension = null;
 
     public function __construct(Disk $disk, string $fileName)
     {
@@ -34,7 +34,7 @@ public function __construct(Disk $disk, string $fileName)
         $pathinfo = pathinfo($fileName);
 
         if ($pathinfo['extension'] === 'gz') {
-            $this->compressionExt = $pathinfo['extension'];
+            $this->compressionExtension = $pathinfo['extension'];
             $fileName = $pathinfo['filename'];
         }
 
@@ -53,7 +53,7 @@ public function load(string $connectionName = null)
 
         $dbDumpContents = $this->disk->get($this->fileName);
 
-        if ($this->compressionExt === 'gz') {
+        if ($this->compressionExtension === 'gz') {
             $dbDumpContents = gzdecode($dbDumpContents);
         }
 

src/SnapshotFactory.php

@@ -26,15 +26,13 @@ public function __construct(DbDumperFactory $dumperFactory, Factory $filesystemF
         $this->filesystemFactory = $filesystemFactory;
     }
 
-    public function create(string $snapshotName, string $diskName, string $connectionName, bool $compress = null): Snapshot
+    public function create(string $snapshotName, string $diskName, string $connectionName, bool $compress = false): Snapshot
     {
         $disk = $this->getDisk($diskName);
 
         $fileName = $snapshotName.'.sql';
         $fileName = pathinfo($fileName, PATHINFO_BASENAME);
 
-        $compress = ($compress === true) ?: (bool) config('db-snapshots.compress', false);
-
         if ($compress) {
             $fileName .= '.gz';
         }

tests/Commands/CreateTest.php

@@ -15,15 +15,15 @@ public function it_can_create_a_snapshot_without_a_specific_name()
 
         $fileName = Carbon::now()->format('Y-m-d_H-i-s').'.sql';
 
-        $this->assertFileOnDiskContains($fileName, '/CREATE TABLE(?: IF NOT EXISTS){0,1} "models"/', true);
+        $this->assertFileOnDiskPassesRegex($fileName, '/CREATE TABLE(?: IF NOT EXISTS){0,1} "models"/');
     }
 
     /** @test */
     public function it_can_create_a_snapshot_with_specific_name()
     {
         Artisan::call('snapshot:create', ['name' => 'test']);
 
-        $this->assertFileOnDiskContains('test.sql', '/CREATE TABLE(?: IF NOT EXISTS){0,1} "models"/', true);
+        $this->assertFileOnDiskPassesRegex('test.sql', '/CREATE TABLE(?: IF NOT EXISTS){0,1} "models"/');
     }
 
     /** @test */

tests/SnapshotRepositoryTest.php

@@ -42,7 +42,7 @@ public function it_can_find_gz_compressed_snapshots()
 
         $this->assertInstanceOf(Snapshot::class, $snapshot);
 
-        $this->assertEquals('gz', $snapshot->compressionExt);
+        $this->assertEquals('gz', $snapshot->compressionExtension);
 
         $this->assertNull($this->repository->findByName('snapshot5'));
     }

tests/TestCase.php

@@ -56,13 +56,13 @@ protected function getEnvironmentSetUp($app)
         ]);
     }
 
-    protected function assertFileOnDiskContains($fileName, $needle, bool $isRegex = false)
+    protected function assertFileOnDiskPassesRegex($fileName, $needle)
     {
         $this->disk->assertExists($fileName);
 
         $contents = $this->disk->get($fileName);
 
-        ($isRegex) ? $this->assertRegExp($needle, $contents) : $this->assertContains($needle, $contents);
+        $this->assertRegExp($needle, $contents);
     }
 
     protected function setupDatabase()