- revert changes

Author: dnahrebecki

Tests/Storage/OAuthStorageTest.php

@@ -88,7 +88,7 @@ public function testCheckClientCredentialsThrowsIfInvalidClientClass()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->expectException('InvalidArgumentException');
+        $this->setExpectedException('InvalidArgumentException');
         $this->storage->checkClientCredentials($client, 'dummy');
     }
 
@@ -138,7 +138,7 @@ public function testCreateAccessTokenThrowsOnInvalidClientClass()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->expectException('InvalidArgumentException');
+        $this->setExpectedException('InvalidArgumentException');
         $this->storage->createAccessToken('foo', $client, new User(42), 1, 'foo bar');
     }
 
@@ -221,7 +221,7 @@ public function testCreateRefreshTokenThrowsOnInvalidClientClass()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->expectException('InvalidArgumentException');
+        $this->setExpectedException('InvalidArgumentException');
         $this->storage->createRefreshToken('foo', $client, 42, 1, 'foo bar');
     }
 
@@ -282,7 +282,7 @@ public function testCheckRestrictedGrantTypeThrowsOnInvalidClientClass()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->expectException('InvalidArgumentException');
+        $this->setExpectedException('InvalidArgumentException');
 
         $this->storage->checkRestrictedGrantType($client, 'foo');
     }
@@ -303,7 +303,7 @@ public function testCheckUserCredentialsThrowsOnInvalidClientClass()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->expectException('InvalidArgumentException');
+        $this->setExpectedException('InvalidArgumentException');
 
         $this->storage->checkUserCredentials($client, 'Joe', 'baz');
     }
@@ -401,7 +401,7 @@ public function testCreateAuthCodeThrowsOnInvalidClientClass()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->expectException('InvalidArgumentException');
+        $this->setExpectedException('InvalidArgumentException');
         $this->storage->createAuthCode('foo', $client, 42, 'http://www.example.com/', 1, 'foo bar');
     }