mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-05 06:07:32 +02:00
Code Issues Releases Wiki Activity

PHP bug 66773 workaround in Hybridauth

Browse Source 
In PHP 7.0.12 and earlier, a class could not be loaded with the same
name as another class in a different namespace.  This commit patches the
Hybridauth dependency to avoid PHP bug 66773.  Unfortunately, the fix
will be rolled back any time Hybridauth is updated or overwritten.

PHP bug link: https://bugs.php.net/bug.php?id=66773
This commit is contained in:
Nick Liu
2020-02-17 14:49:57 +01:00
parent 91bfc1df23
commit 5edcee8ad0
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
e107_handlers/vendor/hybridauth/hybridauth/src/Provider/AOLOpenID.php vendored
View File

@@ -7,12 +7,12 @@
namespace Hybridauth\Provider;
use Hybridauth\Adapter\OpenID;
use Hybridauth\Adapter\OpenID as OpenIDAdapter;
/**
* AOL OpenID provider adapter.
*/
class AOLOpenID extends OpenID
class AOLOpenID extends OpenIDAdapter
{
/**
* {@inheritdoc}

8
e107_handlers/vendor/hybridauth/hybridauth/src/Provider/OpenID.php vendored
View File

@@ -7,7 +7,7 @@
namespace Hybridauth\Provider;
use Hybridauth\Adapter;
use Hybridauth\Adapter\OpenID as OpenIDAdapter;
/**
* Generic OpenID providers adapter.
@@ -18,12 +18,12 @@ use Hybridauth\Adapter;
* 'callback' => Hybridauth\HttpClient\Util::getCurrentUrl(),
*
* // authenticate with Yahoo openid
* 'openid_identifier' => 'https://open.login.yahooapis.com/openid20/www.yahoo.com/xrds'
* 'openid_identifier' => 'https://open.login.yahooapis.com/openid20/www.yahoo.com/xrds'
*
* // authenticate with stackexchange network openid
* // 'openid_identifier' => 'https://openid.stackexchange.com/',
*
* // authenticate with Steam openid
* // authenticate with Steam openid
* // 'openid_identifier' => 'http://steamcommunity.com/openid',
*
* // etc.
@@ -40,6 +40,6 @@ use Hybridauth\Adapter;
* echo $e->getMessage() ;
* }
*/
class OpenID extends Adapter\OpenID
class OpenID extends OpenIDAdapter
{
}

4
e107_handlers/vendor/hybridauth/hybridauth/src/Provider/PaypalOpenID.php vendored
View File

@@ -7,13 +7,13 @@
namespace Hybridauth\Provider;
use Hybridauth\Adapter\OpenID;
use Hybridauth\Adapter\OpenID as OpenIDAdapter;
use Hybridauth\HttpClient;
/**
* PayPal OpenID provider adapter.
*/
class PaypalOpenID extends OpenID
class PaypalOpenID extends OpenIDAdapter
{
/**
* {@inheritdoc}

4
e107_handlers/vendor/hybridauth/hybridauth/src/Provider/StackExchangeOpenID.php vendored
View File

@@ -7,12 +7,12 @@
namespace Hybridauth\Provider;
use Hybridauth\Adapter\OpenID;
use Hybridauth\Adapter\OpenID as OpenIDAdapter;
/**
* StackExchange OpenID provider adapter.
*/
class StackExchangeOpenID extends OpenID
class StackExchangeOpenID extends OpenIDAdapter
{
/**
* {@inheritdoc}

4
e107_handlers/vendor/hybridauth/hybridauth/src/Provider/Steam.php vendored
View File

@@ -7,7 +7,7 @@
namespace Hybridauth\Provider;
use Hybridauth\Adapter\OpenID;
use Hybridauth\Adapter\OpenID as OpenIDAdapter;
use Hybridauth\Exception\UnexpectedApiResponseException;
use Hybridauth\Data;
use Hybridauth\User;
@@ -28,7 +28,7 @@ use Hybridauth\User;
* $userProfile = $adapter->getUserProfile();
*/
class Steam extends OpenID
class Steam extends OpenIDAdapter
{
/**
* {@inheritdoc}

4
e107_handlers/vendor/hybridauth/hybridauth/src/Provider/YahooOpenID.php vendored
View File

@@ -7,12 +7,12 @@
namespace Hybridauth\Provider;
use Hybridauth\Adapter\OpenID;
use Hybridauth\Adapter\OpenID as OpenIDAdapter;
/**
* Yahoo OpenID provider adapter.
*/
class YahooOpenID extends OpenID
class YahooOpenID extends OpenIDAdapter
{
/**
* {@inheritdoc}