Merge pull request #17 from jbaldwin/master

Added ClusterBuilder->withPort($port)

Author: avalanche123

ext/php_cassandra.c

@@ -142,6 +142,7 @@ const zend_function_entry cassandra_functions[] = {
   PHP_FE(cassandra_cluster_set_token_aware_routing, NULL)
   PHP_FE(cassandra_cluster_set_credentials, NULL)
   PHP_FE(cassandra_cluster_set_contact_points, NULL)
+  PHP_FE(cassandra_cluster_set_port, NULL)
   PHP_FE(cassandra_cluster_set_ssl, NULL)
   /* CassSsl */
   PHP_FE(cassandra_ssl_new, NULL)
@@ -671,6 +672,23 @@ PHP_FUNCTION(cassandra_cluster_set_contact_points)
   CHECK_RESULT(rc);
 }
 
+PHP_FUNCTION(cassandra_cluster_set_port)
+{
+  CassCluster* cluster;
+  long port;
+  zval* cluster_resource;
+
+  if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &port) == FAILURE) {
+    RETURN_FALSE;
+  }
+
+  ZEND_FETCH_RESOURCE(cluster, CassCluster*, &cluster_resource, -1,
+    PHP_CASSANDRA_CLUSTER_RES_NAME, le_cassandra_cluster_res);
+
+  CassError rc = cass_cluster_set_port(cluster, (int)port);
+  CHECK_RESULT(rc);
+}
+
 PHP_FUNCTION(cassandra_cluster_set_ssl)
 {
   CassCluster* cluster;

ext/php_cassandra.h

@@ -126,6 +126,7 @@ PHP_FUNCTION(cassandra_cluster_set_load_balance_dc_aware);
 PHP_FUNCTION(cassandra_cluster_set_token_aware_routing);
 PHP_FUNCTION(cassandra_cluster_set_credentials);
 PHP_FUNCTION(cassandra_cluster_set_contact_points);
+PHP_FUNCTION(cassandra_cluster_set_port);
 PHP_FUNCTION(cassandra_cluster_set_ssl);
 
 /* CassSsl */

src/Cassandra/Cluster/Builder.php

@@ -132,6 +132,14 @@ final class Builder
      */
     private $defaultTimeout;
 
+    /**
+     * Default port for connection.
+     * Default: 9042
+     *
+     * @var int
+     */
+    private $port;
+
     /**
      * @access private
      */
@@ -143,6 +151,7 @@ public function __construct()
         $this->defaultConsistency       = \Cassandra::CONSISTENCY_ONE;
         $this->defaultPageSize          = 10000;
         $this->defaultTimeout           = null;
+        $this->port                     = 9042;
     }
 
     /**
@@ -190,6 +199,10 @@ public function build()
 
         cassandra_cluster_set_contact_points($cluster, $this->contactPoints);
 
+        if (!is_null($this->port) && $this->port != 9042) {
+            cassandra_cluster_set_port($cluster, $this->port);
+        }
+
         return new DefaultCluster($cluster, $options, $ssl);
     }
 
@@ -287,6 +300,20 @@ public function withContactPoints($host)
         return $this;
     }
 
+    /**
+     * Configures the port for endpoints.
+     *
+     * @param int $port an ip address string
+     *
+     * @return self
+     */
+    public function withPort($port)
+    {
+        $this->port = $port;
+
+        return $this;
+    }
+
     /**
      * Configures this cluster to use a round robin load balancing policy.
      *