Stop using deprecated defaultOption method

README.md

@@ -105,7 +105,7 @@ employees for the [Wikidata project](https://wikidata.org/).
 
 ### 4.5.0 (2024-12-10)
 
-* Dropped support for PHP 7.3
+* Dropped support for PHP 7.3 and 7.4
 * Improved support for PHP 8.4 by explicitly declaring nullable types
 * Upgraded `mediawiki/mediawiki-codesniffer` rules to version 45.0.0
 * Added testing with PHP 8.2 and 8.3

composer.json

@@ -38,7 +38,7 @@
 		"docs": "https://github.com/DataValues/Geo/#usage"
 	},
 	"require": {
-		"php": ">=7.4",
+		"php": ">=8.0",
 		"data-values/data-values": "^3.0|^2.0|^1.0|~0.1",
 		"data-values/interfaces": "^1.0.0|^0.2.0",
 		"symfony/polyfill-php80": "^1.18.1"

src/Formatters/LatLongFormatter.php

@@ -119,7 +119,7 @@ public function __construct( ?FormatterOptions $options = null ) {
 		$this->defaultOption( self::OPT_PRECISION, 0 );
 
 		// Not used in this component, only here for downstream compatibility reasons
-		$this->options->defaultOption( ValueFormatter::OPT_LANG, 'en' );
+		$this->defaultOption( ValueFormatter::OPT_LANG, 'en' );
 	}
 
 	/**
@@ -368,12 +368,10 @@ private function formatNumber( float $number, int $digits = 0 ): string {
 		return sprintf( '%.' . ( $digits > 0 ? $digits : 0 ) . 'F', $number );
 	}
 
-	/**
-	 * @param string $option
-	 * @param mixed $default
-	 */
-	private function defaultOption( $option, $default ) {
-		$this->options->defaultOption( $option, $default );
+	private function defaultOption( string $option, mixed $default ): void {
+		if ( !$this->options->hasOption( $option ) ) {
+			$this->options->setOption( $option, $default );
+		}
 	}
 
 }

src/Parsers/DdCoordinateParser.php

@@ -35,10 +35,9 @@ class DdCoordinateParser extends LatLongParserBase {
 	 * @param ParserOptions|null $options
 	 */
 	public function __construct( ?ParserOptions $options = null ) {
-		$options = $options ?: new ParserOptions();
-		$options->defaultOption( self::OPT_DEGREE_SYMBOL, '°' );
-
-		parent::__construct( $options );
+		parent::__construct(
+			( $options ?: new ParserOptions() )->withDefaultOption( self::OPT_DEGREE_SYMBOL, '°' )
+		);
 
 		$this->defaultDelimiters = [ $this->getOption( self::OPT_DEGREE_SYMBOL ) ];
 	}

src/Parsers/DmCoordinateParser.php

@@ -30,10 +30,9 @@ class DmCoordinateParser extends DdCoordinateParser {
 	 * @param ParserOptions|null $options
 	 */
 	public function __construct( ?ParserOptions $options = null ) {
-		$options = $options ?: new ParserOptions();
-		$options->defaultOption( self::OPT_MINUTE_SYMBOL, "'" );
-
-		parent::__construct( $options );
+		parent::__construct(
+			( $options ?: new ParserOptions() )->withDefaultOption( self::OPT_MINUTE_SYMBOL, "'" )
+		);
 
 		$this->defaultDelimiters = [ $this->getOption( self::OPT_MINUTE_SYMBOL ) ];
 	}

src/Parsers/DmsCoordinateParser.php

@@ -30,10 +30,9 @@ class DmsCoordinateParser extends DmCoordinateParser {
 	 * @param ?ParserOptions $options
 	 */
 	public function __construct( ?ParserOptions $options = null ) {
-		$options = $options ?: new ParserOptions();
-		$options->defaultOption( self::OPT_SECOND_SYMBOL, '"' );
-
-		parent::__construct( $options );
+		parent::__construct(
+			( $options ?: new ParserOptions() )->withDefaultOption( self::OPT_SECOND_SYMBOL, '"' )
+		);
 
 		$this->defaultDelimiters = [ $this->getOption( self::OPT_SECOND_SYMBOL ) ];
 	}

src/Parsers/GlobeCoordinateParser.php

@@ -38,9 +38,8 @@ class GlobeCoordinateParser implements ValueParser {
 
 	public function __construct( ?ParserOptions $options = null ) {
 		$this->options = $options ?: new ParserOptions();
-
-		$this->options->defaultOption( ValueParser::OPT_LANG, 'en' );
-		$this->options->defaultOption( self::OPT_GLOBE, 'http://www.wikidata.org/entity/Q2' );
+		$this->options = $this->options->withDefaultOption( ValueParser::OPT_LANG, 'en' );
+		$this->options = $this->options->withDefaultOption( self::OPT_GLOBE, 'http://www.wikidata.org/entity/Q2' );
 	}
 
 	/**

src/Parsers/LatLongParser.php

@@ -67,8 +67,7 @@ class LatLongParser implements ValueParser {
 	private $options;
 
 	public function __construct( ?ParserOptions $options = null ) {
-		$this->options = $options ?: new ParserOptions();
-		$this->options->defaultOption( ValueParser::OPT_LANG, 'en' );
+		$this->options = ( $options ?: new ParserOptions() )->withDefaultOption( ValueParser::OPT_LANG, 'en' );
 	}
 
 	/**

src/Parsers/LatLongParserBase.php

@@ -33,22 +33,25 @@ abstract class LatLongParserBase implements ValueParser {
 	 */
 	public const OPT_SEPARATOR_SYMBOL = 'separator';
 
-	/**
-	 * @var ParserOptions
-	 */
-	private $options;
+	private ParserOptions $options;
 
 	public function __construct( ?ParserOptions $options = null ) {
 		$this->options = $options ?: new ParserOptions();
 
-		$this->options->defaultOption( ValueParser::OPT_LANG, 'en' );
+		$this->defaultOption( ValueParser::OPT_LANG, 'en' );
 
-		$this->options->defaultOption( self::OPT_NORTH_SYMBOL, 'N' );
-		$this->options->defaultOption( self::OPT_EAST_SYMBOL, 'E' );
-		$this->options->defaultOption( self::OPT_SOUTH_SYMBOL, 'S' );
-		$this->options->defaultOption( self::OPT_WEST_SYMBOL, 'W' );
+		$this->defaultOption( self::OPT_NORTH_SYMBOL, 'N' );
+		$this->defaultOption( self::OPT_EAST_SYMBOL, 'E' );
+		$this->defaultOption( self::OPT_SOUTH_SYMBOL, 'S' );
+		$this->defaultOption( self::OPT_WEST_SYMBOL, 'W' );
 
-		$this->options->defaultOption( self::OPT_SEPARATOR_SYMBOL, ',' );
+		$this->defaultOption( self::OPT_SEPARATOR_SYMBOL, ',' );
+	}
+
+	private function defaultOption( string $option, mixed $default ): void {
+		if ( !$this->options->hasOption( $option ) ) {
+			$this->options->setOption( $option, $default );
+		}
 	}
 
 	/**