Merge pull request #92 from stloyd/patch-2

Adjust composer.json file to allow usage of PHP 7

Author: GuilhemN

.gitignore

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

.gitmodules

@@ -15,19 +15,29 @@
             "homepage": "https://github.com/FriendsOfSymfony/oauth2-php/contributors"
         }
     ],
+
     "require": {
         "php": "^5.5.9|>=7.0.8",
         "symfony/http-foundation": "~3.0|~4.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.0"
+        "phpunit/phpunit": "^4.8 || ^5.0"
     },
+
     "autoload": {
-        "psr-4": { "OAuth2\\": "lib/" }
+        "psr-4": {
+            "OAuth2\\": "lib/"
+        },
+        "exclude-from-classmap": [
+            "/tests/"
+        ]
     },
     "autoload-dev": {
-        "psr-4": { "OAuth2\\Tests\\": "tests/" }
+        "psr-4": {
+            "OAuth2\\Tests\\": "tests/"
+        }
     },
+
     "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;
     }
-
 }