Skip to content

Commit d9f7213

Browse files
authored
fix(composer): conflict for symfony/property-info versions (#2685)
## Description See issue in symfony/symfony#63179 ## What type of PR is this? (check all applicable) - [ ] Bug Fix - [ ] Feature - [ ] Refactor - [ ] Deprecation - [ ] Breaking Change - [ ] Documentation Update - [ ] CI ## Checklist - [ ] I have made corresponding changes to the documentation (`docs/`)
1 parent af02498 commit d9f7213

3 files changed

Lines changed: 3 additions & 41 deletions

File tree

.php-cs-fixer.dist.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
$finder = (new PhpCsFixer\Finder())
1515
->in(__DIR__)
1616
->exclude('var')
17+
->notName('reference.php')
1718
->exclude('tests/Functional/cache')
1819
->exclude('tests/Functional/ModelDescriber/Fixtures')
1920
->notContains('ChoiceConstraintsWithPHP85StaticCallbackEntity');

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@
6666
"willdurand/negotiation": "^3.0"
6767
},
6868
"conflict": {
69-
"zircote/swagger-php": "4.8.7 || 5.5.0"
69+
"zircote/swagger-php": "4.8.7 || 5.5.0",
70+
"symfony/property-info": "6.4.32 || 7.3.10 || 7.4.4 || 8.0.4"
7071
},
7172
"suggest": {
7273
"api-platform/core": "For using an API oriented framework.",

tests/Functional/ModelDescriber/ObjectModelDescriberTypeInfoTest.php

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -89,46 +89,6 @@ public static function provideFixtures(): \Generator
8989
}
9090
}
9191

92-
/**
93-
* @dataProvider provideInvalidTypes
94-
*/
95-
public function testInvalidType(object $class, string $expectedType, string $propertyName): void
96-
{
97-
$model = new Model(Type::object($class::class));
98-
$schema = new OA\Schema([
99-
'type' => 'object',
100-
]);
101-
102-
self::expectException(\Exception::class);
103-
self::expectExceptionMessage(\sprintf('Type "%s" is not supported in %s::%s. You may need to use the `#[OA\Property(type="")]` attribute to specify it manually.', $expectedType, $class::class, $propertyName));
104-
105-
$this->modelDescriber->describe($model, $schema);
106-
}
107-
108-
public static function provideInvalidTypes(): \Generator
109-
{
110-
yield 'never' => [
111-
new class {
112-
public function getNever(): never
113-
{
114-
throw new \Exception('This method should never be called');
115-
}
116-
},
117-
'never',
118-
'$never',
119-
];
120-
121-
yield 'void' => [
122-
new class {
123-
public function getVoid(): void
124-
{
125-
}
126-
},
127-
'void',
128-
'$void',
129-
];
130-
}
131-
13292
/**
13393
* `symfony/type-info 7.3.3` changed the string representation of list from `array<int, T>` to `list<T>`.
13494
*

0 commit comments

Comments
 (0)