Use Guzzle 6

Author: Tpt

composer.json

@@ -16,12 +16,12 @@
 	],
 	"require": {
 		"php": ">=5.5.0",
-		"serialization/serialization": "3.*",
+		"serialization/serialization": "~3.0",
 		"wikibase/data-model": "~4.0|~3.0|~2.0|~1.0|~0.8",
 		"data-values/geo": "~1.0|~0.1",
 		"data-values/time": "~0.6",
 		"data-values/number": "~0.4",
-		"guzzle/http": "~3.7"
+		"guzzlehttp/guzzle": "~6.1"
 	},
 	"autoload": {
 		"psr-4": {

src/Guzzle/WikidataQueryApiClient.php

@@ -2,8 +2,8 @@
 
 namespace WikidataQueryApi;
 
-use InvalidArgumentException;
-use WikidataQueryApi\Guzzle\WikidataQueryApiClient;
+use GuzzleHttp\Client;
+use GuzzleHttp\ClientInterface;
 
 /**
  * @licence GPLv2+
@@ -12,21 +12,25 @@
 class WikidataQueryApi {
 
 	/**
-	 * @var WikidataQueryApiClient
+	 * @var string
+	 */
+	private $apiUrl;
+
+	/**
+	 * @var ClientInterface
 	 */
 	private $client;
 
 	/**
-	 * @param string|WikidataQueryApiClient $client either the url or the api or a custom Client
+	 * @param string $apiUrl the URL of the Wikidata Query API
+	 * @param ClientInterface|null $client the Guzzle client to use
 	 */
-	public function __construct( $client ) {
-		if ( is_string( $client ) ) {
-			$client = WikidataQueryApiClient::factory( [ 'base_url' => $client ] );
-		}
-		if ( !( $client instanceof WikidataQueryApiClient ) ) {
-			throw new InvalidArgumentException();
+	public function __construct( $apiUrl, ClientInterface $client = null ) {
+		if( $client === null ) {
+			$client = new Client();
 		}
 
+		$this->apiUrl = $apiUrl;
 		$this->client = $client;
 	}
 
@@ -37,9 +41,12 @@ public function __construct( $client ) {
 	 * @throws WikibaseQueryApiException
 	 */
 	public function doQuery( $params ) {
-		$result = $this->client->apiGet( $params );
+		$result = json_decode( $this->client->get(
+			$this->apiUrl,
+			[ 'query' => $params ]
+		)->getBody(), true );
 
-		if ( $result['status']['error'] != 'OK' ) {
+		if ( $result['status']['error'] !== 'OK' ) {
 			throw new WikibaseQueryApiException( $result['status']['error'] );
 		}
 

src/WikidataQueryApi.php

@@ -2,6 +2,11 @@
 
 namespace WikidataQueryApi;
 
+use GuzzleHttp\Client;
+use GuzzleHttp\Handler\MockHandler;
+use GuzzleHttp\HandlerStack;
+use GuzzleHttp\Psr7\Response;
+
 /**
  * @covers WikidataQueryApi\WikidataQueryApi
  *
@@ -11,18 +16,20 @@
 class WikidataQueryApiTest extends \PHPUnit_Framework_TestCase {
 
 	public function testDoQuery() {
-		$clientMock = $this->getMock( 'WikidataQueryApi\Guzzle\WikidataQueryApiClient' );
-		$clientMock->expects( $this->any() )
-			->method( 'apiGet' )
-			->with( $this->equalTo( [
-				'q' => 'claim[42:42]'
-			] ) )
-			->will( $this->returnValue( [
-				'status' => [ 'error' => 'OK' ],
-				'items' => [ 42 ]
-			] ) );
+		$mock = new MockHandler( [
+			new Response(
+				200,
+				[],
+				json_encode( [
+					'status' => [ 'error' => 'OK' ],
+					'items' => [ 42 ]
+				] )
+			)
+		] );
+		$handler = HandlerStack::create( $mock );
+		$client = new Client( [ 'handler' => $handler ] );
+		$wikidataQueryApi = new WikidataQueryApi( '', $client );
 
-		$wikidataQueryApi = new WikidataQueryApi( $clientMock );
 		$this->assertEquals(
 			[
 				'status' => [ 'error' => 'OK' ],
@@ -35,17 +42,18 @@ public function testDoQuery() {
 	}
 
 	public function testDoQueryWithError() {
-		$clientMock = $this->getMock( 'WikidataQueryApi\Guzzle\WikidataQueryApiClient' );
-		$clientMock->expects( $this->any() )
-			->method( 'apiGet' )
-			->with( $this->equalTo( [
-				'q' => 'claim[42:42]'
-			] ) )
-			->will( $this->returnValue( [
-				'status' => [ 'error' => 'Error' ]
-			] ) );
-
-		$wikidataQueryApi = new WikidataQueryApi( $clientMock );
+		$mock = new MockHandler( [
+			new Response(
+				200,
+				[],
+				json_encode( [
+					'status' => [ 'error' => 'Error' ]
+				] )
+			)
+		] );
+		$handler = HandlerStack::create( $mock );
+		$client = new Client( [ 'handler' => $handler ] );
+		$wikidataQueryApi = new WikidataQueryApi( '', $client );
 
 		$this->setExpectedException( 'WikidataQueryApi\WikibaseQueryApiException' );
 		$wikidataQueryApi->doQuery( [