chore(deps): upgrade cassandra:v4.1.0

rgsystemes · Jan 2, 2023 · 554b72c · 554b72c
1 parent f614cab
commit 554b72c
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.1
+FROM php:8.2
 WORKDIR /tmp/cassandra-php-driver
 
 RUN apt update -y \

diff --git a/behat.yml b/behat.yml
@@ -1,4 +1,15 @@
 default:
+    formatters:
+        pretty: true
+    suites:
+        default:
+            filters:
+              tags: "[email protected]&&[email protected]&&~@broken"
+            contexts:
+                - FeatureContext:
+                    cassandra_version: "4.1.0"
+
+cassandra-version-3.11:
     formatters:
         pretty: true
     suites:

diff --git a/features/bootstrap/FeatureContext.php b/features/bootstrap/FeatureContext.php
@@ -49,7 +49,7 @@ class FeatureContext implements Context, SnippetAcceptingContext
      */
     public function __construct($cassandra_version)
     {
-        $this->ccm = new \CCM();
+        $this->ccm = new \CCM($cassandra_version);
     }
 
     /**

diff --git a/support/ccm.php b/support/ccm.php
@@ -22,7 +22,7 @@
 class CCM
 {
     const DEFAULT_CLUSTER_PREFIX = "php-driver";
-    const DEFAULT_CASSANDRA_VERSION = "4.0.1";
+    const DEFAULT_CASSANDRA_VERSION = "4.1.0";
     const PROCESS_TIMEOUT_IN_SECONDS = 480;
     private $clusterPrefix;
     private $isSilent;
@@ -37,7 +37,7 @@ class CCM
     public function __construct($version = self::DEFAULT_CASSANDRA_VERSION, $isSilent = true, $clusterPrefix = self::DEFAULT_CLUSTER_PREFIX)
     {
         $this->version            = $version;
-        $this->isSilent           = $isSilent;
+        $this->isSilent           = $isSilent && \getenv('CI');
         $this->clusterPrefix      = $clusterPrefix;
         $this->cluster            = null;
         $this->session            = null;

diff --git a/tests/integration/Cassandra/SchemaMetadataIntegrationTest.php b/tests/integration/Cassandra/SchemaMetadataIntegrationTest.php
@@ -320,7 +320,7 @@ protected function assertUserDefinedFunctionsEqual($name, $function) {
             }
         }
         if (is_null($expectedFunction)) {
-            $this->fail("Unable to Locate Function: ${name}");
+            $this->fail("Unable to Locate Function: {$name}");
         }
 
         $this->assertEquals($expectedFunction->simpleName(),
-Original file line number
+Diff line change
@@ Expand Up @@
          */
         public function __construct($cassandra_version)
         {
-            $this->ccm = new \CCM();
+            $this->ccm = new \CCM($cassandra_version);
         }
         /**
@@ Expand Down @@