Fix disconnection vs close issue

maikgreubel · Aug 17, 2017 · 5c694c7 · 5c694c7
1 parent 2f84608
commit 5c694c7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/Generics/Socket/ClientSocket.php b/src/Generics/Socket/ClientSocket.php
@@ -62,6 +62,10 @@ public function connect()
      */
     public function disconnect()
     {
+        if (! $this->conntected) {
+            throw new SocketException("Socket is not connected");
+        }
+
         $this->close();
     }
 
@@ -81,10 +85,6 @@ public function isConnected()
      */
     public function close()
     {
-        if (! $this->conntected) {
-            throw new SocketException("Socket is not connected");
-        }
-
         parent::close();
         $this->conntected = false;
     }

diff --git a/tests/http-tests/HttpClientTest.php b/tests/http-tests/HttpClientTest.php
@@ -38,7 +38,7 @@ public function testRetrieveHeaders()
 
         $http = new HttpClient($url);
         $http->setHeader('Connection', '');
-        $http->setTimeout(1);
+        $http->setTimeout(5);
 
         $headers = $http->retrieveHeaders();
 

diff --git a/tests/util-tests/UrlParserTest.php b/tests/util-tests/UrlParserTest.php
@@ -32,7 +32,7 @@ public function testUrlParserSimpleUrl()
 
     /**
      * @expectedException \Generics\Socket\InvalidUrlException
-     * @expectedExceptionMessage This URL does not contain a host part
+     * @expectedExceptionMessage does not contain necessary parts
      */
     public function testInvalidHost()
     {
@@ -41,7 +41,7 @@ public function testInvalidHost()
 
     /**
      * @expectedException \Generics\Socket\InvalidUrlException
-     * @expectedExceptionMessage This URL does not contain a scheme part
+     * @expectedExceptionMessage does not contain necessary parts
      */
     public function testInvalidScheme()
     {