adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-19 02:56:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #9348 from ndm2/backport-9341

Browse source 
2.x - Backport `Folder::inPath()` changes.
This commit is contained in:
Mark Story 2016-08-26 10:55:11 -04:00 • committed by GitHub
commit 1a4631b9cd
2 changed files with 81 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

82
lib/Cake/Test/Case/Utility/FolderTest.php
View file

@ -109,28 +109,86 @@ class FolderTest extends CakeTestCase {
* @return void * @return void
*/ */
public function testInPath() { public function testInPath() {
$path = dirname(dirname(__FILE__)); // "/Test/test_app/"
$inside = dirname($path) . DS; $basePath = CAKE . 'Test' . DS . 'test_app' . DS;
$Base = new Folder($basePath);
$Folder = new Folder($path); $result = $Base->pwd();
$this->assertEquals($basePath, $result);
$result = $Folder->pwd(); // is "/" in "/Test/test_app/"
$this->assertEquals($path, $result); $result = $Base->inPath(realpath(DS), true);
$this->assertFalse($result, true);
$result = Folder::isSlashTerm($inside); // is "/Test/test_app/" in "/Test/test_app/"
$result = $Base->inPath($basePath, true);
$this->assertTrue($result); $this->assertTrue($result);
$result = $Folder->realpath('Test/'); // is "/Test/test_app" in "/Test/test_app/"
$this->assertEquals($path . DS . 'Test' . DS, $result); $result = $Base->inPath(mb_substr($basePath, 0, -1), true);
$result = $Folder->inPath('Test' . DS);
$this->assertTrue($result); $this->assertTrue($result);
$result = $Folder->inPath(DS . 'non-existing' . $inside); // is "/Test/test_app/sub" in "/Test/test_app/"
$result = $Base->inPath($basePath . 'sub', true);
$this->assertTrue($result);
// is "/Test" in "/Test/test_app/"
$result = $Base->inPath(dirname($basePath), true);
$this->assertFalse($result); $this->assertFalse($result);
$result = $Folder->inPath($path . DS . 'Model', true); // is "/Test/other/(...)Test/test_app" in "/Test/test_app/"
$result = $Base->inPath(TMP . 'tests' . DS . 'other' . DS . $basePath, true);
$this->assertFalse($result);
// is "/Test/test_app/" in "/"
$result = $Base->inPath(realpath(DS));
$this->assertTrue($result); $this->assertTrue($result);
// is "/Test/test_app/" in "/Test/test_app/"
$result = $Base->inPath($basePath);
$this->assertTrue($result);
// is "/Test/test_app/" in "/Test/test_app"
$result = $Base->inPath(mb_substr($basePath, 0, -1));
$this->assertTrue($result);
// is "/Test/test_app/" in "/Test"
$result = $Base->inPath(dirname($basePath));
$this->assertTrue($result);
// is "/Test/test_app/" in "/Test/test_app/sub"
$result = $Base->inPath($basePath . 'sub');
$this->assertFalse($result);
// is "/other/Test/test_app/" in "/Test/test_app/"
$VirtualBase = new Folder();
$VirtualBase->path = '/other/Test/test_app';
$result = $VirtualBase->inPath('/Test/test_app/');
$this->assertFalse($result);
}
/**
* Data provider for the testInPathInvalidPathArgument test
*
* @return array
*/
public function inPathInvalidPathArgumentDataProvider() {
return array(
array(''),
array('relative/path/'),
array('unknown://stream-wrapper')
);
}
/**
* @dataProvider inPathInvalidPathArgumentDataProvider
* @param string $path
* @expectedException \InvalidArgumentException
* @expectedExceptionMessage The $path argument is expected to be an absolute path.
*/
public function testInPathInvalidPathArgument($path) {
$Folder = new Folder();
$Folder->inPath($path);
} }
/** /**

17
lib/Cake/Utility/Folder.php
View file

@ -385,7 +385,7 @@ class Folder {
} }
/** /**
* Returns true if the File is in a given CakePath. * Returns true if the Folder is in the given Cake path.
* *
* @param string $path The path to check. * @param string $path The path to check.
* @return bool * @return bool
@ -399,21 +399,26 @@ class Folder {
} }
/** /**
* Returns true if the File is in given path. * Returns true if the Folder is in the given path.
* *
* @param string $path The path to check that the current pwd() resides with in. * @param string $path The absolute path to check that the current `pwd()` resides within.
* @param bool $reverse Reverse the search, check that pwd() resides within $path. * @param bool $reverse Reverse the search, check if the given `$path` resides within the current `pwd()`.
* @return bool * @return bool
* @throws \InvalidArgumentException When the given `$path` argument is not an absolute path.
* @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#Folder::inPath * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#Folder::inPath
*/ */
public function inPath($path = '', $reverse = false) { public function inPath($path = '', $reverse = false) {
if (!Folder::isAbsolute($path)) {
throw new InvalidArgumentException(__d('cake_dev', 'The $path argument is expected to be an absolute path.'));
}
$dir = Folder::slashTerm($path); $dir = Folder::slashTerm($path);
$current = Folder::slashTerm($this->pwd()); $current = Folder::slashTerm($this->pwd());
if (!$reverse) { if (!$reverse) {
$return = preg_match('/^(.*)' . preg_quote($dir, '/') . '(.*)/', $current); $return = preg_match('/^' . preg_quote($dir, '/') . '(.*)/', $current);
} else { } else {
$return = preg_match('/^(.*)' . preg_quote($current, '/') . '(.*)/', $dir); $return = preg_match('/^' . preg_quote($current, '/') . '(.*)/', $dir);
} }
return (bool)$return; return (bool)$return;
} }