Commit dff6d8e
committed
Merge branch '8.0' into 8.1
* 8.0:
Fix post-merge cleanups for #64389
[Yaml] Replace @dataProvider annotation with #[DataProvider] attribute in InlineTest
Migrate `configureSchema()` to DBAL's editor API
[Yaml] Fix parsing inline anchored values
[Dotenv] Don't truncate external env vars containing $ when referenced via ${...} indirection
Remove usage of Kernel::VERSION
[Translation] Fix XLIFF 2 catalog metadata
Bump Symfony version to 8.0.14
Update VERSION for 8.0.13
Update CHANGELOG for 8.0.13
Bump Symfony version to 7.4.14
Update VERSION for 7.4.13
Update CHANGELOG for 7.4.13
Bump Symfony version to 6.4.42
Update VERSION for 6.4.41
Update CONTRIBUTORS for 6.4.41
Update CHANGELOG for 6.4.41
[ObjectMapper] Fix TargetClass generic in ConditionCallableInterface
# Conflicts:
# src/Symfony/Bridge/Doctrine/SchemaListener/AbstractSchemaListener.php
# src/Symfony/Bundle/FrameworkBundle/Console/Application.php
# src/Symfony/Component/Cache/Adapter/DoctrineDbalAdapter.php
# src/Symfony/Component/HttpKernel/Kernel.php
# src/Symfony/Component/ObjectMapper/Condition/TargetClass.php
# src/Symfony/Component/Translation/Tests/Loader/XliffFileLoaderTest.php1 file changed
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
43 | 43 | | |
44 | 44 | | |
45 | 45 | | |
46 | | - | |
| 46 | + | |
47 | 47 | | |
48 | 48 | | |
49 | 49 | | |
| |||
0 commit comments