Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Map/DisplayMap/DisplayMapRenderer.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class DisplayMapRenderer {
private WikitextParser $wikitextParser;
private ElementJsonSerializer $elementSerializer;

public function __construct( MappingService $service = null ) {
public function __construct( ?MappingService $service = null ) {
$this->service = $service;
}

Expand Down
8 changes: 4 additions & 4 deletions src/Presentation/MapsDistanceParser.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,30 +17,30 @@ class MapsDistanceParser {
private static bool $validatedDistanceUnit = false;
private static $unitRegex = false;

public static function parseAndFormat( string $distance, string $unit = null, int $decimals = 2 ): string {
public static function parseAndFormat( string $distance, ?string $unit = null, int $decimals = 2 ): string {
return self::formatDistance( self::parseDistance( $distance ), $unit, $decimals );
}

/**
* Formats a given distance in meters to a distance in an optionally specified notation.
*/
public static function formatDistance( float $meters, string $unit = null, int $decimals = 2 ): string {
public static function formatDistance( float $meters, ?string $unit = null, int $decimals = 2 ): string {
$meters = MediaWikiServices::getInstance()->getContentLanguage()->formatNum( round( $meters / self::getUnitRatio( $unit ), $decimals ) );
return "$meters $unit";
}

/**
* Returns the unit to meter ratio in a safe way, by first resolving the unit.
*/
public static function getUnitRatio( string $unit = null ): float {
public static function getUnitRatio( ?string $unit = null ): float {
global $egMapsDistanceUnits;
return $egMapsDistanceUnits[self::getValidUnit( $unit )];
}

/**
* Returns a valid unit. If the provided one is invalid, the default will be used.
*/
public static function getValidUnit( string $unit = null ): string {
public static function getValidUnit( ?string $unit = null ): string {
global $egMapsDistanceUnit, $egMapsDistanceUnits;

// This ensures the value for $egMapsDistanceUnit is correct, and caches the result.
Expand Down
2 changes: 1 addition & 1 deletion src/SemanticMW/AreaDescription.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class AreaDescription extends ValueDescription {
private SMWDIGeoCoord $center;
private string $radius;

public function __construct( SMWDataItem $areaCenter, int $comparator, string $radius, DIProperty $property = null ) {
public function __construct( SMWDataItem $areaCenter, int $comparator, string $radius, ?DIProperty $property = null ) {
if ( !( $areaCenter instanceof SMWDIGeoCoord ) ) {
throw new InvalidArgumentException( '$areaCenter needs to be a SMWDIGeoCoord' );
}
Expand Down
2 changes: 1 addition & 1 deletion src/SemanticMW/CoordinateValue.php
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ public function getShortWikiText( $linker = null ) {
*
* @return string|null
*/
private function getFormattedCoord( SMWDIGeoCoord $dataItem, string $format = null ) {
private function getFormattedCoord( SMWDIGeoCoord $dataItem, ?string $format = null ) {
return MapsFactory::globalInstance()->getCoordinateFormatter()->format(
new LatLongValue(
$dataItem->getLatitude(),
Expand Down
Loading