Merge pull request #536 from thelovekesh/fix/phpstan-errors

Fix PHPStan errors
ampproject · Oct 20, 2022 · bd739dd · bd739dd
2 parents 325bc7b + e00195e
commit bd739dd
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/src/RemoteRequest/CurlRemoteGetRequest.php b/src/RemoteRequest/CurlRemoteGetRequest.php
@@ -6,6 +6,7 @@
 use AmpProject\Exception\FailedToGetFromRemoteUrl;
 use AmpProject\RemoteGetRequest;
 use AmpProject\Response;
+use AmpProject\Exception\FailedToParseUrl;
 
 /**
  * Remote request transport using cURL.
@@ -97,13 +98,18 @@ public function __construct($sslVerify = true, $timeout = self::DEFAULT_TIMEOUT,
     public function get($url, $headers = [])
     {
         $retriesLeft = $this->retries;
+
+        if (! is_string($url) || empty($url)) {
+            throw FailedToGetFromRemoteUrl::withException($url, FailedToParseUrl::forUrl($url));
+        }
+
         do {
             $curlHandle = curl_init();
 
             curl_setopt($curlHandle, CURLOPT_URL, $url);
-            curl_setopt($curlHandle, CURLOPT_HEADER, 0);
+            curl_setopt($curlHandle, CURLOPT_HEADER, false);
             curl_setopt($curlHandle, CURLOPT_FOLLOWLOCATION, true);
-            curl_setopt($curlHandle, CURLOPT_SSL_VERIFYPEER, $this->sslVerify ? 1 : 0);
+            curl_setopt($curlHandle, CURLOPT_SSL_VERIFYPEER, $this->sslVerify);
             curl_setopt($curlHandle, CURLOPT_SSL_VERIFYHOST, $this->sslVerify ? 2 : 0);
             curl_setopt($curlHandle, CURLOPT_RETURNTRANSFER, true);
             curl_setopt($curlHandle, CURLOPT_FAILONERROR, true);

diff --git a/tests/RemoteRequest/CurlRemoteGetRequestTest.php b/tests/RemoteRequest/CurlRemoteGetRequestTest.php
@@ -3,6 +3,7 @@
 namespace AmpProject\RemoteRequest;
 
 use AmpProject\RemoteGetRequest;
+use AmpProject\Exception\FailedToGetFromRemoteUrl;
 use AmpProject\Tests\TestCase;
 
 /**
@@ -19,4 +20,20 @@ public function testInstantiation()
         $this->assertInstanceOf(RemoteGetRequest::class, $curlRequest);
         $this->assertInstanceOf(CurlRemoteGetRequest::class, $curlRequest);
     }
+
+    /**
+     * @covers ::get()
+     */
+    public function testGet()
+    {
+        $curlRequest = new CurlRemoteGetRequest(false);
+
+        // When passed url is not string, it should throw exception.
+        $this->expectException(FailedToGetFromRemoteUrl::class);
+        $curlRequest->get(123);
+
+        // When passed url is empty string, it should throw exception.
+        $this->expectException(FailedToGetFromRemoteUrl::class);
+        $curlRequest->get('');
+    }
 }