Skip to content

Commit fe6d904

Browse files
fabpotfabpot
committed
Merge branch '2.7' into 2.8
* 2.7: [Filesystem] Fix false positive in ->remove() [Filesystem] Cleanup/sync with 2.3 [Validator] Fix the locale validator so it treats a locale alias as a valid locale reference form type by name on Symfony 2.7
2 parents 5500fe7 + a1c95f7 commit fe6d904

File tree

5 files changed

+31
-32
lines changed

5 files changed

+31
-32
lines changed

‎src/Symfony/Component/Filesystem/Filesystem.php

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -158,24 +158,23 @@ public function remove($files)
158158
$files = iterator_to_array($this->toIterator($files));
159159
$files = array_reverse($files);
160160
foreach ($files as $file) {
161+
if (@(unlink($file) || rmdir($file))) {
162+
continue;
163+
}
161164
if (is_link($file)) {
162-
// Workaround https://bugs.php.net/52176
163-
if (!@unlink($file) && !@rmdir($file)) {
164-
$error = error_get_last();
165-
throw new IOException(sprintf('Failed to remove symlink "%s": %s.', $file, $error['message']));
166-
}
165+
// See https://bugs.php.net/52176
166+
$error = error_get_last();
167+
throw new IOException(sprintf('Failed to remove symlink "%s": %s.', $file, $error['message']));
167168
} elseif (is_dir($file)) {
168169
$this->remove(new \FilesystemIterator($file));
169170

170171
if (!@rmdir($file)) {
171172
$error = error_get_last();
172173
throw new IOException(sprintf('Failed to remove directory "%s": %s.', $file, $error['message']));
173174
}
174-
} elseif ($this->exists($file)) {
175-
if (!@unlink($file)) {
176-
$error = error_get_last();
177-
throw new IOException(sprintf('Failed to remove file "%s": %s.', $file, $error['message']));
178-
}
175+
} elseif (file_exists($file)) {
176+
$error = error_get_last();
177+
throw new IOException(sprintf('Failed to remove file "%s": %s.', $file, $error['message']));
179178
}
180179
}
181180
}
@@ -435,7 +434,7 @@ public function mirror($originDir, $targetDir, \Traversable $iterator = null, $o
435434
$target = str_replace($originDir, $targetDir, $file->getPathname());
436435

437436
if ($copyOnWindows) {
438-
if (is_link($file) || is_file($file)) {
437+
if (is_file($file)) {
439438
$this->copy($file, $target, isset($options['override']) ? $options['override'] : false);
440439
} elseif (is_dir($file)) {
441440
$this->mkdir($target);

‎src/Symfony/Component/Filesystem/Tests/FilesystemTest.php

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ public function testRemoveCleansInvalidLinks()
347347

348348
// create symlink to nonexistent dir
349349
rmdir($basePath.'dir');
350-
$this->assertFalse(is_dir($basePath.'dir-link'));
350+
$this->assertFalse('\\' === DIRECTORY_SEPARATOR ? @readlink($basePath.'dir-link') : is_dir($basePath.'dir-link'));
351351

352352
$this->filesystem->remove($basePath);
353353

@@ -383,7 +383,7 @@ public function testFilesExistsFails()
383383
$file = str_repeat('T', 259 - strlen($basePath));
384384
$path = $basePath.$file;
385385
exec('TYPE NUL >>'.$file); // equivalent of touch, we can not use the php touch() here because it suffers from the same limitation
386-
self::$longPathNamesWindows[] = $path; // save this so we can clean up later
386+
$this->longPathNamesWindows[] = $path; // save this so we can clean up later
387387
chdir($oldPath);
388388
$this->filesystem->exists($path);
389389
}
@@ -744,6 +744,8 @@ public function testRemoveSymlink()
744744
$this->filesystem->remove($link);
745745

746746
$this->assertTrue(!is_link($link));
747+
$this->assertTrue(!is_file($link));
748+
$this->assertTrue(!is_dir($link));
747749
}
748750

749751
public function testSymlinkIsOverwrittenIfPointsToDifferentTarget()
@@ -917,7 +919,7 @@ public function testMirrorCopiesLinks()
917919
$this->filesystem->mirror($sourcePath, $targetPath);
918920

919921
$this->assertTrue(is_dir($targetPath));
920-
$this->assertFileEquals($sourcePath.'file1', $targetPath.DIRECTORY_SEPARATOR.'link1');
922+
$this->assertFileEquals($sourcePath.'file1', $targetPath.'link1');
921923
$this->assertTrue(is_link($targetPath.DIRECTORY_SEPARATOR.'link1'));
922924
}
923925

@@ -937,7 +939,7 @@ public function testMirrorCopiesLinkedDirectoryContents()
937939
$this->filesystem->mirror($sourcePath, $targetPath);
938940

939941
$this->assertTrue(is_dir($targetPath));
940-
$this->assertFileEquals($sourcePath.'/nested/file1.txt', $targetPath.DIRECTORY_SEPARATOR.'link1/file1.txt');
942+
$this->assertFileEquals($sourcePath.'/nested/file1.txt', $targetPath.'link1/file1.txt');
941943
$this->assertTrue(is_link($targetPath.DIRECTORY_SEPARATOR.'link1'));
942944
}
943945

@@ -961,7 +963,7 @@ public function testMirrorCopiesRelativeLinkedContents()
961963
$this->filesystem->mirror($sourcePath, $targetPath);
962964

963965
$this->assertTrue(is_dir($targetPath));
964-
$this->assertFileEquals($sourcePath.'/nested/file1.txt', $targetPath.DIRECTORY_SEPARATOR.'link1/file1.txt');
966+
$this->assertFileEquals($sourcePath.'/nested/file1.txt', $targetPath.'link1/file1.txt');
965967
$this->assertTrue(is_link($targetPath.DIRECTORY_SEPARATOR.'link1'));
966968
$this->assertEquals('\\' === DIRECTORY_SEPARATOR ? realpath($sourcePath.'\nested') : 'nested', readlink($targetPath.DIRECTORY_SEPARATOR.'link1'));
967969
}

‎src/Symfony/Component/Filesystem/Tests/FilesystemTestCase.php

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class FilesystemTestCase extends \PHPUnit_Framework_TestCase
1717
{
1818
private $umask;
1919

20-
static protected $longPathNamesWindows = array();
20+
protected $longPathNamesWindows = array();
2121

2222
/**
2323
* @var \Symfony\Component\Filesystem\Filesystem
@@ -33,33 +33,33 @@ class FilesystemTestCase extends \PHPUnit_Framework_TestCase
3333

3434
public static function setUpBeforeClass()
3535
{
36-
if (!empty(self::$longPathNamesWindows)) {
37-
foreach (self::$longPathNamesWindows as $path) {
38-
exec('DEL '.$path);
39-
}
40-
}
41-
4236
if ('\\' === DIRECTORY_SEPARATOR && null === self::$symlinkOnWindows) {
4337
$target = tempnam(sys_get_temp_dir(), 'sl');
4438
$link = sys_get_temp_dir().'/sl'.microtime(true).mt_rand();
45-
if (self::$symlinkOnWindows = @symlink($target, $link)) {
46-
unlink($link);
47-
}
39+
self::$symlinkOnWindows = @symlink($target, $link) && is_link($link);
40+
@unlink($link);
4841
unlink($target);
4942
}
5043
}
5144

5245
protected function setUp()
5346
{
5447
$this->umask = umask(0);
48+
$this->filesystem = new Filesystem();
5549
$this->workspace = rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.time().mt_rand(0, 1000);
5650
mkdir($this->workspace, 0777, true);
5751
$this->workspace = realpath($this->workspace);
58-
$this->filesystem = new Filesystem();
5952
}
6053

6154
protected function tearDown()
6255
{
56+
if (!empty($this->longPathNamesWindows)) {
57+
foreach ($this->longPathNamesWindows as $path) {
58+
exec('DEL '.$path);
59+
}
60+
$this->longPathNamesWindows = array();
61+
}
62+
6363
$this->filesystem->remove($this->workspace);
6464
umask($this->umask);
6565
}
@@ -102,10 +102,6 @@ protected function getFileGroup($filepath)
102102

103103
protected function markAsSkippedIfSymlinkIsMissing($relative = false)
104104
{
105-
if (!function_exists('symlink')) {
106-
$this->markTestSkipped('Function symlink is required.');
107-
}
108-
109105
if ('\\' === DIRECTORY_SEPARATOR && false === self::$symlinkOnWindows) {
110106
$this->markTestSkipped('symlink requires "Create symbolic links" privilege on Windows');
111107
}

‎src/Symfony/Component/Validator/Constraints/LocaleValidator.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,9 @@ public function validate($value, Constraint $constraint)
4343

4444
$value = (string) $value;
4545
$locales = Intl::getLocaleBundle()->getLocaleNames();
46+
$aliases = Intl::getLocaleBundle()->getAliases();
4647

47-
if (!isset($locales[$value])) {
48+
if (!isset($locales[$value]) && !in_array($value, $aliases)) {
4849
if ($this->context instanceof ExecutionContextInterface) {
4950
$this->context->buildViolation($constraint->message)
5051
->setParameter('{{ value }}', $this->formatValue($value))

‎src/Symfony/Component/Validator/Tests/Constraints/LocaleValidatorTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ public function getValidLocales()
6767
array('pt'),
6868
array('pt_PT'),
6969
array('zh_Hans'),
70+
array('fil_PH'),
7071
);
7172
}
7273

0 commit comments

Comments
 (0)