Skip to content

Commit

Permalink
Merge branch '7.1' into 7.2
Browse files Browse the repository at this point in the history
* 7.1:
  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()
  • Loading branch information
xabbuh committed Nov 8, 2024
2 parents 72e038e + 00320cf commit 08b5abe
Show file tree
Hide file tree
Showing 594 changed files with 13,826 additions and 6,578 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ jobs:
$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
$env:COMPOSER_ROOT_VERSION=$env:SYMFONY_VERSION + ".x-dev"
php .github/build-packages.php HEAD^ %SYMFONY_VERSION% src\Symfony\Bridge\PhpUnit
php .github/build-packages.php HEAD^ $env:SYMFONY_VERSION src\Symfony\Bridge\PhpUnit
php composer.phar update --no-progress --ansi
- name: Install PHPUnit
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Intl/Intl.php
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public static function getIcuDataVersion(): string
*/
public static function getIcuStubVersion(): string
{
return '75.1';
return '76.1';
}

/**
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 08b5abe

Please sign in to comment.