-
Notifications
You must be signed in to change notification settings - Fork 116
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix PHP 8+ compat issues #126
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,14 +8,22 @@ | |
*/ | ||
class RequestHandler | ||
{ | ||
|
||
/** @var \Eher\OAuth\Consumer */ | ||
private $consumer; | ||
/** @var \Eher\OAuth\Token */ | ||
private $token; | ||
/** @var \Eher\OAuth\HmacSha1 */ | ||
private $signatureMethod; | ||
|
||
/** @var string */ | ||
private $baseUrl; | ||
|
||
/** @var string */ | ||
private $version; | ||
|
||
/** @var \GuzzleHttp\Client */ | ||
public $client; | ||
|
||
/** | ||
* Instantiate a new RequestHandler | ||
*/ | ||
|
@@ -34,7 +42,8 @@ public function __construct() | |
* Set the consumer for this request handler | ||
* | ||
* @param string $key the consumer key | ||
* @param string $secret the consumer secret | ||
* @param string|null $secret the consumer secret | ||
* @return void | ||
*/ | ||
public function setConsumer($key, $secret) | ||
{ | ||
|
@@ -46,6 +55,7 @@ public function setConsumer($key, $secret) | |
* | ||
* @param string $token the oauth token | ||
* @param string $secret the oauth secret | ||
* @return void | ||
*/ | ||
public function setToken($token, $secret) | ||
{ | ||
|
@@ -56,6 +66,7 @@ public function setToken($token, $secret) | |
* Set the base url for this request handler. | ||
* | ||
* @param string $url The base url (e.g. https://api.tumblr.com) | ||
* @return void | ||
*/ | ||
public function setBaseUrl($url) | ||
{ | ||
|
@@ -72,7 +83,7 @@ public function setBaseUrl($url) | |
* | ||
* @param string $method one of GET, POST | ||
* @param string $path the path to hit | ||
* @param array $options the array of params | ||
* @param array|null $options the array of params | ||
* | ||
* @return \stdClass response object | ||
*/ | ||
|
@@ -96,7 +107,7 @@ public function request($method, $path, $options) | |
); | ||
$oauth->sign_request($this->signatureMethod, $this->consumer, $this->token); | ||
$authHeader = $oauth->to_header(); | ||
$pieces = explode(' ', $authHeader, 2); | ||
$pieces = explode(' ', $authHeader, 2) + [1 => '']; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The only code change here: to guard against |
||
$authString = $pieces[1]; | ||
|
||
|
||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These properties were effectively
public
before, so to avoid BC breaks we have to keep them public as well.