From 7994746dabe1ecfe15cc89c1fa14b7848113dc90 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

(cherry picked from commit 539c3f1a672330d460a8cffa63adc63902ae4da4)
---
 .../vendor/hybridauth/hybridauth/src/Provider/AOLOpenID.php   | 4 ++--
 .../vendor/hybridauth/hybridauth/src/Provider/OpenID.php      | 4 ++--
 .../hybridauth/hybridauth/src/Provider/PaypalOpenID.php       | 4 ++--
 .../hybridauth/src/Provider/StackExchangeOpenID.php           | 4 ++--
 .../vendor/hybridauth/hybridauth/src/Provider/Steam.php       | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/e107_handlers/vendor/hybridauth/hybridauth/src/Provider/AOLOpenID.php b/e107_handlers/vendor/hybridauth/hybridauth/src/Provider/AOLOpenID.php
index 2af1785ea..7391c8cf1 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 d58a30d49..60ffb609f 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.
@@ -39,6 +39,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 9c455f82e..a964ea863 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 4e8d5763e..fa63b4f19 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 1288f0a74..d041adb18 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;
@@ -32,7 +32,7 @@ use Hybridauth\User;
  *       echo $e->getMessage() ;
  *   }
  */
-class Steam extends OpenID
+class Steam extends OpenIDAdapter
 {
     /**
      * {@inheritdoc}