aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.lock12
-rw-r--r--vendor/bshaffer/oauth2-server-php/src/OAuth2/TokenType/Bearer.php2
-rw-r--r--vendor/bshaffer/oauth2-server-php/test/OAuth2/TokenType/BearerTest.php11
-rw-r--r--vendor/composer/installed.json14
-rw-r--r--vendor/composer/installed.php10
5 files changed, 30 insertions, 19 deletions
diff --git a/composer.lock b/composer.lock
index 162e70980..18b261e2f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -133,16 +133,16 @@
},
{
"name": "bshaffer/oauth2-server-php",
- "version": "v1.12.0",
+ "version": "v1.12.1",
"source": {
"type": "git",
"url": "https://github.com/bshaffer/oauth2-server-php.git",
- "reference": "60254fc7fbb08ce56164faae9e075068adf914ef"
+ "reference": "2bfaf9d7bbebe2ba1c1deb48e756ba0b3af4e985"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/bshaffer/oauth2-server-php/zipball/60254fc7fbb08ce56164faae9e075068adf914ef",
- "reference": "60254fc7fbb08ce56164faae9e075068adf914ef",
+ "url": "https://api.github.com/repos/bshaffer/oauth2-server-php/zipball/2bfaf9d7bbebe2ba1c1deb48e756ba0b3af4e985",
+ "reference": "2bfaf9d7bbebe2ba1c1deb48e756ba0b3af4e985",
"shasum": ""
},
"require": {
@@ -190,9 +190,9 @@
],
"support": {
"issues": "https://github.com/bshaffer/oauth2-server-php/issues",
- "source": "https://github.com/bshaffer/oauth2-server-php/tree/v1.12.0"
+ "source": "https://github.com/bshaffer/oauth2-server-php/tree/v1.12.1"
},
- "time": "2022-04-19T17:09:11+00:00"
+ "time": "2022-05-31T16:12:58+00:00"
},
{
"name": "commerceguys/intl",
diff --git a/vendor/bshaffer/oauth2-server-php/src/OAuth2/TokenType/Bearer.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/TokenType/Bearer.php
index 8ac8596ac..aa1094b1e 100644
--- a/vendor/bshaffer/oauth2-server-php/src/OAuth2/TokenType/Bearer.php
+++ b/vendor/bshaffer/oauth2-server-php/src/OAuth2/TokenType/Bearer.php
@@ -109,7 +109,7 @@ class Bearer implements TokenTypeInterface
}
$contentType = $request->server('CONTENT_TYPE');
- if (false !== $pos = strpos($contentType, ';')) {
+ if (false !== $pos = strpos((string) $contentType, ';')) {
$contentType = substr($contentType, 0, $pos);
}
diff --git a/vendor/bshaffer/oauth2-server-php/test/OAuth2/TokenType/BearerTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/TokenType/BearerTest.php
index 71cca3bd9..021fc7f5a 100644
--- a/vendor/bshaffer/oauth2-server-php/test/OAuth2/TokenType/BearerTest.php
+++ b/vendor/bshaffer/oauth2-server-php/test/OAuth2/TokenType/BearerTest.php
@@ -35,6 +35,17 @@ class BearerTest extends TestCase
$this->assertEquals($response->getParameter('error_description'), 'The content type for POST requests must be "application/x-www-form-urlencoded"');
}
+ public function testMissingContentTypeExpectsToBeCorrectContent()
+ {
+ $bearer = new Bearer();
+ $request = TestRequest::createPost(array(
+ 'access_token' => 'ThisIsMyAccessToken'
+ ));
+
+ $param = $bearer->getAccessTokenParameter($request, $response = new Response());
+ $this->assertEquals($param, 'ThisIsMyAccessToken');
+ }
+
public function testValidRequestUsingAuthorizationHeader()
{
$bearer = new Bearer();
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 726c3e996..7fee15c32 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -133,17 +133,17 @@
},
{
"name": "bshaffer/oauth2-server-php",
- "version": "v1.12.0",
- "version_normalized": "1.12.0.0",
+ "version": "v1.12.1",
+ "version_normalized": "1.12.1.0",
"source": {
"type": "git",
"url": "https://github.com/bshaffer/oauth2-server-php.git",
- "reference": "60254fc7fbb08ce56164faae9e075068adf914ef"
+ "reference": "2bfaf9d7bbebe2ba1c1deb48e756ba0b3af4e985"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/bshaffer/oauth2-server-php/zipball/60254fc7fbb08ce56164faae9e075068adf914ef",
- "reference": "60254fc7fbb08ce56164faae9e075068adf914ef",
+ "url": "https://api.github.com/repos/bshaffer/oauth2-server-php/zipball/2bfaf9d7bbebe2ba1c1deb48e756ba0b3af4e985",
+ "reference": "2bfaf9d7bbebe2ba1c1deb48e756ba0b3af4e985",
"shasum": ""
},
"require": {
@@ -165,7 +165,7 @@
"predis/predis": "Required to use Redis storage",
"thobbs/phpcassa": "Required to use Cassandra storage"
},
- "time": "2022-04-19T17:09:11+00:00",
+ "time": "2022-05-31T16:12:58+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -193,7 +193,7 @@
],
"support": {
"issues": "https://github.com/bshaffer/oauth2-server-php/issues",
- "source": "https://github.com/bshaffer/oauth2-server-php/tree/v1.12.0"
+ "source": "https://github.com/bshaffer/oauth2-server-php/tree/v1.12.1"
},
"install-path": "../bshaffer/oauth2-server-php"
},
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
index b3a922588..9778f18d2 100644
--- a/vendor/composer/installed.php
+++ b/vendor/composer/installed.php
@@ -3,7 +3,7 @@
'name' => 'zotlabs/hubzilla',
'pretty_version' => 'dev-master',
'version' => 'dev-master',
- 'reference' => '54f4762e1ac1512c2c1106cf68833f8a7135420f',
+ 'reference' => 'bec76bd0577c5b131adffd8665afc73a4602bd03',
'type' => 'application',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
@@ -29,9 +29,9 @@
'dev_requirement' => false,
),
'bshaffer/oauth2-server-php' => array(
- 'pretty_version' => 'v1.12.0',
- 'version' => '1.12.0.0',
- 'reference' => '60254fc7fbb08ce56164faae9e075068adf914ef',
+ 'pretty_version' => 'v1.12.1',
+ 'version' => '1.12.1.0',
+ 'reference' => '2bfaf9d7bbebe2ba1c1deb48e756ba0b3af4e985',
'type' => 'library',
'install_path' => __DIR__ . '/../bshaffer/oauth2-server-php',
'aliases' => array(),
@@ -268,7 +268,7 @@
'zotlabs/hubzilla' => array(
'pretty_version' => 'dev-master',
'version' => 'dev-master',
- 'reference' => '54f4762e1ac1512c2c1106cf68833f8a7135420f',
+ 'reference' => 'bec76bd0577c5b131adffd8665afc73a4602bd03',
'type' => 'application',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),