t push origin masterMerge branch 'Niban-master'

laracasts · Feb 28, 2015 · 20ba013 · 20ba013
2 parents 582022b + b5dc81f
commit 20ba013
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/spec/Migrations/SchemaParserSpec.php b/spec/Migrations/SchemaParserSpec.php
@@ -40,4 +40,20 @@ function it_parses_correctly_when_the_type_contains_method_arguments()
             ['name' => 'amount', 'type' => 'decimal', 'arguments' => ['5', '2'], 'options' => []]
         ]);
     }
+
+    function it_parses_schema_with_multiple_fields_using_no_spaces()
+    {
+        $this->parse('name:string,age:integer')->shouldReturn([
+            ['name' => 'name', 'type' => 'string', 'arguments' => [], 'options' => []],
+            ['name' => 'age', 'type' => 'integer', 'arguments' => [], 'options' => []],
+        ]);
+    }
+
+    function it_parses_schema_with_multiple_fields_containing_arguments_using_no_spaces()
+    {
+        $this->parse('name:string,amount:decimal(5,2)')->shouldReturn([
+            ['name' => 'name', 'type' => 'string', 'arguments' => [], 'options' => []],
+            ['name' => 'amount', 'type' => 'decimal', 'arguments' => ['5', '2'], 'options' => []]
+        ]);
+    }
 }
diff --git a/src/Commands/PivotMigrationMakeCommand.php b/src/Commands/PivotMigrationMakeCommand.php
@@ -21,7 +21,7 @@ class PivotMigrationMakeCommand extends GeneratorCommand
      *
      * @var string
      */
-    protected $description = 'Create a new migration pivot class.';
+    protected $description = 'Create a new migration pivot class';
 
     /**
      * The type of class being generated.

diff --git a/src/Migrations/SchemaParser.php b/src/Migrations/SchemaParser.php
@@ -34,7 +34,9 @@ public function parse($schema)
      */
     private function getFields($schema)
     {
-        return preg_split('/\s?,\s/', $schema);
+        $preg_split = preg_split('/,(?![^()]*+\\))/', $schema);
+
+        return array_map("trim", $preg_split);
     }
 
     /**