Merge pull request #100 from simPod/proper-message

Fix english in no response message

Author: isublimity

.travis.yml

@@ -77,7 +77,7 @@ jobs:
             git fetch origin $TRAVIS_BRANCH;
           fi
         - git merge-base origin/$TRAVIS_BRANCH $TRAVIS_PULL_REQUEST_SHA || git fetch origin +refs/pull/$TRAVIS_PULL_REQUEST/merge --unshallow
-        - wget https://github.com/diff-sniffer/git/releases/download/0.1.0/git-phpcs.phar
+        - wget https://github.com/diff-sniffer/git/releases/download/0.2.0/git-phpcs.phar
         - php git-phpcs.phar origin/$TRAVIS_BRANCH...$TRAVIS_PULL_REQUEST_SHA
 
 #    - stage: Code Quality

src/Exception/QueryException.php

@@ -12,4 +12,9 @@ public static function cannotInsertEmptyValues() : self
     {
         return new self('Inserting empty values array is not supported in ClickHouse');
     }
+
+    public static function noResponse() : self
+    {
+        return new self('No response returned');
+    }
 }

src/Statement.php

@@ -183,14 +183,10 @@ public function isError()
         return ($this->response()->http_code() !== 200 || $this->response()->error_no());
     }
 
-    /**
-     * @return bool
-     * @throws Exception\TransportException
-     */
-    private function check()
+    private function check() : bool
     {
         if (!$this->_request->isResponseExists()) {
-            throw new QueryException('Not have response');
+            throw QueryException::noResponse();
         }
 
         if ($this->isError()) {

src/Transport/CurlerRequest.php

@@ -2,6 +2,9 @@
 
 namespace ClickHouseDB\Transport;
 
+use const CURLOPT_HTTPGET;
+use const CURLOPT_POST;
+
 class CurlerRequest
 {
     /**
@@ -44,14 +47,10 @@ class CurlerRequest
      */
     private $handle;
 
-    /**
-     * @var CurlerResponse
-     */
-    private $resp = null;
+    /** @var CurlerResponse */
+    private $response;
 
-    /**
-     * @var bool
-     */
+    /** @var bool */
     private $_persistent = false;
 
     /**
@@ -616,24 +615,21 @@ private function execute($method)
      */
     public function response()
     {
-        if (!$this->resp) {
+        if (! $this->response) {
             throw new \ClickHouseDB\Exception\TransportException('Can`t fetch response - is empty');
         }
 
-        return $this->resp;
+        return $this->response;
     }
 
-    /**
-     * @return bool
-     */
-    public function isResponseExists()
+    public function isResponseExists() : bool
     {
-        return ($this->resp ? true : false);
+        return $this->response !== null;
     }
 
-    public function setResponse(CurlerResponse $response)
+    public function setResponse(CurlerResponse $response) : void
     {
-        $this->resp = $response;
+        $this->response = $response;
     }
 
     /**
@@ -678,12 +674,12 @@ private function prepareRequest()
 
 
         if (strtoupper($method) == 'GET') {
-            $curl_opt[CURLOPT_HTTPGET] = TRUE;
+            $curl_opt[CURLOPT_HTTPGET]       = true;
             $curl_opt[CURLOPT_CUSTOMREQUEST] = strtoupper($method);
             $curl_opt[CURLOPT_POSTFIELDS] = false;
         } else {
             if (strtoupper($method) === 'POST') {
-                $curl_opt[CURLOPT_POST] = TRUE;
+                $curl_opt[CURLOPT_POST] = true;
             }
 
             $curl_opt[CURLOPT_CUSTOMREQUEST] = strtoupper($method);