tests and static analysis cleanup

MindTouch · Feb 21, 2019 · d360c87 · d360c87
1 parent 948a525
commit d360c87
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 2 deletions.
diff --git a/src/HttpPlug.php b/src/HttpPlug.php
@@ -68,9 +68,9 @@ class HttpPlug {
     protected $user;
 
     /**
-     * @var string - password for basic auth credentials
+     * @var string|null - password for basic auth credentials
      */
-    protected $password;
+    protected $password = null;
 
     /**
      * @var IMutableHeaders - stores the headers for the request

diff --git a/tests/HttpPlug/MockInvoke/get_Test.php b/tests/HttpPlug/MockInvoke/get_Test.php
@@ -165,4 +165,32 @@ public function Will_throw_if_cannot_unserialize_php() {
         $this->assertEquals(200, $maxContentLength);
         $this->assertTrue($exceptionThrown);
     }
+
+    /**
+     * @test
+     */
+    public function Can_unserialize_empty_php_body() {
+
+        // arrange
+        $uri = XUri::tryParse('test://example.com/foo');
+        MockPlug::register(
+            $this->newDefaultMockRequestMatcher(HttpPlug::METHOD_GET, $uri),
+            (new HttpResult())
+                ->withStatus(200)
+                ->withHeaders(Headers::newFromHeaderNameValuePairs([
+                    [Headers::HEADER_CONTENT_TYPE, ContentType::PHP],
+                    [Headers::HEADER_CONTENT_LENGTH, '0']
+                ]))
+                ->withBody('')
+        );
+        $plug = new HttpPlug($uri);
+
+         // act
+        $parser = (new SerializedPhpArrayParser())->withMaxContentLength(50000);
+        $result = $plug->withHttpResultParser($parser)->get();
+
+        // assert
+        $this->assertEquals(200, $result->getStatus());
+        $this->assertEquals('', $result->getBody()->getVal('body'));
+    }
 }
diff --git a/tests/HttpPlug/getUri_Test.php b/tests/HttpPlug/getUri_Test.php
@@ -40,6 +40,22 @@ public function Can_get_uri_with_credentials() {
         $this->assertEquals('http://aaa:[email protected]/bar/baz?a=b&c=d', $result->toString());
     }
 
+    /**
+     * @test
+     */
+    public function Can_get_uri_with_username_credential() {
+
+        // arrange
+        $plug = (new HttpPlug(XUri::tryParse('http://foo.com/bar/baz?a=b&c=d')))
+            ->withCredentials('aaa', null);
+
+        // act
+        $result = $plug->getUri(true);
+
+        // assert
+        $this->assertEquals('http://aaa:@foo.com/bar/baz?a=b&c=d', $result->toString());
+    }
+
     /**
      * @test
      */