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

Commit 30fa94e

Browse files
xabbuhxabbuh
committed
Merge branch '6.4' into 7.0
* 6.4: fix tests Revert "Bump Symfony version to 7.0.4" Bump Symfony version to 7.0.4 Bump Symfony version to 6.4.4 Update VERSION for 6.4.3 Update CHANGELOG for 6.4.3
2 parents ee07003 + ad1563b commit 30fa94e

File tree

2 files changed

+18
-1
lines changed

2 files changed

+18
-1
lines changed

‎src/Symfony/Component/DependencyInjection/Tests/Dumper/YamlDumperTest.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,11 @@ public function testDumpHandlesEnumeration()
163163
$container->compile();
164164
$dumper = new YamlDumper($container);
165165

166-
$this->assertEquals(file_get_contents(self::$fixturesPath.'/yaml/services_with_enumeration.yml'), $dumper->dump());
166+
if (str_starts_with(Yaml::dump(FooUnitEnum::BAR), '!php/enum')) {
167+
$this->assertEquals(file_get_contents(self::$fixturesPath.'/yaml/services_with_enumeration_enum_tag.yml'), $dumper->dump());
168+
} else {
169+
$this->assertEquals(file_get_contents(self::$fixturesPath.'/yaml/services_with_enumeration.yml'), $dumper->dump());
170+
}
167171
}
168172

169173
/**

‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services_with_enumeration_enum_tag.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
parameters:
2+
unit_enum: !php/enum Symfony\Component\DependencyInjection\Tests\Fixtures\FooUnitEnum::BAR
3+
enum_array: [!php/enum Symfony\Component\DependencyInjection\Tests\Fixtures\FooUnitEnum::BAR, !php/enum Symfony\Component\DependencyInjection\Tests\Fixtures\FooUnitEnum::FOO]
4+
5+
services:
6+
service_container:
7+
class: Symfony\Component\DependencyInjection\ContainerInterface
8+
public: true
9+
synthetic: true
10+
Symfony\Component\DependencyInjection\Tests\Fixtures\FooClassWithEnumAttribute:
11+
class: Symfony\Component\DependencyInjection\Tests\Fixtures\FooClassWithEnumAttribute
12+
public: true
13+
arguments: [!php/const 'Symfony\Component\DependencyInjection\Tests\Fixtures\FooUnitEnum::BAR']

0 commit comments

Comments
 (0)
0