Merge branch '3.2RC'3.2

3 files changed, 9 insertions, 2 deletions

diff --git a/vendor/bshaffer/oauth2-server-php/test/lib/OAuth2/Request/TestRequest.php b/vendor/bshaffer/oauth2-server-php/test/lib/OAuth2/Request/TestRequest.php
index 7bbce28a4..a916ff2a3 100644
--- a/vendor/bshaffer/oauth2-server-php/test/lib/OAuth2/Request/TestRequest.php
+++ b/vendor/bshaffer/oauth2-server-php/test/lib/OAuth2/Request/TestRequest.php
@@ -45,9 +45,14 @@ class TestRequest extends Request implements RequestInterface
         $this->query = $query;
     }
 
+    public function setMethod($method)
+    {
+        $this->server['REQUEST_METHOD'] = $method;
+    }
+
     public function setPost(array $params)
     {
-        $this->server['REQUEST_METHOD'] = 'POST';
+        $this->setMethod('POST');
         $this->request = $params;
     }
 
diff --git a/vendor/bshaffer/oauth2-server-php/test/lib/OAuth2/Storage/BaseTest.php b/vendor/bshaffer/oauth2-server-php/test/lib/OAuth2/Storage/BaseTest.php
index f0b1274a2..e841d3ad2 100755..100644
--- a/vendor/bshaffer/oauth2-server-php/test/lib/OAuth2/Storage/BaseTest.php
+++ b/vendor/bshaffer/oauth2-server-php/test/lib/OAuth2/Storage/BaseTest.php
@@ -2,7 +2,9 @@
 
 namespace OAuth2\Storage;
 
-abstract class BaseTest extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+abstract class BaseTest extends TestCase
 {
     public function provideStorage()
     {
diff --git a/vendor/bshaffer/oauth2-server-php/test/lib/OAuth2/Storage/Bootstrap.php b/vendor/bshaffer/oauth2-server-php/test/lib/OAuth2/Storage/Bootstrap.php
index 3d7bdd4e9..3d7bdd4e9 100755..100644
--- a/vendor/bshaffer/oauth2-server-php/test/lib/OAuth2/Storage/Bootstrap.php
+++ b/vendor/bshaffer/oauth2-server-php/test/lib/OAuth2/Storage/Bootstrap.php