Convert drupal_http_request usage in openid.module to Guzzle

#1: openid-guzzle-1866124-1.patch queued for re-testing.

+++ b/core/modules/openid/openid.moduleundefined
@@ -595,54 +597,43 @@ function _openid_xrds_discovery($claimed_id) {
+      $client = drupal_container()->get('http_default_client');
...
       // Replace the user-entered claimed_id if we received a redirect.
-      if (!empty($result->redirect_url)) {
-        $claimed_id = openid_normalize($result->redirect_url);
+      if ($location = $response->getLocation()) {
+        $claimed_id = openid_normalize($location);

$response->getLocation() returns the requested location. Only $response->getPreviousResponse()->getLocation() returns the redirection location.

+++ b/core/modules/openid/openid.moduleundefined
@@ -653,14 +644,16 @@ function _openid_xrds_discovery($claimed_id) {
+    } catch (BadResponseException $exception) {
+      // @todo: What to do with the exception here?
+    }

Without any knowledge of the process, we should ignore the notification and open a follow-up issue to evaluate the exception handling.

+++ b/core/modules/openid/openid.moduleundefined
@@ -967,6 +952,9 @@ function openid_verify_assertion($service, $response) {
+    } catch (BadResponseException $exception) {
+      // @todo: What to do with this exception?
+      $valid = FALSE;

See above.

+++ b/core/modules/openid/openid.moduleundefined
@@ -653,14 +645,16 @@ function _openid_xrds_discovery($claimed_id) {
+    } catch (RequestException $exception) {
+      return;

@@ -706,39 +700,37 @@ function openid_association($op_endpoint) {
+    } catch (RequestException $exception) {
       return FALSE;
     }

#576248: [policy] Coding Standards Update for PHP5

And, #1862538-10: Convert drupal_http_request usage in update.fetch.inc to Guzzle

besides the two following minors seems good

+++ b/core/modules/openid/openid.moduleundefined
@@ -5,6 +5,9 @@
+use Guzzle\Http\Exception\BadResponseException;

we are only catching RequestExceptions so this use is not needed

+++ b/core/modules/openid/openid.moduleundefined
@@ -967,6 +958,8 @@ function openid_verify_assertion($service, $response) {
+    } catch (RequestException $exception) {

missed this catch

if testbot disagrees it ll let us know:)
thanks!

+++ b/core/modules/openid/lib/Drupal/openid/Tests/OpenIDFunctionalTest.phpundefined
@@ -119,16 +119,14 @@ function testDiscovery() {
+    // Exactly 5 redirects (default value for the max redirects setting).
...
+    $this->addRedirectedIdentity($identity, 2, 'http://example.com/xrds', $expected_claimed_id, 4);
...
+    // Fails because there are more than 5 redirects.
...
+    $this->addRedirectedIdentity($identity, 2, 'http://example.com/xrds', $expected_claimed_id, 5);

This is perhaps the most confusing set of comment/test pairs I've ever seen, since it *looks* like the comments are +1 what the code is doing. However, this is a pre-existing issue, so I guess they must be zero-based?

However, overall, this is eliminating tons of detailed-ly commented code in favour of pretty standard stuff. Looks good here, thanks!

Committed and pushed to 8.x.