Merge pull request #4 from whikloj/issue-363

Pass url into curlinfo hook for effective url

Author: specialtactics

src/VCR/LibraryHooks/CurlHook.php

@@ -281,6 +281,7 @@ public static function curlGetinfo(CurlHandle $curlHandle, int $option = 0)
         if (isset(self::$responses[(int) $curlHandle])) {
             return CurlHelper::getCurlOptionFromResponse(
                 self::$responses[(int) $curlHandle],
+                self::$requests[(int) $curlHandle]->getUrl(),
                 $option
             );
         } elseif (isset(self::$lastErrors[(int) $curlHandle])) {

src/VCR/Util/CurlHelper.php

@@ -88,13 +88,15 @@ public static function handleOutput(Response $response, array $curlOptions, Curl
     }
 
     /**
-     * @param int $option cURL option to get
+     * @param Response    $response response to get cURL option from
+     * @param string|null $url      the URL this response is for
+     * @param int         $option   cURL option to get
      *
      * @throws \BadMethodCallException
      *
      * @return mixed value of the cURL option
      */
-    public static function getCurlOptionFromResponse(Response $response, int $option = 0)
+    public static function getCurlOptionFromResponse(Response $response, ?string $url, int $option = 0)
     {
         switch ($option) {
             case 0: // 0 == array of all curl options
@@ -116,6 +118,9 @@ public static function getCurlOptionFromResponse(Response $response, int $option
             case \CURLINFO_APPCONNECT_TIME:
                 $info = '';
                 break;
+          case \CURLINFO_EFFECTIVE_URL:
+                $info = $url;
+                break;
             default:
                 $info = $response->getCurlInfo(self::$curlInfoList[$option]);
                 break;

tests/Unit/Util/CurlHelperTest.php

@@ -407,7 +407,7 @@ public function testGetCurlOptionFromResponse(Response $response, $curlOption, $
     {
         $this->assertEquals(
             $expectedCurlOptionValue,
-            CurlHelper::getCurlOptionFromResponse($response, $curlOption)
+            CurlHelper::getCurlOptionFromResponse($response, '', $curlOption)
         );
     }