Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitadd24fa

Browse files
committed
minor#53683 fix tests (xabbuh)
This PR was merged into the 7.1 branch.Discussion----------fix tests| Q | A| ------------- | ---| Branch? | 7.1| Bug fix? | no| New feature? | no| Deprecations? | no| Issues || License | MITCommits-------38b2e6a fix tests
2 parents4a49af8 +38b2e6a commitadd24fa

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

‎src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ private function dumpValue(mixed $value): mixed
312312
}elseif ($valueinstanceof Definition) {
313313
returnnewTaggedValue('service', (newParser())->parse("_:\n".$this->addService('_',$value), Yaml::PARSE_CUSTOM_TAGS)['_']['_']);
314314
}elseif ($valueinstanceof \UnitEnum) {
315-
returnnewTaggedValue('php/const',sprintf('%s::%s',$value::class,$value->name));
315+
returnnewTaggedValue('php/enum',sprintf('%s::%s',$value::class,$value->name));
316316
}elseif ($valueinstanceof AbstractArgument) {
317317
returnnewTaggedValue('abstract',$value->getText());
318318
}elseif (\is_object($value) ||\is_resource($value)) {
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
parameters:
2-
unit_enum:!php/const Symfony\Component\DependencyInjection\Tests\Fixtures\FooUnitEnum::BAR
3-
enum_array:[!php/const Symfony\Component\DependencyInjection\Tests\Fixtures\FooUnitEnum::BAR, !php/const Symfony\Component\DependencyInjection\Tests\Fixtures\FooUnitEnum::FOO]
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]
44

55
services:
66
service_container:
@@ -10,4 +10,4 @@ services:
1010
Symfony\Component\DependencyInjection\Tests\Fixtures\FooClassWithEnumAttribute:
1111
class:Symfony\Component\DependencyInjection\Tests\Fixtures\FooClassWithEnumAttribute
1212
public:true
13-
arguments:[!php/const 'Symfony\Component\DependencyInjection\Tests\Fixtures\FooUnitEnum::BAR']
13+
arguments:[!php/enum 'Symfony\Component\DependencyInjection\Tests\Fixtures\FooUnitEnum::BAR']

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ services:
77
Symfony\Component\DependencyInjection\Tests\Fixtures\FooClassWithEnumAttribute:
88
class:Symfony\Component\DependencyInjection\Tests\Fixtures\FooClassWithEnumAttribute
99
public:true
10-
arguments:[!php/const 'Symfony\Component\DependencyInjection\Tests\Fixtures\FooUnitEnum::BAZ']
10+
arguments:[!php/enum 'Symfony\Component\DependencyInjection\Tests\Fixtures\FooUnitEnum::BAZ']

‎src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1020,7 +1020,7 @@ public function testInvalidEnumeration()
10201020
$loader =newYamlFileLoader($container,newFileLocator(self::$fixturesPath.'/yaml'));
10211021

10221022
$this->expectException(InvalidArgumentException::class);
1023-
$this->expectExceptionMessage('Theconstant "Symfony\Component\DependencyInjection\Tests\Fixtures\FooUnitEnum::BAZ" is not defined');
1023+
$this->expectExceptionMessage('Theenum "Symfony\Component\DependencyInjection\Tests\Fixtures\FooUnitEnum::BAZ" is not defined');
10241024
$loader->load('services_with_invalid_enumeration.yml');
10251025
}
10261026

‎src/Symfony/Component/DependencyInjection/composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323
"symfony/var-exporter":"^6.4|^7.0"
2424
},
2525
"require-dev": {
26-
"symfony/yaml":"^6.4|^7.0",
26+
"symfony/yaml":"^7.1",
2727
"symfony/config":"^6.4|^7.0",
2828
"symfony/expression-language":"^6.4|^7.0"
2929
},
3030
"conflict": {
3131
"ext-psr":"<1.1|>=2",
3232
"symfony/config":"<6.4",
3333
"symfony/finder":"<6.4",
34-
"symfony/yaml":"<6.4"
34+
"symfony/yaml":"<7.1"
3535
},
3636
"provide": {
3737
"psr/container-implementation":"1.1|2.0",

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp