Skip to content

Commit 57ba412

Browse files
Hlavtoxtobias-93
authored andcommitted
Fix PHP 8.4 deprecation notices
1 parent 571de55 commit 57ba412

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

Diff for: Extractor/ExposedRoutesExtractor.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public function getScheme(): string
143143
/**
144144
* {@inheritDoc}
145145
*/
146-
public function getCachePath(string $locale = null): string
146+
public function getCachePath(?string $locale = null): string
147147
{
148148
$cachePath = $this->cacheDir.DIRECTORY_SEPARATOR.'fosJsRouting';
149149
if (!file_exists($cachePath)) {

Diff for: Response/RoutesResponse.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class RoutesResponse
2121

2222
public function __construct(
2323
protected ?string $baseUrl = null,
24-
RouteCollection $routes = null,
24+
?RouteCollection $routes = null,
2525
protected ?string $prefix = null,
2626
protected ?string $host = null,
2727
protected ?string $port = null,

Diff for: Serializer/Denormalizer/RouteCollectionDenormalizer.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class RouteCollectionDenormalizer implements DenormalizerInterface
2222
/**
2323
* {@inheritDoc}
2424
*/
25-
public function denormalize(mixed $data, string $type, string $format = null, array $context = []): RouteCollection
25+
public function denormalize(mixed $data, string $type, ?string $format = null, array $context = []): RouteCollection
2626
{
2727
$collection = new RouteCollection();
2828

@@ -45,7 +45,7 @@ public function denormalize(mixed $data, string $type, string $format = null, ar
4545
/**
4646
* {@inheritDoc}
4747
*/
48-
public function supportsDenormalization(mixed $data, string $type, string $format = null, array $context = []): bool
48+
public function supportsDenormalization(mixed $data, string $type, ?string $format = null, array $context = []): bool
4949
{
5050
if (!is_array($data)) {
5151
return false;

Diff for: Serializer/Normalizer/RouteCollectionNormalizer.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class RouteCollectionNormalizer implements NormalizerInterface
2424
/**
2525
* {@inheritDoc}
2626
*/
27-
public function normalize(mixed $object, string $format = null, array $context = []): array
27+
public function normalize(mixed $object, ?string $format = null, array $context = []): array
2828
{
2929
$collection = [];
3030

@@ -47,7 +47,7 @@ public function normalize(mixed $object, string $format = null, array $context =
4747
/**
4848
* {@inheritDoc}
4949
*/
50-
public function supportsNormalization(mixed $data, string $format = null, array $context = []): bool
50+
public function supportsNormalization(mixed $data, ?string $format = null, array $context = []): bool
5151
{
5252
return $data instanceof RouteCollection;
5353
}

Diff for: Serializer/Normalizer/RoutesResponseNormalizer.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class RoutesResponseNormalizer implements NormalizerInterface
2424
/**
2525
* {@inheritDoc}
2626
*/
27-
public function normalize(mixed $object, string $format = null, array $context = []): array
27+
public function normalize(mixed $object, ?string $format = null, array $context = []): array
2828
{
2929
return [
3030
'base_url' => $object->getBaseUrl(),
@@ -40,7 +40,7 @@ public function normalize(mixed $object, string $format = null, array $context =
4040
/**
4141
* {@inheritDoc}
4242
*/
43-
public function supportsNormalization(mixed $data, string $format = null, array $context = []): bool
43+
public function supportsNormalization(mixed $data, ?string $format = null, array $context = []): bool
4444
{
4545
return $data instanceof RoutesResponse;
4646
}

Diff for: Tests/Controller/ControllerTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ public function testExposeDomain(): void
243243
$this->assertEquals('{"base_url":"","routes":{"homepage":{"tokens":[["text","\/"]],"defaults":[],"requirements":[],"hosttokens":[],"methods":[],"schemes":[]},"admin_index":{"tokens":[["text","\/admin"]],"defaults":[],"requirements":[],"hosttokens":[],"methods":[],"schemes":[]},"admin_pages":{"tokens":[["text","\/admin\/path"]],"defaults":[],"requirements":[],"hosttokens":[],"methods":[],"schemes":[]},"blog_index":{"tokens":[["text","\/blog"]],"defaults":[],"requirements":[],"hosttokens":[["text","localhost"]],"methods":[],"schemes":[]},"blog_post":{"tokens":[["variable","\/","[^\/]++","slug"],["text","\/blog"]],"defaults":[],"requirements":[],"hosttokens":[["text","localhost"]],"methods":[],"schemes":[]}},"prefix":"","host":"","port":null,"scheme":"","locale":"en"}', $response->getContent());
244244
}
245245

246-
private function getExtractor(RouteCollection $exposedRoutes = null, $baseUrl = '')
246+
private function getExtractor(?RouteCollection $exposedRoutes = null, $baseUrl = '')
247247
{
248248
if (null === $exposedRoutes) {
249249
$exposedRoutes = new RouteCollection();

0 commit comments

Comments
 (0)