Merge pull request #5635 from ndm2/3.0-fix-handling-of-non-existent-paths

3.0 - Fix partial path being set for non existent paths

src/Filesystem/File.php

@@ -391,7 +391,10 @@ class File
     public function pwd()
     {
         if ($this->path === null) {
-            $this->path = $this->Folder->slashTerm($this->Folder->pwd()) . $this->name;
+            $dir = $this->Folder->pwd();
+            if (is_dir($dir)) {
+                $this->path = $this->Folder->slashTerm($dir) . $this->name;
+            }
         }
         return $this->path;
     }

tests/TestCase/Filesystem/FileTest.php

@@ -622,4 +622,17 @@ class FileTest extends TestCase
 
         $TmpFile->delete();
     }
+
+    /**
+     * Tests that no path is being set for passed file paths that
+     * do not exist.
+     *
+     * @return void
+     */
+    public function testNoPartialPathBeingSetForNonExistentPath()
+    {
+        $TmpFile = new File('/non/existent/file');
+        $this->assertNull($TmpFile->pwd());
+        $this->assertNull($TmpFile->path);
+    }
 }