recursive mkdir, fix #5

lib/BlockingDriver.php

@@ -203,8 +203,8 @@ class BlockingDriver implements Driver {
     /**
      * {@inheritdoc}
      */
-    public function mkdir($path, $mode = 0644) {
+    public function mkdir($path, $mode = 0644, $recursive) {
-        return new Success((bool) @\mkdir($path, $mode));
+        return new Success((bool) @\mkdir($path, $mode, $recursive));
     }
 
     /**

lib/Driver.php

@@ -129,9 +129,10 @@ interface Driver {
      *
      * @param string $path
      * @param int $mode
+     * @param bool $recursive
      * @return \Amp\Promise
      */
-    public function mkdir($path, $mode = 0644);
+    public function mkdir($path, $mode = 0644, $recursive);
 
     /**
      * Delete a directory

lib/EioDriver.php

@@ -356,11 +356,39 @@ class EioDriver implements Driver {
     /**
      * {@inheritdoc}
      */
-    public function mkdir($path, $mode = 0644) {
+    public function mkdir($path, $mode = 0644, $recursive) {
         \call_user_func($this->incrementor, 1);
         $promisor = new Deferred;
         $priority = \EIO_PRI_DEFAULT;
+
+        if ($recursive) {
+            $arrayPath = array_filter(explode(DIRECTORY_SEPARATOR, $path));
+            $tmpPath = "";
+
+            $callback = function() use (
+                &$callback, &$arrayPath, &$tmpPath, $mode, $priority, $promisor
+            ) {
+                $tmpPath .= DIRECTORY_SEPARATOR . array_shift($arrayPath);
+
+                if (empty($arrayPath)) {
+                    \eio_mkdir($tmpPath, $mode, $priority, [$this, "onGenericResult"], $promisor);
+                } else {
+                    $this->isdir($tmpPath)->when(function ($error, $result) use (
+                        $callback, $tmpPath, $mode, $priority
+                    ) {
+                        if ($result) {
+                            $callback();
+                        } else {
+                            \eio_mkdir($tmpPath, $mode, $priority, $callback);
+                        }
+                    });
+                }
+            };
+
+            $callback();
+        } else {
             \eio_mkdir($path, $mode, $priority, [$this, "onGenericResult"], $promisor);
+        }
 
         return $promisor->promise();
     }

lib/UvDriver.php

@@ -300,13 +300,44 @@ class UvDriver implements Driver {
     /**
      * {@inheritdoc}
      */
-    public function mkdir($path, $mode = 0644) {
+    public function mkdir($path, $mode = 0644, $recursive) {
         $this->reactor->addRef();
         $promisor = new Deferred;
+
+        if ($recursive) {
+            $arrayPath = array_filter(explode(DIRECTORY_SEPARATOR, $path));
+            $tmpPath = "";
+
+            $callback = function() use (
+                &$callback, &$arrayPath, &$tmpPath, $mode, $promisor
+            ) {
+                $tmpPath .= DIRECTORY_SEPARATOR . array_shift($arrayPath);
+
+                if (empty($arrayPath)) {
+                    \uv_fs_mkdir($this->loop, $tmpPath, $mode, function($fh) use ($promisor) {
+                        $this->reactor->delRef();
+                        $promisor->succeed((bool)$fh);
+                    });
+                } else {
+                    $this->isdir($tmpPath)->when(function ($error, $result) use (
+                        $callback, $tmpPath, $mode
+                    ) {
+                        if ($result) {
+                            $callback();
+                        } else {
+                            \uv_fs_mkdir($this->loop, $tmpPath, $mode, $callback);
+                        }
+                    });
+                }
+            };
+
+            $callback();
+        } else {
             \uv_fs_mkdir($this->loop, $path, $mode, function($fh) use ($promisor) {
                 $this->reactor->delRef();
                 $promisor->succeed((bool)$fh);
             });
+        }
 
         return $promisor->promise();
     }

lib/functions.php

@@ -197,10 +197,11 @@ function unlink($path) {
  *
  * @param string $path
  * @param int $mode
+ * @param bool $recursive
  * @return \Amp\Promise<null>
  */
-function mkdir($path, $mode = 0644) {
+function mkdir($path, $mode = 0644, $recursive = false) {
-    return filesystem()->mkdir($path, $mode);
+    return filesystem()->mkdir($path, $mode, $recursive);
 }
 
 /**

test/DriverTest.php

@@ -261,9 +261,14 @@ abstract class DriverTest extends \PHPUnit_Framework_TestCase {
             $dir = "{$fixtureDir}/newdir";
 
             yield file\mkdir($dir);
-            $stat = (yield file\stat($dir));
+            $this->assertNotNull(yield file\stat($dir));
             yield file\rmdir($dir);
             $this->assertNull(yield file\stat($dir));
+
+            $dir = "{$fixtureDir}/newdir/with/recursive/creation";
+
+            yield file\mkdir($dir, 0744, true);
+            $this->assertNotNull(yield file\stat($dir));
         });
     }