Prepeare Release 1.5

Author: LKaemmerling

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 1.5.1 (29.03.2019)
++ Fix a bug on the `LKDev\HetznerCloud\RequestOpts` - `buildQuery()` method
+
 ## 1.5.0 (28.03.2019)
 + Implement `getByName` method on `LKDev\HetznerCloud\Models\Servers\Servers` and `LKDev\HetznerCloud\Models\Volumes\Volumes`.
 + Implement `waitUntilCompleted`  method on `LKDev\HetznerCloud\Models\Actions\Action`

src/Models/Servers/ServerRequestOpts.php

@@ -25,14 +25,15 @@ class ServerRequestOpts extends RequestOpts
      * RequestOpts constructor.
      *
      * @param $name
+     * @param $status
      * @param $perPage
      * @param $page
      * @param $labelSelector
      */
     public function __construct(string $name = null, string $status = null, int $perPage = null, int $page = null, string $labelSelector = null)
     {
-        parent::__construct($perPage, $page, $labelSelector);
         $this->name = $name;
         $this->status = $status;
+        parent::__construct($perPage, $page, $labelSelector);
     }
 }

src/RequestOpts.php

@@ -51,9 +51,10 @@ public function __construct(int $perPage = null, int $page = null, string $label
      */
     public function buildQuery()
     {
-        $values = collect(get_object_vars($this))->reject(function ($var) {
-            return $var == null;
-        })->toArray();
-        return count($values) > 0 ? '': ('?'.http_build_query($values));
+        $values = collect(get_object_vars($this))
+            ->filter(function ($var) {
+                return $var != null;
+            })->toArray();
+        return count($values) == 0 ? '' : ('?' . http_build_query($values));
     }
-}
+}

tests/Unit/Servers/ServersTest.php

@@ -8,6 +8,7 @@
 
 namespace Tests\Unit\Servers;
 
+use LKDev\HetznerCloud\Models\Servers\ServerRequestOpts;
 use LKDev\HetznerCloud\Models\Servers\Servers;
 use Tests\TestCase;
 
@@ -40,6 +41,7 @@ public function testGet()
         $this->assertEquals($server->name, 'my-server');
         $this->assertEquals($server->status, 'running');
     }
+
     /**
      *
      */
@@ -50,6 +52,7 @@ public function testGetByName()
         $this->assertEquals($server->name, 'my-server');
         $this->assertEquals($server->status, 'running');
     }
+
     /**
      *
      */
@@ -62,4 +65,10 @@ public function testAll()
         $this->assertEquals($servers[0]->name, 'my-server');
     }
 
+    public function testRequestsObject()
+    {
+        $c = new ServerRequestOpts("test", "online");
+
+        $this->assertEquals("?name=test&status=online", $c->buildQuery());
+    }
 }