CS fix

src/BritishNationalGridPoint.php

@@ -28,15 +28,15 @@ class BritishNationalGridPoint extends ProjectedPoint
 {
     private const GRID_LETTERS = 'VWXYZQRSTULMNOPFGHJKABCDE';
 
-    public function __construct(Length $easting, Length $northing, ?DateTimeInterface $epoch = null)
+    public function __construct(Length $easting, Length $northing, DateTimeInterface $epoch = null)
     {
         parent::__construct(Projected::fromSRID(Projected::EPSG_OSGB36_BRITISH_NATIONAL_GRID), $easting, $northing, null, null, $epoch, null);
     }
 
     /**
      * @param string $reference OS grid reference (e.g. "TG514131")
      */
-    public static function fromGridReference(string $reference, ?DateTimeInterface $epoch = null): self
+    public static function fromGridReference(string $reference, DateTimeInterface $epoch = null): self
     {
         $reference = str_replace(' ', '', $reference);
 

src/CompoundPoint.php

@@ -64,7 +64,7 @@ class CompoundPoint extends Point implements ConvertiblePoint
      */
     protected ?DateTimeImmutable $epoch;
 
-    protected function __construct(Compound $crs, GeographicPoint|ProjectedPoint $horizontalPoint, VerticalPoint $verticalPoint, ?DateTimeInterface $epoch = null)
+    protected function __construct(Compound $crs, GeographicPoint|ProjectedPoint $horizontalPoint, VerticalPoint $verticalPoint, DateTimeInterface $epoch = null)
     {
         $this->horizontalPoint = $horizontalPoint;
         $this->verticalPoint = $verticalPoint;
@@ -76,7 +76,7 @@ protected function __construct(Compound $crs, GeographicPoint|ProjectedPoint $ho
         $this->epoch = $epoch;
     }
 
-    public static function create(Compound $crs, GeographicPoint|ProjectedPoint $horizontalPoint, VerticalPoint $verticalPoint, ?DateTimeInterface $epoch = null): self
+    public static function create(Compound $crs, GeographicPoint|ProjectedPoint $horizontalPoint, VerticalPoint $verticalPoint, DateTimeInterface $epoch = null): self
     {
         return new self($crs, $horizontalPoint, $verticalPoint, $epoch);
     }

src/CoordinateReferenceSystem/Geographic2D.php

@@ -4381,7 +4381,7 @@ public static function getSupportedSRIDsWithHelp(): array
         return array_map(fn (array $data) => ['name' => $data['name'], 'extent_description' => $data['extent_description'], 'help' => $data['help']], static::$sridData);
     }
 
-    public static function registerCustomCRS(string $srid, string $name, string $coordinateSystemSrid, string $datumSrid, BoundingArea $extent, ?string $baseCRSSrid = null, string $help = ''): void
+    public static function registerCustomCRS(string $srid, string $name, string $coordinateSystemSrid, string $datumSrid, BoundingArea $extent, string $baseCRSSrid = null, string $help = ''): void
     {
         self::$sridData[$srid] = ['name' => $name, 'coordinate_system' => $coordinateSystemSrid, 'datum' => $datumSrid, 'extent' => $extent, 'extent_description' => '', 'base_crs' => $baseCRSSrid, 'help' => $help];
     }

src/CoordinateReferenceSystem/Geographic3D.php

@@ -1744,7 +1744,7 @@ public static function getSupportedSRIDsWithHelp(): array
         return array_map(fn (array $data) => ['name' => $data['name'], 'extent_description' => $data['extent_description'], 'help' => $data['help']], static::$sridData);
     }
 
-    public static function registerCustomCRS(string $srid, string $name, string $coordinateSystemSrid, string $datumSrid, BoundingArea $extent, ?string $baseCRSSrid = null, string $help = ''): void
+    public static function registerCustomCRS(string $srid, string $name, string $coordinateSystemSrid, string $datumSrid, BoundingArea $extent, string $baseCRSSrid = null, string $help = ''): void
     {
         self::$sridData[$srid] = ['name' => $name, 'coordinate_system' => $coordinateSystemSrid, 'datum' => $datumSrid, 'extent' => $extent, 'extent_description' => '', 'base_crs' => $baseCRSSrid, 'help' => $help];
     }

src/CoordinateReferenceSystem/Projected.php

@@ -40299,7 +40299,7 @@ public function __construct(
         BoundingArea $boundingArea,
         string $name = '',
         Geographic2D|Geographic3D $baseCRS = null,
-        ?string $derivingConversion = null
+        string $derivingConversion = null
     ) {
         $this->srid = $srid;
         $this->coordinateSystem = $coordinateSystem;

src/EPSG/Import/Codegen.php

@@ -179,8 +179,8 @@ public function csFixFile(string $fileName): void
 
         foreach ($fixers as $fixer) {
             if (
-                !$fixer instanceof AbstractFixer &&
-                (!$fixer->supports($file) || !$fixer->isCandidate($tokens))
+                !$fixer instanceof AbstractFixer
+                && (!$fixer->supports($file) || !$fixer->isCandidate($tokens))
             ) {
                 continue;
             }

src/EPSG/Import/EPSGCodegenFromDataImport.php

@@ -1751,8 +1751,8 @@ public function generateDataCoordinateOperations(): void
                     $paramsRow['value'] = 'urn:ogc:def:coordinateOperation:EPSG::' . $paramsRow['value'];
                 }
                 if (
-                    isset($filenameToProviderMap[(string) $paramsRow['value']]) &&
-                    in_array(
+                    isset($filenameToProviderMap[(string) $paramsRow['value']])
+                    && in_array(
                         $paramsRow['name'],
                         [
                             'eastingAndNorthingDifferenceFile',

src/GeocentricPoint.php

@@ -67,7 +67,7 @@ class GeocentricPoint extends Point implements ConvertiblePoint
      */
     protected ?DateTimeImmutable $epoch;
 
-    protected function __construct(Geocentric $crs, Length $x, Length $y, Length $z, ?DateTimeInterface $epoch = null)
+    protected function __construct(Geocentric $crs, Length $x, Length $y, Length $z, DateTimeInterface $epoch = null)
     {
         $this->crs = $crs;
         $this->x = $x::convert($x, $this->crs->getCoordinateSystem()->getAxisByName(Axis::GEOCENTRIC_X)->getUnitOfMeasureId());
@@ -85,7 +85,7 @@ protected function __construct(Geocentric $crs, Length $x, Length $y, Length $z,
      * @param Length $y refer to CRS for preferred unit of measure, but any length unit accepted
      * @param Length $z refer to CRS for preferred unit of measure, but any length unit accepted
      */
-    public static function create(Geocentric $crs, Length $x, Length $y, Length $z, ?DateTimeInterface $epoch = null): self
+    public static function create(Geocentric $crs, Length $x, Length $y, Length $z, DateTimeInterface $epoch = null): self
     {
         return new self($crs, $x, $y, $z, $epoch);
     }

src/GeographicPoint.php

@@ -134,7 +134,7 @@ protected function __construct(Geographic2D|Geographic3D $crs, Angle $latitude,
      * @param Angle   $latitude  refer to CRS for preferred unit of measure, but any angle unit accepted
      * @param Angle   $longitude refer to CRS for preferred unit of measure, but any angle unit accepted
      */
-    public static function create(Geographic2D|Geographic3D $crs, Angle $latitude, Angle $longitude, ?Length $height = null, ?DateTimeInterface $epoch = null): self
+    public static function create(Geographic2D|Geographic3D $crs, Angle $latitude, Angle $longitude, Length $height = null, DateTimeInterface $epoch = null): self
     {
         return new self($crs, $latitude, $longitude, $height, $epoch);
     }

src/IrishGridPoint.php

@@ -31,15 +31,15 @@ class IrishGridPoint extends ProjectedPoint
 {
     private const GRID_LETTERS = 'VWXYZQRSTULMNOPFGHJKABCDE';
 
-    public function __construct(Length $easting, Length $northing, ?DateTimeInterface $epoch = null)
+    public function __construct(Length $easting, Length $northing, DateTimeInterface $epoch = null)
     {
         parent::__construct(Projected::fromSRID(Projected::EPSG_TM75_IRISH_GRID), $easting, $northing, null, null, $epoch, null);
     }
 
     /**
      * @param string $reference Irish grid reference (e.g. "T514131")
      */
-    public static function fromGridReference(string $reference, ?DateTimeInterface $epoch = null): self
+    public static function fromGridReference(string $reference, DateTimeInterface $epoch = null): self
     {
         $reference = str_replace(' ', '', $reference);
 

src/IrishTransverseMercatorPoint.php

@@ -17,7 +17,7 @@
  */
 class IrishTransverseMercatorPoint extends ProjectedPoint
 {
-    public function __construct(Length $easting, Length $northing, ?DateTimeInterface $epoch = null)
+    public function __construct(Length $easting, Length $northing, DateTimeInterface $epoch = null)
     {
         parent::__construct(Projected::fromSRID(Projected::EPSG_IRENET95_IRISH_TRANSVERSE_MERCATOR), $easting, $northing, null, null, $epoch, null);
     }

src/ProjectedPoint.php

@@ -150,7 +150,7 @@ protected function __construct(Projected $crs, ?Length $easting, ?Length $northi
         $this->height = $height;
     }
 
-    public static function create(Projected $crs, ?Length $easting, ?Length $northing, ?Length $westing, ?Length $southing, ?DateTimeInterface $epoch = null, ?Length $height = null): self
+    public static function create(Projected $crs, ?Length $easting, ?Length $northing, ?Length $westing, ?Length $southing, DateTimeInterface $epoch = null, Length $height = null): self
     {
         return match ($crs->getSRID()) {
             Projected::EPSG_OSGB36_BRITISH_NATIONAL_GRID => new BritishNationalGridPoint($easting, $northing, $epoch),
@@ -160,17 +160,17 @@ public static function create(Projected $crs, ?Length $easting, ?Length $northin
         };
     }
 
-    public static function createFromEastingNorthing(Projected $crs, Length $easting, Length $northing, ?DateTimeInterface $epoch = null, ?Length $height = null): self
+    public static function createFromEastingNorthing(Projected $crs, Length $easting, Length $northing, DateTimeInterface $epoch = null, Length $height = null): self
     {
         return static::create($crs, $easting, $northing, null, null, $epoch, $height);
     }
 
-    public static function createFromWestingNorthing(Projected $crs, Length $westing, Length $northing, ?DateTimeInterface $epoch = null, ?Length $height = null): self
+    public static function createFromWestingNorthing(Projected $crs, Length $westing, Length $northing, DateTimeInterface $epoch = null, Length $height = null): self
     {
         return static::create($crs, null, $northing, $westing, null, $epoch, $height);
     }
 
-    public static function createFromWestingSouthing(Projected $crs, Length $westing, Length $southing, ?DateTimeInterface $epoch = null, ?Length $height = null): self
+    public static function createFromWestingSouthing(Projected $crs, Length $westing, Length $southing, DateTimeInterface $epoch = null, Length $height = null): self
     {
         return static::create($crs, null, null, $westing, $southing, $epoch, $height);
     }
@@ -2142,8 +2142,8 @@ public function complexPolynomial(
         Scale $A4,
         Scale $A5,
         Scale $A6,
-        ?Scale $A7 = null,
-        ?Scale $A8 = null
+        Scale $A7 = null,
+        Scale $A8 = null
     ): self {
         $xs = $this->easting->getValue();
         $ys = $this->northing->getValue();

src/UTMPoint.php

@@ -44,7 +44,7 @@ class UTMPoint extends ProjectedPoint
      */
     protected Geographic2D|Geographic3D $baseCRS;
 
-    public function __construct(Geographic2D|Geographic3D $crs, Length $easting, Length $northing, int $zone, string $hemisphere, ?DateTimeInterface $epoch = null)
+    public function __construct(Geographic2D|Geographic3D $crs, Length $easting, Length $northing, int $zone, string $hemisphere, DateTimeInterface $epoch = null)
     {
         $this->zone = $zone;
         $this->hemisphere = $hemisphere;

src/VerticalPoint.php

@@ -47,7 +47,7 @@ class VerticalPoint extends Point
      * Constructor.
      * @param Length $height refer to CRS for preferred unit of measure, but any length unit accepted
      */
-    protected function __construct(Vertical $crs, Length $height, ?DateTimeInterface $epoch = null)
+    protected function __construct(Vertical $crs, Length $height, DateTimeInterface $epoch = null)
     {
         $this->height = $height::convert($height, $crs->getCoordinateSystem()->getAxes()[0]->getUnitOfMeasureId());
         $this->crs = $crs;
@@ -62,7 +62,7 @@ protected function __construct(Vertical $crs, Length $height, ?DateTimeInterface
      * Constructor.
      * @param Length $height refer to CRS for preferred unit of measure, but any length unit accepted
      */
-    public static function create(Vertical $crs, Length $height, ?DateTimeInterface $epoch = null): self
+    public static function create(Vertical $crs, Length $height, DateTimeInterface $epoch = null): self
     {
         return new self($crs, $height, $epoch);
     }