Skip to content

Commit 1ebf00c

Browse files
committed
Merge branch '7.0' into 7.1
* 7.0: fix tests Bump Symfony version to 7.0.4 Revert "Bump Symfony version to 7.0.4" [HttpKernel] Fix including welcome page multiple times Bump Symfony version to 7.0.4 Update VERSION for 7.0.3 Update CHANGELOG for 7.0.3 Bump Symfony version to 6.4.4 Update VERSION for 6.4.3 Update CHANGELOG for 6.4.3
2 parents 0e810bd + 41a9480 commit 1ebf00c

File tree

2 files changed

+18
-1
lines changed

2 files changed

+18
-1
lines changed

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
/**
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)