upgrade to laravel 6

Author: freekmurze

.travis.yml

@@ -1,20 +1,35 @@
 language: php
 
-php:
-  - 7.0
-  - 7.1
-  - 7.2
-  - 7.3
+cache:
+    directories:
+        - $HOME/.composer/cache
 
-env:
-  matrix:
-    - COMPOSER_FLAGS="--prefer-lowest"
-    - COMPOSER_FLAGS=""
+matrix:
+    fast_finish: true
+    include:
+        - php: 7.2
+          env: LARAVEL='5.8.*' TESTBENCH='3.8.*' COMPOSER_FLAGS='--prefer-lowest'
+        - php: 7.2
+          env: LARAVEL='5.8.*' TESTBENCH='3.8.*' COMPOSER_FLAGS='--prefer-stable'
+        - php: 7.3
+          env: LARAVEL='5.8.*' TESTBENCH='3.8.*' COMPOSER_FLAGS='--prefer-lowest'
+        - php: 7.3
+          env: LARAVEL='5.8.*' TESTBENCH='3.8.*' COMPOSER_FLAGS='--prefer-stable'
+        - php: 7.2
+          env: LARAVEL='6.*' TESTBENCH='4.*' COMPOSER_FLAGS='--prefer-lowest'
+        - php: 7.2
+          env: LARAVEL='6.*' TESTBENCH='4.*' COMPOSER_FLAGS='--prefer-stable'
+        - php: 7.3
+          env: LARAVEL='6.*' TESTBENCH='4.*' COMPOSER_FLAGS='--prefer-lowest'
+        - php: 7.3
+          env: LARAVEL='6.*' TESTBENCH='4.*' COMPOSER_FLAGS='--prefer-stable'
 
-before_script:
-  - travis_retry composer self-update
-  - travis_retry composer update ${COMPOSER_FLAGS} --no-interaction --prefer-source
+before_install:
+    - travis_retry composer self-update
+    - travis_retry composer require --no-update --no-interaction "illuminate/support:${LARAVEL}" "orchestra/testbench:${TESTBENCH}"
+
+install:
+    - travis_retry composer update ${COMPOSER_FLAGS} --prefer-dist --no-interaction --no-suggest
 
 script:
-  - vendor/bin/phpunit
-  
+    - vendor/bin/phpunit

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to `laravel-db-snapshots` will be documented in this file
 
+## 1.3.0 - 2019-09-04
+
+- add support for Laravel 6
+- drop anything below Laravel 5.8
+- drop anything below PHP 7.2
+
 ## 1.2.4 - 2019-07-01
 
 - fix for load command in production

composer.json

@@ -16,17 +16,16 @@
         }
     ],
     "require": {
-        "php": "^7.0",
-        "illuminate/support": "^5.4.30",
+        "php": "^7.2",
+        "illuminate/support": "^5.8|^6.0",
         "league/flysystem": "^1.0.41",
         "spatie/db-dumper": "^2.11",
-        "spatie/laravel-migrate-fresh": "^1.4.1",
         "spatie/temporary-directory": "^1.1"
     },
     "require-dev": {
-        "mockery/mockery": "^0.9.8",
-        "orchestra/testbench": "^3.4.10",
-        "phpunit/phpunit": "^6.5 || ^7.0"
+        "mockery/mockery": "^1.0",
+        "orchestra/testbench": "^3.8|^4.0",
+        "phpunit/phpunit": "^8.0"
     },
     "autoload": {
         "psr-4": {

phpunit.xml.dist

@@ -19,11 +19,4 @@
             <directory suffix=".php">src/</directory>
         </whitelist>
     </filter>
-    <logging>
-        <log type="tap" target="build/report.tap"/>
-        <log type="junit" target="build/report.junit.xml"/>
-        <log type="coverage-html" target="build/coverage" charset="UTF-8" yui="true" highlight="true"/>
-        <log type="coverage-text" target="build/coverage.txt"/>
-        <log type="coverage-clover" target="build/logs/clover.xml"/>
-    </logging>
 </phpunit>

src/Snapshot.php

@@ -83,9 +83,9 @@ public function createdAt(): Carbon
 
     protected function dropAllCurrentTables()
     {
-        $tableDropper = TableDropperFactory::create(DB::getDriverName());
-
-        $tableDropper->dropAllTables();
+        DB::connection(DB::getDefaultConnection())
+            ->getSchemaBuilder()
+            ->dropAllTables();
 
         DB::reconnect();
     }

tests/Commands/DeleteTest.php

@@ -11,7 +11,7 @@ class DeleteTest extends TestCase
     /** @var \Spatie\DbSnapshots\Commands\Delete|m\Mock */
     protected $command;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

tests/Commands/LoadTest.php

@@ -12,7 +12,7 @@ class LoadTest extends TestCase
     /** @var \Spatie\DbSnapshots\Commands\Delete|m\Mock */
     protected $command;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

tests/DbDumperFactoryTest.php

@@ -10,7 +10,7 @@
 
 class DbDumperFactoryTest extends TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -96,7 +96,7 @@ public function it_can_add_named_options_to_the_dump_command()
 
         $this->app['config']->set('database.connections.mysql.dump', $dumpConfig);
 
-        $this->assertContains('--single-transaction', $this->getDumpCommand('mysql'));
+        $this->assertStringContainsString('--single-transaction', $this->getDumpCommand('mysql'));
     }
 
     /** @test */
@@ -106,7 +106,7 @@ public function it_can_add_named_options_with_an_array_value_to_the_dump_command
 
         $this->app['config']->set('database.connections.mysql.dump', $dumpConfig);
 
-        $this->assertContains(implode(' ', $dumpConfig['include_tables']), $this->getDumpCommand('mysql'));
+        $this->assertStringContainsString(implode(' ', $dumpConfig['include_tables']), $this->getDumpCommand('mysql'));
     }
 
     /** @test */
@@ -116,13 +116,13 @@ public function it_can_add_arbritrary_options_to_the_dump_command()
 
         $this->app['config']->set('database.connections.mysql.dump', $dumpConfig);
 
-        $this->assertContains($dumpConfig['add_extra_option'], $this->getDumpCommand('mysql'));
+        $this->assertStringContainsString($dumpConfig['add_extra_option'], $this->getDumpCommand('mysql'));
     }
 
     /** @test */
     public function it_adds_the_inserts_option_to_the_pgsql_dump_command()
     {
-        $this->assertContains('--inserts', $this->getDumpCommand('pgsql'));
+        $this->assertStringContainsString('--inserts', $this->getDumpCommand('pgsql'));
     }
 
     protected function getDumpCommand(string $connectionName): string

tests/SnapshotRepositoryTest.php

@@ -10,7 +10,7 @@ class SnapshotRepositoryTest extends TestCase
     /** @var \Spatie\DbSnapshots\SnapshotRepository */
     protected $repository;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

tests/TestCase.php

@@ -12,10 +12,10 @@
 
 abstract class TestCase extends Orchestra
 {
-    /** @var FilesystemAdapter */
+    /** @var \Illuminate\Filesystem\FilesystemAdapter */
     protected $disk;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -126,7 +126,7 @@ protected function seeInConsoleOutput($searchStrings)
         $output = Artisan::output();
 
         foreach ($searchStrings as $searchString) {
-            $this->assertContains((string) $searchString, $output);
+            $this->assertStringContainsString((string) $searchString, $output);
         }
     }
 }