Merge pull request #169 from Ravetracer/master

mikeSimonson · web-flow · commit 6276139e0b91 · 2016-12-05T19:36:37.000+01:00
Updated condition to prevent error on existing dir
diff --git a/Command/DoctrineCommand.php b/Command/DoctrineCommand.php
@@ -32,7 +32,7 @@ public static function configureMigrations(ContainerInterface $container, Config
     {
         if (!$configuration->getMigrationsDirectory()) {
             $dir = $container->getParameter('doctrine_migrations.dir_name');
-            if (!@mkdir($dir, 0777, true) && !is_dir($dir)) {
+            if (!is_dir($dir) && !@mkdir($dir, 0777, true) && !is_dir($dir)) {
                 $error = error_get_last();
                 throw new \ErrorException($error['message']);
             }
@@ -46,7 +46,7 @@ public static function configureMigrations(ContainerInterface $container, Config
                     $dir = str_replace('%'.$pathPlaceholder.'%', $container->getParameter($pathPlaceholder), $dir);
                 }
             }
-            if (!@mkdir($dir, 0777, true) && !is_dir($dir)) {
+            if (!is_dir($dir) && !@mkdir($dir, 0777, true) && !is_dir($dir)) {
                 $error = error_get_last();
                 throw new \ErrorException($error['message']);
             }

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ 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 (!@mkdir($dir, 0777, true) && !is_dir($dir)) {`
	`35`	`+ if (!is_dir($dir) && !@mkdir($dir, 0777, true) && !is_dir($dir)) {`
`36`	`36`	`$error = error_get_last();`
`37`	`37`	`throw new \ErrorException($error['message']);`
`38`	`38`	`}`
`@@ -46,7 +46,7 @@ public static function configureMigrations(ContainerInterface $container, Config`
`46`	`46`	`$dir = str_replace('%'.$pathPlaceholder.'%', $container->getParameter($pathPlaceholder), $dir);`
`47`	`47`	`}`
`48`	`48`	`}`
`49`		`- if (!@mkdir($dir, 0777, true) && !is_dir($dir)) {`
	`49`	`+ if (!is_dir($dir) && !@mkdir($dir, 0777, true) && !is_dir($dir)) {`
`50`	`50`	`$error = error_get_last();`
`51`	`51`	`throw new \ErrorException($error['message']);`
`52`	`52`	`}`