8000 [BUGFIX] Update `symfony/property-info` to v6.2.11 · TYPO3/typo3@c374f16 · GitHub
[go: up one dir, main page]

Skip to content

Commit c374f16

Browse files
andreaskienastsbuerk
authored andcommitted
[BUGFIX] Update symfony/property-info to v6.2.11
Handling of collections without a dedicated type has changed in `symfony/property-info` with v6.2.11, [1] seems to be the offensive commit. This should be backward compatible, as only string|int make sense for array keys and therefore is the same for array-like object annotation syntax. We raise the version constraint for `symfony/property-info` package to a slightly higher patchlevel version to ensure consistent behaviour. This is done for shipped version and the core development, therefore the raises are also added to the corresponding extension composer.json files. Used command(s): > composer require --no-update \ -d typo3/sysext/extbase \ "symfony/property-info":"^6.2.11" > composer require \ "symfony/property-info":"^6.2.11" [1] symfony/symfony#49557 Resolves: #100927 Releases: main, 12.4 Change-Id: I1465206414cd7e596d0852ed4288c5013db23c2d Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/79151 Tested-by: core-ci <typo3@b13.com> Reviewed-by: Stefan Bürk <stefan@buerk.tech> Tested-by: Stefan Bürk <stefan@buerk.tech> Reviewed-by: Oliver Klee <typo3-coding@oliverklee.de> Tested-by: Oliver Klee <typo3-coding@oliverklee.de>
1 parent 03742d8 commit c374f16

File tree

6 files changed

+18
-13
lines changed

6 files changed

+18
-13
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
"symfony/mime": "^6.2",
9090
"symfony/options-resolver": "^6.2",
9191
"symfony/property-access": "^6.2",
92-
"symfony/property-info": "^6.2",
92+
"symfony/property-info": "^6.2.11",
9393
"symfony/rate-limiter": "^6.2",
9494
"symfony/routing": "^6.2",
9595
"symfony/uid": "^6.2",

composer.lock

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

typo3/sysext/extbase/Tests/Unit/Reflection/ClassSchema/Property/PropertyWithTypeDeclarationsTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,9 @@ public function objectStorageWithArraySyntaxWithoutKeyValueTypeProperty(): void
181181
self::assertSame('object', $propertyTypes[0]->getBuiltinType());
182182
self::assertSame(ObjectStorage::class, $propertyTypes[0]->getClassName());
183183

184-
self::assertCount(0, $propertyTypes[0]->getCollectionKeyTypes());
184+
self::assertCount(2, $propertyTypes[0]->getCollectionKeyTypes());
185+
self::assertSame('string', $propertyTypes[0]->getCollectionKeyTypes()[0]->getBuiltinType());
186+
self::assertSame('int', $propertyTypes[0]->getCollectionKeyTypes()[1]->getBuiltinType());
185187

186188
self::assertCount(1, $propertyTypes[0]->getCollectionValueTypes());
187189
self::assertSame('object', $propertyTypes[0]->getCollectionValueTypes()[0]->getBuiltinType());

typo3/sysext/extbase/Tests/Unit/Reflection/ClassSchema/Property/PropertyWithoutTypeDeclarationsTest.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,8 +193,9 @@ public function objectStorageWithArraySyntaxWithoutKeyValueTypeProperty(): void
193193
self::assertTrue($propertyTypes[0]->isCollection());
194194
self::assertSame('object', $propertyTypes[0]->getBuiltinType());
195195
self::assertSame(ObjectStorage::class, $propertyTypes[0]->getClassName());
196-
197-
self::assertSame([], $propertyTypes[0]->getCollectionKeyTypes());
196+
self::assertCount(2, $propertyTypes[0]->getCollectionKeyTypes());
197+
self::assertSame('string', $propertyTypes[0]->getCollectionKeyTypes()[0]->getBuiltinType());
198+
self::assertSame('int', $propertyTypes[0]->getCollectionKeyTypes F5AF ()[1]->getBuiltinType());
198199

199200
self::assertCount(1, $propertyTypes[0]->getCollectionValueTypes());
200201
self::assertSame('object', $propertyTypes[0]->getCollectionValueTypes()[0]->getBuiltinType());

typo3/sysext/extbase/Tests/Unit/Reflection/ClassSchema/PropertyTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,9 @@ public function classSchemaDetectsTypeAndElementType(): void
144144

145145
self::assertSame(ObjectStorage::class, $propertyType->getClassName());
146146

147-
self::assertCount(0, $propertyType->getCollectionKeyTypes());
147+
self::assertCount(2, $propertyType->getCollectionKeyTypes());
148+
self::assertSame('string', $propertyType->getCollectionKeyTypes()[0]->getBuiltinType());
149+
self::assertSame('int', $propertyType->getCollectionKeyTypes()[1]->getBuiltinType());
148150
self::assertCount(1, $propertyType->getCollectionValueTypes());
149151

150152
self::assertSame(DummyClassWithAllTypesOfProperties::class, $propertyType->getCollectionValueTypes()[0]->getClassName());

typo3/sysext/extbase/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"phpdocumentor/type-resolver": "^1.7.1",
2525
"symfony/dependency-injection": "^6.2",
2626
"symfony/property-access": "^6.2",
27-
"symfony/property-info": "^6.2",
27+
"symfony/property-info": "^6.2.11",
2828
"typo3/cms-core": "13.0.*@dev"
2929
},
3030
"suggest": {

0 commit comments

Comments
 (0)
0