Always urlencode

kornelski · kornelski · commit efbbd37dc97f · 2016-05-22T13:11:47.000+01:00
diff --git a/src/Request.php b/src/Request.php
@@ -105,12 +105,7 @@ function apiURL() {
         if ($this->quality) $options[] = 'quality=' . $this->quality;
         if ($this->timeout) $options[] = 'timeout=' . $this->timeout;
 
-        $imageURL = $this->url;
-        if (preg_match('/[\s%+]/', $imageURL)) {
-            $imageURL = rawurlencode($imageURL);
-        }
-
-        return self::BASE_URL . '/' . rawurlencode($this->username) . '/' . implode(',', $options) . '/' . $imageURL;
+        return self::BASE_URL . '/' . rawurlencode($this->username) . '/' . implode(',', $options) . '/' . rawurlencode($this->url);
     }
 
     function getBytes() {
diff --git a/test/BasicTest.php b/test/BasicTest.php
@@ -87,6 +87,6 @@ public function testChains() {
         $this->assertContains('2x', $c2->apiURL());
         $this->assertContains('1280x300', $c1->apiURL());
         $this->assertContains('timeout=34', $c1->apiURL());
-        $this->assertContains('/http://example.com', $c1->apiURL());
+        $this->assertContains('/http%3A%2F%2Fexample.com', $c1->apiURL());
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,6 @@ public function testChains() {`
`87`	`87`	`$this->assertContains('2x', $c2->apiURL());`
`88`	`88`	`$this->assertContains('1280x300', $c1->apiURL());`
`89`	`89`	`$this->assertContains('timeout=34', $c1->apiURL());`
`90`		`- $this->assertContains('/http://example.com', $c1->apiURL());`
	`90`	`+ $this->assertContains('/http%3A%2F%2Fexample.com', $c1->apiURL());`
`91`	`91`	`}`
`92`	`92`	`}`