Merge pull request #48 from allok/8.0

PHP 8+ support

Author: Sanikovich Aleksey

.gitignore

@@ -2,6 +2,7 @@
 composer.lock
 vendor/
 phpunit.xml
+.phpunit.result.cache
 Vagrantfile
 puphpet/
 .vagrant/

.travis.yml

@@ -5,6 +5,7 @@ sudo: required
 php:
   - 7.1
   - 7.2
+  - 8.0
   - nightly
 
 services:

composer.json

@@ -18,18 +18,22 @@
         {
             "name": "Mitrofanov Nikolay",
             "email": "mitrofanovnk@yandex.ru"
+        },
+        {
+            "name": "Sanikovich Aleksey",
+            "email": "asanikovich@gmail.com"
         }
     ],
     "require": {
-        "php": "^7.1",
-        "ext-PDO": "*",
+        "php": "^7.1 || ^8.0",
+        "ext-pdo": "*",
         "ext-pcre": "*",
         "doctrine/dbal": "^2.7",
-        "smi2/phpClickHouse": "^1.0"
+        "smi2/phpclickhouse": "^1.0"
     },
     "require-dev": {
-        "doctrine/coding-standard": "^4.0",
-        "phpunit/phpunit": "^7.0"
+        "doctrine/coding-standard": "^4.0 || ^9.0",
+        "phpunit/phpunit": "^7.0 || ^9.0"
     },
     "autoload": {
         "psr-4": {

src/ClickHouseConnection.php

@@ -8,7 +8,7 @@
  *
  * (c) FriendsOfDoctrine <https://github.com/FriendsOfDoctrine/>.
  *
- * For the full copyright and license inflormation, please view the LICENSE
+ * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
@@ -35,11 +35,6 @@ class ClickHouseConnection implements Connection, PingableConnection, ServerInfo
     /** @var AbstractPlatform */
     protected $platform;
 
-    /**
-     * Connection constructor
-     *
-     * @param mixed[] $params
-     */
     public function __construct(
         array $params,
         string $username,
@@ -60,15 +55,15 @@ public function __construct(
     /**
      * {@inheritDoc}
      */
-    public function prepare($prepareString)
+    public function prepare($prepareString) : ClickHouseStatement
     {
         return new ClickHouseStatement($this->smi2CHClient, $prepareString, $this->platform);
     }
 
     /**
      * {@inheritDoc}
      */
-    public function query()
+    public function query() : ClickHouseStatement
     {
         $args = func_get_args();
         $stmt = $this->prepare($args[0]);
@@ -105,73 +100,73 @@ public function exec($statement) : int
      */
     public function lastInsertId($name = null)
     {
-        throw new \LogicException('Unable to get last insert id in ClickHouse');
+        throw ClickHouseException::notSupported('Unable to get last insert id in ClickHouse');
     }
 
     /**
      * {@inheritDoc}
      */
-    public function beginTransaction()
+    public function beginTransaction() : bool
     {
-        throw new \LogicException('Transactions are not allowed in ClickHouse');
+        throw ClickHouseException::notSupported('Transactions are not allowed in ClickHouse');
     }
 
     /**
      * {@inheritDoc}
      */
-    public function commit()
+    public function commit() : bool
     {
-        throw new \LogicException('Transactions are not allowed in ClickHouse');
+        throw ClickHouseException::notSupported('Transactions are not allowed in ClickHouse');
     }
 
     /**
      * {@inheritDoc}
      */
-    public function rollBack()
+    public function rollBack() : bool
     {
-        throw new \LogicException('Transactions are not allowed in ClickHouse');
+        throw ClickHouseException::notSupported('Transactions are not allowed in ClickHouse');
     }
 
     /**
      * {@inheritDoc}
      */
-    public function errorCode()
+    public function errorCode() : ?string
     {
-        throw new \LogicException('You need to implement ClickHouseConnection::errorCode()');
+        throw ClickHouseException::notSupported('You need to implement ClickHouseConnection::errorCode()');
     }
 
     /**
      * {@inheritDoc}
      */
-    public function errorInfo()
+    public function errorInfo() : array
     {
-        throw new \LogicException('You need to implement ClickHouseConnection::errorInfo()');
+        throw ClickHouseException::notSupported('You need to implement ClickHouseConnection::errorInfo()');
     }
 
     /**
      * {@inheritDoc}
      */
-    public function ping()
+    public function ping() : bool
     {
         return $this->smi2CHClient->ping();
     }
 
     /**
      * {@inheritDoc}
      */
-    public function getServerVersion()
+    public function getServerVersion() : string
     {
         try {
             return $this->smi2CHClient->getServerVersion();
-        } catch (TransportException $exception) {
+        } catch (TransportException $e) {
             return '';
         }
     }
 
     /**
      * {@inheritDoc}
      */
-    public function requiresQueryForServerVersion()
+    public function requiresQueryForServerVersion() : bool
     {
         return true;
     }

src/ClickHouseException.php

@@ -8,15 +8,21 @@
  *
  * (c) FriendsOfDoctrine <https://github.com/FriendsOfDoctrine/>.
  *
- * For the full copyright and license inflormation, please view the LICENSE
+ * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
 namespace FOD\DBALClickHouse;
 
+use Doctrine\DBAL\Exception;
+
 /**
  * Specific Exception for ClickHouse
  */
-class ClickHouseException extends \Exception
+class ClickHouseException extends Exception
 {
+    public static function notSupported($method) : ClickHouseException
+    {
+        return new self(sprintf("Operation '%s' is not supported by platform.", $method));
+    }
 }

src/ClickHouseKeywords.php

@@ -8,7 +8,7 @@
  *
  * (c) FriendsOfDoctrine <https://github.com/FriendsOfDoctrine/>.
  *
- * For the full copyright and license inflormation, please view the LICENSE
+ * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */