Skip to content

Commit 6d3d716

Browse files
committed
Merge 3.4
2 parents 86a7959 + 05e75be commit 6d3d716

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/Laravel/workbench/app/Models/Author.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
namespace Workbench\App\Models;
1515

16-
use ApiPlatform\Laravel\IsApiResource;
16+
use ApiPlatform\Metadata\IsApiResource;
1717
use Illuminate\Database\Eloquent\Factories\HasFactory;
1818
use Illuminate\Database\Eloquent\Model;
1919

src/Serializer/AbstractItemNormalizer.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ public function denormalize(mixed $data, string $class, ?string $format = null,
225225
return $this->iriConverter->getResourceFromIri($data, $context + ['fetch_data' => true]);
226226
} catch (ItemNotFoundException $e) {
227227
throw new UnexpectedValueException($e->getMessage(), $e->getCode(), $e);
228-
} catch (LegacyInvalidArgumentException|InvalidArgumentException $e) {
228+
} catch (InvalidArgumentException $e) {
229229
throw new UnexpectedValueException(\sprintf('Invalid IRI "%s".', $data), $e->getCode(), $e);
230230
}
231231
}
@@ -576,7 +576,7 @@ protected function denormalizeRelation(string $attributeName, ApiProperty $prope
576576
);
577577

578578
return null;
579-
} catch (LegacyInvalidArgumentException|InvalidArgumentException $e) {
579+
} catch (InvalidArgumentException $e) {
580580
if (!isset($context['not_normalizable_value_exceptions'])) {
581581
throw new UnexpectedValueException(\sprintf('Invalid IRI "%s".', $value), $e->getCode(), $e);
582582
}

0 commit comments

Comments
 (0)