Minor tweaks

Author: Mark Salmon

src/Translators/Rules.php

@@ -30,20 +30,29 @@ public static function fromColumn(Column $column)
             'smallInteger',
             'mediumInteger',
             'bigInteger',
-            'decimal',
-            'double',
-            'float',
             'increments',
             'tinyIncrements',
             'smallIncrements',
             'mediumIncrements',
             'bigIncrements',
             'unsignedBigInteger',
-            'unsignedDecimal',
             'unsignedInteger',
             'unsignedMediumInteger',
             'unsignedSmallInteger',
             'unsignedTinyInteger'
+        ])) {
+            $rules = array_merge($rules, ['integer']);
+
+            if (Str::startsWith($column->dataType(), 'unsigned')) {
+                $rules = array_merge($rules, ['gt:0']);
+            }
+        }
+
+        if (in_array($column->dataType(), [
+            'decimal',
+            'double',
+            'float',
+            'unsignedDecimal',
         ])) {
             $rules = array_merge($rules, ['numeric']);
 
@@ -71,16 +80,13 @@ public static function fromColumn(Column $column)
 
     private static function overrideStringRuleForSpecialNames($name)
     {
-        switch ($name) {
-            case Str::startsWith($name, 'email'):
-                return 'email';
-                break;
-            case $name === 'password':
-                return 'password';
-                break;
-            default:
-                return 'string';
-                break;
+        if (Str::startsWith($name, 'email')) {
+            return 'email';
         }
+        if ($name === 'password') {
+            return 'password';
+        }
+
+        return 'string';
     }
 }

tests/Feature/Translators/RulesTest.php

@@ -83,20 +83,29 @@ public function forColumn_returns_numeric_rule_for_numeric_types($data_type)
         $this->assertContains('numeric', Rules::fromColumn($column));
     }
 
+    /**
+     * @test
+     * @dataProvider integerDataTypesProvider
+     */
+    public function forColumn_returns_integer_rule_for_integer_types($data_type)
+    {
+        $column = new Column('test', $data_type);
+
+        $this->assertContains('integer', Rules::fromColumn($column));
+    }
+
     /**
      * @test
      */
     public function forColumn_returns_gt0_rule_for_unsigned_numeric_types()
     {
         $column = new Column('test', 'integer');
 
-        $this->assertContains('numeric', Rules::fromColumn($column));
         $this->assertNotContains('gt:0', Rules::fromColumn($column));
 
         $column = new Column('test', 'unsignedInteger');
 
         $this->assertContains('gt:0', Rules::fromColumn($column));
-        $this->assertContains('numeric', Rules::fromColumn($column));
     }
 
     /**
@@ -132,28 +141,34 @@ public function stringDataTypesProvider()
         ];
     }
 
-    public function numericDataTypesProvider()
+    public function integerDataTypesProvider()
     {
         return [
             ['integer'],
             ['tinyInteger'],
             ['smallInteger'],
             ['mediumInteger'],
             ['bigInteger'],
-            ['decimal'],
-            ['double'],
-            ['float'],
+            ['unsignedBigInteger'],
+            ['unsignedInteger'],
+            ['unsignedMediumInteger'],
+            ['unsignedSmallInteger'],
+            ['unsignedTinyInteger'],
             ['increments'],
             ['tinyIncrements'],
             ['smallIncrements'],
             ['mediumIncrements'],
             ['bigIncrements'],
-            ['unsignedBigInteger'],
+        ];
+    }
+
+    public function numericDataTypesProvider()
+    {
+        return [
+            ['decimal'],
+            ['double'],
+            ['float'],
             ['unsignedDecimal'],
-            ['unsignedInteger'],
-            ['unsignedMediumInteger'],
-            ['unsignedSmallInteger'],
-            ['unsignedTinyInteger'],
         ];
     }