updates for php8 (#77)

Author: TomK

.circleci/config.yml

@@ -43,10 +43,10 @@ defaults: &defaults
 
 version: 2
 jobs:
-  build-php71:
+  build-php72:
     <<: *defaults
     docker:
-      - image: php:7.1-alpine
+      - image: php:7.2-alpine
         environment:
           ADD_PACKAGES: "php7-apcu php7-memcached"
           ADD_MODULES: "mysqli pdo pdo_mysql"
@@ -58,10 +58,10 @@ jobs:
           MYSQL_ALLOW_EMPTY_PASSWORD: yes
           MYSQL_ROOT_HOST: "%"
       - image: memcached:1.4
-  build-php72:
+  build-php73:
     <<: *defaults
     docker:
-      - image: php:7.2-alpine
+      - image: php:7.3-alpine
         environment:
           ADD_PACKAGES: "php7-apcu php7-memcached"
           ADD_MODULES: "mysqli pdo pdo_mysql"
@@ -73,10 +73,10 @@ jobs:
           MYSQL_ALLOW_EMPTY_PASSWORD: yes
           MYSQL_ROOT_HOST: "%"
       - image: memcached:1.4
-  build-php73:
+  build-php74:
     <<: *defaults
     docker:
-      - image: php:7.3-alpine
+      - image: php:7.4-alpine
         environment:
           ADD_PACKAGES: "php7-apcu php7-memcached"
           ADD_MODULES: "mysqli pdo pdo_mysql"
@@ -88,10 +88,10 @@ jobs:
           MYSQL_ALLOW_EMPTY_PASSWORD: yes
           MYSQL_ROOT_HOST: "%"
       - image: memcached:1.4
-  build-php74:
+  build-php80:
     <<: *defaults
     docker:
-      - image: php:7.4-alpine
+      - image: php:8.0-alpine
         environment:
           ADD_PACKAGES: "php7-apcu php7-memcached"
           ADD_MODULES: "mysqli pdo pdo_mysql"
@@ -108,7 +108,7 @@ workflows:
   version: 2
   build:
     jobs:
-      - build-php71
       - build-php72
       - build-php73
       - build-php74
+      - build-php80

composer.json

@@ -16,14 +16,14 @@
     "packaged/log": "~1.0",
     "packaged/querybuilder": "~0.21",
     "packaged/config": "~1.1",
-    "packaged/cassandrathrift": "~22",
+    "packaged/cassandrathrift": "^20.1.0",
     "doctrine/inflector": "~1.0"
   },
   "suggest": {
     "ext-apcu": "*"
   },
   "require-dev": {
-    "phpunit/phpunit": "~7"
+    "phpunit/phpunit": "~8"
   },
   "autoload": {
     "psr-4": {

src/DataTypes/Counter.php

@@ -38,13 +38,15 @@ public function calculated()
 
   public function increment($by = 1)
   {
+    $by = floatval($by);
     $this->_adjust += abs($by);
     $this->_adjusted = abs($by) > 0;
     return $this;
   }
 
   public function decrement($by = 1)
   {
+    $by = floatval($by);
     $this->_adjust -= abs($by);
     $this->_adjusted = abs($by) > 0;
     return $this;
@@ -62,7 +64,7 @@ public function isDecrement()
 
   public function isFixedValue()
   {
-    return $this->_adjusted && $this->_adjust === 0;
+    return $this->_adjusted && $this->_adjust == 0;
   }
 
   public function hasChanged()

src/Ql/Cql/CqlDataStore.php

@@ -59,9 +59,9 @@ protected function _getCounterValue(QlDao $dao, $field, $value)
       {
         $value = DecrementExpression::create($field, $newValue->getDecrement());
       }
-      else if($newValue->isFixedValue() && $newValue->hasChanged())
+      else if($newValue->isFixedValue())
       {
-        if($newValue->current() === null && $newValue->calculated() === 0)
+        if($newValue->current() === null && $newValue->calculated() == 0)
         {
           //Allow counter row initialisation
           $value = [

src/Ql/Cql/DalSocket.php

@@ -28,7 +28,15 @@ public function close()
   {
     $persist = $this->persist_;
     $this->persist_ = false;
-    parent::close();
+
+    if(is_resource($this->handle_))
+    {
+      parent::close();
+    }
+    else
+    {
+      $this->handle_ = null;
+    }
     $this->persist_ = $persist;
   }
 

src/Ql/PdoConnection.php

@@ -250,7 +250,7 @@ protected function _isRecoverableException(\Exception $e)
 
     $code = $e->getCode();
     $p = $e->getPrevious();
-    if(($code === 0) || Strings::startsWith($code, 42)
+    if(($code == 0) || Strings::startsWith($code, 42)
       || ($p && Strings::startsWith($p->getCode(), 42)))
     {
       return false;

tests/Cache/Apc/ApcConnectionTest.php

@@ -8,7 +8,7 @@
 
 class ApcConnectionTest extends TestCase
 {
-  protected function setUp()
+  protected function setUp(): void
   {
     if(!((extension_loaded('apc') || extension_loaded('apcu'))
       && ini_get('apc.enabled'))

tests/Exceptions/Connection/CqlExceptionTest.php

@@ -31,12 +31,12 @@ public function testExceptions($exception, $code, $contains)
     {
       foreach($contains as $contain)
       {
-        $this->assertContains($contain, $formed->getMessage());
+        $this->assertStringContainsString($contain, $formed->getMessage());
       }
     }
     else
     {
-      $this->assertContains($contains, $formed->getMessage());
+      $this->assertStringContainsString($contains, $formed->getMessage());
     }
     $this->assertSame($exception, $formed->getPrevious());
   }

tests/Exceptions/Connection/PdoExceptionTest.php

@@ -25,12 +25,12 @@ public function testExceptions($exception, $code, $contains)
     {
       foreach($contains as $contain)
       {
-        $this->assertContains($contain, $formed->getMessage());
+        $this->assertStringContainsString($contain, $formed->getMessage());
       }
     }
     else
     {
-      $this->assertContains($contains, $formed->getMessage());
+      $this->assertStringContainsString($contains, $formed->getMessage());
     }
     $this->assertSame($exception, $formed->getPrevious());
   }

tests/FileSystem/FileSystemDataStoreTest.php

@@ -19,13 +19,13 @@ protected function _getResourceLocation($filename)
     return Path::system(dirname(__DIR__), 'resources', 'FileSystem', $filename);
   }
 
-  protected function setUp()
+  protected function setUp(): void
   {
     $resolver = new DalResolver();
     $resolver->boot();
   }
 
-  protected function tearDown()
+  protected function tearDown(): void
   {
     Dao::unsetDalResolver();
   }