Ensure that Request::getFullUrl() always returns a string (an excep…

…tion will be thrown in case of an invalid call/config).

src/CurlFormatter.php

@@ -42,7 +42,7 @@ public function format(Request $request)
                 $content = http_build_query((array)$data, '', '&', $this->encodingType);
                 $request->setFullUrl(null);
                 $url = $request->getFullUrl();
-                $url .= ($url === null || strpos($url, '?') === false) ? '?' : '&';
+                $url .= (strpos($url, '?') === false) ? '?' : '&';
                 $url .= $content;
                 $request->setFullUrl($url);
             }

src/Request.php

@@ -7,6 +7,7 @@
 
 namespace yii\httpclient;
 
+use yii\base\InvalidCallException;
 use yii\helpers\ArrayHelper;
 use yii\helpers\FileHelper;
 
@@ -86,7 +87,7 @@ public function setUrl($url)
 
     /**
      * Returns target URL.
-     * @return string|array target URL or URL parameters
+     * @return string|array|null target URL or URL parameters
      */
     public function getUrl()
     {
@@ -337,6 +338,10 @@ private function createFullUrl($url)
             $url .= http_build_query($params);
         }
 
+        if ($url === null) {
+            throw new InvalidCallException('Either the $url or the $client->baseUrl must be set.');
+        }
+
         return $url;
     }
 

src/UrlEncodedFormatter.php

@@ -48,7 +48,7 @@ public function format(Request $request)
             if (!empty($content)) {
                 $request->setFullUrl(null);
                 $url = $request->getFullUrl();
-                $url .= ($url === null || strpos($url, '?') === false) ? '?' : '&';
+                $url .= (strpos($url, '?') === false) ? '?' : '&';
                 $url .= $content;
                 $request->setFullUrl($url);
             }

tests/CurlFormatterTest.php

@@ -41,6 +41,7 @@ public function testFormat()
     public function testFormatMethodGet()
     {
         $request = new Request();
+        $request->setUrl('https://yiiframework.com/');
         $request->setMethod('GET');
         $data = [
             'name1' => 'value1',
@@ -80,4 +81,4 @@ public function testFormatPostRequestWithEmptyBody()
 
         $this->assertEquals('0', $headers['content-length'][0]);
     }
-}
+}

tests/RequestTest.php

@@ -288,6 +288,15 @@ public function testGetFullUrl($baseUrl, $url, $expectedFullUrl)
         $this->assertEquals($expectedFullUrl, $request->getFullUrl());
     }
 
+    public function testGetFullUrlWithoutUrlAndClientBaseUrl()
+    {
+        $client = new Client();
+        $request = new Request(['client' => $client]);
+
+        $this->expectException('yii\\base\\InvalidCallException');
+        var_dump($request->getFullUrl());
+    }
+
     /**
      * @depends testToString
      */

tests/UrlEncodedFormatterTest.php

@@ -42,6 +42,7 @@ public function testFormatMethodGet()
             'name2' => 'value2',
         ];
         $request->setData($data);
+        $request->setUrl('https://yiiframework.com/');
 
         $formatter = new UrlEncodedFormatter();
         $formatter->format($request);
@@ -103,4 +104,4 @@ public function testFormatPutRequestWithInfileOption()
 
         $this->assertEquals($expectedHeaders, $headers);
     }
-}
+}