8000 Merge branch '6.4' into 7.1 · symfony/symfony@00320cf · GitHub
[go: up one dir, main page]
Skip to content

Commit 00320cf

Browse files
xabbuhxabbuh
committed
Merge branch '6.4' into 7.1
* 6.4: relax format assertions for fstat() results on Windows update ICU data from 75.1 to 76.1 fix referencing the SYMFONY_VERSION env var handle error results of DateTime::modify()
2 parents f0223a2 + 3381be1 commit 00320cf

File tree

594 files changed

+13826
-6578
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

594 files changed

+13826
-6578
lines changed

‎.github/workflows/windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787
$env:SYMFONY_VERSION=(Select-String -CaseSensitive -Pattern " VERSION =" -SimpleMatch -Path src/Symfony/Component/HttpKernel/Kernel.php | Select Line | Select-String -Pattern "([0-9][0-9]*\.[0-9])").Matches.Value
8888
$env:COMPOSER_ROOT_VERSION=$env:SYMFONY_VERSION + ".x-dev"
8989
90-
php .github/build-packages.php HEAD^ %SYMFONY_VERSION% src\Symfony\Bridge\PhpUnit
90+
php .github/build-packages.php HEAD^ $env:SYMFONY_VERSION src\Symfony\Bridge\PhpUnit
9191
php composer.phar update --no-progress --ansi
9292
9393
- name: Install PHPUnit

‎src/Symfony/Component/Intl/Intl.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public static function getIcuDataVersion(): string
106106
*/
107107
public static function getIcuStubVersion(): string
108108
{
109-
return '75.1';
109+
return '76.1';
110110
}
111111

112112
/**

‎src/Symfony/Component/Intl/Resources/data/currencies/af.php

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
0