another patch of scru fixes

michael-donat · May 11, 2014 · e42d2f5 · e42d2f5
1 parent f46fc31
commit e42d2f5
Show file tree

Hide file tree

Showing 8 changed files with 266 additions and 188 deletions.
diff --git a/src/VirtualFileSystem/Container.php b/src/VirtualFileSystem/Container.php
@@ -92,7 +92,7 @@ public function root()
      *
      * @throws NotFoundException
      */
-    public function fileAt($path)
+    public function nodeAt($path)
     {
         $pathParts = array_filter(explode('/', str_replace('\\', '/', $path)), 'strlen');
 
@@ -115,10 +115,10 @@ public function fileAt($path)
      *
      * @return bool
      */
-    public function hasFileAt($path)
+    public function hasNodeAt($path)
     {
         try {
-            $this->fileAt($path);
+            $this->nodeAt($path);
 
             return true;
         } catch (NotFoundException $e) {
@@ -138,7 +138,7 @@ public function hasFileAt($path)
      */
     public function directoryAt($path)
     {
-        $file = $this->fileAt($path);
+        $file = $this->nodeAt($path);
 
         if (!$file instanceof Directory) {
             throw new NotDirectoryException();
@@ -147,6 +147,27 @@ public function directoryAt($path)
         return $file;
     }
 
+    /**
+     * Returns file at given path
+     *
+     * @param string $path
+     *
+     * @return Structure\File
+     *
+     * @throws NotFileException
+     * @throws NotFoundException
+     */
+    public function fileAt($path)
+    {
+        $file = $this->nodeAt($path);
+
+        if (!$file instanceof File) {
+            throw new NotFileException();
+        }
+
+        return $file;
+    }
+
     /**
      * Creates Directory at given path.
      *
@@ -193,16 +214,16 @@ public function createDir($path, $recursive = false, $mode = null)
     public function createLink($path, $destination)
     {
 
-        $destination = $this->fileAt($destination);
+        $destination = $this->nodeAt($destination);
 
         try {
-            $file = $this->fileAt($path);
+            $this->nodeAt($path);
             throw new \RuntimeException(sprintf('%s already exists', $path));
         } catch (NotFoundException $e) {
 
         }
 
-        $parent =  $this->fileAt(dirname($path));
+        $parent =  $this->directoryAt(dirname($path));
 
         $parent->addLink($newLink = $this->factory()->getLink(basename($path), $destination));
 
@@ -222,7 +243,7 @@ public function createLink($path, $destination)
      */
     public function createFile($path, $data = null)
     {
-        if ($this->hasFileAt($path)) {
+        if ($this->hasNodeAt($path)) {
             throw new \RuntimeException(sprintf('%s already exists', $path));
         }
 
@@ -263,18 +284,18 @@ public function createStructure(array $structure, $parent = '/')
      */
     public function move($fromPath, $toPath)
     {
-        $fromNode = $this->fileAt($fromPath);
+        $fromNode = $this->nodeAt($fromPath);
 
         try {
-            $nodeToOverride = $this->fileAt($toPath);
+            $nodeToOverride = $this->nodeAt($toPath);
 
-            if(!is_a($nodeToOverride, get_class($fromNode))) {
+            if (!is_a($nodeToOverride, get_class($fromNode))) {
                 //nodes of a different type
                 throw new \RuntimeException('Can\'t move.');
             }
 
-            if($nodeToOverride instanceof Directory) {
-                if($nodeToOverride->size()) {
+            if ($nodeToOverride instanceof Directory) {
+                if ($nodeToOverride->size()) {
                     //nodes of a different type
                     throw new \RuntimeException('Can\'t override non empty directory.');
                 }
@@ -283,18 +304,14 @@ public function move($fromPath, $toPath)
             $this->remove($toPath, true);
 
         } catch (NotFoundException $e) {
-
+            //nothing at destination, we're good
         }
 
         $toParent = $this->directoryAt(dirname($toPath));
 
         $fromNode->setBasename(basename($toPath));
 
-        if ($fromNode instanceof File) {
-            $toParent->addFile($fromNode);
-        } else {
-            $toParent->addDirectory($fromNode);
-        }
+        $toParent->addNode($fromNode);
 
         $this->remove($fromPath, true);
 
@@ -311,7 +328,7 @@ public function move($fromPath, $toPath)
      */
     public function remove($path, $recursive = false)
     {
-        $fileToRemove = $this->fileAt($path);
+        $fileToRemove = $this->nodeAt($path);
 
         if (!$recursive && $fileToRemove instanceof Directory) {
             throw new \RuntimeException('Won\'t non-recursively remove directory');

diff --git a/src/VirtualFileSystem/NotFileException.php b/src/VirtualFileSystem/NotFileException.php
@@ -0,0 +1,21 @@
+<?php
+/*
+ * This file is part of the php-vfs package.
+ *
+ * (c) Michael Donat <michael.donat@me.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace VirtualFileSystem;
+
+/**
+ * Thrown when non-existing Node is requested.
+ *
+ * @author Michael Donat <michael.donat@me.com>
+ * @package php-vfs
+ */
+class NotFileException extends \Exception
+{
+}
diff --git a/src/VirtualFileSystem/Structure/Directory.php b/src/VirtualFileSystem/Structure/Directory.php
@@ -80,7 +80,7 @@ public function addLink(Link $link)
      *
      * @throws FileExistsException
      */
-    protected function addNode(Node $node)
+    public function addNode(Node $node)
     {
         if (array_key_exists($node->basename(), $this->children)) {
             throw new FileExistsException(sprintf('%s already exists', $node->basename()));