Fix compatibility with latest SMW master

Closes #895

Author: SomeMWDev

src/SemanticMW/AreaDescription.php

@@ -10,6 +10,7 @@
 use Maps\Presentation\MapsDistanceParser;
 use SMW\DataValueFactory;
 use SMW\DIProperty;
+use SMW\Query\Language\Description;
 use SMW\Query\Language\ThingDescription;
 use SMW\Query\Language\ValueDescription;
 use SMWDataItem;
@@ -43,7 +44,7 @@ public function __construct( SMWDataItem $areaCenter, int $comparator, string $r
 	/**
 	 * @see Description::prune
 	 */
-	public function prune( &$maxsize, &$maxDepth, &$log ) {
+	public function prune( &$maxsize, &$maxDepth, &$log ): Description {
 		if ( ( $maxsize < $this->getSize() ) || ( $maxDepth < $this->getDepth() ) ) {
 			$log[] = $this->getQueryString();
 
@@ -59,7 +60,7 @@ public function prune( &$maxsize, &$maxDepth, &$log ) {
 		return $this;
 	}
 
-	public function getQueryString( $asValue = false ) {
+	public function getQueryString( $asValue = false ): string {
 		$centerString = DataValueFactory::getInstance()->newDataValueByItem(
 			$this->center,
 			$this->getProperty()

src/SemanticMW/CoordinateDescription.php

@@ -16,7 +16,7 @@
  */
 class CoordinateDescription extends ValueDescription {
 
-	public function getQueryString( $asValue = false ) {
+	public function getQueryString( $asValue = false ): string {
 		$queryString = DataValueFactory::getInstance()->newDataValueByItem(
 			$this->getDataItem(),
 			$this->getProperty()

src/SemanticMW/CoordinateValue.php

@@ -43,7 +43,7 @@ public function getQueryDescription( $value ) {
 			throw new InvalidArgumentException( '$value needs to be a string' );
 		}
 
-		[ $distance, $comparator ] = $this->parseUserValue( $value );
+		[ $distance, $comparator ] = $this->parseAndReturnUserValue( $value );
 		$distance = $this->parserDistance( $distance );
 
 		$this->setUserValue( $value );
@@ -69,7 +69,11 @@ public function getQueryDescription( $value ) {
 	/**
 	 * @see SMWDataValue::parseUserValue
 	 */
-	protected function parseUserValue( $value ) {
+	protected function parseUserValue( $value ): void {
+		$this->parseAndReturnUserValue( $value );
+	}
+
+	private function parseAndReturnUserValue( $value ): array {
 		if ( !is_string( $value ) ) {
 			throw new InvalidArgumentException( '$value needs to be a string' );
 		}
@@ -245,16 +249,14 @@ protected function loadDataItem( SMWDataItem $dataItem ) {
 	 * $2: The location in directional DMS notation.
 	 * $3: The latitude in non-directional float notation.
 	 * $4 The longitude in non-directional float notation.
-	 *
-	 * @return array
 	 */
-	protected function getServiceLinkParams() {
+	protected function getServiceLinkParams(): array {
 		$coordinateSet = $this->m_dataitem->getCoordinateSet();
 		return [
 			$this->getFormattedCoord( $this->m_dataitem, 'float' ), // TODO
 			$this->getFormattedCoord( $this->m_dataitem, 'dms' ), // TODO
 			$coordinateSet['lat'],
-			$coordinateSet['lon']
+			$coordinateSet['lon'],
 		];
 	}
 

src/SemanticMW/KmlPrinter.php

@@ -86,10 +86,8 @@ private function getKMLLink( QueryResult $res, int $outputMode ): string {
 	 * @see SMWResultPrinter::getParamDefinitions
 	 *
 	 * @param ParamDefinition[] $definitions
-	 *
-	 * @return array
 	 */
-	public function getParamDefinitions( array $definitions ) {
+	public function getParamDefinitions( array $definitions ): array {
 		global $egMapsDefaultLabel, $egMapsDefaultTitle;
 
 		$definitions['text'] = [
@@ -134,7 +132,7 @@ public function getMimeType( QueryResult $queryResult ) {
 	 *
 	 * @return string|boolean
 	 */
-	public function getFileName( QueryResult $queryResult ) {
+	public function getFileName( QueryResult $queryResult ): false|string {
 		if ( $this->params['filename'] !== '' ) {
 			$filename = $this->params['filename'];
 
@@ -160,7 +158,7 @@ final public function getName() {
 	 * @param array $params
 	 * @param $outputMode
 	 */
-	protected function handleParameters( array $params, $outputMode ) {
+	protected function handleParameters( array $params, $outputMode ): void {
 		$this->params = $params;
 	}
 }