Various cleanup and PHP 8 syntax

src/Formatters/GlobeCoordinateFormatter.php

@@ -26,10 +26,7 @@
  */
 class GlobeCoordinateFormatter implements ValueFormatter {
 
-	/**
-	 * @var LatLongFormatter
-	 */
-	private $formatter;
+	private LatLongFormatter $formatter;
 
 	public function __construct( ?FormatterOptions $options = null ) {
 		$this->formatter = new LatLongFormatter( $options );

src/Formatters/LatLongFormatter.php

@@ -161,7 +161,7 @@ private function getPrecisionFromOptions(): float {
 	 * @since 0.5
 	 *
 	 * @param LatLongValue $value
-	 * @param float|int $precision The desired precision, given as fractional degrees.
+	 * @param ?float $precision The desired precision, given as fractional degrees.
 	 *
 	 * @return string Plain text
 	 * @throws InvalidArgumentException
@@ -171,15 +171,13 @@ public function formatLatLongValue( LatLongValue $value, ?float $precision ): st
 			$precision = self::DEFAULT_PRECISION;
 		}
 
-		$formatted = implode(
+		return implode(
 			$this->options->getOption( self::OPT_SEPARATOR_SYMBOL ) . $this->getSpacing( self::OPT_SPACE_LATLONG ),
 			[
 				$this->formatLatitude( $value->getLatitude(), $precision ),
 				$this->formatLongitude( $value->getLongitude(), $precision )
 			]
 		);
-
-		return $formatted;
 	}
 
 	/**
@@ -188,10 +186,7 @@ public function formatLatLongValue( LatLongValue $value, ?float $precision ): st
 	 * @return string
 	 */
 	private function getSpacing( string $spacingLevel ): string {
-		if ( in_array( $spacingLevel, $this->options->getOption( self::OPT_SPACING_LEVEL ) ) ) {
-			return ' ';
-		}
-		return '';
+		return in_array( $spacingLevel, $this->options->getOption( self::OPT_SPACING_LEVEL ) ) ? ' ' : '';
 	}
 
 	private function formatLatitude( float $latitude, float $precision ): string {
@@ -347,9 +342,9 @@ private function getInDecimalMinuteFormat( float $floatDegrees, float $precision
 	}
 
 	/**
-	 * @param float|int $unitsPerDegree The number of target units per degree
+	 * @param float $unitsPerDegree The number of target units per degree
 	 * (60 for minutes, 3600 for seconds)
-	 * @param float|int $degreePrecision
+	 * @param float $degreePrecision
 	 *
 	 * @return int The number of digits to show after the decimal point
 	 * (resp. before, if the result is negative).
@@ -366,7 +361,7 @@ private function getSignificantDigits( float $unitsPerDegree, float $degreePreci
 	 */
 	private function formatNumber( float $number, int $digits = 0 ): string {
 		// TODO: use NumberLocalizer
-		return sprintf( '%.' . ( $digits > 0 ? $digits : 0 ) . 'F', $number );
+		return sprintf( '%.' . ( max( $digits, 0 ) ) . 'F', $number );
 	}
 
 	private function defaultOption( string $option, mixed $default ): void {

src/GlobeMath.php

@@ -61,14 +61,10 @@ public function normalizeGlobeCoordinate( GlobeCoordinateValue $value ): GlobeCo
 	 * @return LatLongValue
 	 */
 	public function normalizeGlobeLatLong( LatLongValue $value, ?string $globe = null ): LatLongValue {
-		switch ( $this->normalizeGlobe( $globe ) ) {
-			case GlobeCoordinateValue::GLOBE_EARTH:
-			case self::GLOBE_MOON:
-				$minimumLongitude = -180;
-				break;
-			default:
-				$minimumLongitude = 0;
-		}
+		$minimumLongitude = match ( $this->normalizeGlobe( $globe ) ) {
+			GlobeCoordinateValue::GLOBE_EARTH, self::GLOBE_MOON => -180,
+			default => 0,
+		};
 
 		return $this->normalizeLatLong( $value, $minimumLongitude );
 	}

src/PackagePrivate/LatLongPrecisionParser.php

@@ -13,19 +13,16 @@
  * @api
  */
 class LatLongPrecisionParser {
-
-	private ?ParserOptions $options;
 	private ?array $parsers = null;
 
-	public function __construct( ?ParserOptions $options = null ) {
-		$this->options = $options;
+	public function __construct( private ?ParserOptions $options = null ) {
 	}
 
 	public function parse( string $coordinate ): PreciseLatLong {
 		foreach ( $this->getParsers() as $parser ) {
 			try {
 				$latLongPrecision = $parser->parse( $coordinate );
-			} catch ( ParseException $parseException ) {
+			} catch ( ParseException ) {
 				continue;
 			}
 

src/PackagePrivate/PreciseLatLong.php

@@ -10,13 +10,7 @@
  * @api
  */
 class PreciseLatLong {
-
-	private LatLongValue $latLong;
-	private Precision $precision;
-
-	public function __construct( LatLongValue $latLong, Precision $precision ) {
-		$this->latLong = $latLong;
-		$this->precision = $precision;
+	public function __construct( private readonly LatLongValue $latLong, private readonly Precision $precision ) {
 	}
 
 	public function getLatLong(): LatLongValue {

src/PackagePrivate/Precision.php

@@ -4,6 +4,8 @@
 
 namespace DataValues\Geo\PackagePrivate;
 
+use InvalidArgumentException;
+
 /**
  * @api
  */
@@ -13,7 +15,7 @@ class Precision {
 
 	public function __construct( float $precisionInDegrees ) {
 		if ( $precisionInDegrees < -360 || $precisionInDegrees > 360 ) {
-			throw new \InvalidArgumentException( '$precision needs to be between -360 and 360' );
+			throw new InvalidArgumentException( '$precision needs to be between -360 and 360' );
 		}
 
 		$this->precision = $precisionInDegrees;

src/PackagePrivate/PrecisionParser.php

@@ -8,13 +8,7 @@
  * @api
  */
 class PrecisionParser {
-
-	private ValueParser $latLongParser;
-	private PrecisionDetector $precisionDetector;
-
-	public function __construct( ValueParser $latLongParser, PrecisionDetector $precisionDetector ) {
-		$this->latLongParser = $latLongParser;
-		$this->precisionDetector = $precisionDetector;
+	public function __construct( private readonly ValueParser $latLongParser, private readonly PrecisionDetector $precisionDetector ) {
 	}
 
 	public function parse( string $coordinate ): PreciseLatLong {

src/Parsers/DdCoordinateParser.php

@@ -45,10 +45,6 @@ public function __construct( ?ParserOptions $options = null ) {
 
 	/**
 	 * @see LatLongParserBase::getParsedCoordinate
-	 *
-	 * @param string $coordinateSegment
-	 *
-	 * @return float
 	 */
 	protected function getParsedCoordinate( string $coordinateSegment ): float {
 		$coordinateSegment = $this->resolveDirection( $coordinateSegment );
@@ -73,14 +69,14 @@ protected function areValidCoordinates( array $normalizedCoordinateSegments ): b
 		$match = false;
 
 		foreach ( $normalizedCoordinateSegments as $i => $segment ) {
-			$direction = '('
-				. $this->getOption( self::OPT_NORTH_SYMBOL ) . '|'
-				. $this->getOption( self::OPT_SOUTH_SYMBOL ) . ')';
-
 			if ( $i === 1 ) {
 				$direction = '('
 					. $this->getOption( self::OPT_EAST_SYMBOL ) . '|'
 					. $this->getOption( self::OPT_WEST_SYMBOL ) . ')';
+			} else {
+				$direction = '('
+					. $this->getOption( self::OPT_NORTH_SYMBOL ) . '|'
+					. $this->getOption( self::OPT_SOUTH_SYMBOL ) . ')';
 			}
 
 			$match = preg_match(
@@ -90,10 +86,12 @@ protected function areValidCoordinates( array $normalizedCoordinateSegments ): b
 
 			if ( $directional ) {
 				// Directionality is only set after parsing latitude: When the latitude is
-				// is directional, the longitude needs to be as well. Therefore we break here since
+				// directional, the longitude needs to be as well. Therefore, we break here since
 				// checking for directionality is the only check needed for longitude.
 				break;
-			} elseif ( $match ) {
+			}
+
+			if ( $match ) {
 				// Latitude is directional, no need to check for non-directionality.
 				$directional = true;
 				continue;
@@ -139,9 +137,7 @@ protected function getNormalizedNotation( string $coordinates ): string {
 			$this->getOption( self::OPT_DEGREE_SYMBOL ), $coordinates
 		);
 
-		$coordinates = $this->removeInvalidChars( $coordinates );
-
-		return $coordinates;
+		return $this->removeInvalidChars( $coordinates );
 	}
 
 	/**
@@ -160,10 +156,6 @@ protected function removeInvalidChars( string $string ): string {
 
 	/**
 	 * Converts a coordinate segment to float representation.
-	 *
-	 * @param string $coordinateSegment
-	 *
-	 * @return float
 	 */
 	protected function parseCoordinate( string $coordinateSegment ): float {
 		return (float)str_replace(
@@ -186,7 +178,7 @@ protected function splitString( string $normalizedCoordinateString ): array {
 		$normalizedCoordinateSegments = explode( $separator, $normalizedCoordinateString );
 
 		if ( count( $normalizedCoordinateSegments ) !== 2 ) {
-			// Separator not present within the string, trying to figure out the segments by
+			// Separator is not present within the string, trying to figure out the segments by
 			// splitting after the first direction character or degree symbol:
 			$delimiters = $this->defaultDelimiters;
 

src/Parsers/DmCoordinateParser.php

@@ -109,21 +109,13 @@ protected function areValidCoordinates( array $normalizedCoordinateSegments ): b
 
 	/**
 	 * @see DdCoordinateParser::getNormalizedNotation
-	 *
-	 * @param string $coordinates
-	 *
-	 * @return string
 	 */
 	protected function getNormalizedNotation( string $coordinates ): string {
-		$minute = $this->getOption( self::OPT_MINUTE_SYMBOL );
-
-		$coordinates = str_replace( [ '′', '′', '´', '′' ], $minute, $coordinates );
+		$coordinates = str_replace( [ '′', '′', '´', '′' ], $this->getOption( self::OPT_MINUTE_SYMBOL ), $coordinates );
 
-		$coordinates = parent::getNormalizedNotation( $coordinates );
-
-		$coordinates = $this->removeInvalidChars( $coordinates );
-
-		return $coordinates;
+		return $this->removeInvalidChars(
+			parent::getNormalizedNotation( $coordinates )
+		);
 	}
 
 	/**

src/Parsers/DmsCoordinateParser.php

@@ -68,14 +68,14 @@ protected function areValidCoordinates( array $normalizedCoordinateSegments ): b
 		$directional = false;
 
 		foreach ( $normalizedCoordinateSegments as $i => $segment ) {
-			$direction = '('
-				. $this->getOption( self::OPT_NORTH_SYMBOL ) . '|'
-				. $this->getOption( self::OPT_SOUTH_SYMBOL ) . ')';
-
 			if ( $i === 1 ) {
 				$direction = '('
 					. $this->getOption( self::OPT_EAST_SYMBOL ) . '|'
 					. $this->getOption( self::OPT_WEST_SYMBOL ) . ')';
+			} else {
+				$direction = '('
+					. $this->getOption( self::OPT_NORTH_SYMBOL ) . '|'
+					. $this->getOption( self::OPT_SOUTH_SYMBOL ) . ')';
 			}
 
 			$match = preg_match(
@@ -130,11 +130,7 @@ protected function getNormalizedNotation( string $coordinates ): string {
 		);
 		$coordinates = str_replace( [ '´', '´' ], $second, $coordinates );
 
-		$coordinates = parent::getNormalizedNotation( $coordinates );
-
-		$coordinates = $this->removeInvalidChars( $coordinates );
-
-		return $coordinates;
+		return $this->removeInvalidChars( parent::getNormalizedNotation( $coordinates ) );
 	}
 
 	/**

src/Parsers/FloatCoordinateParser.php

@@ -45,14 +45,14 @@ protected function areValidCoordinates( array $normalizedCoordinateSegments ): b
 		foreach ( $normalizedCoordinateSegments as $i => $segment ) {
 			$segment = str_replace( ' ', '', $segment );
 
-			$direction = '('
-				. $this->getOption( self::OPT_NORTH_SYMBOL ) . '|'
-				. $this->getOption( self::OPT_SOUTH_SYMBOL ) . ')';
-
 			if ( $i === 1 ) {
 				$direction = '('
 					. $this->getOption( self::OPT_EAST_SYMBOL ) . '|'
 					. $this->getOption( self::OPT_WEST_SYMBOL ) . ')';
+			} else {
+				$direction = '('
+					. $this->getOption( self::OPT_NORTH_SYMBOL ) . '|'
+					. $this->getOption( self::OPT_SOUTH_SYMBOL ) . ')';
 			}
 
 			$match = preg_match(
@@ -89,8 +89,8 @@ protected function splitString( string $normalizedCoordinateString ): array {
 		$normalizedCoordinateSegments = explode( $separator, $normalizedCoordinateString );
 
 		if ( count( $normalizedCoordinateSegments ) !== 2 ) {
-			// Separator not present within the string, trying to figure out the segments by
-			// splitting at the the first SPACE after the first direction character or digit:
+			// Separator is not present within the string, trying to figure out the segments by
+			// splitting at the first SPACE after the first direction character or digit:
 			$numberRegEx = '-?\d{1,3}(\.\d{1,20})?';
 
 			$ns = '('

src/Parsers/GlobeCoordinateParser.php

@@ -7,6 +7,7 @@
 use DataValues\Geo\PackagePrivate\LatLongPrecisionParser;
 use DataValues\Geo\PackagePrivate\Precision;
 use DataValues\Geo\Values\GlobeCoordinateValue;
+use Exception;
 use ValueParsers\ParseException;
 use ValueParsers\ParserOptions;
 use ValueParsers\ValueParser;
@@ -56,7 +57,7 @@ public function parse( $value ): GlobeCoordinateValue {
 
 		try {
 			$latLongPrecision = $parser->parse( $value );
-		} catch ( \Exception $ex ) {
+		} catch ( Exception ) {
 			throw new ParseException(
 				'The format of the coordinate could not be determined.',
 				$value,

src/Parsers/LatLongParser.php

@@ -58,14 +58,11 @@ class LatLongParser implements ValueParser {
 	public const OPT_SECOND_SYMBOL = 'second';
 
 	/**
-	 * The symbol to use as separator between latitude and longitude.
+	 * The symbol to use as a separator between latitude and longitude.
 	 */
 	public const OPT_SEPARATOR_SYMBOL = 'separator';
 
-	/**
-	 * @var ParserOptions
-	 */
-	private $options;
+	private ParserOptions $options;
 
 	public function __construct( ?ParserOptions $options = null ) {
 		$this->options = ( $options ?: new ParserOptions() )->withDefaultOption( ValueParser::OPT_LANG, 'en' );
@@ -83,7 +80,7 @@ public function parse( $value ): LatLongValue {
 		foreach ( $this->getParsers() as $parser ) {
 			try {
 				return $parser->parse( $value );
-			} catch ( ParseException $ex ) {
+			} catch ( ParseException ) {
 				continue;
 			}
 		}