Merge branch 'release/2.1.0'

Author: jimmypuckett

VERSION

@@ -1 +1 @@
-2.0.2
+2.1.0

src/Commands/PurgeCommand.php

@@ -169,7 +169,7 @@ protected function purgeExpiredRecordsForModel($model, $days)
             return false;
         }
 
-        if (!method_exists($model, 'onlyTrashed') || !method_exists($model, 'forceDelete')) {
+        if (!method_exists($model, 'forceDelete')) {
             $this->recordMessage(sprintf("The model [%s] does not support soft deleting.", $model), 'error');
 
             return false;

tests/Commands/PurgeCommandTest.php

@@ -217,7 +217,7 @@ public function it_writes_a_comment_if_there_are_no_models_configured()
      * @test
      * @group unit
      */
-    public function it_warns_on_models_in_the_config_that_does_not_exists()
+    public function it_warns_on_models_in_the_config_that_do_not_exist()
     {
         $this->config_mock->shouldReceive('get')
                           ->once()
@@ -295,72 +295,7 @@ public function it_warns_on_models_in_the_config_that_does_not_exists()
      * @test
      * @group unit
      */
-    public function it_errors_on_models_in_the_config_that_does_not_have_onlyTrashed()
-    {
-        $this->config_mock->shouldReceive('get')
-                          ->once()
-                          ->withArgs(
-                              [
-                                  'garbageman.dispatch_purge_events',
-                                  false,
-                              ]
-                          )
-                          ->andReturn(false);
-
-        $this->config_mock->shouldReceive('get')
-                          ->once()
-                          ->withArgs(
-                              [
-                                  'garbageman.logging_level',
-                                  [
-                                      'console' => 6,
-                                      'log'     => 6,
-                                  ],
-                              ]
-                          )
-                          ->andReturn(
-                              [
-                                  'console' => 6,
-                                  'log'     => 6,
-                              ]
-                          );
-
-        $this->config_mock->shouldReceive('get')
-                          ->once()
-                          ->withArgs(
-                              [
-                                  'garbageman.schedule',
-                                  [],
-                              ]
-                          )
-                          ->andReturn(
-                              [
-                                  'NoOnlyTrashed' => 14,
-                              ]
-                          );
-
-        $this->log_mock->shouldReceive('error')
-                       ->once()
-                       ->with('The model [NoOnlyTrashed] does not support soft deleting.')
-                       ->andReturnNull();
-
-        $this->output_mock->shouldReceive('writeln')
-                          ->once()
-                          ->withArgs(
-                              $this->checkVerbosity(
-                                  '<error>The model [NoOnlyTrashed] does not support soft deleting.</error>'
-                              )
-                          )
-                          ->andReturnNull();
-
-        $this->command->handle();
-    }
-
-    /**
-     * @test
-     * @group unit
-     */
-    public function it_errors_on_models_in_the_config_that_does_not_have_forceDelete()
+    public function it_errors_on_models_in_the_config_that_do_not_have_forceDelete()
     {
         $this->config_mock->shouldReceive('get')
                           ->once()
@@ -603,7 +538,6 @@ public function it_deletes_all_expired_records_for_models_with_soft_delete_when_
     public function it_deletes_each_expired_record_for_models_and_throws_events_with_soft_delete_when_configured_to_dispatch_events(
     )
     {
-
         $this->config_mock->shouldReceive('get')
                           ->once()
                           ->withArgs(