Skip to content

Commit

Permalink
Merge pull request #232 from codders/feat/restore-php74-support
Browse files Browse the repository at this point in the history
Restore PHP 7.4 support
  • Loading branch information
lucaswerkmeister authored Jan 6, 2025
2 parents 947a174 + a4a40fd commit 8cdc1d3
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 3 deletions.
1 change: 1 addition & 0 deletions .github/workflows/php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ jobs:
fail-fast: false
matrix:
php:
- '7.4'
- '8.0'
- '8.1'
- '8.2'
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"docs": "https://github.com/DataValues/Geo/#usage"
},
"require": {
"php": ">=8.0",
"php": ">=7.4",
"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"
Expand Down
6 changes: 5 additions & 1 deletion src/Formatters/LatLongFormatter.php
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,11 @@ private function formatNumber( float $number, int $digits = 0 ): string {
return sprintf( '%.' . ( $digits > 0 ? $digits : 0 ) . 'F', $number );
}

private function defaultOption( string $option, mixed $default ): void {
/**
* @param string $option
* @param mixed $default
*/
private function defaultOption( string $option, $default ): void {
if ( !$this->options->hasOption( $option ) ) {
$this->options->setOption( $option, $default );
}
Expand Down
6 changes: 5 additions & 1 deletion src/Parsers/LatLongParserBase.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,11 @@ public function __construct( ?ParserOptions $options = null ) {
$this->defaultOption( self::OPT_SEPARATOR_SYMBOL, ',' );
}

private function defaultOption( string $option, mixed $default ): void {
/**
* @param string $option
* @param mixed $default
*/
private function defaultOption( string $option, $default ): void {
if ( !$this->options->hasOption( $option ) ) {
$this->options->setOption( $option, $default );
}
Expand Down

0 comments on commit 8cdc1d3

Please sign in to comment.