Make sure arguments can be passed to types

spec/Migrations/SchemaParserSpec.php

@@ -15,22 +15,29 @@ function it_is_initializable()
     function it_parses_a_basic_string_schema()
     {
         $this->parse('name:string')->shouldReturn([
-            ['name' => 'name', 'type' => 'string', 'options' => []]
+            ['name' => 'name', 'type' => 'string', 'arguments' => [], 'options' => []]
         ]);
     }
 
     function it_parses_schema_with_multiple_fields()
     {
         $this->parse('name:string, age:integer')->shouldReturn([
-            ['name' => 'name', 'type' => 'string', 'options' => []],
-            ['name' => 'age', 'type' => 'integer', 'options' => []],
+            ['name' => 'name', 'type' => 'string', 'arguments' => [], 'options' => []],
+            ['name' => 'age', 'type' => 'integer', 'arguments' => [], 'options' => []],
         ]);
     }
 
     function it_parses_schema_that_includes_extras()
     {
         $this->parse('age:integer:nullable:default(21)')->shouldReturn([
-            ['name' => 'age', 'type' => 'integer', 'options' => ['nullable' => true, 'default' => '21']]
+            ['name' => 'age', 'type' => 'integer', 'arguments' => [], 'options' => ['nullable' => true, 'default' => '21']]
+        ]);
+    }
+
+    function it_parses_correctly_when_the_type_contains_method_arguments()
+    {
+        $this->parse('amount:decimal(5,2)')->shouldReturn([
+            ['name' => 'amount', 'type' => 'decimal', 'arguments' => ['5', '2'], 'options' => []]
         ]);
     }
 }

spec/Migrations/SyntaxBuilderSpec.php

@@ -17,6 +17,7 @@ function it_creates_the_php_syntax_for_the_schema()
         $schema = [[
             "name"    => "email",
             "type"    => "string",
+            "arguments" => ["100"],
             "options" => [
                 "unique"   => true,
                 "nullable" => true,
@@ -34,7 +35,7 @@ function getStub() {
     return <<<EOT
 Schema::create('{{table}}', function(Blueprint \$table) {
             \$table->increments('id');
-            \$table->string('email')->unique()->nullable()->default("foo@example.com");
+            \$table->string('email', 100)->unique()->nullable()->default("foo@example.com");
             \$table->timestamps();
         });
 EOT;

src/Migrations/SchemaParser.php

@@ -34,7 +34,7 @@ public function parse($schema)
      */
     private function getFields($schema)
     {
-        return preg_split('/\s?,\s?/', $schema);
+        return preg_split('/\s?,\s/', $schema);
     }
 
     /**
@@ -47,11 +47,19 @@ private function getDetails($field)
     {
         $segments = explode(':', $field);
 
-        return [
-            'name' => array_shift($segments),
-            'type' => array_shift($segments),
-            'options' => $this->parseOptions($segments)
-        ];
+        $name = array_shift($segments);
+        $type = array_shift($segments);
+        $arguments = [];
+        $options = $this->parseOptions($segments);
+
+        // Do we have arguments being used here?
+        // Like: string(100)
+        if (preg_match('/(.+?)\(([^)]+)\)/', $type, $matches)) {
+            $type = $matches[1];
+            $arguments = explode(',', $matches[2]);
+        }
+
+        return compact('name', 'type', 'arguments', 'options');
     }
 
     /**

src/Migrations/SyntaxBuilder.php

@@ -171,6 +171,14 @@ private function addColumn($field)
     {
         $syntax = sprintf("\$table->%s('%s')", $field['type'], $field['name']);
 
+        // If there are arguments for the schema type, like decimal('amount', 5, 2)
+        // then we have to remember to work those in.
+        if ($field['arguments']) {
+            $syntax = substr($syntax, 0, -1) . ', ';
+
+            $syntax .= implode(', ', $field['arguments']) . ')';
+        }
+
         foreach ($field['options'] as $method => $value) {
             $syntax .= sprintf("->%s(%s)", $method, $value === true ? '' : $value);
         }