Fix phpunit deprecation warnings after update of dependencies

Update .gitignore, clean .travis.yml

Author: stloyd

.gitignore

@@ -1,2 +1,3 @@
 vendor/
 composer.lock
+phpunit.xml

.gitmodules

@@ -1,11 +1,5 @@
 language: php
 
-php:
-  - 7.0
-  - 5.6
-  - 5.3
-  - hhvm
-
 sudo: false
 
 cache:
@@ -15,8 +9,14 @@ cache:
 matrix:
   fast_finish: true
   include:
+    - php: hhvm-stable
+      sudo: required
+      dist: trusty
+      group: edge
     - php: 5.3
       env: COMPOSER_FLAGS="--prefer-lowest"
+    - php: 5.4
+    - php: 5.5
     - php: 5.6
       env: SYMFONY_VERSION=2.3.*
     - php: 5.6
@@ -27,12 +27,10 @@ matrix:
       env: SYMFONY_VERSION=3.0.*
     - php: 7.0
       env: SYMFONY_VERSION=3.1.*
-  allow_failures:
-    - php: hhvm
+    - php: 7.1
 
 before_install:
-  - if [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then phpenv config-rm xdebug.ini; fi;
-  - if [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then echo "memory_limit=2G" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi;
+  - if [[ "$TRAVIS_PHP_VERSION" != "hhvm-stable" ]]; then phpenv config-rm xdebug.ini || echo "xdebug not available"; fi;
 
 before_script:
   - composer self-update

.travis.yml

@@ -38,9 +38,6 @@
         }
     },
 
-    "minimum-stability": "dev",
-    "prefer-stable": true,
-
     "extra": {
         "branch-alias": {
             "dev-master": "1.2.x-dev"

composer.json

@@ -11,20 +11,12 @@
  */
 class OAuth2ImplicitGrantTypeTest extends PHPUnit_Framework_TestCase
 {
-    /**
-     * The actual token ID is irrelevant, so choose one:
-     * @var string
-     */
-    private $tokenId = 'my_token';
-
     /**
      * Tests OAuth2->grantAccessToken() with implicit
      *
      */
     public function testGrantAccessTokenWithGrantImplicit()
     {
-        //$this->fixture->grantAccessToken(/* parameters */);
-
         $stub = new OAuth2ImplicitStub();
         $stub->addClient(new OAuth2Client('blah', 'foo', array('http://www.example.com/')));
         $oauth2 = new OAuth2($stub);
@@ -56,7 +48,7 @@ public function testRejectedAccessTokenWithGrantImplicit()
         $data = new \stdClass();
 
         try {
-            $response = $oauth2->finishClientAuthorization(false, $data, new Request(array(
+            $oauth2->finishClientAuthorization(false, $data, new Request(array(
                     'client_id' => 'blah',
                     'redirect_uri' => 'http://www.example.com/?foo=bar',
                     'state' => '42',

tests/OAuth2ImplicitGrantTypeTest.php

@@ -6,7 +6,7 @@
 use Symfony\Component\HttpFoundation\Request;
 
 /**
- * OAuth2 test cases that invovle capturing output.
+ * OAuth2 test cases that involve capturing output.
  */
 class OAuth2OutputTest extends PHPUnit_Framework_TestCase
 {
@@ -35,7 +35,7 @@ public function testGrantAccessTokenWithGrantAuthCodeSuccess()
         $response = $this->fixture->grantAccessToken($request);
 
         // Successful token grant will return a JSON encoded token:
-        $this->assertRegexp('/{"access_token":".*","expires_in":\d+,"token_type":"bearer"/', $response->getContent());
+        $this->assertRegExp('/{"access_token":".*","expires_in":\d+,"token_type":"bearer"/', $response->getContent());
     }
 
     /**
@@ -58,7 +58,7 @@ public function testGrantAccessTokenWithGrantAuthCodeSuccessWithoutRedirect()
         $response = $this->fixture->grantAccessToken($request);
 
         // Successful token grant will return a JSON encoded token:
-        $this->assertRegexp('/{"access_token":".*","expires_in":\d+,"token_type":"bearer"/', $response->getContent());
+        $this->assertRegExp('/{"access_token":".*","expires_in":\d+,"token_type":"bearer"/', $response->getContent());
     }
 
 // Utility methods
@@ -71,7 +71,7 @@ protected function createBaseMock($interfaceName)
     {
         $client = new OAuth2Client('my_little_app');
 
-        $mockStorage = $this->getMock($interfaceName);
+        $mockStorage = $this->getMockBuilder($interfaceName)->getMock();
         $mockStorage->expects($this->any())
             ->method('getClient')
             ->will($this->returnCallback(function ($id) use ($client) {
@@ -88,5 +88,4 @@ protected function createBaseMock($interfaceName)
 
          return $mockStorage;
     }
-
 }