Browse Source

Merge pull request #584 from shama/patch-inpath-test

Add test/doc for reverse Folder::inPath()
Mark Story 14 years ago
parent
commit
0443fe1507
2 changed files with 4 additions and 1 deletions
  1. 3 0
      lib/Cake/Test/Case/Utility/FolderTest.php
  2. 1 1
      lib/Cake/Utility/Folder.php

+ 3 - 0
lib/Cake/Test/Case/Utility/FolderTest.php

@@ -122,6 +122,9 @@ class FolderTest extends CakeTestCase {
 
 		$result = $Folder->inPath(DS . 'non-existing' . $inside);
 		$this->assertFalse($result);
+
+		$result = $Folder->inPath($path . DS . 'Model', true);
+		$this->assertTrue($result);
 	}
 
 /**

+ 1 - 1
lib/Cake/Utility/Folder.php

@@ -322,7 +322,7 @@ class Folder {
  * Returns true if the File is in given path.
  *
  * @param string $path The path to check that the current pwd() resides with in.
- * @param boolean $reverse
+ * @param boolean $reverse Reverse the search, check that pwd() resides within $path.
  * @return boolean
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#Folder::inPath
  */