diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

deprecate relative paths in makePathRelative()

This commit is contained in:
Christian Flothmann 2017-09-14 14:29:42 +02:00
parent 12bb22c4eb
commit 893df5804e
5 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
UPGRADE-3.4.md
View File

@ -66,6 +66,7 @@ Filesystem
* The `Symfony\Component\Filesystem\LockHandler` class has been deprecated,
use the `Symfony\Component\Lock\Store\FlockStore` class
or the `Symfony\Component\Lock\Store\FlockStore\SemaphoreStore` class directly instead.
* Support for passing relative paths to `Filesystem::makePathRelative()` is deprecated and will be removed in 4.0.
Finder
------

1
UPGRADE-4.0.md
View File

@ -200,6 +200,7 @@ Filesystem
* The `Symfony\Component\Filesystem\LockHandler` has been removed,
use the `Symfony\Component\Lock\Store\FlockStore` class
or the `Symfony\Component\Lock\Store\FlockStore\SemaphoreStore` class directly instead.
* Support for passing relative paths to `Filesystem::makePathRelative()` has been removed.
Finder
------

1
src/Symfony/Component/Filesystem/CHANGELOG.md
View File

@ -5,6 +5,7 @@ CHANGELOG
-----
* added `appendToFile()` to append contents to existing files
* support for passing relative paths to `Filesystem::makePathRelative()` is deprecated and will be removed in 4.0
3.2.0
-----

6
src/Symfony/Component/Filesystem/Filesystem.php
View File

@ -446,6 +446,10 @@ class Filesystem
*/
public function makePathRelative($endPath, $startPath)
{
if (!$this->isAbsolutePath($endPath) || !$this->isAbsolutePath($startPath)) {
@trigger_error(sprintf('Support for passing relative paths to %s() is deprecated since version 3.4 and will be removed in 4.0.', __METHOD__), E_USER_DEPRECATED);
}
// Normalize separators on Windows
if ('\\' === DIRECTORY_SEPARATOR) {
$endPath = str_replace('\\', '/', $endPath);
@ -596,7 +600,7 @@ class Filesystem
{
return strspn($file, '/\\', 0, 1)
|| (strlen($file) > 3 && ctype_alpha($file[0])
&& ':' === substr($file, 1, 1)
&& ':' === $file[1]
&& strspn($file, '/\\', 2, 1)
)
|| null !== parse_url($file, PHP_URL_SCHEME)

10
src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
View File

@ -1103,7 +1103,6 @@ class FilesystemTest extends FilesystemTestCase
array('/var/lib/symfony/src/Symfony/', '/var/lib/symfony/src/Symfony/Component/', '../'),
array('/var/lib/symfony/src/Symfony', '/var/lib/symfony/src/Symfony/Component', '../'),
array('/var/lib/symfony/src/Symfony', '/var/lib/symfony/src/Symfony/Component/', '../'),
array('var/lib/symfony/', 'var/lib/symfony/src/Symfony/Component', '../../../'),
array('/usr/lib/symfony/', '/var/lib/symfony/src/Symfony/Component', '../../../../../../usr/lib/symfony/'),
array('/var/lib/symfony/src/Symfony/', '/var/lib/symfony/', 'src/Symfony/'),
array('/aa/bb', '/aa/bb', './'),
@ -1145,6 +1144,15 @@ class FilesystemTest extends FilesystemTestCase
return $paths;
}
/**
* @group legacy
* @expectedDeprecation Support for passing relative paths to Symfony\Component\Filesystem\Filesystem::makePathRelative() is deprecated since version 3.4 and will be removed in 4.0.
*/
public function testMakePathRelativeWithRelativePaths()
{
$this->assertSame('../../../', $this->filesystem->makePathRelative('var/lib/symfony/', 'var/lib/symfony/src/Symfony/Component'));
}
public function testMirrorCopiesFilesAndDirectoriesRecursively()
{
$sourcePath = $this->workspace.DIRECTORY_SEPARATOR.'source'.DIRECTORY_SEPARATOR;