Always return array

ProfessionalWiki · Nov 13, 2023 · d8858da · d8858da
1 parent 9f9c5c7
commit d8858da
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 9 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -19,8 +19,3 @@ parameters:
 			message: "#^Method ProfessionalWiki\\\\SPARQL\\\\SparqlLuaQueryRunner\\:\\:runQuery\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
 			path: src/SparqlLuaQueryRunner.php
-
-		-
-			message: "#^Method ProfessionalWiki\\\\SPARQL\\\\SparqlLuaQueryRunner\\:\\:runQuery\\(\\) should return array\\|null but returns mixed\\.$#"
-			count: 1
-			path: src/SparqlLuaQueryRunner.php
diff --git a/src/SparqlLua.php b/src/SparqlLua.php
@@ -19,7 +19,7 @@ public function register(): array {
 		);
 	}
 
-	private function runSparqlQuery( string $sparql ): array|null {
+	private function runSparqlQuery( string $sparql ): array {
 		$sparqlEndpoint = MediaWikiServices::getInstance()->getMainConfig()->get( 'SPARQLEndpoint' );
 
 		if ( !is_string( $sparqlEndpoint ) ) {

diff --git a/src/SparqlLuaQueryRunner.php b/src/SparqlLuaQueryRunner.php
@@ -14,7 +14,7 @@ public function __construct(
 	) {
 	}
 
-	public function runQuery( string $sparql ): array|null {
+	public function runQuery( string $sparql ): array {
 		$options = [
 			'postData' => [
 				'query' => $sparql,
@@ -23,7 +23,7 @@ public function runQuery( string $sparql ): array|null {
 		];
 		$response = $this->requestFactory->request( 'POST', $this->sparqlEndpoint, $options );
 
-		return $response !== null ? json_decode( $response, true ) : null;
+		return $response !== null ? (array)json_decode( $response, true ) : [];
 	}
 
 }
diff --git a/tests/integration/SparqlLuaQueryRunnerIntegrationTest.php b/tests/integration/SparqlLuaQueryRunnerIntegrationTest.php
@@ -27,7 +27,7 @@ private function newQueryRunner(): SparqlLuaQueryRunner {
 	public function testRunQueryWhenSparqlQueryIsEmpty(): void {
 		$sparqlQuery = '';
 		$result = $this->newQueryRunner()->runQuery( $sparqlQuery );
-		$this->assertNull( $result );
+		$this->assertSame( [], $result );
 	}
 
 	public function testRunQueryReturnsRightHeadVars(): void {