From 5edcee8ad0074d53740d36b168a38da22867d76a Mon Sep 17 00:00:00 2001
From: Nick Liu <deltik@gmx.com>
Date: Mon, 17 Feb 2020 14:49:57 +0100
Subject: [PATCH] PHP bug 66773 workaround in Hybridauth

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
---
 .../hybridauth/hybridauth/src/Provider/AOLOpenID.php      | 4 ++--
 .../vendor/hybridauth/hybridauth/src/Provider/OpenID.php  | 8 ++++----
 .../hybridauth/hybridauth/src/Provider/PaypalOpenID.php   | 4 ++--
 .../hybridauth/src/Provider/StackExchangeOpenID.php       | 4 ++--
 .../vendor/hybridauth/hybridauth/src/Provider/Steam.php   | 4 ++--
 .../hybridauth/hybridauth/src/Provider/YahooOpenID.php    | 4 ++--
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/e107_handlers/vendor/hybridauth/hybridauth/src/Provider/AOLOpenID.php b/e107_handlers/vendor/hybridauth/hybridauth/src/Provider/AOLOpenID.php
index e7ee0bfbe..bbf931cfc 100644
--- a/e107_handlers/vendor/hybridauth/hybridauth/src/Provider/AOLOpenID.php
+++ b/e107_handlers/vendor/hybridauth/hybridauth/src/Provider/AOLOpenID.php
@@ -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}
diff --git a/e107_handlers/vendor/hybridauth/hybridauth/src/Provider/OpenID.php b/e107_handlers/vendor/hybridauth/hybridauth/src/Provider/OpenID.php
index aeb556c8d..aef704ace 100644
--- a/e107_handlers/vendor/hybridauth/hybridauth/src/Provider/OpenID.php
+++ b/e107_handlers/vendor/hybridauth/hybridauth/src/Provider/OpenID.php
@@ -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
 {
 }
diff --git a/e107_handlers/vendor/hybridauth/hybridauth/src/Provider/PaypalOpenID.php b/e107_handlers/vendor/hybridauth/hybridauth/src/Provider/PaypalOpenID.php
index 9e6b7a1a7..fc7720335 100644
--- a/e107_handlers/vendor/hybridauth/hybridauth/src/Provider/PaypalOpenID.php
+++ b/e107_handlers/vendor/hybridauth/hybridauth/src/Provider/PaypalOpenID.php
@@ -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}
diff --git a/e107_handlers/vendor/hybridauth/hybridauth/src/Provider/StackExchangeOpenID.php b/e107_handlers/vendor/hybridauth/hybridauth/src/Provider/StackExchangeOpenID.php
index befb32dfa..9c40f7772 100644
--- a/e107_handlers/vendor/hybridauth/hybridauth/src/Provider/StackExchangeOpenID.php
+++ b/e107_handlers/vendor/hybridauth/hybridauth/src/Provider/StackExchangeOpenID.php
@@ -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}
diff --git a/e107_handlers/vendor/hybridauth/hybridauth/src/Provider/Steam.php b/e107_handlers/vendor/hybridauth/hybridauth/src/Provider/Steam.php
index 04f5678ad..69b3793df 100644
--- a/e107_handlers/vendor/hybridauth/hybridauth/src/Provider/Steam.php
+++ b/e107_handlers/vendor/hybridauth/hybridauth/src/Provider/Steam.php
@@ -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}
diff --git a/e107_handlers/vendor/hybridauth/hybridauth/src/Provider/YahooOpenID.php b/e107_handlers/vendor/hybridauth/hybridauth/src/Provider/YahooOpenID.php
index 4b36f7dc2..dfda4983e 100644
--- a/e107_handlers/vendor/hybridauth/hybridauth/src/Provider/YahooOpenID.php
+++ b/e107_handlers/vendor/hybridauth/hybridauth/src/Provider/YahooOpenID.php
@@ -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}