phpunit update

test/Github/Tests/Api/AbstractApiTest.php

@@ -4,6 +4,7 @@
 
 use Github\Api\AbstractApi;
 use GuzzleHttp\Psr7\Response;
+use ReflectionMethod;
 
 class AbstractApiTest extends \PHPUnit_Framework_TestCase
 {
@@ -29,7 +30,9 @@ public function shouldPassGETRequestToClient()
 
         $api = $this->getAbstractApiObject($client);
 
-        $this->assertEquals($expectedArray, $api->get('/path', array('param1' => 'param1value'), array('header1' => 'header1value')));
+        $method = $this->getMethodReflection($api, 'get');
+
+        $this->assertEquals($expectedArray, $method->invokeArgs($api, ['/path', ['param1' => 'param1value'], ['header1' => 'header1value']]));
     }
 
     /**
@@ -54,8 +57,9 @@ public function shouldPassPOSTRequestToClient()
             ->willReturn($httpClient);
 
         $api = $this->getAbstractApiObject($client);
+        $method = $this->getMethodReflection($api, 'post');
 
-        $this->assertEquals($expectedArray, $api->post('/path', array('param1' => 'param1value'), array('option1' => 'option1value')));
+        $this->assertEquals($expectedArray, $method->invokeArgs($api, ['/path', array('param1' => 'param1value'), array('option1' => 'option1value')]));
     }
 
     /**
@@ -80,8 +84,9 @@ public function shouldPassPATCHRequestToClient()
             ->willReturn($httpClient);
 
         $api = $this->getAbstractApiObject($client);
+        $method = $this->getMethodReflection($api, 'patch');
 
-        $this->assertEquals($expectedArray, $api->patch('/path', array('param1' => 'param1value'), array('option1' => 'option1value')));
+        $this->assertEquals($expectedArray, $method->invokeArgs($api, ['/path', array('param1' => 'param1value'), array('option1' => 'option1value')]));
     }
 
     /**
@@ -106,8 +111,9 @@ public function shouldPassPUTRequestToClient()
             ->willReturn($httpClient);
 
         $api = $this->getAbstractApiObject($client);
+        $method = $this->getMethodReflection($api, 'put');
 
-        $this->assertEquals($expectedArray, $api->put('/path', array('param1' => 'param1value'), array('option1' => 'option1value')));
+        $this->assertEquals($expectedArray, $method->invokeArgs($api, ['/path', array('param1' => 'param1value'), array('option1' => 'option1value')]));
     }
 
     /**
@@ -133,8 +139,9 @@ public function shouldPassDELETERequestToClient()
 
 
         $api = $this->getAbstractApiObject($client);
+        $method = $this->getMethodReflection($api, 'delete');
 
-        $this->assertEquals($expectedArray, $api->delete('/path', array('param1' => 'param1value'), array('option1' => 'option1value')));
+        $this->assertEquals($expectedArray, $method->invokeArgs($api, ['/path', array('param1' => 'param1value'), array('option1' => 'option1value')]));
     }
 
     /**
@@ -159,12 +166,34 @@ public function shouldNotPassEmptyRefToClient()
             ->willReturn($httpClient);
 
         $api = $this->getAbstractApiObject($client);
-        $api->get('/path', array('ref' => null));
+        $method = $this->getMethodReflection($api, 'get');
+
+        $this->assertInternalType('array', $method->invokeArgs($api, ['/path', array('ref' => null)]));
     }
 
+    /**
+     * @param $client
+     * @return AbstractApi
+     */
     protected function getAbstractApiObject($client)
     {
-        return new AbstractApiTestInstance($client);
+        return $this->getMockBuilder(AbstractApi::class)
+            ->setMethods(null)
+            ->setConstructorArgs([$client])
+            ->getMock();
+    }
+
+    /**
+     * @param $api
+     * @param $methodName
+     * @return ReflectionMethod
+     */
+    protected function getMethodReflection($api, $methodName)
+    {
+        $method = new ReflectionMethod($api, $methodName);
+        $method->setAccessible(true);
+
+        return $method;
     }
 
     /**
@@ -223,68 +252,3 @@ private function getPSR7Response($expectedArray)
         );
     }
 }
-
-class AbstractApiTestInstance extends AbstractApi
-{
-    /**
-     * {@inheritDoc}
-     */
-    public function get($path, array $parameters = array(), array $requestHeaders = array())
-    {
-        return parent::get($path, $parameters, $requestHeaders);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function post($path, array $parameters = array(), array $requestHeaders = array())
-    {
-        return parent::post($path, $parameters, $requestHeaders);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function postRaw($path, $body, array $requestHeaders = array())
-    {
-        return parent::postRaw($path, $body, $requestHeaders);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function patch($path, array $parameters = array(), array $requestHeaders = array())
-    {
-        return parent::patch($path, $parameters, $requestHeaders);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function put($path, array $parameters = array(), array $requestHeaders = array())
-    {
-        return parent::put($path, $parameters, $requestHeaders);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function delete($path, array $parameters = array(), array $requestHeaders = array())
-    {
-        return parent::delete($path, $parameters, $requestHeaders);
-    }
-}
-
-/**
- * @deprecated
- */
-class ExposedAbstractApiTestInstance extends AbstractApi
-{
-    /**
-     * {@inheritDoc}
-     */
-    public function get($path, array $parameters = array(), array $requestHeaders = array())
-    {
-        return parent::get($path, $parameters, $requestHeaders);
-    }
-}

test/Github/Tests/Api/TestCase.php

@@ -6,9 +6,12 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase
 {
     abstract protected function getApiClass();
 
+    /**
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
     protected function getApiMock()
     {
-        $httpClient = $this->getMockBuilder('Http\Client\HttpClient')
+        $httpClient = $this->getMockBuilder(\Http\Client\HttpClient::class)
             ->setMethods(array('sendRequest'))
             ->getMock();
         $httpClient

test/Github/Tests/ResultPagerTest.php

@@ -101,7 +101,8 @@ public function testFetch()
         $result = 'foo';
         $method = 'bar';
         $parameters = array('baz');
-        $api = $this->createMock('Github\Api\ApiInterface');
+        $api = $this->getMockBuilder('Github\Api\ApiInterface')
+            ->getMock();
 
         $paginator = $this->getMockBuilder('Github\ResultPager')
             ->disableOriginalConstructor()