[8.x] Apply --except option in combination with --model for model:prune

src/Illuminate/Database/Console/PruneCommand.php

@@ -9,6 +9,7 @@
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Events\ModelsPruned;
 use Illuminate\Support\Str;
+use InvalidArgumentException;
 use Symfony\Component\Finder\Finder;
 
 class PruneCommand extends Command
@@ -85,28 +86,33 @@ public function handle(Dispatcher $events)
      */
     protected function models()
     {
-        if (! empty($models = $this->option('model'))) {
-            return collect($models);
-        }
-
-        $except = $this->option('except');
+        $models = collect($this->option('model'));
+        $except = collect($this->option('except'));
 
-        return collect((new Finder)->in(app_path('Models'))->files()->name('*.php'))
-            ->map(function ($model) {
-                $namespace = $this->laravel->getNamespace();
+        if ($models->isNotEmpty() && $except->isNotEmpty()) {
+            throw new InvalidArgumentException("Combining the --except and --model options is not supported.");
+        }
 
-                return $namespace.str_replace(
-                    ['/', '.php'],
-                    ['\\', ''],
-                    Str::after($model->getRealPath(), realpath(app_path()).DIRECTORY_SEPARATOR)
-                );
-            })->when(! empty($except), function ($models) use ($except) {
-                return $models->reject(function ($model) use ($except) {
-                    return in_array($model, $except);
+        if ($models->isEmpty()) {
+            collect((new Finder)->in(app_path('Models'))->files()->name('*.php'))
+                ->map(function ($model) {
+                    $namespace = $this->laravel->getNamespace();
+
+                    return $namespace.str_replace(
+                            ['/', '.php'],
+                            ['\\', ''],
+                            Str::after($model->getRealPath(), realpath(app_path()).DIRECTORY_SEPARATOR)
+                        );
                 });
-            })->filter(function ($model) {
-                return $this->isPrunable($model);
-            })->values();
+        }
+
+        return $models->when($except->isNotEmpty(), function ($models) use ($except) {
+            return $models->reject(function ($model) use ($except) {
+                return $except->contains($model);
+            });
+        })->filter(function ($model) {
+            return $this->isPrunable($model);
+        })->values();
     }
 
     /**

tests/Database/PruneCommandTest.php

@@ -87,7 +87,7 @@ public function testNonPrunableTest()
         $output = $this->artisan(['--model' => NonPrunableTestModel::class]);
 
         $this->assertEquals(<<<'EOF'
-No prunable [Illuminate\Tests\Database\NonPrunableTestModel] records found.
+No prunable models found.
 
 EOF, str_replace("\r", '', $output->fetch()));
     }
@@ -159,6 +159,34 @@ public function testTheCommandMayBePretendedOnSoftDeletedModel()
         $this->assertEquals(4, PrunableTestSoftDeletedModelWithPrunableRecords::withTrashed()->count());
     }
 
+    public function testCombinationOfModelAndExceptParameter()
+    {
+        $this->expectException(\InvalidArgumentException::class);
+
+        $db = new DB;
+        $db->addConnection([
+            'driver' => 'sqlite',
+            'database' => ':memory:',
+        ]);
+        $db->bootEloquent();
+        $db->setAsGlobal();
+        DB::connection('default')->getSchemaBuilder()->create('prunables', function ($table) {
+            $table->string('value')->nullable();
+            $table->datetime('deleted_at')->nullable();
+        });
+        DB::connection('default')->table('prunables')->insert([
+            ['value' => 1, 'deleted_at' => null],
+            ['value' => 2, 'deleted_at' => '2021-12-01 00:00:00'],
+            ['value' => 3, 'deleted_at' => null],
+            ['value' => 4, 'deleted_at' => '2021-12-02 00:00:00'],
+        ]);
+
+        $output = $this->artisan([
+            '--model' => [PrunableTestModelWithPrunableRecords::class, PrunableTestSoftDeletedModelWithPrunableRecords::class],
+            '--except' => PrunableTestModelWithPrunableRecords::class,
+        ]);
+    }
+
     protected function artisan($arguments)
     {
         $input = new ArrayInput($arguments);