Merge branch '8.x' into 9.x

Author: GrahamCampbell

src/Illuminate/Database/Console/PruneCommand.php

@@ -87,7 +87,9 @@ public function handle(Dispatcher $events)
     protected function models()
     {
         if (! empty($models = $this->option('model'))) {
-            return collect($models);
+            return collect($models)->filter(function ($model) {
+                return class_exists($model);
+            })->values();
         }
 
         $except = $this->option('except');
@@ -111,6 +113,8 @@ protected function models()
                 });
             })->filter(function ($model) {
                 return $this->isPrunable($model);
+            })->filter(function ($model) {
+                return class_exists($model);
             })->values();
     }
 

src/Illuminate/Queue/Console/BatchesTableCommand.php

@@ -48,7 +48,7 @@ class BatchesTableCommand extends Command
     protected $composer;
 
     /**
-     * Create a new failed queue jobs table command instance.
+     * Create a new batched queue jobs table command instance.
      *
      * @param  \Illuminate\Filesystem\Filesystem  $files
      * @param  \Illuminate\Support\Composer  $composer
@@ -86,15 +86,15 @@ public function handle()
      * @param  string  $table
      * @return string
      */
-    protected function createBaseMigration($table = 'failed_jobs')
+    protected function createBaseMigration($table = 'job_batches')
     {
         return $this->laravel['migration.creator']->create(
             'create_'.$table.'_table', $this->laravel->databasePath().'/migrations'
         );
     }
 
     /**
-     * Replace the generated migration with the failed job table stub.
+     * Replace the generated migration with the batches job table stub.
      *
      * @param  string  $path
      * @param  string  $table

src/Illuminate/Validation/Concerns/ValidatesAttributes.php

@@ -563,7 +563,18 @@ public function validateDigits($attribute, $value, $parameters)
     {
         $this->requireParameterCount(1, $parameters, 'digits');
 
-        return ! preg_match('/[^0-9]/', $value)
+        $length = strlen((string) $value);
+
+        if (((string) $value) === '.') {
+            return false;
+        }
+
+        // Make sure there is not more than one dot...
+        if (($length - strlen(str_replace('.', '', (string) $value))) > 1) {
+            return false;
+        }
+
+        return ! preg_match('/[^0-9.]/', $value)
                     && strlen((string) $value) == $parameters[0];
     }
 

tests/Database/PruneCommandTest.php

@@ -89,6 +89,16 @@ public function testNonPrunableTest()
         $this->assertEquals(<<<'EOF'
 No prunable [Illuminate\Tests\Database\NonPrunableTestModel] records found.
 
+EOF, str_replace("\r", '', $output->fetch()));
+    }
+
+    public function testNonPrunableTestWithATrait()
+    {
+        $output = $this->artisan(['--model' => NonPrunableTrait::class]);
+
+        $this->assertEquals(<<<'EOF'
+No prunable models found.
+
 EOF, str_replace("\r", '', $output->fetch()));
     }
 
@@ -227,3 +237,8 @@ class NonPrunableTestModel extends Model
 {
     // ..
 }
+
+trait NonPrunableTrait
+{
+    use Prunable;
+}

tests/Validation/ValidationValidatorTest.php

@@ -2325,6 +2325,30 @@ public function testValidateDigits()
         $v = new Validator($trans, ['foo' => '2e7'], ['foo' => 'Digits:3']);
         $this->assertTrue($v->fails());
 
+        $v = new Validator($trans, ['foo' => '1.2'], ['foo' => 'digits:3']);
+        $this->assertTrue($v->passes());
+
+        $v = new Validator($trans, ['foo' => '0.9876'], ['foo' => 'digits:5']);
+        $this->assertTrue($v->fails());
+
+        $v = new Validator($trans, ['foo' => '1..2'], ['foo' => 'digits:4']);
+        $this->assertTrue($v->fails());
+
+        $v = new Validator($trans, ['foo' => '123.456.789'], ['foo' => 'digits:10']);
+        $this->assertTrue($v->fails());
+
+        $v = new Validator($trans, ['foo' => '...'], ['foo' => 'digits:3']);
+        $this->assertTrue($v->fails());
+
+        $v = new Validator($trans, ['foo' => '.'], ['foo' => 'digits:1']);
+        $this->assertTrue($v->fails());
+
+        $v = new Validator($trans, ['foo' => '.2'], ['foo' => 'digits:2']);
+        $this->assertTrue($v->passes());
+
+        $v = new Validator($trans, ['foo' => '2.'], ['foo' => 'digits:2']);
+        $this->assertTrue($v->passes());
+
         $trans = $this->getIlluminateArrayTranslator();
         $v = new Validator($trans, ['foo' => '12345'], ['foo' => 'digits_between:1,6']);
         $this->assertTrue($v->passes());