8000 Merge branch '4.4' into 5.1 · symfony/symfony@216f2fa · GitHub
[go: up one dir, main page]
Skip to content

Commit 216f2fa

Browse files
fabpotfabpot
committed
Merge branch '4.4' into 5.1
* 4.4: Backport: Improve link script with rollback when using symlink fix more numeric cases changing in PHP 8
2 parents df7950d + 6d850e0 commit 216f2fa

File tree

3 files changed

+28
-6
lines changed

3 files changed

+28
-6
lines changed

‎link

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,22 @@ require __DIR__.'/src/Symfony/Component/Filesystem/Filesystem.php';
1818
use Symfony\Component\Filesystem\Filesystem;
1919

2020
/**
21-
* Links dependencies to components to a local clone of the main symfony/symfony GitHub repository.
21+
* Links dependencies of a project to a local clone of the main symfony/symfony GitHub repository.
2222
*
2323
* @author Kévin Dunglas <dunglas@gmail.com>
2424
*/
2525

2626
$copy = false !== $k = array_search('--copy', $argv, true);
2727
$copy && array_splice($argv, $k, 1);
28+
$rollback = false !== $k = array_search('--rollback', $argv, true);
29+
$rollback && array_splice($argv, $k, 1);
2830
$pathToProject = $argv[1] ?? getcwd();
2931

3032
if (!is_dir("$pathToProject/vendor/symfony")) {
31-
echo 'Link (or copy) dependencies to components to a local clone of the main symfony/symfony GitHub repository.'.PHP_EOL.PHP_EOL;
33+
echo 'Links dependencies of a project to a local clone of the main symfony/symfony GitHub repository.'.PHP_EOL.PHP_EOL;
3234
echo "Usage: $argv[0] /path/to/the/project".PHP_EOL;
3335
echo ' Use `--copy` to copy dependencies instead of symlink'.PHP_EOL.PHP_EOL;
36+
echo ' Use `--rollback` to rollback'.PHP_EOL.PHP_EOL;
3437
echo "The directory \"$pathToProject\" does not exist or the dependencies are not installed, did you forget to run \"composer install\" in your project?".PHP_EOL;
3538
exit(1);
3639
}
@@ -53,12 +56,19 @@ foreach ($directories as $dir) {
5356

5457
foreach (glob("$pathToProject/vendor/symfony/*", GLOB_ONLYDIR | GLOB_NOSORT) as $dir) {
5558
$package = 'symfony/'.basename($dir);
56-
if (!$copy && is_link($dir)) {
57-
echo "\"$package\" is already a symlink, skipping.".PHP_EOL;
59+
60+
if (!isset($sfPackages[$package])) {
5861
continue;
5962
}
6063

61-
if (!isset($sfPackages[$package])) {
64+
if ($rollback) {
65+
$filesystem->remove($dir);
66+
echo "\"$package\" has been rollback from \"$sfPackages[$package]\".".PHP_EOL;
67+
continue;
68+
}
69+
70+
if (!$copy && is_link($dir)) {
71+
echo "\"$package\" is already a symlink, skipping.".PHP_EOL;
6272
continue;
6373
}
6474

@@ -78,3 +88,7 @@ foreach (glob("$pathToProject/vendor/symfony/*", GLOB_ONLYDIR | GLOB_NOSORT) as
7888
foreach (glob("$pathToProject/var/cache/*", GLOB_NOSORT) as $cacheDir) {
7989
$filesystem->remove($cacheDir);
8090
}
91+
92+
if ($rollback) {
93+
echo PHP_EOL."Rollback done, do not forget to run \"composer install\" in your project \"$pathToProject\".".PHP_EOL;
94+
}

‎src/Symfony/Component/Yaml/Inline.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ public static function dump($value, int $flags = 0): string
161161
return 'false';
162162
case ctype_digit($value):
163163
return \is_string($value) ? "'$value'" : (int) $value;
164-
case is_numeric($value) && false === strpos($value, "\n"):
164+
case is_numeric($value) && false === strpos($value, "\f") && false === strpos($value, "\n") && false === strpos($value, "\r") && false === strpos($value, "\t") && false === strpos($value, "\v"):
165165
$locale = setlocale(LC_NUMERIC, 0);
166166
if (false !== $locale) {
167167
setlocale(LC_NUMERIC, 'C');

‎src/Symfony/Component/Yaml/Tests/InlineTest.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -506,6 +506,14 @@ public function getTestsForDump()
506506
['[foo, \'@foo.baz\', { \'%foo%\': \'foo is %foo%\', bar: \'%foo%\' }, true, \'@service_container\']', ['foo', '@foo.baz', ['%foo%' => 'foo is %foo%', 'bar' => '%foo%'], true, '@service_container']],
507507

508508
['{ foo: { bar: { 1: 2, baz: 3 } } }', ['foo' => ['bar' => [1 => 2, 'baz' => 3]]]],
509+
510+
// numeric strings with trailing whitespaces
511+
["'0123 '", '0123 '],
512+
['"0123\f"', "0123\f"],
513+
['"0123\n"', "0123\n"],
514+
['"0123\r"', "0123\r"],
515+
['"0123\t"', "0123\t"],
516+
['"0123\v"', "0123\v"],
509517
];
510518
}
511519

0 commit comments

Comments
 (0)
0