Merge pull request #159 from lucchese/patch-1

mikeSimonson · mikeSimonson · commit fce0e7a1d1de · 2016-04-11T16:22:49.000+02:00
Update DoctrineCommand.php
diff --git a/Command/DoctrineCommand.php b/Command/DoctrineCommand.php
@@ -32,8 +32,9 @@ public static function configureMigrations(ContainerInterface $container, Config
     {
         if (!$configuration->getMigrationsDirectory()) {
             $dir = $container->getParameter('doctrine_migrations.dir_name');
-            if (!file_exists($dir)) {
-                mkdir($dir, 0777, true);
+            if (!@mkdir($dir, 0777, true) && !is_dir($dir)) {
+                $error = error_get_last();
+                throw new \ErrorException($error['message']);
             }
             $configuration->setMigrationsDirectory($dir);
         } else {
@@ -45,8 +46,9 @@ public static function configureMigrations(ContainerInterface $container, Config
                     $dir = str_replace('%'.$pathPlaceholder.'%', $container->getParameter($pathPlaceholder), $dir);
                 }
             }
-            if (!file_exists($dir)) {
-                mkdir($dir, 0777, true);
+            if (!@mkdir($dir, 0777, true) && !is_dir($dir)) {
+                $error = error_get_last();
+                throw new \ErrorException($error['message']);
             }
             $configuration->setMigrationsDirectory($dir);
         }

Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,9 @@ public static function configureMigrations(ContainerInterface $container, Config`
`32`	`32`	`{`
`33`	`33`	`if (!$configuration->getMigrationsDirectory()) {`
`34`	`34`	`$dir = $container->getParameter('doctrine_migrations.dir_name');`
`35`		`- if (!file_exists($dir)) {`
`36`		`- mkdir($dir, 0777, true);`
	`35`	`+ if (!@mkdir($dir, 0777, true) && !is_dir($dir)) {`
	`36`	`+ $error = error_get_last();`
	`37`	`+ throw new \ErrorException($error['message']);`
`37`	`38`	`}`
`38`	`39`	`$configuration->setMigrationsDirectory($dir);`
`39`	`40`	`} else {`
`@@ -45,8 +46,9 @@ public static function configureMigrations(ContainerInterface $container, Config`
`45`	`46`	`$dir = str_replace('%'.$pathPlaceholder.'%', $container->getParameter($pathPlaceholder), $dir);`
`46`	`47`	`}`
`47`	`48`	`}`
`48`		`- if (!file_exists($dir)) {`
`49`		`- mkdir($dir, 0777, true);`
	`49`	`+ if (!@mkdir($dir, 0777, true) && !is_dir($dir)) {`
	`50`	`+ $error = error_get_last();`
	`51`	`+ throw new \ErrorException($error['message']);`
`50`	`52`	`}`
`51`	`53`	`$configuration->setMigrationsDirectory($dir);`
`52`	`54`	`}`