Skip to content

Fix bug for php 7 #81

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.

Sign up for GitHub

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix bug for php 7 #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce1a654
Fix bug for php 7
free6k Apr 21, 2016
f28d38c
fix for 7.2
free6k Jun 27, 2018
88fbb56
Update Service.php
free6k Sep 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/EAuth.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
namespace nodge\eauth;

use Yii;
use yii\base\Object;
use yii\base\BaseObject;
use yii\helpers\ArrayHelper;
use yii\helpers\Url;

Expand All @@ -19,7 +19,7 @@
*
* @package application.extensions.eauth
*/
class EAuth extends Object
class EAuth extends BaseObject
{

/**
Expand Down
4 changes: 2 additions & 2 deletions src/ServiceBase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
namespace nodge\eauth;

use Yii;
use yii\base\Object;
use yii\base\BaseObject;
use yii\helpers\Url;
use yii\helpers\ArrayHelper;
use OAuth\Common\Http\Uri\Uri;
Expand All @@ -21,7 +21,7 @@
*
* @package application.extensions.eauth
*/
abstract class ServiceBase extends Object implements IAuthService
abstract class ServiceBase extends BaseObject implements IAuthService
{

/**
Expand Down
2 changes: 1 addition & 1 deletion src/oauth/HttpClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ protected function curl()
curl_setopt($ch, CURLOPT_TIMEOUT, $this->timeout);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
curl_setopt($ch, CURLOPT_HEADER, false);
curl_setopt($ch, CURLOPT_HTTPHEADER, $this->extraHeaders);
curl_setopt($ch, CURLOPT_HTTPHEADER, array_values($this->extraHeaders));

if ($this->forceSSL3) {
curl_setopt($ch, CURLOPT_SSLVERSION, 3);
Expand Down
4 changes: 2 additions & 2 deletions src/oauth2/Service.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ protected function getCallbackUrl()
array_unshift($route, '');

// Can not use these params in OAuth2 callbacks
foreach (['code', 'state', 'redirect_uri'] as $param) {
foreach (['code', 'state', 'redirect_uri', 'scope'] as $param) {
if (isset($route[$param])) {
unset($route[$param]);
}
Expand Down Expand Up @@ -324,4 +324,4 @@ public function getScopeSeparator()
{
return $this->scopeSeparator;
}
}
}