From 08d06200d27cdf7bacb0e3645e6e247f6172e5e4 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Sun, 27 Mar 2016 15:08:17 +0200
Subject: [PATCH] Fixing writable check and interface bugs

---
 System/File/Directory.php    | 49 +++++++++++++++++++++++-------------
 System/File/File.php         |  2 +-
 System/File/FileAbstract.php |  5 ++++
 3 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/System/File/Directory.php b/System/File/Directory.php
index f96867f38..6e409b5ee 100644
--- a/System/File/Directory.php
+++ b/System/File/Directory.php
@@ -13,7 +13,7 @@
  * @version    1.0.0
  * @link       http://orange-management.com
  */
-namespace phpOMS\System;
+namespace phpOMS\System\File;
 
 /**
  * Filesystem class.
@@ -28,19 +28,24 @@ namespace phpOMS\System;
  * @link       http://orange-management.com
  * @since      1.0.0
  */
-class Directory extends FileAbstract implements Iterator, ArrayAccess
+class Directory extends FileAbstract implements \Iterator, \ArrayAccess
 {
     private $filter = '*';
     private $nodes = [];
 
-    public static function create(string $path, $permission = 0644) : bool
+    public static function create(string $path, int $permission = 0644, bool $recursive = false) : bool
     {
+        if($recursive && !file_exists($parent = self::getParent($path))) {
+            self::create($parent, $permission, $recursive);
+        }
+
         if (!file_exists($path)) {
-            if(is_writable($path)) {
+            if(is_writable(self::getParent($path))) {
                 mkdir($path, $permission, true);
 
                 return true;
             } else {
+
                 throw new PathException($path);
             }
         }
@@ -48,6 +53,14 @@ class Directory extends FileAbstract implements Iterator, ArrayAccess
         return false;
     }
 
+    public static function getParent(string $path) : string
+    {
+        $path = explode('/', str_replace('\\', '/', $path));
+        array_pop($path);
+
+        return implode('/', $path);
+    }
+
     public function __construct(string $path, string $filter = '*') 
     {
         $this->filter = $filter;
@@ -105,55 +118,55 @@ class Directory extends FileAbstract implements Iterator, ArrayAccess
     /* Iterator */
     public function rewind()
     {
-        reset($this->node);
+        reset($this->nodes);
     }
 
     public function current()
     {
-        return current($this->node);
+        return current($this->nodes);
     }
 
     public function key() 
     {
-        return key($this->node);
+        return key($this->nodes);
     }
 
     public function next() 
     {
-        return next($this->node);
+        return next($this->nodes);
     }
 
     public function valid()
     {
-        $key = key($this->node);
+        $key = key($this->nodes);
 
         return ($key !== null && $key !== false);
     }
 
     /* ArrayAccess */
-    public function offsetSet(string $offset, FileInterface $value) 
+    public function offsetSet($offset, $value) 
     {
         if (is_null($offset)) {
             $this->add($value);
         } else {
-            $this->node[$offset] = $value;
+            $this->nodes[$offset] = $value;
         }
     }
 
-    public function offsetExists(string $offset) 
+    public function offsetExists($offset) 
     {
-        return isset($this->node[$offset]);
+        return isset($this->nodes[$offset]);
     }
 
-    public function offsetUnset(string $offset) 
+    public function offsetUnset($offset) 
     {
-        if(isset($this->node[$offset])) {
-            unset($this->node[$offset]);
+        if(isset($this->nodes[$offset])) {
+            unset($this->nodes[$offset]);
         }
     }
 
-    public function offsetGet(string $offset) 
+    public function offsetGet($offset) 
     {
-        return $this->node[$offset] ?? null;
+        return $this->nodes[$offset] ?? null;
     }
 }
\ No newline at end of file
diff --git a/System/File/File.php b/System/File/File.php
index 2bd41e8ff..a3a8c7966 100644
--- a/System/File/File.php
+++ b/System/File/File.php
@@ -34,7 +34,7 @@ class File extends FileAbstract
     public static function create(string $path) : bool
     {
         if (!file_exists($path)) {
-            if(is_writable($path)) {
+            if(is_writable(Directory::getParent($path))) {
                 touch($path);
 
                 return true;
diff --git a/System/File/FileAbstract.php b/System/File/FileAbstract.php
index a8fad4784..51267a314 100644
--- a/System/File/FileAbstract.php
+++ b/System/File/FileAbstract.php
@@ -68,6 +68,11 @@ abstract class FileAbstract
         return $this->path;
     }
 
+    public function parent() : Directory 
+    {
+        return new Directory(Directory::getParent($this->path));
+    }
+
     public function getCreatedAt() : \DateTime 
     {
         return $this->createdAt;