Skip to content

Commit 0d085fb

Browse files
DerManoMannDerManoMann
committed
Remove deprecated getSchemaForSource() 
1 parent 90b2938 commit 0d085fb

9 files changed

Lines changed: 14 additions & 23 deletions

File tree

‎docs/examples/processors/schema-query-parameter/SchemaQueryParameter.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public function __invoke(Analysis $analysis): void
3434
throw new \InvalidArgumentException('Value of `x.' . self::REF . '` must be a string');
3535
}
3636

37-
$schema = $analysis->getSchemaForSource($operation->x[self::REF]);
37+
$schema = $analysis->getAnnotationForSource($operation->x[self::REF]);
3838
if (!$schema instanceof Schema) {
3939
throw new \InvalidArgumentException('Value of `x.' . self::REF . "` contains reference to unknown schema: `{$operation->x[self::REF]}`");
4040
}

‎src/Analysis.php‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -307,15 +307,6 @@ public function getAnnotationsOfType($classes, bool $strict = false): array
307307
return $annotations;
308308
}
309309

310-
/**
311-
* @param string $fqdn the source class/interface/trait
312-
* @deprecated use getAnnotationForSource() instead
313-
*/
314-
public function getSchemaForSource(string $fqdn): ?OA\Schema
315-
{
316-
return $this->getAnnotationForSource($fqdn, OA\Schema::class);
317-
}
318-
319310
/**
320311
* @template T of OA\AbstractAnnotation
321312
*

‎src/Processors/AugmentDiscriminators.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public function __invoke(Analysis $analysis): void
2323
foreach ($discriminators as $discriminator) {
2424
if (!Generator::isDefault($discriminator->mapping)) {
2525
foreach ($discriminator->mapping as $value => $type) {
26-
if (is_string($type) && $typeSchema = $analysis->getSchemaForSource($type)) {
26+
if (is_string($type) && $typeSchema = $analysis->getAnnotationForSource($type)) {
2727
$discriminator->mapping[$value] = OA\Components::ref($typeSchema);
2828
}
2929
}

‎src/Processors/AugmentSchemas.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ protected function augmentType(Analysis $analysis, array $schemas): void
103103
$schema->type = 'object';
104104
}
105105
} else {
106-
if (is_string($schema->type) && $typeSchema = $analysis->getSchemaForSource($schema->type)) {
106+
if (is_string($schema->type) && $typeSchema = $analysis->getAnnotationForSource($schema->type)) {
107107
if (Generator::isDefault($schema->format)) {
108108
$schema->ref = OA\Components::ref($typeSchema);
109109
$schema->type = Generator::UNDEFINED;

‎src/Processors/ExpandClasses.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function __invoke(Analysis $analysis): void
3131
$ancestors = $analysis->getSuperClasses($schema->_context->fullyQualifiedName($schema->_context->class));
3232
$existing = [];
3333
foreach ($ancestors as $ancestor) {
34-
$ancestorSchema = $analysis->getSchemaForSource($ancestor['context']->fullyQualifiedName($ancestor['class']));
34+
$ancestorSchema = $analysis->getAnnotationForSource($ancestor['context']->fullyQualifiedName($ancestor['class']));
3535
if ($ancestorSchema) {
3636
$refPath = Generator::isDefault($ancestorSchema->schema) ? $ancestor['class'] : $ancestorSchema->schema;
3737
$this->inheritFrom($analysis, $schema, $ancestorSchema, $refPath, $ancestor['context']);

‎src/Processors/ExpandInterfaces.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public function __invoke(Analysis $analysis): void
4141
$existing = [];
4242
foreach ($interfaces as $interface) {
4343
$interfaceName = $interface['context']->fullyQualifiedName($interface['interface']);
44-
$interfaceSchema = $analysis->getSchemaForSource($interfaceName);
44+
$interfaceSchema = $analysis->getAnnotationForSource($interfaceName);
4545
if ($interfaceSchema) {
4646
$refPath = Generator::isDefault($interfaceSchema->schema) ? $interface['interface'] : $interfaceSchema->schema;
4747
$this->inheritFrom($analysis, $schema, $interfaceSchema, $refPath, $interface['context']);

‎src/Processors/ExpandTraits.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public function __invoke(Analysis $analysis): void
3030
$traits = $analysis->getTraitsOfClass($schema->_context->fullyQualifiedName($schema->_context->trait), true);
3131
$existing = [];
3232
foreach ($traits as $trait) {
33-
$traitSchema = $analysis->getSchemaForSource($trait['context']->fullyQualifiedName($trait['trait']));
33+
$traitSchema = $analysis->getAnnotationForSource($trait['context']->fullyQualifiedName($trait['trait']));
3434
if ($traitSchema) {
3535
$refPath = Generator::isDefault($traitSchema->schema) ? $trait['trait'] : $traitSchema->schema;
3636
$this->inheritFrom($analysis, $schema, $traitSchema, $refPath, $trait['context']);
@@ -48,7 +48,7 @@ public function __invoke(Analysis $analysis): void
4848
$traits = $analysis->getTraitsOfClass($schema->_context->fullyQualifiedName($schema->_context->class), true);
4949
$existing = [];
5050
foreach ($traits as $trait) {
51-
$traitSchema = $analysis->getSchemaForSource($trait['context']->fullyQualifiedName($trait['trait']));
51+
$traitSchema = $analysis->getAnnotationForSource($trait['context']->fullyQualifiedName($trait['trait']));
5252
if ($traitSchema) {
5353
$refPath = Generator::isDefault($traitSchema->schema) ? $trait['trait'] : $traitSchema->schema;
5454
$this->inheritFrom($analysis, $schema, $traitSchema, $refPath, $trait['context']);
@@ -62,7 +62,7 @@ public function __invoke(Analysis $analysis): void
6262
$ancestors = $analysis->getSuperClasses($schema->_context->fullyQualifiedName($schema->_context->class));
6363
$existing = [];
6464
foreach ($ancestors as $ancestor) {
65-
$ancestorSchema = $analysis->getSchemaForSource($ancestor['context']->fullyQualifiedName($ancestor['class']));
65+
$ancestorSchema = $analysis->getAnnotationForSource($ancestor['context']->fullyQualifiedName($ancestor['class']));
6666
if ($ancestorSchema) {
6767
// stop here as we inherit everything above
6868
break;

‎tests/Processors/ExpandEnumsTest.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public function testExpandUnitEnum(): void
2525
$this->processorPipeline([new ExpandEnums()]),
2626
);
2727

28-
$schema = $analysis->getSchemaForSource(StatusEnum::class);
28+
$schema = $analysis->getAnnotationForSource(StatusEnum::class);
2929

3030
$this->assertEquals(['DRAFT', 'PUBLISHED', 'ARCHIVED'], $schema->enum);
3131
$this->assertEquals('string', $schema->type);
@@ -38,7 +38,7 @@ public function testExpandBackedEnum(): void
3838
$this->processorPipeline([new ExpandEnums()]),
3939
);
4040

41-
$schema = $analysis->getSchemaForSource(StatusEnumBacked::class);
41+
$schema = $analysis->getAnnotationForSource(StatusEnumBacked::class);
4242

4343
$this->assertEquals(['DRAFT', 'PUBLISHED', 'ARCHIVED'], $schema->enum);
4444
$this->assertEquals('string', $schema->type);
@@ -51,7 +51,7 @@ public function testExpandBackedIntegerEnum(): void
5151
$this->processorPipeline([new ExpandEnums()]),
5252
);
5353

54-
$schema = $analysis->getSchemaForSource(StatusEnumIntegerBacked::class);
54+
$schema = $analysis->getAnnotationForSource(StatusEnumIntegerBacked::class);
5555

5656
$this->assertEquals([1, 2, 3], $schema->enum);
5757
$this->assertEquals('integer', $schema->type);
@@ -64,7 +64,7 @@ public function testExpandBackedStringEnum(): void
6464
$this->processorPipeline([new ExpandEnums()]),
6565
);
6666

67-
$schema = $analysis->getSchemaForSource(StatusEnumStringBacked::class);
67+
$schema = $analysis->getAnnotationForSource(StatusEnumStringBacked::class);
6868

6969
$this->assertEquals(['draft', 'published', 'archived'], $schema->enum);
7070
$this->assertEquals('string', $schema->type);
@@ -77,7 +77,7 @@ public function testEnumNamesInBackedStringEnum(): void
7777
$this->processorPipeline([new ExpandEnums('enumNames')]),
7878
);
7979

80-
$schema = $analysis->getSchemaForSource(StatusEnumStringBacked::class);
80+
$schema = $analysis->getAnnotationForSource(StatusEnumStringBacked::class);
8181

8282
$this->assertEquals(['DRAFT', 'PUBLISHED', 'ARCHIVED'], $schema->x['enumNames']);
8383
}

‎tests/Type/TypeResolverTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public static function resolverAugmentCases(): iterable
7777
return $analysis;
7878
});
7979

80-
$schema = $analysis->getSchemaForSource(DocblockAndTypehintTypes::class);
80+
$schema = $analysis->getAnnotationForSource(DocblockAndTypehintTypes::class);
8181

8282
foreach ($schema->properties as $ii => $property) {
8383
$property->property = $property->_context->property

0 commit comments

Comments
 (0)