Adjust MediawikiApi to use ClientInterface

addwiki · Jan 18, 2016 · 99f61d1 · 99f61d1
1 parent 75ba537
commit 99f61d1
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 33 deletions.
diff --git a/src/MediawikiApi.php b/src/MediawikiApi.php
@@ -5,12 +5,9 @@
 use GuzzleHttp\Client;
 use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Exception\RequestException;
-use GuzzleHttp\Handler\CurlHandler;
-use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Promise\PromiseInterface;
 use InvalidArgumentException;
 use Mediawiki\Api\Guzzle\ClientFactory;
-use Mediawiki\Api\Guzzle\MiddlewareFactory;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerInterface;
@@ -28,7 +25,7 @@
 class MediawikiApi implements MediawikiApiInterface, LoggerAwareInterface {
 
 	/**
-	 * @var Client|null Should be accessed through getClient
+	 * @var ClientInterface|null Should be accessed through getClient
 	 */
 	private $client = null;
 
@@ -142,7 +139,8 @@ public function setLogger( LoggerInterface $logger ) {
 	 *         Can throw UsageExceptions or RejectionExceptions
 	 */
 	public function getRequestAsync( Request $request ) {
-		$promise = $this->getClient()->getAsync(
+		$promise = $this->getClient()->requestAsync(
+			'GET',
 			$this->apiUrl,
 			$this->getClientRequestOptions( $request, 'query' )
 		);
@@ -162,7 +160,8 @@ public function getRequestAsync( Request $request ) {
 	 *         Can throw UsageExceptions or RejectionExceptions
 	 */
 	public function postRequestAsync( Request $request ) {
-		$promise = $this->getClient()->postAsync(
+		$promise = $this->getClient()->requestAsync(
+			'POST',
 			$this->apiUrl,
 			$this->getClientRequestOptions( $request, 'form_params' )
 		);
@@ -180,7 +179,8 @@ public function postRequestAsync( Request $request ) {
 	 * @return mixed Normally an array
 	 */
 	public function getRequest( Request $request ) {
-		$response = $this->getClient()->get(
+		$response = $this->getClient()->request(
+			'GET',
 			$this->apiUrl,
 			$this->getClientRequestOptions( $request, 'query' )
 		);
@@ -196,7 +196,8 @@ public function getRequest( Request $request ) {
 	 * @return mixed Normally an array
 	 */
 	public function postRequest( Request $request ) {
-		$response = $this->getClient()->post(
+		$response = $this->getClient()->request(
+			'POST',
 			$this->apiUrl,
 			$this->getClientRequestOptions( $request, 'form_params' )
 		);

diff --git a/tests/unit/MediawikiApiTest.php b/tests/unit/MediawikiApiTest.php
@@ -50,11 +50,7 @@ public function testInvalidConstruction( $apiLocation ) {
 	}
 
 	private function getMockClient() {
-		$mock = $this->getMockBuilder( 'GuzzleHttp\Client' )
-			->disableOriginalConstructor()
-			->setMethods( array( 'get', 'post' ) )
-			->getMock();
-		return $mock;
+		return $this->getMock( 'GuzzleHttp\ClientInterface' );
 	}
 
 	private function getMockResponse( $responseValue ) {
@@ -80,7 +76,7 @@ private function getExpectedRequestOpts( $params, $wasPosted = false ) {
 	public function testGetRequestThrowsUsageExceptionOnError() {
 		$client = $this->getMockClient();
 		$client->expects( $this->once() )
-			->method( 'get' )
+			->method( 'request' )
 			->will( $this->returnValue(
 				$this->getMockResponse( array( 'error' => array(
 					'code' => 'imacode',
@@ -102,7 +98,7 @@ public function testGetRequestThrowsUsageExceptionOnError() {
 	public function testPostRequestThrowsUsageExceptionOnError() {
 		$client = $this->getMockClient();
 		$client->expects( $this->once() )
-			->method( 'post' )
+			->method( 'request' )
 			->will( $this->returnValue(
 				$this->getMockResponse( array( 'error' => array(
 					'code' => 'imacode',
@@ -127,8 +123,8 @@ public function testPostRequestThrowsUsageExceptionOnError() {
 	public function testGetActionReturnsResult( $expectedResult, $action, $params = array() ) {
 		$client = $this->getMockClient();
 		$client->expects( $this->once() )
-			->method( 'get' )
-			->with( null, $this->getExpectedRequestOpts( array_merge( array( 'action' => $action ), $params ) ) )
+			->method( 'request' )
+			->with( 'GET', null, $this->getExpectedRequestOpts( array_merge( array( 'action' => $action ), $params ) ) )
 			->will( $this->returnValue( $this->getMockResponse( $expectedResult ) ) );
 		$api = new MediawikiApi( '', $client );
 
@@ -143,8 +139,8 @@ public function testGetActionReturnsResult( $expectedResult, $action, $params =
 	public function testPostActionReturnsResult( $expectedResult, $action, $params = array() ) {
 		$client = $this->getMockClient();
 		$client->expects( $this->once() )
-			->method( 'post' )
-			->with( null, $this->getExpectedRequestOpts( array_merge( array( 'action' => $action ), $params ), true ))
+			->method( 'request' )
+			->with( 'POST', null, $this->getExpectedRequestOpts( array_merge( array( 'action' => $action ), $params ), true ))
 			->will( $this->returnValue( $this->getMockResponse( $expectedResult ) ) );
 		$api = new MediawikiApi( '', $client );
 
@@ -171,15 +167,15 @@ public function testGoodLoginSequence() {
 			'lgpassword' => 'P1',
 		);
 		$client->expects( $this->at( 0 ) )
-			->method( 'post' )
-			->with( null, $this->getExpectedRequestOpts( $eq1, true ) )
+			->method( 'request' )
+			->with( 'POST', null, $this->getExpectedRequestOpts( $eq1, true ) )
 			->will( $this->returnValue( $this->getMockResponse( array( 'login' => array(
 				'result' => 'NeedToken',
 				'token' => 'IamLoginTK',
 			) ) ) ) );
 		$client->expects( $this->at( 1 ) )
-			->method( 'post' )
-			->with( null, $this->getExpectedRequestOpts( array_merge( $eq1, array( 'lgtoken' => 'IamLoginTK' ) ), true ) )
+			->method( 'request' )
+			->with( 'POST', null, $this->getExpectedRequestOpts( array_merge( $eq1, array( 'lgtoken' => 'IamLoginTK' ) ), true ) )
 			->will( $this->returnValue( $this->getMockResponse( array( 'login' => array( 'result' => 'Success' ) ) ) ) );
 		$api = new MediawikiApi( '', $client );
 
@@ -196,15 +192,15 @@ public function testBadLoginSequence() {
 			'lgpassword' => 'P1',
 		);
 		$client->expects( $this->at( 0 ) )
-			->method( 'post' )
-			->with( null, $this->getExpectedRequestOpts( $eq1, true ) )
+			->method( 'request' )
+			->with( 'POST', null, $this->getExpectedRequestOpts( $eq1, true ) )
 			->will( $this->returnValue( $this->getMockResponse( array( 'login' => array(
 				'result' => 'NeedToken',
 				'token' => 'IamLoginTK',
 			) ) ) ) );
 		$client->expects( $this->at( 1 ) )
-			->method( 'post' )
-			->with( null, $this->getExpectedRequestOpts( array_merge( $eq1, array( 'lgtoken' => 'IamLoginTK' ) ), true ) )
+			->method( 'request' )
+			->with( 'POST', null, $this->getExpectedRequestOpts( array_merge( $eq1, array( 'lgtoken' => 'IamLoginTK' ) ), true ) )
 			->will( $this->returnValue( $this->getMockResponse( array( 'login' => array( 'result' => 'BADTOKENorsmthin' ) ) ) ) );
 		$api = new MediawikiApi( '', $client );
 
@@ -215,8 +211,8 @@ public function testBadLoginSequence() {
 	public function testLogout() {
 		$client = $this->getMockClient();
 		$client->expects( $this->at( 0 ) )
-			->method( 'post' )
-			->with( null, $this->getExpectedRequestOpts( array( 'action' => 'logout' ), true ) )
+			->method( 'request' )
+			->with( 'POST', null, $this->getExpectedRequestOpts( array( 'action' => 'logout' ), true ) )
 			->will( $this->returnValue( $this->getMockResponse( array( ) ) ) );
 		$api = new MediawikiApi( '', $client );
 
@@ -226,8 +222,8 @@ public function testLogout() {
 	public function testLogoutOnFailure() {
 		$client = $this->getMockClient();
 		$client->expects( $this->at( 0 ) )
-			->method( 'post' )
-			->with( null, $this->getExpectedRequestOpts( array( 'action' => 'logout' ), true ) )
+			->method( 'request' )
+			->with( 'POST', null, $this->getExpectedRequestOpts( array( 'action' => 'logout' ), true ) )
 			->will( $this->returnValue( $this->getMockResponse( null ) ) );
 		$api = new MediawikiApi( '', $client );
 
@@ -240,8 +236,8 @@ public function testLogoutOnFailure() {
 	public function testGetVersion( $apiValue, $expectedVersion ) {
 		$client = $this->getMockClient();
 		$client->expects( $this->exactly( 1 ) )
-			->method( 'get' )
-			->with( null, $this->getExpectedRequestOpts( array( 'action' => 'query', 'meta' => 'siteinfo', 'continue' => '' ) ) )
+			->method( 'request' )
+			->with( 'GET', null, $this->getExpectedRequestOpts( array( 'action' => 'query', 'meta' => 'siteinfo', 'continue' => '' ) ) )
 			->will( $this->returnValue( $this->getMockResponse( array(
 				'query' => array(
 					'general' => array(