Merge pull request #40 from Chris53897/patch-1

chore: Add tests for PHP 8.4
bresam · Oct 1, 2024 · e97a9a0 · e97a9a0
2 parents 728129b + 11382fc
commit e97a9a0
Show file tree

Hide file tree

Showing 22 changed files with 31 additions and 29 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -35,7 +35,9 @@ jobs:
                   - php: '8.3'
                     symfony-version: 7.0.*
                     stability: prefer-stable
-
+                  - php: '8.4'
+                    symfony-version: 7.0.*
+                    stability: prefer-stable
 
         env:
             APP_ENV: test

diff --git a/src/Base/Bound.php b/src/Base/Bound.php
@@ -35,7 +35,7 @@ class Bound implements VariableAwareInterface
     #[SerializedName('extendables')]
     private array $extendables = [];
 
-    public function __construct(Coordinate $southWest = null, Coordinate $northEast = null)
+    public function __construct(?Coordinate $southWest = null, ?Coordinate $northEast = null)
     {
         $this->setSouthWest($southWest);
         $this->setNorthEast($northEast);

diff --git a/src/Helper/Builder/JsonBuilder.php b/src/Helper/Builder/JsonBuilder.php
@@ -42,7 +42,7 @@ class JsonBuilder
     private $jsonEncodeOptions;
 
 
-    public function __construct(PropertyAccessorInterface $propertyAccessor = null)
+    public function __construct(?PropertyAccessorInterface $propertyAccessor = null)
     {
         $this->accessor = $propertyAccessor ?: new PropertyAccessor();
 
@@ -71,7 +71,7 @@ public function getValues(): array
         return $this->values;
     }
 
-    public function setValues(array $values, string $pathPrefix = null): JsonBuilder
+    public function setValues(array $values, ?string $pathPrefix = null): JsonBuilder
     {
         foreach ($values as $key => $value) {
             $path = sprintf('%s[%s]', $pathPrefix, $key);

diff --git a/src/Helper/Formatter/Formatter.php b/src/Helper/Formatter/Formatter.php
@@ -237,7 +237,7 @@ public function renderContainerAssignment(
         VariableAwareInterface $root,
         $declaration,
         $propertyPath = null,
-        VariableAwareInterface $object = null,
+        ?VariableAwareInterface $object = null,
         $semicolon = true,
         $newLine = true
     ) {
@@ -257,7 +257,7 @@ public function renderContainerAssignment(
     public function renderContainerVariable(
         VariableAwareInterface $root,
         $propertyPath = null,
-        VariableAwareInterface $object = null
+        ?VariableAwareInterface $object = null
     ) {
         $variable = $root->getVariable().'_container';
 

diff --git a/src/Place/Autocomplete.php b/src/Place/Autocomplete.php
@@ -113,7 +113,7 @@ public function getBound()
         return $this->bound;
     }
 
-    public function setBound(Bound $bound = null)
+    public function setBound(?Bound $bound = null)
     {
         $this->bound = $bound;
     }

diff --git a/src/Service/AbstractSerializableService.php b/src/Service/AbstractSerializableService.php
@@ -31,7 +31,7 @@ public function __construct(
         string $url,
         HttpClient $client,
         MessageFactory $messageFactory,
-        SerializerInterface $serializer = null
+        ?SerializerInterface $serializer = null
     ) {
         parent::__construct($url, $client, $messageFactory);
 

diff --git a/src/Service/Base/Geometry.php b/src/Service/Base/Geometry.php
@@ -114,7 +114,7 @@ public function getBound()
         return $this->bound;
     }
 
-    public function setBound(Bound $bound = null)
+    public function setBound(?Bound $bound = null)
     {
         $this->bound = $bound;
     }

diff --git a/src/Service/Direction/DirectionService.php b/src/Service/Direction/DirectionService.php
@@ -27,7 +27,7 @@ class DirectionService extends AbstractSerializableService
     public function __construct(
         HttpClient $client,
         MessageFactory $messageFactory,
-        SerializerInterface $serializer = null
+        ?SerializerInterface $serializer = null
     ) {
         parent::__construct('https://maps.googleapis.com/maps/api/directions', $client, $messageFactory, $serializer);
     }

diff --git a/src/Service/Direction/Response/DirectionRoute.php b/src/Service/Direction/Response/DirectionRoute.php
@@ -60,7 +60,7 @@ public function getBound(): ?Bound
         return $this->bound;
     }
 
-    public function setBound(Bound $bound = null): void
+    public function setBound(?Bound $bound = null): void
     {
         $this->bound = $bound;
     }

diff --git a/src/Service/DistanceMatrix/DistanceMatrixService.php b/src/Service/DistanceMatrix/DistanceMatrixService.php
@@ -26,7 +26,7 @@ class DistanceMatrixService extends AbstractSerializableService
     public function __construct(
         HttpClient $client,
         MessageFactory $messageFactory,
-        SerializerInterface $serializer = null
+        ?SerializerInterface $serializer = null
     ) {
         parent::__construct(
             'https://maps.googleapis.com/maps/api/distancematrix',

diff --git a/src/Service/Elevation/ElevationService.php b/src/Service/Elevation/ElevationService.php
@@ -26,7 +26,7 @@ class ElevationService extends AbstractSerializableService
     public function __construct(
         HttpClient $client,
         MessageFactory $messageFactory,
-        SerializerInterface $serializer = null
+        ?SerializerInterface $serializer = null
     ) {
         parent::__construct('https://maps.googleapis.com/maps/api/elevation', $client, $messageFactory, $serializer);
     }

diff --git a/src/Service/Geocoder/GeocoderService.php b/src/Service/Geocoder/GeocoderService.php
@@ -26,7 +26,7 @@ class GeocoderService extends AbstractSerializableService
     public function __construct(
         HttpClient $client,
         MessageFactory $messageFactory,
-        SerializerInterface $serializer = null
+        ?SerializerInterface $serializer = null
     ) {
         parent::__construct(
             'https://maps.googleapis.com/maps/api/geocode',

diff --git a/src/Service/Geocoder/Request/GeocoderAddressRequest.php b/src/Service/Geocoder/Request/GeocoderAddressRequest.php
@@ -152,7 +152,7 @@ public function getBound()
         return $this->bound;
     }
 
-    public function setBound(Bound $bound = null)
+    public function setBound(?Bound $bound = null)
     {
         $this->bound = $bound;
     }

diff --git a/src/Service/Place/AbstractPlaceSerializableService.php b/src/Service/Place/AbstractPlaceSerializableService.php
@@ -27,7 +27,7 @@ abstract class AbstractPlaceSerializableService extends AbstractSerializableServ
     public function __construct(
         HttpClient $client,
         MessageFactory $messageFactory,
-        SerializerInterface $serializer = null,
+        ?SerializerInterface $serializer = null,
         $context = null
     ) {
         if (null !== $context) {

diff --git a/src/Service/Place/Detail/PlaceDetailService.php b/src/Service/Place/Detail/PlaceDetailService.php
@@ -26,7 +26,7 @@ class PlaceDetailService extends AbstractSerializableService
     public function __construct(
         HttpClient $client,
         MessageFactory $messageFactory,
-        SerializerInterface $serializer = null
+        ?SerializerInterface $serializer = null
     ) {
         parent::__construct(
             'https://maps.googleapis.com/maps/api/place/details',

diff --git a/src/Service/Serializer/GoogleDateTimeNormalizer.php b/src/Service/Serializer/GoogleDateTimeNormalizer.php
@@ -39,7 +39,7 @@ public function setDefaultContext(array $defaultContext): void
     /**
      * {@inheritdoc}
      */
-    public function normalize(mixed $object, string $format = null, array $context = []): float|int|bool|\ArrayObject|array|string|null
+    public function normalize(mixed $object, ?string $format = null, array $context = []): float|int|bool|\ArrayObject|array|string|null
     {
         if (!$object instanceof \DateTimeInterface) {
             throw new InvalidArgumentException('The object must implement the "\DateTimeInterface".');
@@ -59,7 +59,7 @@ public function normalize(mixed $object, string $format = null, array $context =
     /**
      * {@inheritdoc}
      */
-    public function supportsNormalization(mixed $data, string $format = null, array $context = []): bool
+    public function supportsNormalization(mixed $data, ?string $format = null, array $context = []): bool
     {
         return $data instanceof \DateTimeInterface;
     }
@@ -71,7 +71,7 @@ public function supportsNormalization(mixed $data, string $format = null, array
      *
      * @throws NotNormalizableValueException
      */
-    public function denormalize($data, string $type, string $format = null, array $context = []): mixed
+    public function denormalize($data, string $type, ?string $format = null, array $context = []): mixed
     {
         $dateTimeFormat = $context[self::FORMAT_KEY] ?? null;
         $timezone = $this->getTimezone($context);
@@ -114,7 +114,7 @@ public function denormalize($data, string $type, string $format = null, array $c
     /**
      * {@inheritdoc}
      */
-    public function supportsDenormalization(mixed $data, string $type, string $format = null, array $context = []): bool
+    public function supportsDenormalization(mixed $data, string $type, ?string $format = null, array $context = []): bool
     {
         return isset(self::SUPPORTED_TYPES[$type]);
     }

diff --git a/src/Service/TimeZone/TimeZoneService.php b/src/Service/TimeZone/TimeZoneService.php
@@ -26,7 +26,7 @@ class TimeZoneService extends AbstractSerializableService
     public function __construct(
         HttpClient $client,
         MessageFactory $messageFactory,
-        SerializerInterface $serializer = null
+        ?SerializerInterface $serializer = null
     ) {
         parent::__construct('https://maps.googleapis.com/maps/api/timezone', $client, $messageFactory, $serializer);
     }

diff --git a/tests/Helper/Formatter/FormatterTest.php b/tests/Helper/Formatter/FormatterTest.php
@@ -247,7 +247,7 @@ public function testRenderContainerAssignment(
         VariableAwareInterface $root,
         $declaration,
         $propertyPath = null,
-        VariableAwareInterface $object = null,
+        ?VariableAwareInterface $object = null,
         $semicolon = true,
         $newLine = true,
         $debug = false
@@ -275,7 +275,7 @@ public function testRenderContainerVariable(
         $expected,
         VariableAwareInterface $root,
         $propertyPath = null,
-        VariableAwareInterface $object = null,
+        ?VariableAwareInterface $object = null,
         $debug = false
     ) {
         $this->formatter->setDebug($debug);

diff --git a/tests/Helper/Functional/AbstractApiFunctional.php b/tests/Helper/Functional/AbstractApiFunctional.php
@@ -150,7 +150,7 @@ protected function assertContainerVariableExists(VariableAwareInterface $root, $
     protected function assertSameContainerVariable(
         VariableAwareInterface $root,
         $propertyPath,
-        VariableAwareInterface $object = null,
+        ?VariableAwareInterface $object = null,
         $expected = null,
         $formatter = null
     ) {
@@ -191,7 +191,7 @@ protected function createApiHelper()
     private function getContainer(
         VariableAwareInterface $root,
         $propertyPath = null,
-        VariableAwareInterface $object = null
+        ?VariableAwareInterface $object = null
     ) {
         $variable = $root->getVariable().'_container';
 

diff --git a/tests/Layer/LayerManagerTest.php b/tests/Layer/LayerManagerTest.php
@@ -393,7 +393,7 @@ public function testRemoveKmlLayerWithAutoZoom()
     /**
      * @return MockObject|Map
      */
-    private function createMapMock(Bound $bound = null)
+    private function createMapMock(?Bound $bound = null)
     {
         $map = $this->createMock(Map::class);
         $map

diff --git a/tests/Overlay/MarkerClusterTest.php b/tests/Overlay/MarkerClusterTest.php
@@ -257,7 +257,7 @@ private function createOverlayManagerMock(Map $map = null)
     /**
      * @return MockObject|Map
      */
-    private function createMapMock(Bound $bound = null)
+    private function createMapMock(?Bound $bound = null)
     {
         $map = $this->createMock(Map::class);
         $map

diff --git a/tests/Overlay/OverlayManagerTest.php b/tests/Overlay/OverlayManagerTest.php
@@ -1103,7 +1103,7 @@ public function testRemoveGroundOverlayWithAutoZoom()
     /**
      * @return MockObject|Map
      */
-    private function createMapMock(Bound $bound = null)
+    private function createMapMock(?Bound $bound = null)
     {
         $map = $this->createMock(Map::class);
         $map