PHP 8.4 support

Author: batyrmastyr

.github/workflows/ci.yml

@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ '7.3', '7.4', '8.0', '8.1', '8.2', '8.3' ]
+        php: [ '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]
         strategy: [ 'highest' ]
         sf_version: ['']
         include:
@@ -26,6 +26,8 @@ jobs:
               sf_version: '6.*'
             - php: 8.3
               sf_version: '7.*'
+            - php: 8.4
+              sf_version: '7.*'
 
     steps:
       - name: Checkout code

CHANGELOG.md

@@ -1,6 +1,12 @@
 CHANGELOG
 =========
 
+1.3.0
+-----
+### Fixed
+
+- PHP 8.4 support by @batyrmastyr in #194
+
 1.2.0
 -----
 ### Fixed

composer.json

@@ -24,8 +24,8 @@
     "require" : {
         "php"                     : "^7.3 || ^7.4 || ^8.0",
         "psr/cache"               : "^1.0 || ^2.0 || ^3.0",
-        "willdurand/geocoder"     : "^4.5",
-        "react/promise"           : "^2.8",
+        "willdurand/geocoder"     : "^4.5 || ^5.0",
+        "react/promise"           : "^2.8 || ^3.0",
         "symfony/console"         : "^4.4 || ^5.0 || ^6.0 || ^7.0",
         "symfony/property-access" : "^4.4 || ^5.0 || ^6.0 || ^7.0",
         "symfony/serializer"      : "^4.4 || ^5.0 || ^6.0 || ^7.0",

src/Batch/Batch.php

@@ -124,7 +124,7 @@ public function geocode($values)
                             }
                         } catch (\Exception $e) {
                             $batchGeocoded = new BatchResult($provider->getName(), $value, $e->getMessage());
-                            $deferred->reject($batchGeocoded->newInstance());
+                            $deferred->resolve($batchGeocoded->newInstance());
                         }
 
                         return $deferred->promise();
@@ -144,7 +144,7 @@ public function geocode($values)
                         }
                     } catch (\Exception $e) {
                         $batchGeocoded = new BatchResult($provider->getName(), $values, $e->getMessage());
-                        $deferred->reject($batchGeocoded->newInstance());
+                        $deferred->resolve($batchGeocoded->newInstance());
                     }
 
                     return $deferred->promise();
@@ -188,7 +188,7 @@ public function reverse($coordinates)
                             }
                         } catch (\Exception $e) {
                             $batchGeocoded = new BatchResult($provider->getName(), $valueCoordinates, $e->getMessage());
-                            $deferred->reject($batchGeocoded->newInstance());
+                            $deferred->resolve($batchGeocoded->newInstance());
                         }
 
                         return $deferred->promise();
@@ -212,7 +212,7 @@ public function reverse($coordinates)
                         }
                     } catch (\Exception $e) {
                         $batchGeocoded = new BatchResult($provider->getName(), $valueCoordinates, $e->getMessage());
-                        $deferred->reject($batchGeocoded->newInstance());
+                        $deferred->resolve($batchGeocoded->newInstance());
                     }
 
                     return $deferred->promise();

src/CLI/GeotoolsApplication.php

@@ -44,7 +44,7 @@ public function getHelp(): string
     /**
      * {@inheritdoc}
      */
-    public function run(InputInterface $input = null, OutputInterface $output = null): int
+    public function run(?InputInterface $input = null, ?OutputInterface $output = null): int
     {
         return parent::run($input, new ConsoleOutput);
     }

src/Coordinate/Coordinate.php

@@ -54,11 +54,11 @@ class Coordinate implements CoordinateInterface, \JsonSerializable
      * Set the latitude and the longitude of the coordinates into an selected ellipsoid.
      *
      * @param Location|array|string         $coordinates The coordinates.
-     * @param Ellipsoid                    $ellipsoid   The selected ellipsoid (WGS84 by default).
+     * @param Ellipsoid|null                $ellipsoid   The selected ellipsoid (WGS84 by default).
      *
      * @throws InvalidArgumentException
      */
-    public function __construct($coordinates, Ellipsoid $ellipsoid = null)
+    public function __construct($coordinates, ?Ellipsoid $ellipsoid = null)
     {
         if ($coordinates instanceof Location) {
             if (null !== $locationCoordinates = $coordinates->getCoordinates()) {

src/Coordinate/CoordinateCollection.php

@@ -28,9 +28,9 @@ class CoordinateCollection extends ArrayCollection
      * CoordinateCollection constructor.
      *
      * @param CoordinateInterface[] $coordinates
-     * @param Ellipsoid             $ellipsoid
+     * @param ?Ellipsoid            $ellipsoid
      */
-    public function __construct(array $coordinates = array(), Ellipsoid $ellipsoid = null)
+    public function __construct(array $coordinates = array(), ?Ellipsoid $ellipsoid = null)
     {
         if ($ellipsoid) {
             $this->ellipsoid = $ellipsoid;

src/GeometryCollection.php

@@ -37,9 +37,9 @@ abstract class GeometryCollection extends ArrayCollection implements GeometryInt
      * CoordinateCollection constructor.
      *
      * @param GeometryInterface[] $geometries
-     * @param Ellipsoid             $ellipsoid
+     * @param ?Ellipsoid          $ellipsoid
      */
-    public function __construct(array $geometries = array(), Ellipsoid $ellipsoid = null)
+    public function __construct(array $geometries = array(), ?Ellipsoid $ellipsoid = null)
     {
         $this->precision = -1;
 

src/Polygon/Polygon.php

@@ -383,7 +383,7 @@ public function get($key)
     /**
      * {@inheritDoc}
      */
-    public function set($key, CoordinateInterface $coordinate = null)
+    public function set($key, ?CoordinateInterface $coordinate = null)
     {
         if (is_array($key)) {
             $values = $key;

tests/TestCase.php

@@ -113,11 +113,11 @@ protected function getStubCoordinate($lat = null, $lng = null)
 
     /**
      * @param array $coordinate
-     * @param Ellipsoid $ellipsoid
+     * @param ?Ellipsoid $ellipsoid
      *
      * @return CoordinateInterface
      */
-    protected function getMockCoordinateReturns(array $coordinate, Ellipsoid $ellipsoid = null)
+    protected function getMockCoordinateReturns(array $coordinate, ?Ellipsoid $ellipsoid = null)
     {
         $mock = $this->createMock('\League\Geotools\Coordinate\CoordinateInterface');
         $mock