Skip to content

fix(symfony): 404 wrongly normalized #5936

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 30, 2023
Merged

fix(symfony): 404 wrongly normalized #5936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/Hydra/Serializer/ErrorNormalizer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,9 @@ public function supportsNormalization(mixed $data, string $format = null, array
return false;
}

return self::FORMAT === $format && ($data instanceof \Exception || $data instanceof FlattenException);
$decoration = $this->itemNormalizer ? $this->itemNormalizer->supportsNormalization($data, $format, $context) : true;

return self::FORMAT === $format && ($data instanceof \Exception || $data instanceof FlattenException) && $decoration;
}

public function getSupportedTypes($format): array
Expand Down
4 changes: 3 additions & 1 deletion src/JsonApi/Serializer/ErrorNormalizer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,9 @@ public function supportsNormalization(mixed $data, string $format = null, array
return false;
}

return self::FORMAT === $format && ($data instanceof \Exception || $data instanceof FlattenException);
$decoration = $this->itemNormalizer ? $this->itemNormalizer->supportsNormalization($data, $format, $context) : true;

return self::FORMAT === $format && ($data instanceof \Exception || $data instanceof FlattenException) && $decoration;
}

public function getSupportedTypes($format): array
Expand Down
4 changes: 3 additions & 1 deletion src/Problem/Serializer/ErrorNormalizer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,9 @@ public function supportsNormalization(mixed $data, string $format = null, array
return false;
}

return (self::FORMAT === $format || 'json' === $format) && ($data instanceof \Exception || $data instanceof FlattenException);
$decoration = $this->itemNormalizer ? $this->itemNormalizer->supportsNormalization($data, $format, $context) : true;

return (self::FORMAT === $format || 'json' === $format) && ($data instanceof \Exception || $data instanceof FlattenException) && $decoration;
}

public function getSupportedTypes($format): array
Expand Down
28 changes: 17 additions & 11 deletions tests/Symfony/Bundle/Test/ApiTestCaseTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,20 @@ public function testGetMercureMessages(): void
);
}

private function recreateSchema(array $options = []): void
{
self::bootKernel($options);

/** @var EntityManagerInterface $manager */
$manager = static::getContainer()->get('doctrine')->getManager();
/** @var ClassMetadata[] $classes */
$classes = $manager->getMetadataFactory()->getAllMetadata();
$schemaTool = new SchemaTool($manager);

@$schemaTool->dropSchema($classes);
@$schemaTool->createSchema($classes);
}

/**
* @group legacy
*/
Expand All @@ -289,17 +303,9 @@ public function testExceptionNormalizer(): void
$this->assertEquals($data['hello'], 'world');
}

private function recreateSchema(array $options = []): void
public function testMissingMethod(): void
{
self::bootKernel($options);

/** @var EntityManagerInterface $manager */
$manager = static::getContainer()->get('doctrine')->getManager();
/** @var ClassMetadata[] $classes */
$classes = $manager->getMetadataFactory()->getAllMetadata();
$schemaTool = new SchemaTool($manager);

@$schemaTool->dropSchema($classes);
@$schemaTool->createSchema($classes);
$response = self::createClient([], ['headers' => ['accept' => 'application/json']])->request('DELETE', '/something/that/does/not/exist/ever');
$this->assertResponseStatusCodeSame(404);
}
}