Require PHP8

Author: jsor

.gitignore

@@ -1,5 +1,6 @@
 /build
 /vendor
+.phpunit.result.cache
 composer.lock
 composer.phar
 phpunit.xml

composer.json

@@ -14,17 +14,20 @@
         }
     ],
     "require": {
-        "php": ">=5.3.3",
-        "geo-io/interface": "~1.0"
+        "php": "^8.0",
+        "geo-io/interface": "2.x-dev"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^9.5"
     },
     "autoload": {
         "psr-4": {
             "GeoIO\\Geometry\\": "src/"
         }
     },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.0-dev"
+    "autoload-dev": {
+        "psr-4": {
+            "GeoIO\\Geometry\\": "tests/"
         }
     }
 }

phpunit.xml.dist

@@ -1,25 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="false"
-         bootstrap="tests/bootstrap.php"
+<phpunit
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+    colors="true"
+    bootstrap="vendor/autoload.php"
 >
     <testsuites>
         <testsuite name="Geo I/O Geometry Test Suite">
             <directory>./tests/</directory>
         </testsuite>
     </testsuites>
 
-    <filter>
-        <whitelist>
+    <coverage>
+        <include>
             <directory>./src/</directory>
-        </whitelist>
-    </filter>
+        </include>
+    </coverage>
 </phpunit>

src/BaseGeometry.php

@@ -1,52 +1,29 @@
 <?php
 
+declare(strict_types=1);
+
 namespace GeoIO\Geometry;
 
-use GeoIO\Dimension;
-use GeoIO\Geometry\Exception\InvalidDimensionException;
-use GeoIO\Geometry\Exception\InvalidGeometryException;
-use GeoIO\Geometry\Exception\InvalidGeometryTypeException;
 use GeoIO\Geometry\Exception\MixedDimensionalityException;
 use GeoIO\Geometry\Exception\MixedSridsException;
 
 abstract class BaseGeometry implements Geometry
 {
-    protected $dimension;
-    protected $srid;
+    protected string $dimension;
+    protected ?int $srid;
 
-    public function getDimension()
+    public function getDimension(): string
     {
         return $this->dimension;
     }
 
-    public function getSrid()
+    public function getSrid(): ?int
     {
         return $this->srid;
     }
 
-    protected function assertDimension($dimension)
-    {
-        switch ($dimension) {
-            case Dimension::DIMENSION_4D:
-            case Dimension::DIMENSION_3DZ:
-            case Dimension::DIMENSION_3DM:
-            case Dimension::DIMENSION_2D:
-                break;
-            default:
-                throw InvalidDimensionException::create($dimension);
-        }
-    }
-
-    protected function assertGeometry($geometry, $type = null)
+    protected function assertGeometry(Geometry $geometry): void
     {
-        if (!$geometry instanceof Geometry) {
-            throw InvalidGeometryException::create($geometry);
-        }
-
-        if (null !== $type && !$geometry instanceof $type) {
-            throw InvalidGeometryTypeException::create($type, $geometry);
-        }
-
         if ($geometry->getDimension() !== $this->getDimension()) {
             throw MixedDimensionalityException::create($this, $geometry);
         }

src/Coordinates.php

@@ -1,5 +1,9 @@
 <?php
 
+declare(strict_types=1);
+
 namespace GeoIO\Geometry\Exception;
 
-interface Exception {}
+interface Exception
+{
+}

src/Exception/Exception.php

@@ -1,16 +1,20 @@
 <?php
 
+declare(strict_types=1);
+
 namespace GeoIO\Geometry\Exception;
 
-class InsufficientNumberOfGeometriesException extends \InvalidArgumentException implements Exception
+use InvalidArgumentException;
+
+class InsufficientNumberOfGeometriesException extends InvalidArgumentException implements Exception
 {
-    public static function create($expected, $given, $type)
+    public static function create(int $expected, int $given, string $type): self
     {
         return new self(sprintf(
             'Expected at least %d geometries of type %s, got %d.',
             $expected,
             $type,
-            $given
+            $given,
         ));
     }
 }

src/Exception/InsufficientNumberOfGeometriesException.php

@@ -1,14 +1,27 @@
 <?php
 
+declare(strict_types=1);
+
 namespace GeoIO\Geometry\Exception;
 
-class InvalidGeometryException extends \InvalidArgumentException implements Exception
+use InvalidArgumentException;
+
+class InvalidGeometryException extends InvalidArgumentException implements Exception
 {
-    public static function create($value)
+    public static function create(mixed $value): self
     {
         return new self(sprintf(
             'Expected valid Geometry object, got %s.',
-            is_object($value) ? get_class($value) : gettype($value)
+            get_debug_type($value),
+        ));
+    }
+
+    public static function createForWrongType(string $expected, mixed $value): self
+    {
+        return new self(sprintf(
+            'Expected Geometry object of type %s, got %s.',
+            $expected,
+            get_debug_type($value),
         ));
     }
 }

src/Exception/InvalidCoordinateException.php

@@ -1,10 +1,14 @@
 <?php
 
+declare(strict_types=1);
+
 namespace GeoIO\Geometry\Exception;
 
-class LinearRingNotClosedException extends \InvalidArgumentException implements Exception
+use InvalidArgumentException;
+
+class LinearRingNotClosedException extends InvalidArgumentException implements Exception
 {
-    public static function create()
+    public static function create(): self
     {
         return new self('LinearRing requires the first and last positions to be equivalent.');
     }

src/Exception/InvalidDimensionException.php

@@ -1,15 +1,19 @@
 <?php
 
+declare(strict_types=1);
+
 namespace GeoIO\Geometry\Exception;
 
-class MissingCoordinateException extends \InvalidArgumentException implements Exception
+use InvalidArgumentException;
+
+class MissingCoordinateException extends InvalidArgumentException implements Exception
 {
-    public static function create($coordinate, $dimension)
+    public static function create(string $coordinate, string $dimension): self
     {
         return new self(sprintf(
             '%s-coordinate must not be null for dimension %s.',
             strtoupper($coordinate),
-            $dimension
+            $dimension,
         ));
     }
 }

src/Exception/InvalidGeometryException.php

@@ -1,19 +1,23 @@
 <?php
 
+declare(strict_types=1);
+
 namespace GeoIO\Geometry\Exception;
 
 use GeoIO\Geometry\Geometry;
+use InvalidArgumentException;
+use function get_class;
 
-class MixedDimensionalityException extends \InvalidArgumentException implements Exception
+class MixedDimensionalityException extends InvalidArgumentException implements Exception
 {
-    public static function create(Geometry $geometry, Geometry $subGeometry)
+    public static function create(Geometry $geometry, Geometry $subGeometry): self
     {
         return new self(sprintf(
             'Can not mix dimensionality in a geometry: %s(%s) vs. %s(%s).',
             get_class($geometry),
             $geometry->getDimension(),
             get_class($subGeometry),
-            $subGeometry->getDimension()
+            $subGeometry->getDimension(),
         ));
     }
 }