1.6.0

classes/URL.php

@@ -36,13 +36,13 @@ public function __construct($url=''){
 
   public function __toString(){
     $d = [];
-    if ($this->scheme)     $d[] = "{$this->scheme}://";
-    if ($this->user)       $d[] = "{$this->user}" . (empty($this->pass)?'':":{$this->pass}") . "@";
-    if ($this->host)       $d[] = "{$this->host}";
-    if ($this->port)       $d[] = ":{$this->port}";
-    if ($this->path)       $d[] = "/" . ltrim($this->path,"/");
-    if ($this->query)      $d[] = "?" . http_build_query($this->query);
-    if ($this->fragment)   $d[] = "#{$this->fragment}";
+    if ($this->scheme)         $d[] = "{$this->scheme}://";
+    if ($this->user)           $d[] = "{$this->user}" . (empty($this->pass)?'':":{$this->pass}") . "@";
+    if ($this->host)           $d[] = "{$this->host}";
+    if ($this->port)           $d[] = ":{$this->port}";
+    if ($this->path)           $d[] = "/" . ltrim($this->path,"/");
+    if (!empty($this->query))  $d[] = "?" . http_build_query($this->query);
+    if ($this->fragment)       $d[] = "#{$this->fragment}";
     return implode('', $d);
   }
 

composer.json

@@ -4,7 +4,7 @@
     "description": "Components for rapid application development.",
     "keywords": ["framework","core","sdk","toolbox"],
     "homepage": "http://caffeina.com",
-    "version": "1.5.3",
+    "version": "1.6.0",
     "license": "MIT",
     "authors": [
         {

tests/URLTest.php

@@ -24,17 +24,7 @@ public function testModify(){
     }
 
     public function testParseQuery(){
-      $url = new URL('https://user:[email protected]:9080/path/to/resource.html?foo=bar&another[]=2&another[]=3#frag_link');
-
-$url = new URL("ftps://test.com:9000/index.php");
-
-$url->scheme = 'https';
-$url->port = false;
-
-echo $url;
-
-
-die;
+      $url = new URL('https://user:[email protected]:9080/path/to/resource.html?query=string&another[]=2&another[]=3#fragment');
       $this->assertEquals('string', $url->query['query']);
     }