DirHandler, FileHandler improvements

Author: doganoo

src/FileSystem/DirHandler.php

@@ -31,6 +31,7 @@
  * @package doganoo\PHPUtil\FileSystem
  */
 class DirHandler {
+    public const DEFAULT_PERMISSION_MODE = 0770;
     private $path = null;
 
     /**
@@ -41,20 +42,6 @@ public function __construct(string $path) {
         $this->setPath($path);
     }
 
-    /**
-     * @return string
-     */
-    public function getPath(): string {
-        return $this->path;
-    }
-
-    /**
-     * @param string $path
-     */
-    public function setPath(string $path) {
-        $this->path = $path;
-    }
-
     /**
      * @param string $fileName
      * @return null|FileHandler
@@ -106,6 +93,29 @@ public function isReadable(): bool {
         return \is_dir($this->path) && \is_readable($this->path);
     }
 
+    /**
+     * @param int $mode
+     * @param bool $recursive
+     * @return bool
+     */
+    public function mkdir(int $mode = DirHandler::DEFAULT_PERMISSION_MODE, bool $recursive = true): bool {
+        return \mkdir($this->getPath(), $mode, $recursive);
+    }
+
+    /**
+     * @return string
+     */
+    public function getPath(): string {
+        return $this->path;
+    }
+
+    /**
+     * @param string $path
+     */
+    public function setPath(string $path) {
+        $this->path = $path;
+    }
+
     /**
      * whether the dir is writable
      *

src/FileSystem/FileHandler.php

@@ -34,25 +34,45 @@ class FileHandler {
     /** @var string $path */
     private $path = null;
 
+    /** @var null|string $content */
+    private $content = null;
+
     /**
      * FileHandler constructor.
      *
      * @param $path
      */
-    public function __construct($path) {
+    public function __construct(string $path) {
+        $this->setPath($path);
+    }
+
+    /**
+     * @return string
+     */
+    public function getPath(): string {
+        return $this->path;
+    }
+
+    /**
+     * @param string $path
+     */
+    public function setPath(string $path): void {
         $this->path = $path;
+        $this->content = null;
     }
 
     /**
      * creates a file
      *
+     * @param bool $override whether the file should be overriden
      * @return bool
      */
-    public function create(): bool {
-        if ($this->isFile()) {
-            return \touch($this->path);
-        }
-        return false;
+    public function create(bool $override): bool {
+        if ($this->isFile() && !$override) return false;
+        $handle = @fopen($this->path, 'w');
+        if (false === $handle) return false;
+        fclose($handle);
+        return true;
     }
 
     /**
@@ -64,10 +84,29 @@ public function isFile(): bool {
         return \is_file($this->path);
     }
 
+    /**
+     * checks whether the file is readable or not
+     *
+     * @return bool
+     */
+    public function isReadable(): bool {
+        return \is_readable($this->path);
+    }
+
+    /**
+     * alias method of isFile()
+     *
+     * @return bool
+     */
+    public function exists(): bool {
+        return $this->isFile();
+    }
+
     /**
      * forces a file creation
      *
      * @return bool
+     * @deprecated Use create() instead
      */
     public function forceCreate(): bool {
         if (!$this->isFile()) {
@@ -95,21 +134,30 @@ public function isWritable(): bool {
      * @return null|string
      */
     public function getContent(): ?string {
-        if ($this->isFile()) {
-            return \file_get_contents($this->path);
-        }
-        return null;
+        if (null !== $this->content) return $this->content;
+        if (!$this->isFile()) return null;
+        $content = \file_get_contents($this->path);
+        if (false === $content) return null;
+        return $content;
     }
 
     /**
      * sets the content
      *
      * @param string $content
+     * @return void
+     */
+    public function setContent(string $content): void {
+        $this->content = $content;
+    }
+
+    /**
      * @return bool
      */
-    public function setContent(string $content): bool {
+    public function save(): bool {
         if (!$this->isFile()) return false;
-        return false !== \file_put_contents($this->path, $content);
+        if (!$this->isWritable()) return false;
+        return false !== \file_put_contents($this->path, $this->content);
     }
 
 }