From 0d6814525ebf7c8d45ad951f07aea9b6d54ccad7 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 28 Jun 2018 11:34:58 +0200 Subject: [PATCH 01/10] fix build error [-Werror=format-security] --- ext/src/FutureSession.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/src/FutureSession.c b/ext/src/FutureSession.c index 408297c15..3c622f6e6 100644 --- a/ext/src/FutureSession.c +++ b/ext/src/FutureSession.c @@ -37,7 +37,7 @@ PHP_METHOD(FutureSession, get) if (self->exception_message) { zend_throw_exception_ex(exception_class(self->exception_code), - self->exception_code TSRMLS_CC, self->exception_message); + self->exception_code TSRMLS_CC, "%s", self->exception_message); return; } @@ -71,7 +71,7 @@ PHP_METHOD(FutureSession, get) } zend_throw_exception_ex(exception_class(self->exception_code), - self->exception_code TSRMLS_CC, self->exception_message); + self->exception_code TSRMLS_CC, "%s", self->exception_message); return; } From fd60ca80f16f7cff098cc637c91cf9188a033c2e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 28 Jun 2018 11:44:56 +0200 Subject: [PATCH 02/10] fix some build warnings [-WFormat] --- ext/php_driver.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ext/php_driver.c b/ext/php_driver.c index b9663f8d2..14b7a31dc 100644 --- a/ext/php_driver.c +++ b/ext/php_driver.c @@ -325,7 +325,7 @@ throw_invalid_argument(zval *object, if (cls_name) { zend_throw_exception_ex(php_driver_invalid_argument_exception_ce, 0 TSRMLS_CC, "%s must be %s, an instance of %.*s given", - object_name, expected_type, cls_len, cls_name); + object_name, expected_type, (int)cls_len, cls_name); #if PHP_MAJOR_VERSION >= 7 zend_string_release(str); #else @@ -367,7 +367,11 @@ PHP_INI_MH(OnUpdateLogLevel) } else { php_error_docref(NULL TSRMLS_CC, E_NOTICE, PHP_DRIVER_NAME " | Unknown log level '%s', using 'ERROR'", +#if PHP_MAJOR_VERSION >= 7 + ZSTR_VAL(new_value)); +#else new_value); +#endif cass_log_set_level(CASS_LOG_ERROR); } } From 9c84d3c2e8b87f2335c4fa6ca232de13afd282c9 Mon Sep 17 00:00:00 2001 From: Vasyl Sovyak Date: Thu, 6 Sep 2018 10:57:26 +0300 Subject: [PATCH 03/10] - Fix for generate_doc.php to generate correct namespaces for "extends" and "implements" - Regenerated docs with applied fix in generator. --- ext/doc/Cassandra.php | 4 ++-- ext/doc/Cassandra/Cluster/Builder.php | 4 ++++ ext/doc/Cassandra/Exception/DomainException.php | 2 +- .../Cassandra/Exception/InvalidArgumentException.php | 2 +- ext/doc/Cassandra/Exception/LogicException.php | 2 +- ext/doc/Cassandra/Exception/RangeException.php | 2 +- ext/doc/Cassandra/Exception/RuntimeException.php | 2 +- ext/doc/Cassandra/RetryPolicy/DefaultPolicy.php | 2 +- .../Cassandra/RetryPolicy/DowngradingConsistency.php | 2 +- ext/doc/Cassandra/RetryPolicy/Fallthrough.php | 2 +- ext/doc/Cassandra/RetryPolicy/Logging.php | 2 +- ext/doc/Cassandra/TimestampGenerator/Monotonic.php | 2 +- ext/doc/Cassandra/TimestampGenerator/ServerSide.php | 2 +- ext/doc/Cassandra/Type/Collection.php | 2 +- ext/doc/Cassandra/Type/Custom.php | 2 +- ext/doc/Cassandra/Type/Map.php | 2 +- ext/doc/Cassandra/Type/Scalar.php | 2 +- ext/doc/Cassandra/Type/Set.php | 2 +- ext/doc/Cassandra/Type/Tuple.php | 2 +- ext/doc/Cassandra/Type/UserType.php | 2 +- ext/doc/generate_doc.php | 10 ++++++---- 21 files changed, 30 insertions(+), 24 deletions(-) diff --git a/ext/doc/Cassandra.php b/ext/doc/Cassandra.php index e6c56d15f..211f1bf7f 100644 --- a/ext/doc/Cassandra.php +++ b/ext/doc/Cassandra.php @@ -379,12 +379,12 @@ final class Cassandra { /** * The current version of the extension. */ - const VERSION = '1.3.1'; + const VERSION = '1.3.2'; /** * The version of the cpp-driver the extension is compiled against. */ - const CPP_DRIVER_VERSION = '2.7.0'; + const CPP_DRIVER_VERSION = '2.9.0'; /** * Creates a new cluster builder for constructing a Cluster object. diff --git a/ext/doc/Cassandra/Cluster/Builder.php b/ext/doc/Cassandra/Cluster/Builder.php index cc4e2c5d6..c7f7fa47d 100644 --- a/ext/doc/Cassandra/Cluster/Builder.php +++ b/ext/doc/Cassandra/Cluster/Builder.php @@ -323,6 +323,10 @@ public function withSchemaMetadata($enabled) { } * reverse IP lookup. This is useful for authentication (Kerberos) or * encryption SSL services that require a valid hostname for verification. * + * Important: It's possible that the underlying C/C++ driver does not + * support hostname resolution. A PHP warning will be emitted if the driver + * does not support hostname resolution. + * * @param bool $enabled whether the driver uses hostname resolution. * * @return Builder self diff --git a/ext/doc/Cassandra/Exception/DomainException.php b/ext/doc/Cassandra/Exception/DomainException.php index a301fb8ed..e99a01d93 100644 --- a/ext/doc/Cassandra/Exception/DomainException.php +++ b/ext/doc/Cassandra/Exception/DomainException.php @@ -21,7 +21,7 @@ /** * Cassandra domain exception. */ -class DomainException extends \DomainException implements Exception { +class DomainException extends \DomainException implements \Cassandra\Exception { /** * @param mixed $message diff --git a/ext/doc/Cassandra/Exception/InvalidArgumentException.php b/ext/doc/Cassandra/Exception/InvalidArgumentException.php index fb6920546..573e5aa6e 100644 --- a/ext/doc/Cassandra/Exception/InvalidArgumentException.php +++ b/ext/doc/Cassandra/Exception/InvalidArgumentException.php @@ -21,7 +21,7 @@ /** * Cassandra invalid argument exception. */ -class InvalidArgumentException extends \InvalidArgumentException implements Exception { +class InvalidArgumentException extends \InvalidArgumentException implements \Cassandra\Exception { /** * @param mixed $message diff --git a/ext/doc/Cassandra/Exception/LogicException.php b/ext/doc/Cassandra/Exception/LogicException.php index d00e41dce..9129f7d51 100644 --- a/ext/doc/Cassandra/Exception/LogicException.php +++ b/ext/doc/Cassandra/Exception/LogicException.php @@ -21,7 +21,7 @@ /** * Cassandra logic exception. */ -class LogicException extends \LogicException implements Exception { +class LogicException extends \LogicException implements \Cassandra\Exception { /** * @param mixed $message diff --git a/ext/doc/Cassandra/Exception/RangeException.php b/ext/doc/Cassandra/Exception/RangeException.php index d8a7819b6..6e06ad19f 100644 --- a/ext/doc/Cassandra/Exception/RangeException.php +++ b/ext/doc/Cassandra/Exception/RangeException.php @@ -21,7 +21,7 @@ /** * Cassandra domain exception. */ -class RangeException extends \RangeException implements Exception { +class RangeException extends \RangeException implements \Cassandra\Exception { /** * @param mixed $message diff --git a/ext/doc/Cassandra/Exception/RuntimeException.php b/ext/doc/Cassandra/Exception/RuntimeException.php index 1230b17c3..3eaeff499 100644 --- a/ext/doc/Cassandra/Exception/RuntimeException.php +++ b/ext/doc/Cassandra/Exception/RuntimeException.php @@ -21,7 +21,7 @@ /** * Cassandra runtime exception. */ -class RuntimeException extends \RuntimeException implements Exception { +class RuntimeException extends \RuntimeException implements \Cassandra\Exception { /** * @param mixed $message diff --git a/ext/doc/Cassandra/RetryPolicy/DefaultPolicy.php b/ext/doc/Cassandra/RetryPolicy/DefaultPolicy.php index 76554b543..d12a3e99a 100644 --- a/ext/doc/Cassandra/RetryPolicy/DefaultPolicy.php +++ b/ext/doc/Cassandra/RetryPolicy/DefaultPolicy.php @@ -28,6 +28,6 @@ * * In all other cases the error will be returned. */ -final class DefaultPolicy implements RetryPolicy { +final class DefaultPolicy implements \Cassandra\RetryPolicy { } diff --git a/ext/doc/Cassandra/RetryPolicy/DowngradingConsistency.php b/ext/doc/Cassandra/RetryPolicy/DowngradingConsistency.php index d900f4e7f..0720d40ec 100644 --- a/ext/doc/Cassandra/RetryPolicy/DowngradingConsistency.php +++ b/ext/doc/Cassandra/RetryPolicy/DowngradingConsistency.php @@ -39,6 +39,6 @@ * Important: This policy may attempt to retry requests with a lower * consistency level. Using this policy can break consistency guarantees. */ -final class DowngradingConsistency implements RetryPolicy { +final class DowngradingConsistency implements \Cassandra\RetryPolicy { } diff --git a/ext/doc/Cassandra/RetryPolicy/Fallthrough.php b/ext/doc/Cassandra/RetryPolicy/Fallthrough.php index 26b126f7b..1b1b6544b 100644 --- a/ext/doc/Cassandra/RetryPolicy/Fallthrough.php +++ b/ext/doc/Cassandra/RetryPolicy/Fallthrough.php @@ -21,6 +21,6 @@ /** * A retry policy that never retries and allows all errors to fallthrough. */ -final class Fallthrough implements RetryPolicy { +final class Fallthrough implements \Cassandra\RetryPolicy { } diff --git a/ext/doc/Cassandra/RetryPolicy/Logging.php b/ext/doc/Cassandra/RetryPolicy/Logging.php index f12ae0764..a9bd1c0d6 100644 --- a/ext/doc/Cassandra/RetryPolicy/Logging.php +++ b/ext/doc/Cassandra/RetryPolicy/Logging.php @@ -21,7 +21,7 @@ /** * A retry policy that logs the decisions of its child policy. */ -final class Logging implements RetryPolicy { +final class Logging implements \Cassandra\RetryPolicy { /** * Creates a new Logging retry policy. diff --git a/ext/doc/Cassandra/TimestampGenerator/Monotonic.php b/ext/doc/Cassandra/TimestampGenerator/Monotonic.php index 9c72ce444..cf7f24f1a 100644 --- a/ext/doc/Cassandra/TimestampGenerator/Monotonic.php +++ b/ext/doc/Cassandra/TimestampGenerator/Monotonic.php @@ -27,6 +27,6 @@ * exceeded then a warning is logged and timestamps stop incrementing until * the next clock tick. */ -final class Monotonic implements TimestampGenerator { +final class Monotonic implements \Cassandra\TimestampGenerator { } diff --git a/ext/doc/Cassandra/TimestampGenerator/ServerSide.php b/ext/doc/Cassandra/TimestampGenerator/ServerSide.php index ce126399c..28b55a51c 100644 --- a/ext/doc/Cassandra/TimestampGenerator/ServerSide.php +++ b/ext/doc/Cassandra/TimestampGenerator/ServerSide.php @@ -21,6 +21,6 @@ /** * A timestamp generator that allows the server-side to assign timestamps. */ -final class ServerSide implements TimestampGenerator { +final class ServerSide implements \Cassandra\TimestampGenerator { } diff --git a/ext/doc/Cassandra/Type/Collection.php b/ext/doc/Cassandra/Type/Collection.php index 4e1396518..cc11079ff 100644 --- a/ext/doc/Cassandra/Type/Collection.php +++ b/ext/doc/Cassandra/Type/Collection.php @@ -22,7 +22,7 @@ * A class that represents the list type. The list type contains the type of the * elements contain in the list. */ -final class Collection extends Type { +final class Collection extends \Cassandra\Type { private function __construct() { } diff --git a/ext/doc/Cassandra/Type/Custom.php b/ext/doc/Cassandra/Type/Custom.php index 119f98404..c21bb702b 100644 --- a/ext/doc/Cassandra/Type/Custom.php +++ b/ext/doc/Cassandra/Type/Custom.php @@ -21,7 +21,7 @@ /** * A class that represents a custom type. */ -final class Custom extends Type { +final class Custom extends \Cassandra\Type { private function __construct() { } diff --git a/ext/doc/Cassandra/Type/Map.php b/ext/doc/Cassandra/Type/Map.php index bcc68cc46..66c083c0c 100644 --- a/ext/doc/Cassandra/Type/Map.php +++ b/ext/doc/Cassandra/Type/Map.php @@ -22,7 +22,7 @@ * A class that represents the map type. The map type contains two types that * represents the types of the key and value contained in the map. */ -final class Map extends Type { +final class Map extends \Cassandra\Type { private function __construct() { } diff --git a/ext/doc/Cassandra/Type/Scalar.php b/ext/doc/Cassandra/Type/Scalar.php index d6f8053b7..0c1d5e4b4 100644 --- a/ext/doc/Cassandra/Type/Scalar.php +++ b/ext/doc/Cassandra/Type/Scalar.php @@ -21,7 +21,7 @@ /** * A class that represents a primitive type (e.g. `varchar` or `bigint`) */ -final class Scalar extends Type { +final class Scalar extends \Cassandra\Type { private function __construct() { } diff --git a/ext/doc/Cassandra/Type/Set.php b/ext/doc/Cassandra/Type/Set.php index 69755e7a2..fd06aea2d 100644 --- a/ext/doc/Cassandra/Type/Set.php +++ b/ext/doc/Cassandra/Type/Set.php @@ -22,7 +22,7 @@ * A class that represents the set type. The set type contains the type of the * elements contain in the set. */ -final class Set extends Type { +final class Set extends \Cassandra\Type { private function __construct() { } diff --git a/ext/doc/Cassandra/Type/Tuple.php b/ext/doc/Cassandra/Type/Tuple.php index 9b4f47941..9534c51e5 100644 --- a/ext/doc/Cassandra/Type/Tuple.php +++ b/ext/doc/Cassandra/Type/Tuple.php @@ -22,7 +22,7 @@ * A class that represents the tuple type. The tuple type is able to represent * a composite type of one or more types accessed by index. */ -final class Tuple extends Type { +final class Tuple extends \Cassandra\Type { private function __construct() { } diff --git a/ext/doc/Cassandra/Type/UserType.php b/ext/doc/Cassandra/Type/UserType.php index 05e553930..8c328668e 100644 --- a/ext/doc/Cassandra/Type/UserType.php +++ b/ext/doc/Cassandra/Type/UserType.php @@ -22,7 +22,7 @@ * A class that represents a user type. The user type is able to represent a * composite type of one or more types accessed by name. */ -final class UserType extends Type { +final class UserType extends \Cassandra\Type { private function __construct() { } diff --git a/ext/doc/generate_doc.php b/ext/doc/generate_doc.php index 7df1854d5..85471d046 100644 --- a/ext/doc/generate_doc.php +++ b/ext/doc/generate_doc.php @@ -392,8 +392,9 @@ function writeClass($doc, $file, $class) { $parentClass = $class->getParentClass(); if ($parentClass) { $parentClassName = $parentClass->getName(); - if (startsWith($parentClassName, $namespace)) { - $parentClassName = $parentClass->getShortName(); + if (startsWith($parentClassName, $namespace) && $parentClassName !== $namespace) { + $replacement = $namespace . '\\'; + $parentClassName = substr_replace($parentClassName, '', 0, strlen($replacement)); } else { $parentClassName = "\\" . $parentClassName; } @@ -409,8 +410,9 @@ function writeClass($doc, $file, $class) { continue; } $interfaceName = $interface->getName(); - if (startsWith($interfaceName, $namespace)) { - $interfaceName = $interface->getShortName(); + if (startsWith($interfaceName, $namespace) && $interfaceName !== $namespace) { + $replacement = $namespace . '\\'; + $interfaceName = substr_replace($interfaceName, '', 0, strlen($replacement)); } else { $interfaceName = "\\" . $interfaceName; } From 2547023905d81d72a04846baf2e2f00540d8215d Mon Sep 17 00:00:00 2001 From: Vasyl Sovyak Date: Thu, 6 Sep 2018 14:07:28 +0300 Subject: [PATCH 04/10] - fix return type namespaces for PHP class in yaml files - regenerate docs using applied fix --- ext/doc/Cassandra.php | 4 +- ext/doc/Cassandra/Aggregate.php | 10 +-- ext/doc/Cassandra/BatchStatement.php | 4 +- ext/doc/Cassandra/Bigint.php | 32 ++++----- ext/doc/Cassandra/Blob.php | 2 +- ext/doc/Cassandra/Cluster.php | 4 +- ext/doc/Cassandra/Cluster/Builder.php | 70 +++++++++---------- ext/doc/Cassandra/Collection.php | 4 +- ext/doc/Cassandra/Column.php | 2 +- ext/doc/Cassandra/Custom.php | 2 +- ext/doc/Cassandra/Date.php | 4 +- ext/doc/Cassandra/Decimal.php | 28 ++++---- ext/doc/Cassandra/DefaultAggregate.php | 10 +-- ext/doc/Cassandra/DefaultCluster.php | 4 +- ext/doc/Cassandra/DefaultColumn.php | 2 +- ext/doc/Cassandra/DefaultFunction.php | 2 +- ext/doc/Cassandra/DefaultIndex.php | 2 +- ext/doc/Cassandra/DefaultKeyspace.php | 16 ++--- ext/doc/Cassandra/DefaultMaterializedView.php | 10 +-- ext/doc/Cassandra/DefaultSchema.php | 2 +- ext/doc/Cassandra/DefaultSession.php | 24 +++---- ext/doc/Cassandra/DefaultTable.php | 12 ++-- ext/doc/Cassandra/Duration.php | 8 +-- ext/doc/Cassandra/Float.php | 34 ++++----- ext/doc/Cassandra/Function.php | 2 +- ext/doc/Cassandra/FuturePreparedStatement.php | 2 +- ext/doc/Cassandra/FutureRows.php | 2 +- ext/doc/Cassandra/FutureSession.php | 2 +- ext/doc/Cassandra/Index.php | 2 +- ext/doc/Cassandra/Inet.php | 2 +- ext/doc/Cassandra/Keyspace.php | 16 ++--- ext/doc/Cassandra/Map.php | 6 +- ext/doc/Cassandra/MaterializedView.php | 10 +-- ext/doc/Cassandra/Numeric.php | 26 +++---- ext/doc/Cassandra/RetryPolicy/Logging.php | 2 +- ext/doc/Cassandra/Rows.php | 4 +- ext/doc/Cassandra/SSLOptions/Builder.php | 10 +-- ext/doc/Cassandra/Schema.php | 2 +- ext/doc/Cassandra/Session.php | 24 +++---- ext/doc/Cassandra/Set.php | 4 +- ext/doc/Cassandra/Smallint.php | 32 ++++----- ext/doc/Cassandra/Table.php | 8 +-- ext/doc/Cassandra/Time.php | 6 +- ext/doc/Cassandra/Timestamp.php | 2 +- ext/doc/Cassandra/Timeuuid.php | 2 +- ext/doc/Cassandra/Tinyint.php | 32 ++++----- ext/doc/Cassandra/Tuple.php | 2 +- ext/doc/Cassandra/Type.php | 64 ++++++++--------- ext/doc/Cassandra/Type/Collection.php | 4 +- ext/doc/Cassandra/Type/Map.php | 6 +- ext/doc/Cassandra/Type/Set.php | 4 +- ext/doc/Cassandra/Type/Tuple.php | 2 +- ext/doc/Cassandra/Type/UserType.php | 2 +- ext/doc/Cassandra/UserTypeValue.php | 2 +- ext/doc/Cassandra/Uuid.php | 2 +- ext/doc/Cassandra/Value.php | 2 +- ext/doc/Cassandra/Varint.php | 28 ++++---- ext/src/Aggregate.yaml | 10 +-- ext/src/BatchStatement.yaml | 4 +- ext/src/Bigint.yaml | 32 ++++----- ext/src/Blob.yaml | 2 +- ext/src/Cluster.yaml | 4 +- ext/src/Cluster/Builder.yaml | 68 +++++++++--------- ext/src/Collection.yaml | 4 +- ext/src/Column.yaml | 2 +- ext/src/Core.yaml | 4 +- ext/src/Custom.yaml | 2 +- ext/src/Date.yaml | 4 +- ext/src/Decimal.yaml | 28 ++++---- ext/src/DefaultAggregate.yaml | 10 +-- ext/src/DefaultCluster.yaml | 4 +- ext/src/DefaultColumn.yaml | 2 +- ext/src/DefaultFunction.yaml | 2 +- ext/src/DefaultIndex.yaml | 2 +- ext/src/DefaultKeyspace.yaml | 16 ++--- ext/src/DefaultMaterializedView.yaml | 10 +-- ext/src/DefaultSchema.yaml | 2 +- ext/src/DefaultSession.yaml | 24 +++---- ext/src/DefaultTable.yaml | 12 ++-- ext/src/Duration.yaml | 8 +-- ext/src/Float.yaml | 34 ++++----- ext/src/Function.yaml | 2 +- ext/src/FuturePreparedStatement.yaml | 2 +- ext/src/FutureRows.yaml | 2 +- ext/src/FutureSession.yaml | 2 +- ext/src/Index.yaml | 2 +- ext/src/Inet.yaml | 2 +- ext/src/Keyspace.yaml | 16 ++--- ext/src/Map.yaml | 6 +- ext/src/MaterializedView.yaml | 10 +-- ext/src/Numeric.yaml | 26 +++---- ext/src/RetryPolicy/Logging.yaml | 2 +- ext/src/Rows.yaml | 4 +- ext/src/SSLOptions/Builder.yaml | 10 +-- ext/src/Schema.yaml | 2 +- ext/src/Session.yaml | 24 +++---- ext/src/Set.yaml | 4 +- ext/src/Smallint.yaml | 32 ++++----- ext/src/Table.yaml | 8 +-- ext/src/Time.yaml | 8 +-- ext/src/Timestamp.yaml | 2 +- ext/src/Timeuuid.yaml | 2 +- ext/src/Tinyint.yaml | 32 ++++----- ext/src/Tuple.yaml | 2 +- ext/src/Type.yaml | 64 ++++++++--------- ext/src/Type/Collection.yaml | 4 +- ext/src/Type/Map.yaml | 6 +- ext/src/Type/Set.yaml | 4 +- ext/src/Type/Tuple.yaml | 2 +- ext/src/Type/UserType.yaml | 2 +- ext/src/UserTypeValue.yaml | 2 +- ext/src/Uuid.yaml | 2 +- ext/src/Value.yaml | 2 +- ext/src/Varint.yaml | 28 ++++---- 114 files changed, 608 insertions(+), 608 deletions(-) diff --git a/ext/doc/Cassandra.php b/ext/doc/Cassandra.php index 211f1bf7f..9ac1b8014 100644 --- a/ext/doc/Cassandra.php +++ b/ext/doc/Cassandra.php @@ -389,14 +389,14 @@ final class Cassandra { /** * Creates a new cluster builder for constructing a Cluster object. * - * @return Cluster\Builder A cluster builder object with default settings + * @return \Cassandra\Cluster\Builder A cluster builder object with default settings */ public static function cluster() { } /** * Creates a new ssl builder for constructing a SSLOptions object. * - * @return SSLOptions\Builder A SSL options builder with default settings + * @return \Cassandra\SSLOptions\Builder A SSL options builder with default settings */ public static function ssl() { } diff --git a/ext/doc/Cassandra/Aggregate.php b/ext/doc/Cassandra/Aggregate.php index 38cbb6e8a..aa9e62fe9 100644 --- a/ext/doc/Cassandra/Aggregate.php +++ b/ext/doc/Cassandra/Aggregate.php @@ -47,35 +47,35 @@ public function argumentTypes(); /** * Returns the final function of the aggregate * - * @return Function Final function of the aggregate + * @return \Cassandra\Function Final function of the aggregate */ public function finalFunction(); /** * Returns the state function of the aggregate * - * @return Function State function of the aggregate + * @return \Cassandra\Function State function of the aggregate */ public function stateFunction(); /** * Returns the initial condition of the aggregate * - * @return Value Initial condition of the aggregate + * @return \CassandraValue Initial condition of the aggregate */ public function initialCondition(); /** * Returns the return type of the aggregate * - * @return Type Return type of the aggregate + * @return \Cassandra\Type Return type of the aggregate */ public function returnType(); /** * Returns the state type of the aggregate * - * @return Type State type of the aggregate + * @return \Cassandra\Type State type of the aggregate */ public function stateType(); diff --git a/ext/doc/Cassandra/BatchStatement.php b/ext/doc/Cassandra/BatchStatement.php index afbd5ebfe..0e56ccf37 100644 --- a/ext/doc/Cassandra/BatchStatement.php +++ b/ext/doc/Cassandra/BatchStatement.php @@ -49,12 +49,12 @@ public function __construct($type) { } /** * Adds a statement to this batch. * - * @param string|Statement $statement string or statement to add + * @param string|\Cassandra\Statement $statement string or statement to add * @param array|null $arguments positional or named arguments (optional) * * @throws Exception\InvalidArgumentException * - * @return BatchStatement self + * @return \Cassandra\BatchStatement self */ public function add($statement, $arguments) { } diff --git a/ext/doc/Cassandra/Bigint.php b/ext/doc/Cassandra/Bigint.php index 2ffc5eb09..a923a330c 100644 --- a/ext/doc/Cassandra/Bigint.php +++ b/ext/doc/Cassandra/Bigint.php @@ -40,7 +40,7 @@ public function __toString() { } /** * The type of this bigint. * - * @return Type + * @return \Cassandra\Type */ public function type() { } @@ -52,47 +52,47 @@ public function type() { } public function value() { } /** - * @param Numeric $num a number to add to this one - * @return Numeric sum + * @param \Cassandra\Numeric $num a number to add to this one + * @return \Cassandra\Numeric sum */ public function add($num) { } /** - * @param Numeric $num a number to subtract from this one - * @return Numeric difference + * @param \Cassandra\Numeric $num a number to subtract from this one + * @return \Cassandra\Numeric difference */ public function sub($num) { } /** - * @param Numeric $num a number to multiply this one by - * @return Numeric product + * @param \Cassandra\Numeric $num a number to multiply this one by + * @return \Cassandra\Numeric product */ public function mul($num) { } /** - * @param Numeric $num a number to divide this one by - * @return Numeric quotient + * @param \Cassandra\Numeric $num a number to divide this one by + * @return \Cassandra\Numeric quotient */ public function div($num) { } /** - * @param Numeric $num a number to divide this one by - * @return Numeric remainder + * @param \Cassandra\Numeric $num a number to divide this one by + * @return \Cassandra\Numeric remainder */ public function mod($num) { } /** - * @return Numeric absolute value + * @return \Cassandra\Numeric absolute value */ public function abs() { } /** - * @return Numeric negative value + * @return \Cassandra\Numeric negative value */ public function neg() { } /** - * @return Numeric square root + * @return \Cassandra\Numeric square root */ public function sqrt() { } @@ -109,14 +109,14 @@ public function toDouble() { } /** * Minimum possible Bigint value * - * @return Bigint minimum value + * @return \Cassandra\Bigint minimum value */ public static function min() { } /** * Maximum possible Bigint value * - * @return Bigint maximum value + * @return \Cassandra\Bigint maximum value */ public static function max() { } diff --git a/ext/doc/Cassandra/Blob.php b/ext/doc/Cassandra/Blob.php index 89b798cfe..9ded7f803 100644 --- a/ext/doc/Cassandra/Blob.php +++ b/ext/doc/Cassandra/Blob.php @@ -40,7 +40,7 @@ public function __toString() { } /** * The type of this blob. * - * @return Type + * @return \Cassandra\Type */ public function type() { } diff --git a/ext/doc/Cassandra/Cluster.php b/ext/doc/Cassandra/Cluster.php index af15914ff..8b90451c5 100644 --- a/ext/doc/Cassandra/Cluster.php +++ b/ext/doc/Cassandra/Cluster.php @@ -28,7 +28,7 @@ interface Cluster { * * @param string $keyspace Optional keyspace name * - * @return Session Session instance + * @return \Cassandra\Session Session instance */ public function connect($keyspace); @@ -37,7 +37,7 @@ public function connect($keyspace); * * @param string $keyspace Optional keyspace name * - * @return Future A Future Session instance + * @return \Cassandra\Future A Future Session instance */ public function connectAsync($keyspace); diff --git a/ext/doc/Cassandra/Cluster/Builder.php b/ext/doc/Cassandra/Cluster/Builder.php index c7f7fa47d..42facfd52 100644 --- a/ext/doc/Cassandra/Cluster/Builder.php +++ b/ext/doc/Cassandra/Cluster/Builder.php @@ -28,7 +28,7 @@ final class Builder { /** * Returns a Cluster Instance. * - * @return \Cluster Cluster instance + * @return \Cassandra\Cluster Cluster instance */ public function build() { } @@ -37,7 +37,7 @@ public function build() { } * * @param int $consistency A consistency level, must be one of Cassandra::CONSISTENCY_* values * - * @return Builder self + * @return \Cassandra\Cluster\Builder self */ public function withDefaultConsistency($consistency) { } @@ -47,7 +47,7 @@ public function withDefaultConsistency($consistency) { } * * @param int|null $pageSize default page size * - * @return Builder self + * @return \Cassandra\Cluster\Builder self */ public function withDefaultPageSize($pageSize) { } @@ -57,7 +57,7 @@ public function withDefaultPageSize($pageSize) { } * * @param float|null $timeout Timeout value in seconds, can be fractional * - * @return Builder self + * @return \Cassandra\Cluster\Builder self */ public function withDefaultTimeout($timeout) { } @@ -67,7 +67,7 @@ public function withDefaultTimeout($timeout) { } * * @param string $host ,... one or more ip addresses or hostnames * - * @return Builder self + * @return \Cassandra\Cluster\Builder self */ public function withContactPoints($host) { } @@ -78,14 +78,14 @@ public function withContactPoints($host) { } * * @throws \Exception\InvalidArgumentException * - * @return Builder self + * @return \Cassandra\Cluster\Builder self */ public function withPort($port) { } /** * Configures this cluster to use a round robin load balancing policy. * - * @return Builder self + * @return \Cassandra\Cluster\Builder self */ public function withRoundRobinLoadBalancingPolicy() { } @@ -96,7 +96,7 @@ public function withRoundRobinLoadBalancingPolicy() { } * @param int $hostPerRemoteDatacenter Maximum number of hosts to try in remote datacenters * @param bool $useRemoteDatacenterForLocalConsistencies Allow using hosts from remote datacenters to execute statements with local consistencies * - * @return Builder self + * @return \Cassandra\Cluster\Builder self */ public function withDatacenterAwareRoundRobinLoadBalancingPolicy($localDatacenter, $hostPerRemoteDatacenter, $useRemoteDatacenterForLocalConsistencies) { } @@ -107,7 +107,7 @@ public function withDatacenterAwareRoundRobinLoadBalancingPolicy($localDatacente * * @param string $hosts A comma delimited list of addresses. * - * @return Builder self + * @return \Cassandra\Cluster\Builder self */ public function withBlackListHosts($hosts) { } @@ -118,7 +118,7 @@ public function withBlackListHosts($hosts) { } * * @param string $hosts A comma delimited list of addresses. * - * @return Builder self + * @return \Cassandra\Cluster\Builder self */ public function withWhiteListHosts($hosts) { } @@ -130,7 +130,7 @@ public function withWhiteListHosts($hosts) { } * * @param string $dcs A comma delimited list of datacenters. * - * @return Builder self + * @return \Cassandra\Cluster\Builder self */ public function withBlackListDCs($dcs) { } @@ -141,7 +141,7 @@ public function withBlackListDCs($dcs) { } * * @param string $dcs A comma delimited list of datacenters. * - * @return Builder self + * @return \Cassandra\Cluster\Builder self */ public function withWhiteListDCs($dcs) { } @@ -150,7 +150,7 @@ public function withWhiteListDCs($dcs) { } * * @param bool $enabled Whether to enable token aware routing (optional) * - * @return Builder self + * @return \Cassandra\Cluster\Builder self */ public function withTokenAwareRouting($enabled) { } @@ -160,7 +160,7 @@ public function withTokenAwareRouting($enabled) { } * @param string $username Username * @param string $password Password * - * @return Builder self + * @return \Cassandra\Cluster\Builder self */ public function withCredentials($username, $password) { } @@ -169,7 +169,7 @@ public function withCredentials($username, $password) { } * * @param float $timeout Timeout value in seconds, can be fractional * - * @return Builder self + * @return \Cassandra\Cluster\Builder self */ public function withConnectTimeout($timeout) { } @@ -178,16 +178,16 @@ public function withConnectTimeout($timeout) { } * * @param float $timeout Timeout value in seconds, can be fractional * - * @return Builder self + * @return \Cassandra\Cluster\Builder self */ public function withRequestTimeout($timeout) { } /** * Set up ssl context. * - * @param SSLOptions $options a preconfigured ssl context + * @param \Cassandra\SSLOptions $options a preconfigured ssl context * - * @return Builder self + * @return \Cassandra\Cluster\Builder self */ public function withSSL($options) { } @@ -196,7 +196,7 @@ public function withSSL($options) { } * * @param bool $enabled whether to enable persistent sessions and clusters * - * @return Builder self + * @return \Cassandra\Cluster\Builder self */ public function withPersistentSessions($enabled) { } @@ -212,7 +212,7 @@ public function withPersistentSessions($enabled) { } * * @param int $version The protocol version * - * @return Builder self + * @return \Cassandra\Cluster\Builder self */ public function withProtocolVersion($version) { } @@ -224,7 +224,7 @@ public function withProtocolVersion($version) { } * * @param int $count total number of threads. * - * @return Builder self + * @return \Cassandra\Cluster\Builder self */ public function withIOThreads($count) { } @@ -239,7 +239,7 @@ public function withIOThreads($count) { } * @param int $core minimum connections to keep open to any given host * @param int $max maximum connections to keep open to any given host * - * @return Builder self + * @return \Cassandra\Cluster\Builder self */ public function withConnectionsPerHost($core, $max) { } @@ -249,7 +249,7 @@ public function withConnectionsPerHost($core, $max) { } * * @param float $interval interval in seconds * - * @return Builder self + * @return \Cassandra\Cluster\Builder self */ public function withReconnectInterval($interval) { } @@ -258,7 +258,7 @@ public function withReconnectInterval($interval) { } * * @param bool $enabled whether to actually enable or disable the routing. * - * @return Builder self + * @return \Cassandra\Cluster\Builder self */ public function withLatencyAwareRouting($enabled) { } @@ -267,7 +267,7 @@ public function withLatencyAwareRouting($enabled) { } * * @param bool $enabled whether to actually enable or disable nodelay. * - * @return Builder self + * @return \Cassandra\Cluster\Builder self */ public function withTCPNodelay($enabled) { } @@ -279,26 +279,26 @@ public function withTCPNodelay($enabled) { } * the connection. If set to `null`, disables * keepalive probing. * - * @return Builder self + * @return \Cassandra\Cluster\Builder self */ public function withTCPKeepalive($delay) { } /** * Configures the retry policy. * - * @param Cluster\RetryPolicy $policy the retry policy to use. + * @param \Cassandra\RetryPolicy $policy the retry policy to use. * - * @return Builder self + * @return \Cassandra\Cluster\Builder self */ public function withRetryPolicy($policy) { } /** * Sets the timestamp generator. * - * @param TimestampGenerator $generator A timestamp generator that will be used - * to generate timestamps for statements. + * @param \Cassandra\TimestampGenerator $generator A timestamp generator that will be used + * to generate timestamps for statements. * - * @return Builder self + * @return \Cassandra\Cluster\Builder self */ public function withTimestampGenerator($generator) { } @@ -312,7 +312,7 @@ public function withTimestampGenerator($generator) { } * * @param bool $enabled whether the driver fetches and maintains schema metadata. * - * @return Builder self + * @return \Cassandra\Cluster\Builder self */ public function withSchemaMetadata($enabled) { } @@ -329,7 +329,7 @@ public function withSchemaMetadata($enabled) { } * * @param bool $enabled whether the driver uses hostname resolution. * - * @return Builder self + * @return \Cassandra\Cluster\Builder self */ public function withHostnameResolution($enabled) { } @@ -344,7 +344,7 @@ public function withHostnameResolution($enabled) { } * * @param bool $enabled whether the driver uses randomized contact points. * - * @return Builder self + * @return \Cassandra\Cluster\Builder self */ public function withRandomizedContactPoints($enabled) { } @@ -356,7 +356,7 @@ public function withRandomizedContactPoints($enabled) { } * * @param float $interval interval in seconds (0 to disable heartbeat). * - * @return Builder self + * @return \Cassandra\Cluster\Builder self */ public function withConnectionHeartbeatInterval($interval) { } diff --git a/ext/doc/Cassandra/Collection.php b/ext/doc/Cassandra/Collection.php index 81a0bb033..ad3662b87 100644 --- a/ext/doc/Cassandra/Collection.php +++ b/ext/doc/Cassandra/Collection.php @@ -26,14 +26,14 @@ final class Collection implements Value, \Countable, \Iterator { /** * Creates a new collection of a given type. * - * @param Type $type + * @param \Cassandra\Type $type */ public function __construct($type) { } /** * The type of this collection. * - * @return Type + * @return \Cassandra\Type */ public function type() { } diff --git a/ext/doc/Cassandra/Column.php b/ext/doc/Cassandra/Column.php index 0c696cc0f..6a509581c 100644 --- a/ext/doc/Cassandra/Column.php +++ b/ext/doc/Cassandra/Column.php @@ -33,7 +33,7 @@ public function name(); /** * Returns the type of the column. * - * @return Type Type of the column + * @return \Cassandra\Type Type of the column */ public function type(); diff --git a/ext/doc/Cassandra/Custom.php b/ext/doc/Cassandra/Custom.php index 6a2641949..982048319 100644 --- a/ext/doc/Cassandra/Custom.php +++ b/ext/doc/Cassandra/Custom.php @@ -26,7 +26,7 @@ abstract class Custom implements Value { /** * The type of this value. * - * @return Type\Custom + * @return \Cassandra\Type\Custom */ public abstract function type(); diff --git a/ext/doc/Cassandra/Date.php b/ext/doc/Cassandra/Date.php index 25b7c8596..4084aedca 100644 --- a/ext/doc/Cassandra/Date.php +++ b/ext/doc/Cassandra/Date.php @@ -33,7 +33,7 @@ public function __construct($seconds) { } /** * The type of this date. * - * @return Type + * @return \Cassandra\Type */ public function type() { } @@ -45,7 +45,7 @@ public function seconds() { } /** * Converts current date to PHP DateTime. * - * @param Time $time An optional Time object that is added to the DateTime object. + * @param \Cassandra\Time $time An optional Time object that is added to the DateTime object. * * @return \DateTime PHP representation */ diff --git a/ext/doc/Cassandra/Decimal.php b/ext/doc/Cassandra/Decimal.php index f97c9fc29..c4187e00d 100644 --- a/ext/doc/Cassandra/Decimal.php +++ b/ext/doc/Cassandra/Decimal.php @@ -47,7 +47,7 @@ public function __toString() { } /** * The type of this decimal. * - * @return Type + * @return \Cassandra\Type */ public function type() { } @@ -66,47 +66,47 @@ public function value() { } public function scale() { } /** - * @param Numeric $num a number to add to this one - * @return Numeric sum + * @param \Cassandra\Numeric $num a number to add to this one + * @return \Cassandra\Numeric sum */ public function add($num) { } /** - * @param Numeric $num a number to subtract from this one - * @return Numeric difference + * @param \Cassandra\Numeric $num a number to subtract from this one + * @return \Cassandra\Numeric difference */ public function sub($num) { } /** - * @param Numeric $num a number to multiply this one by - * @return Numeric product + * @param \Cassandra\Numeric $num a number to multiply this one by + * @return \Cassandra\Numeric product */ public function mul($num) { } /** - * @param Numeric $num a number to divide this one by - * @return Numeric quotient + * @param \Cassandra\Numeric $num a number to divide this one by + * @return \Cassandra\Numeric quotient */ public function div($num) { } /** - * @param Numeric $num a number to divide this one by - * @return Numeric remainder + * @param \Cassandra\Numeric $num a number to divide this one by + * @return \Cassandra\Numeric remainder */ public function mod($num) { } /** - * @return Numeric absolute value + * @return \Cassandra\Numeric absolute value */ public function abs() { } /** - * @return Numeric negative value + * @return \Cassandra\Numeric negative value */ public function neg() { } /** - * @return Numeric square root + * @return \Cassandra\Numeric square root */ public function sqrt() { } diff --git a/ext/doc/Cassandra/DefaultAggregate.php b/ext/doc/Cassandra/DefaultAggregate.php index e7d0768c5..02844cb7e 100644 --- a/ext/doc/Cassandra/DefaultAggregate.php +++ b/ext/doc/Cassandra/DefaultAggregate.php @@ -47,35 +47,35 @@ public function argumentTypes() { } /** * Returns the state function of the aggregate * - * @return Function State public function of the aggregate + * @return \Cassandra\Function State public function of the aggregate */ public function stateFunction() { } /** * Returns the final function of the aggregate * - * @return Function Final public function of the aggregate + * @return \Cassandra\Function Final public function of the aggregate */ public function finalFunction() { } /** * Returns the initial condition of the aggregate * - * @return Value Initial condition of the aggregate + * @return \Cassandra\Value */ public function initialCondition() { } /** * Returns the state type of the aggregate * - * @return Type State type of the aggregate + * @return \Cassandra\Type State type of the aggregate */ public function stateType() { } /** * Returns the return type of the aggregate * - * @return Type Return type of the aggregate + * @return \Cassandra\Type Return type of the aggregate */ public function returnType() { } diff --git a/ext/doc/Cassandra/DefaultCluster.php b/ext/doc/Cassandra/DefaultCluster.php index 6a3317670..ce969a52a 100644 --- a/ext/doc/Cassandra/DefaultCluster.php +++ b/ext/doc/Cassandra/DefaultCluster.php @@ -31,7 +31,7 @@ final class DefaultCluster implements Cluster { * @param string $keyspace Optional keyspace name * @param int $timeout Optional timeout * - * @return Session Session instance + * @return \Cassandra\Session Session instance */ public function connect($keyspace, $timeout) { } @@ -40,7 +40,7 @@ public function connect($keyspace, $timeout) { } * * @param string $keyspace Optional keyspace name * - * @return Future A Future Session instance + * @return \Cassandra\Future A Future Session instance */ public function connectAsync($keyspace) { } diff --git a/ext/doc/Cassandra/DefaultColumn.php b/ext/doc/Cassandra/DefaultColumn.php index b4e34d947..695b096f2 100644 --- a/ext/doc/Cassandra/DefaultColumn.php +++ b/ext/doc/Cassandra/DefaultColumn.php @@ -33,7 +33,7 @@ public function name() { } /** * Returns the type of the column. * - * @return Type Type of the column + * @return \Cassandra\Type Type of the column */ public function type() { } diff --git a/ext/doc/Cassandra/DefaultFunction.php b/ext/doc/Cassandra/DefaultFunction.php index 8ae30c312..c29a08dc5 100644 --- a/ext/doc/Cassandra/DefaultFunction.php +++ b/ext/doc/Cassandra/DefaultFunction.php @@ -47,7 +47,7 @@ public function arguments() { } /** * Returns the return type of the function * - * @return Type Return type of the function + * @return \Cassandra\Type Return type of the function */ public function returnType() { } diff --git a/ext/doc/Cassandra/DefaultIndex.php b/ext/doc/Cassandra/DefaultIndex.php index 57d705d62..750688c6f 100644 --- a/ext/doc/Cassandra/DefaultIndex.php +++ b/ext/doc/Cassandra/DefaultIndex.php @@ -49,7 +49,7 @@ public function target() { } * * @param string $name The name of the option * - * @return Value Value of an option by name + * @return \Cassandra\Value Value of an option by name */ public function option($name) { } diff --git a/ext/doc/Cassandra/DefaultKeyspace.php b/ext/doc/Cassandra/DefaultKeyspace.php index d18b21e16..70ed5813f 100644 --- a/ext/doc/Cassandra/DefaultKeyspace.php +++ b/ext/doc/Cassandra/DefaultKeyspace.php @@ -40,7 +40,7 @@ public function replicationClassName() { } /** * Returns replication options * - * @return Map Replication options + * @return \Cassandra\Map Replication options */ public function replicationOptions() { } @@ -56,7 +56,7 @@ public function hasDurableWrites() { } * * @param string $name Table name * - * @return Table + * @return \Cassandra\Table */ public function table($name) { } @@ -72,7 +72,7 @@ public function tables() { } * * @param string $name User type name * - * @return Type\UserType|null A user type or null + * @return \Cassandra\Type\UserType|null A user type or null */ public function userType($name) { } @@ -88,7 +88,7 @@ public function userTypes() { } * * @param string $name Materialized view name * - * @return MaterizedView|null A materialized view or null + * @return \Cassandra\MaterizedView|null A materialized view or null */ public function materializedView($name) { } @@ -103,9 +103,9 @@ public function materializedViews() { } * Get a function by name and signature * * @param string $name Function name - * @param string|Type $params Function arguments + * @param string|\Cassandra\Type $params Function arguments * - * @return Function|null A function or null + * @return \Cassandra\Function|null A function or null */ public function function_($name, ...$params) { } @@ -120,9 +120,9 @@ public function functions() { } * Get an aggregate by name and signature * * @param string $name Aggregate name - * @param string|Type $params Aggregate arguments + * @param string|\Cassandra\Type $params Aggregate arguments * - * @return Aggregate|null An aggregate or null + * @return \Cassandra\Aggregate|null An aggregate or null */ public function aggregate($name, ...$params) { } diff --git a/ext/doc/Cassandra/DefaultMaterializedView.php b/ext/doc/Cassandra/DefaultMaterializedView.php index f0be6a2d5..b35e39b12 100644 --- a/ext/doc/Cassandra/DefaultMaterializedView.php +++ b/ext/doc/Cassandra/DefaultMaterializedView.php @@ -35,7 +35,7 @@ public function name() { } * * @param string $name The name of the option * - * @return Value Value of an option by name + * @return \Cassandra\Value Value of an option by name */ public function option($name) { } @@ -126,14 +126,14 @@ public function compactionStrategyClassName() { } /** * Returns compaction strategy options * - * @return Map Compaction strategy options + * @return \Cassandra\Map Compaction strategy options */ public function compactionStrategyOptions() { } /** * Returns compression parameters * - * @return Map Compression parameters + * @return \Cassandra\Map Compression parameters */ public function compressionParameters() { } @@ -170,7 +170,7 @@ public function minIndexInterval() { } * * @param string $name Name of the column * - * @return Column Column instance + * @return \Cassandra\Column Column instance */ public function column($name) { } @@ -210,7 +210,7 @@ public function clusteringOrder() { } /** * Returns the base table of the view * - * @return Table Base table of the view + * @return \Cassandra\Table Base table of the view */ public function baseTable() { } diff --git a/ext/doc/Cassandra/DefaultSchema.php b/ext/doc/Cassandra/DefaultSchema.php index 23c644333..115b67d09 100644 --- a/ext/doc/Cassandra/DefaultSchema.php +++ b/ext/doc/Cassandra/DefaultSchema.php @@ -28,7 +28,7 @@ final class DefaultSchema implements Schema { * * @param string $name Name of the keyspace to get * - * @return Keyspace Keyspace instance or null + * @return \Cassandra\Keyspace Keyspace instance or null */ public function keyspace($name) { } diff --git a/ext/doc/Cassandra/DefaultSession.php b/ext/doc/Cassandra/DefaultSession.php index 001099fe0..53c521815 100644 --- a/ext/doc/Cassandra/DefaultSession.php +++ b/ext/doc/Cassandra/DefaultSession.php @@ -41,12 +41,12 @@ final class DefaultSession implements Session { * | timestamp | int\|string | Either an integer or integer string timestamp that represents the number of microseconds since the epoch | * | execute_as | string | User to execute statement as | * - * @param string|Statement $statement string or statement to be executed. - * @param array|ExecutionOptions|null $options Options to control execution of the query. + * @param string|\Cassandra\Statement $statement string or statement to be executed. + * @param array|\Cassandra\ExecutionOptions|null $options Options to control execution of the query. * * @throws Exception * - * @return Rows A collection of rows. + * @return \Cassandra\Rows A collection of rows. */ public function execute($statement, $options) { } @@ -54,10 +54,10 @@ public function execute($statement, $options) { } * Execute a query asynchronously. This method returns immediately, but * the query continues execution in the background. * - * @param string|Statement $statement string or statement to be executed. - * @param array|ExecutionOptions|null $options Options to control execution of the query. + * @param string|\Cassandra\Statement $statement string or statement to be executed. + * @param array|\Cassandra\ExecutionOptions|null $options Options to control execution of the query. * - * @return FutureRows A future that can be used to retrieve the result. + * @return \Cassandra\FutureRows A future that can be used to retrieve the result. * * @see Session::execute() for valid execution options */ @@ -67,11 +67,11 @@ public function executeAsync($statement, $options) { } * Prepare a query for execution. * * @param string $cql The query to be prepared. - * @param array|ExecutionOptions|null $options Options to control preparing the query. + * @param array|\Cassandra\ExecutionOptions|null $options Options to control preparing the query. * * @throws Exception * - * @return PreparedStatement A prepared statement that can be bound with parameters and executed. + * @return \Cassandra\PreparedStatement A prepared statement that can be bound with parameters and executed. * * @see Session::execute() for valid execution options */ @@ -81,9 +81,9 @@ public function prepare($cql, $options) { } * Asynchronously prepare a query for execution. * * @param string $cql The query to be prepared. - * @param array|ExecutionOptions|null $options Options to control preparing the query. + * @param array|\Cassandra\ExecutionOptions|null $options Options to control preparing the query. * - * @return FuturePreparedStatement A future that can be used to retrieve the prepared statement. + * @return \Cassandra\FuturePreparedStatement A future that can be used to retrieve the prepared statement. * * @see Session::execute() for valid execution options */ @@ -103,7 +103,7 @@ public function close($timeout) { } /** * Asynchronously close the session and all its connections. * - * @return FutureClose A future that can be waited on. + * @return \Cassandra\FutureClose A future that can be waited on. */ public function closeAsync() { } @@ -117,7 +117,7 @@ public function metrics() { } /** * Get a snapshot of the cluster's current schema. * - * @return Schema A snapshot of the cluster's schema. + * @return \Cassandra\Schema A snapshot of the cluster's schema. */ public function schema() { } diff --git a/ext/doc/Cassandra/DefaultTable.php b/ext/doc/Cassandra/DefaultTable.php index 563a2f4ed..a232741bd 100644 --- a/ext/doc/Cassandra/DefaultTable.php +++ b/ext/doc/Cassandra/DefaultTable.php @@ -35,7 +35,7 @@ public function name() { } * * @param string $name The name of the option * - * @return Value Value of an option by name + * @return \Cassandra\Value Value of an option by name */ public function option($name) { } @@ -126,14 +126,14 @@ public function compactionStrategyClassName() { } /** * Returns compaction strategy options * - * @return Map Compaction strategy options + * @return \Cassandra\Map Compaction strategy options */ public function compactionStrategyOptions() { } /** * Returns compression parameters * - * @return Map Compression parameters + * @return \Cassandra\Map Compression parameters */ public function compressionParameters() { } @@ -170,7 +170,7 @@ public function minIndexInterval() { } * * @param string $name Name of the column * - * @return Column Column instance + * @return \Cassandra\Column Column instance */ public function column($name) { } @@ -212,7 +212,7 @@ public function clusteringOrder() { } * * @param string $name Index name * - * @return Index|null An index or null + * @return \Cassandra\Index|null An index or null */ public function index($name) { } @@ -228,7 +228,7 @@ public function indexes() { } * * @param string $name Materialized view name * - * @return MaterizedView|null A materialized view or null + * @return \Cassandra\MaterizedView|null A materialized view or null */ public function materializedView($name) { } diff --git a/ext/doc/Cassandra/Duration.php b/ext/doc/Cassandra/Duration.php index 456e98cb1..009cacfaa 100644 --- a/ext/doc/Cassandra/Duration.php +++ b/ext/doc/Cassandra/Duration.php @@ -24,16 +24,16 @@ final class Duration implements Value { /** - * @param long|double|string|Bigint $months Months attribute of the duration. - * @param long|double|string|Bigint $days Days attribute of the duration. - * @param long|double|string|Bigint $nanos Nanos attribute of the duration. + * @param long|double|string|\Cassandra\Bigint $months Months attribute of the duration. + * @param long|double|string|\Cassandra\Bigint $days Days attribute of the duration. + * @param long|double|string|\Cassandra\Bigint $nanos Nanos attribute of the duration. */ public function __construct($months, $days, $nanos) { } /** * The type of represented by the value. * - * @return Type the Cassandra type for Duration + * @return \Cassandra\Type the Cassandra type for Duration */ public function type() { } diff --git a/ext/doc/Cassandra/Float.php b/ext/doc/Cassandra/Float.php index 5c0a63d5b..869713a88 100644 --- a/ext/doc/Cassandra/Float.php +++ b/ext/doc/Cassandra/Float.php @@ -26,7 +26,7 @@ final class Float_ implements Value, Numeric { /** * Creates a new float. * - * @param double|int|string|Float $value A float value as a string, number or Float + * @param double|int|string|\Cassandra\Float $value A float value as a string, number or Float */ public function __construct($value) { } @@ -40,7 +40,7 @@ public function __toString() { } /** * The type of this float. * - * @return Type + * @return \Cassandra\Type */ public function type() { } @@ -67,47 +67,47 @@ public function isFinite() { } public function isNaN() { } /** - * @param Numeric $num a number to add to this one - * @return Numeric sum + * @param \Cassandra\Numeric $num a number to add to this one + * @return \Cassandra\Numeric sum */ public function add($num) { } /** - * @param Numeric $num a number to subtract from this one - * @return Numeric difference + * @param \Cassandra\Numeric $num a number to subtract from this one + * @return \Cassandra\Numeric difference */ public function sub($num) { } /** - * @param Numeric $num a number to multiply this one by - * @return Numeric product + * @param \Cassandra\Numeric $num a number to multiply this one by + * @return \Cassandra\Numeric product */ public function mul($num) { } /** - * @param Numeric $num a number to divide this one by - * @return Numeric quotient + * @param \Cassandra\Numeric $num a number to divide this one by + * @return \Cassandra\Numeric quotient */ public function div($num) { } /** - * @param Numeric $num a number to divide this one by - * @return Numeric remainder + * @param \Cassandra\Numeric $num a number to divide this one by + * @return \Cassandra\Numeric remainder */ public function mod($num) { } /** - * @return Numeric absolute value + * @return \Cassandra\Numeric absolute value */ public function abs() { } /** - * @return Numeric negative value + * @return \Cassandra\Numeric negative value */ public function neg() { } /** - * @return Numeric square root + * @return \Cassandra\Numeric square root */ public function sqrt() { } @@ -124,14 +124,14 @@ public function toDouble() { } /** * Minimum possible Float value * - * @return Float minimum value + * @return \Cassandra\Float minimum value */ public static function min() { } /** * Maximum possible Float value * - * @return Float maximum value + * @return \Cassandra\Float maximum value */ public static function max() { } diff --git a/ext/doc/Cassandra/Function.php b/ext/doc/Cassandra/Function.php index 13b8f2414..6a1ccf086 100644 --- a/ext/doc/Cassandra/Function.php +++ b/ext/doc/Cassandra/Function.php @@ -47,7 +47,7 @@ public function arguments(); /** * Returns the return type of the function * - * @return Type Return type of the function + * @return \Cassandra\Type Return type of the function */ public function returnType(); diff --git a/ext/doc/Cassandra/FuturePreparedStatement.php b/ext/doc/Cassandra/FuturePreparedStatement.php index eb6a93148..46c3d9278 100644 --- a/ext/doc/Cassandra/FuturePreparedStatement.php +++ b/ext/doc/Cassandra/FuturePreparedStatement.php @@ -34,7 +34,7 @@ final class FuturePreparedStatement implements Future { * @throws Exception\InvalidArgumentException * @throws Exception\TimeoutException * - * @return PreparedStatement A prepared statement + * @return \Cassandra\PreparedStatement A prepared statement */ public function get($timeout) { } diff --git a/ext/doc/Cassandra/FutureRows.php b/ext/doc/Cassandra/FutureRows.php index bcabf4ced..9f8b97129 100644 --- a/ext/doc/Cassandra/FutureRows.php +++ b/ext/doc/Cassandra/FutureRows.php @@ -33,7 +33,7 @@ final class FutureRows implements Future { * @throws Exception\InvalidArgumentException * @throws Exception\TimeoutException * - * @return Rows|null The result set + * @return \Cassandra\Rows|null The result set */ public function get($timeout) { } diff --git a/ext/doc/Cassandra/FutureSession.php b/ext/doc/Cassandra/FutureSession.php index 47153d8ef..df6552b80 100644 --- a/ext/doc/Cassandra/FutureSession.php +++ b/ext/doc/Cassandra/FutureSession.php @@ -33,7 +33,7 @@ final class FutureSession implements Future { * @throws Exception\InvalidArgumentException * @throws Exception\TimeoutException * - * @return Session A connected session + * @return \Cassandra\Session A connected session */ public function get($timeout) { } diff --git a/ext/doc/Cassandra/Index.php b/ext/doc/Cassandra/Index.php index 2598531fb..e740efa2d 100644 --- a/ext/doc/Cassandra/Index.php +++ b/ext/doc/Cassandra/Index.php @@ -49,7 +49,7 @@ public function target(); * * @param string $name The name of the option * - * @return Value Value of an option by name + * @return \Cassandra\Value Value of an option by name */ public function option($name); diff --git a/ext/doc/Cassandra/Inet.php b/ext/doc/Cassandra/Inet.php index a63c27847..ff453a3ff 100644 --- a/ext/doc/Cassandra/Inet.php +++ b/ext/doc/Cassandra/Inet.php @@ -40,7 +40,7 @@ public function __toString() { } /** * The type of this inet. * - * @return Type + * @return \Cassandra\Type */ public function type() { } diff --git a/ext/doc/Cassandra/Keyspace.php b/ext/doc/Cassandra/Keyspace.php index 4c8a08f75..63d58f873 100644 --- a/ext/doc/Cassandra/Keyspace.php +++ b/ext/doc/Cassandra/Keyspace.php @@ -40,7 +40,7 @@ public function replicationClassName(); /** * Returns replication options * - * @return Map Replication options + * @return \Cassandra\Map Replication options */ public function replicationOptions(); @@ -56,7 +56,7 @@ public function hasDurableWrites(); * * @param string $name Table name * - * @return Table|null Table instance or null + * @return \Cassandra\Table|null Table instance or null */ public function table($name); @@ -72,7 +72,7 @@ public function tables(); * * @param string $name User type name * - * @return Type\UserType|null A user type or null + * @return \Cassandra\Type\UserType|null A user type or null */ public function userType($name); @@ -88,7 +88,7 @@ public function userTypes(); * * @param string $name Materialized view name * - * @return MaterizedView|null A materialized view or null + * @return \Cassandra\MaterizedView|null A materialized view or null */ public function materializedView($name); @@ -103,9 +103,9 @@ public function materializedViews(); * Get a function by name and signature * * @param string $name Function name - * @param string|Type $params Function arguments + * @param string|\Cassandra\Type $params Function arguments * - * @return Function|null A function or null + * @return \Cassandra\Function|null A function or null */ public function function_($name, ...$params); @@ -120,9 +120,9 @@ public function functions(); * Get an aggregate by name and signature * * @param string $name Aggregate name - * @param string|Type $params Aggregate arguments + * @param string|\Cassandra\Type $params Aggregate arguments * - * @return Aggregate|null An aggregate or null + * @return \Cassandra\Aggregate|null An aggregate or null */ public function aggregate($name, ...$params); diff --git a/ext/doc/Cassandra/Map.php b/ext/doc/Cassandra/Map.php index e8f99de9f..3495fd685 100644 --- a/ext/doc/Cassandra/Map.php +++ b/ext/doc/Cassandra/Map.php @@ -26,15 +26,15 @@ final class Map implements Value, \Countable, \Iterator, \ArrayAccess { /** * Creates a new map of a given key and value type. * - * @param Type $keyType - * @param Type $valueType + * @param \Cassandra\Type $keyType + * @param \Cassandra\Type $valueType */ public function __construct($keyType, $valueType) { } /** * The type of this map. * - * @return Type + * @return \Cassandra\Type */ public function type() { } diff --git a/ext/doc/Cassandra/MaterializedView.php b/ext/doc/Cassandra/MaterializedView.php index 0e848362c..fd338ea21 100644 --- a/ext/doc/Cassandra/MaterializedView.php +++ b/ext/doc/Cassandra/MaterializedView.php @@ -26,7 +26,7 @@ abstract class MaterializedView implements Table { /** * Returns the base table of the view * - * @return Table Base table of the view + * @return \Cassandra\Table Base table of the view */ public abstract function baseTable(); @@ -42,7 +42,7 @@ public abstract function name(); * * @param string $name The name of the option * - * @return Value Value of an option by name + * @return \Cassandra\Value Value of an option by name */ public abstract function option($name); @@ -134,14 +134,14 @@ public abstract function compactionStrategyClassName(); /** * Returns compaction strategy options * - * @return Map Compaction strategy options + * @return \Cassandra\Map Compaction strategy options */ public abstract function compactionStrategyOptions(); /** * Returns compression parameters * - * @return Map Compression parameters + * @return \Cassandra\Map Compression parameters */ public abstract function compressionParameters(); @@ -178,7 +178,7 @@ public abstract function minIndexInterval(); * * @param string $name Name of the column * - * @return Column Column instance + * @return \Cassandra\Column Column instance */ public abstract function column($name); diff --git a/ext/doc/Cassandra/Numeric.php b/ext/doc/Cassandra/Numeric.php index 458b8b7d8..343a255b4 100644 --- a/ext/doc/Cassandra/Numeric.php +++ b/ext/doc/Cassandra/Numeric.php @@ -30,47 +30,47 @@ interface Numeric { /** - * @param Numeric $num a number to add to this one - * @return Numeric sum + * @param \Cassandra\Numeric $num a number to add to this one + * @return \Cassandra\Numeric sum */ public function add($num); /** - * @param Numeric $num a number to subtract from this one - * @return Numeric difference + * @param \Cassandra\Numeric $num a number to subtract from this one + * @return \Cassandra\Numeric difference */ public function sub($num); /** - * @param Numeric $num a number to multiply this one by - * @return Numeric product + * @param \Cassandra\Numeric $num a number to multiply this one by + * @return \Cassandra\Numeric product */ public function mul($num); /** - * @param Numeric $num a number to divide this one by - * @return Numeric quotient + * @param \Cassandra\Numeric $num a number to divide this one by + * @return \Cassandra\Numeric quotient */ public function div($num); /** - * @param Numeric $num a number to divide this one by - * @return Numeric remainder + * @param \Cassandra\Numeric $num a number to divide this one by + * @return \Cassandra\Numeric remainder */ public function mod($num); /** - * @return Numeric absolute value + * @return \Cassandra\Numeric absolute value */ public function abs(); /** - * @return Numeric negative value + * @return \Cassandra\Numeric negative value */ public function neg(); /** - * @return Numeric square root + * @return \Cassandra\Numeric square root */ public function sqrt(); diff --git a/ext/doc/Cassandra/RetryPolicy/Logging.php b/ext/doc/Cassandra/RetryPolicy/Logging.php index a9bd1c0d6..d05790c28 100644 --- a/ext/doc/Cassandra/RetryPolicy/Logging.php +++ b/ext/doc/Cassandra/RetryPolicy/Logging.php @@ -26,7 +26,7 @@ final class Logging implements \Cassandra\RetryPolicy { /** * Creates a new Logging retry policy. * - * @param RetryPolicy $childPolicy Any retry policy other than Logging + * @param \Cassandra\RetryPolicy $childPolicy Any retry policy other than Logging */ public function __construct($childPolicy) { } diff --git a/ext/doc/Cassandra/Rows.php b/ext/doc/Cassandra/Rows.php index bbc3d971f..4f4e04244 100644 --- a/ext/doc/Cassandra/Rows.php +++ b/ext/doc/Cassandra/Rows.php @@ -142,14 +142,14 @@ public function isLastPage() { } * * @param float|null $timeout * - * @return Rows|null loads and returns next result page + * @return \Cassandra\Rows|null loads and returns next result page */ public function nextPage($timeout) { } /** * Get the next page of results asynchronously. * - * @return Future returns future of the next result page + * @return \Cassandra\Future returns future of the next result page */ public function nextPageAsync() { } diff --git a/ext/doc/Cassandra/SSLOptions/Builder.php b/ext/doc/Cassandra/SSLOptions/Builder.php index ae5c10a14..403fa10d9 100644 --- a/ext/doc/Cassandra/SSLOptions/Builder.php +++ b/ext/doc/Cassandra/SSLOptions/Builder.php @@ -29,7 +29,7 @@ final class Builder { /** * Builds SSL options. * - * @return \SSLOptions ssl options configured accordingly. + * @return \Cassandra\SSLOptions ssl options configured accordingly. */ public function build() { } @@ -40,7 +40,7 @@ public function build() { } * * @throws \Exception\InvalidArgumentException * - * @return Builder self + * @return \Cassandra\SSLOptions\Builder self */ public function withTrustedCerts($path) { } @@ -51,7 +51,7 @@ public function withTrustedCerts($path) { } * * @throws \Exception\InvalidArgumentException * - * @return Builder self + * @return \Cassandra\SSLOptions\Builder self */ public function withVerifyFlags($flags) { } @@ -65,7 +65,7 @@ public function withVerifyFlags($flags) { } * * @throws \Exception\InvalidArgumentException * - * @return Builder self + * @return \Cassandra\SSLOptions\Builder self */ public function withClientCert($path) { } @@ -78,7 +78,7 @@ public function withClientCert($path) { } * * @throws \Exception\InvalidArgumentException * - * @return Builder self + * @return \Cassandra\SSLOptions\Builder self */ public function withPrivateKey($path, $passphrase) { } diff --git a/ext/doc/Cassandra/Schema.php b/ext/doc/Cassandra/Schema.php index 05d1b09a0..56706de9c 100644 --- a/ext/doc/Cassandra/Schema.php +++ b/ext/doc/Cassandra/Schema.php @@ -28,7 +28,7 @@ interface Schema { * * @param string $name Name of the keyspace to get * - * @return Keyspace Keyspace instance or null + * @return \Cassandra\Keyspace Keyspace instance or null */ public function keyspace($name); diff --git a/ext/doc/Cassandra/Session.php b/ext/doc/Cassandra/Session.php index 2d5c89e46..b233668ef 100644 --- a/ext/doc/Cassandra/Session.php +++ b/ext/doc/Cassandra/Session.php @@ -41,12 +41,12 @@ interface Session { * | timestamp | int\|string | Either an integer or integer string timestamp that represents the number of microseconds since the epoch | * | execute_as | string | User to execute statement as | * - * @param string|Statement $statement string or statement to be executed. - * @param array|ExecutionOptions|null $options Options to control execution of the query. + * @param string|\Cassandra\Statement $statement string or statement to be executed. + * @param array|\Cassandra\ExecutionOptions|null $options Options to control execution of the query. * * @throws Exception * - * @return Rows A collection of rows. + * @return \Cassandra\Rows A collection of rows. */ public function execute($statement, $options); @@ -54,10 +54,10 @@ public function execute($statement, $options); * Execute a query asynchronously. This method returns immediately, but * the query continues execution in the background. * - * @param string|Statement $statement string or statement to be executed. - * @param array|ExecutionOptions|null $options Options to control execution of the query. + * @param string|\Cassandra\Statement $statement string or statement to be executed. + * @param array|\Cassandra\ExecutionOptions|null $options Options to control execution of the query. * - * @return FutureRows A future that can be used to retrieve the result. + * @return \Cassandra\FutureRows A future that can be used to retrieve the result. * * @see Session::execute() for valid execution options */ @@ -67,11 +67,11 @@ public function executeAsync($statement, $options); * Prepare a query for execution. * * @param string $cql The query to be prepared. - * @param array|ExecutionOptions|null $options Options to control preparing the query. + * @param array|\Cassandra\ExecutionOptions|null $options Options to control preparing the query. * * @throws Exception * - * @return PreparedStatement A prepared statement that can be bound with parameters and executed. + * @return \Cassandra\PreparedStatement A prepared statement that can be bound with parameters and executed. * * @see Session::execute() for valid execution options */ @@ -81,9 +81,9 @@ public function prepare($cql, $options); * Asynchronously prepare a query for execution. * * @param string $cql The query to be prepared. - * @param array|ExecutionOptions|null $options Options to control preparing the query. + * @param array|\Cassandra\ExecutionOptions|null $options Options to control preparing the query. * - * @return FuturePreparedStatement A future that can be used to retrieve the prepared statement. + * @return \Cassandra\FuturePreparedStatement A future that can be used to retrieve the prepared statement. * * @see Session::execute() for valid execution options */ @@ -103,7 +103,7 @@ public function close($timeout); /** * Asynchronously close the session and all its connections. * - * @return FutureClose A future that can be waited on. + * @return \Cassandra\FutureClose A future that can be waited on. */ public function closeAsync(); @@ -117,7 +117,7 @@ public function metrics(); /** * Get a snapshot of the cluster's current schema. * - * @return Schema A snapshot of the cluster's schema. + * @return \Cassandra\Schema A snapshot of the cluster's schema. */ public function schema(); diff --git a/ext/doc/Cassandra/Set.php b/ext/doc/Cassandra/Set.php index 81e76873f..8daedf2d9 100644 --- a/ext/doc/Cassandra/Set.php +++ b/ext/doc/Cassandra/Set.php @@ -26,14 +26,14 @@ final class Set implements Value, \Countable, \Iterator { /** * Creates a new collection of a given type. * - * @param Type $type + * @param \Cassandra\Type $type */ public function __construct($type) { } /** * The type of this set. * - * @return Type + * @return \Cassandra\Type */ public function type() { } diff --git a/ext/doc/Cassandra/Smallint.php b/ext/doc/Cassandra/Smallint.php index 1e763ade7..3fd19d656 100644 --- a/ext/doc/Cassandra/Smallint.php +++ b/ext/doc/Cassandra/Smallint.php @@ -38,7 +38,7 @@ public function __toString() { } /** * The type of this value (smallint). * - * @return Type + * @return \Cassandra\Type */ public function type() { } @@ -50,47 +50,47 @@ public function type() { } public function value() { } /** - * @param Numeric $num a number to add to this one - * @return Numeric sum + * @param \Cassandra\Numeric $num a number to add to this one + * @return \Cassandra\Numeric sum */ public function add($num) { } /** - * @param Numeric $num a number to subtract from this one - * @return Numeric difference + * @param \Cassandra\Numeric $num a number to subtract from this one + * @return \Cassandra\Numeric difference */ public function sub($num) { } /** - * @param Numeric $num a number to multiply this one by - * @return Numeric product + * @param \Cassandra\Numeric $num a number to multiply this one by + * @return \Cassandra\Numeric product */ public function mul($num) { } /** - * @param Numeric $num a number to divide this one by - * @return Numeric quotient + * @param \Cassandra\Numeric $num a number to divide this one by + * @return \Cassandra\Numeric quotient */ public function div($num) { } /** - * @param Numeric $num a number to divide this one by - * @return Numeric remainder + * @param \Cassandra\Numeric $num a number to divide this one by + * @return \Cassandra\Numeric remainder */ public function mod($num) { } /** - * @return Numeric absolute value + * @return \Cassandra\Numeric absolute value */ public function abs() { } /** - * @return Numeric negative value + * @return \Cassandra\Numeric negative value */ public function neg() { } /** - * @return Numeric square root + * @return \Cassandra\Numeric square root */ public function sqrt() { } @@ -107,14 +107,14 @@ public function toDouble() { } /** * Minimum possible Smallint value * - * @return Smallint minimum value + * @return \Cassandra\Smallint minimum value */ public static function min() { } /** * Maximum possible Smallint value * - * @return Smallint maximum value + * @return \Cassandra\Smallint maximum value */ public static function max() { } diff --git a/ext/doc/Cassandra/Table.php b/ext/doc/Cassandra/Table.php index a5ea9be9a..cb46da247 100644 --- a/ext/doc/Cassandra/Table.php +++ b/ext/doc/Cassandra/Table.php @@ -35,7 +35,7 @@ public function name(); * * @param string $name The name of the option * - * @return Value Value of an option by name + * @return \Cassandra\Value Value of an option by name */ public function option($name); @@ -126,14 +126,14 @@ public function compactionStrategyClassName(); /** * Returns compaction strategy options * - * @return Map Compaction strategy options + * @return \Cassandra\Map Compaction strategy options */ public function compactionStrategyOptions(); /** * Returns compression parameters * - * @return Map Compression parameters + * @return \Cassandra\Map Compression parameters */ public function compressionParameters(); @@ -170,7 +170,7 @@ public function minIndexInterval(); * * @param string $name Name of the column * - * @return Column Column instance + * @return \Cassandra\Column Column instance */ public function column($name); diff --git a/ext/doc/Cassandra/Time.php b/ext/doc/Cassandra/Time.php index 98c3b25af..05bc93911 100644 --- a/ext/doc/Cassandra/Time.php +++ b/ext/doc/Cassandra/Time.php @@ -33,7 +33,7 @@ public function __construct($nanoseconds) { } /** * The type of this date. * - * @return Type + * @return \Cassandra\Type */ public function type() { } @@ -43,8 +43,8 @@ public function type() { } public function seconds() { } /** - * @param DateTime $datetime - * @return Time + * @param \DateTime $datetime + * @return \Cassandra\Time */ public static function fromDateTime($datetime) { } diff --git a/ext/doc/Cassandra/Timestamp.php b/ext/doc/Cassandra/Timestamp.php index 11187224d..b921c1770 100644 --- a/ext/doc/Cassandra/Timestamp.php +++ b/ext/doc/Cassandra/Timestamp.php @@ -35,7 +35,7 @@ public function __construct($seconds, $microseconds) { } /** * The type of this timestamp. * - * @return Type + * @return \Cassandra\Type */ public function type() { } diff --git a/ext/doc/Cassandra/Timeuuid.php b/ext/doc/Cassandra/Timeuuid.php index d12b67c94..514a472b8 100644 --- a/ext/doc/Cassandra/Timeuuid.php +++ b/ext/doc/Cassandra/Timeuuid.php @@ -40,7 +40,7 @@ public function __toString() { } /** * The type of this timeuuid. * - * @return Type + * @return \Cassandra\Type */ public function type() { } diff --git a/ext/doc/Cassandra/Tinyint.php b/ext/doc/Cassandra/Tinyint.php index 07bc11e94..4a1d05209 100644 --- a/ext/doc/Cassandra/Tinyint.php +++ b/ext/doc/Cassandra/Tinyint.php @@ -38,7 +38,7 @@ public function __toString() { } /** * The type of this value (tinyint). * - * @return Type + * @return \Cassandra\Type */ public function type() { } @@ -50,47 +50,47 @@ public function type() { } public function value() { } /** - * @param Numeric $num a number to add to this one - * @return Numeric sum + * @param \Cassandra\Numeric $num a number to add to this one + * @return \Cassandra\Numeric sum */ public function add($num) { } /** - * @param Numeric $num a number to subtract from this one - * @return Numeric difference + * @param \Cassandra\Numeric $num a number to subtract from this one + * @return \Cassandra\Numeric difference */ public function sub($num) { } /** - * @param Numeric $num a number to multiply this one by - * @return Numeric product + * @param \Cassandra\Numeric $num a number to multiply this one by + * @return \Cassandra\Numeric product */ public function mul($num) { } /** - * @param Numeric $num a number to divide this one by - * @return Numeric quotient + * @param \Cassandra\Numeric $num a number to divide this one by + * @return \Cassandra\Numeric quotient */ public function div($num) { } /** - * @param Numeric $num a number to divide this one by - * @return Numeric remainder + * @param \Cassandra\Numeric $num a number to divide this one by + * @return \Cassandra\Numeric remainder */ public function mod($num) { } /** - * @return Numeric absolute value + * @return \Cassandra\Numeric absolute value */ public function abs() { } /** - * @return Numeric negative value + * @return \Cassandra\Numeric negative value */ public function neg() { } /** - * @return Numeric square root + * @return \Cassandra\Numeric square root */ public function sqrt() { } @@ -107,14 +107,14 @@ public function toDouble() { } /** * Minimum possible Tinyint value * - * @return Tinyint minimum value + * @return \Cassandra\Tinyint minimum value */ public static function min() { } /** * Maximum possible Tinyint value * - * @return Tinyint maximum value + * @return \Cassandra\Tinyint maximum value */ public static function max() { } diff --git a/ext/doc/Cassandra/Tuple.php b/ext/doc/Cassandra/Tuple.php index b63ea157f..77e495b19 100644 --- a/ext/doc/Cassandra/Tuple.php +++ b/ext/doc/Cassandra/Tuple.php @@ -33,7 +33,7 @@ public function __construct($types) { } /** * The type of this tuple. * - * @return Type + * @return \Cassandra\Type */ public function type() { } diff --git a/ext/doc/Cassandra/Type.php b/ext/doc/Cassandra/Type.php index 9b3af9910..fe6ff955d 100644 --- a/ext/doc/Cassandra/Type.php +++ b/ext/doc/Cassandra/Type.php @@ -40,147 +40,147 @@ public abstract function __toString(); /** * Get representation of ascii type * - * @return Type ascii type + * @return \Cassandra\Type ascii type */ public static final function ascii() { } /** * Get representation of bigint type * - * @return Type bigint type + * @return \Cassandra\Type bigint type */ public static final function bigint() { } /** * Get representation of smallint type * - * @return Type smallint type + * @return \Cassandra\Type smallint type */ public static final function smallint() { } /** * Get representation of tinyint type * - * @return Type tinyint type + * @return \Cassandra\Type tinyint type */ public static final function tinyint() { } /** * Get representation of blob type * - * @return Type blob type + * @return \Cassandra\Type blob type */ public static final function blob() { } /** * Get representation of boolean type * - * @return Type boolean type + * @return \Cassandra\Type boolean type */ public static final function boolean() { } /** * Get representation of counter type * - * @return Type counter type + * @return \Cassandra\Type counter type */ public static final function counter() { } /** * Get representation of decimal type * - * @return Type decimal type + * @return \Cassandra\Type decimal type */ public static final function decimal() { } /** * Get representation of double type * - * @return Type double type + * @return \Cassandra\Type double type */ public static final function double() { } /** * Get representation of duration type * - * @return Type duration type + * @return \Cassandra\Type duration type */ public static final function duration() { } /** * Get representation of float type * - * @return Type float type + * @return \Cassandra\Type float type */ public static final function float() { } /** * Get representation of int type * - * @return Type int type + * @return \Cassandra\Type int type */ public static final function int() { } /** * Get representation of text type * - * @return Type text type + * @return \Cassandra\Type text type */ public static final function text() { } /** * Get representation of timestamp type * - * @return Type timestamp type + * @return \Cassandra\Type timestamp type */ public static final function timestamp() { } /** * Get representation of date type * - * @return Type date type + * @return \Cassandra\Type date type */ public static final function date() { } /** * Get representation of time type * - * @return Type time type + * @return \Cassandra\Type time type */ public static final function time() { } /** * Get representation of uuid type * - * @return Type uuid type + * @return \Cassandra\Type uuid type */ public static final function uuid() { } /** * Get representation of varchar type * - * @return Type varchar type + * @return \Cassandra\Type varchar type */ public static final function varchar() { } /** * Get representation of varint type * - * @return Type varint type + * @return \Cassandra\Type varint type */ public static final function varint() { } /** * Get representation of timeuuid type * - * @return Type timeuuid type + * @return \Cassandra\Type timeuuid type */ public static final function timeuuid() { } /** * Get representation of inet type * - * @return Type inet type + * @return \Cassandra\Type inet type */ public static final function inet() { } @@ -196,9 +196,9 @@ public static final function inet() { } * var_dump($collection); * @endcode * - * @param Type $type The type of values + * @param \Cassandra\Type $type The type of values * - * @return Type The collection type + * @return \Cassandra\Type The collection type */ public static final function collection($type) { } @@ -214,9 +214,9 @@ public static final function collection($type) { } * var_dump($set); * @endcode * - * @param Type $type The types of values + * @param \Cassandra\Type $type The types of values * - * @return Type The set type + * @return \Cassandra\Type The set type */ public static final function set($type) { } @@ -232,10 +232,10 @@ public static final function set($type) { } * var_dump($map); * @endcode * - * @param Type $keyType The type of keys - * @param Type $valueType The type of values + * @param \Cassandra\Type $keyType The type of keys + * @param \Cassandra\Type $valueType The type of values * - * @return Type The map type + * @return \Cassandra\Type The map type */ public static final function map($keyType, $valueType) { } @@ -251,9 +251,9 @@ public static final function map($keyType, $valueType) { } * var_dump($tuple); * @endcode * - * @param Type $types A variadic list of types + * @param \Cassandra\Type $types A variadic list of types * - * @return Type The tuple type + * @return \Cassandra\Type The tuple type */ public static final function tuple($types) { } @@ -269,9 +269,9 @@ public static final function tuple($types) { } * var_dump($userType); * @endcode * - * @param Type $types A variadic list of name/type pairs + * @param \Cassandra\Type $types A variadic list of name/type pairs * - * @return Type The user type + * @return \Cassandra\Type The user type */ public static final function userType($types) { } diff --git a/ext/doc/Cassandra/Type/Collection.php b/ext/doc/Cassandra/Type/Collection.php index cc11079ff..08bdf97dd 100644 --- a/ext/doc/Cassandra/Type/Collection.php +++ b/ext/doc/Cassandra/Type/Collection.php @@ -36,7 +36,7 @@ public function name() { } /** * Returns type of values * - * @return Type Type of values + * @return \Cassandra\Type Type of values */ public function valueType() { } @@ -57,7 +57,7 @@ public function __toString() { } * different type than what this * list type expects. * - * @return Collection A list with given values. + * @return \Cassandra\Collection A list with given values. */ public function create($value) { } diff --git a/ext/doc/Cassandra/Type/Map.php b/ext/doc/Cassandra/Type/Map.php index 66c083c0c..9653441e9 100644 --- a/ext/doc/Cassandra/Type/Map.php +++ b/ext/doc/Cassandra/Type/Map.php @@ -36,14 +36,14 @@ public function name() { } /** * Returns type of keys * - * @return Type Type of keys + * @return \Cassandra\Type Type of keys */ public function keyType() { } /** * Returns type of values * - * @return Type Type of values + * @return \Cassandra\Type Type of values */ public function valueType() { } @@ -81,7 +81,7 @@ public function __toString() { } * of a different type than what * this map type expects. * - * @return Map A set with given values. + * @return \Cassandra\Map A set with given values. */ public function create($value) { } diff --git a/ext/doc/Cassandra/Type/Set.php b/ext/doc/Cassandra/Type/Set.php index fd06aea2d..86c8b867e 100644 --- a/ext/doc/Cassandra/Type/Set.php +++ b/ext/doc/Cassandra/Type/Set.php @@ -36,7 +36,7 @@ public function name() { } /** * Returns type of values * - * @return Type Type of values + * @return \Cassandra\Type Type of values */ public function valueType() { } @@ -56,7 +56,7 @@ public function __toString() { } * different type than what this * set type expects. * - * @return Set A set with given values. + * @return \Cassandra\Set A set with given values. */ public function create($value) { } diff --git a/ext/doc/Cassandra/Type/Tuple.php b/ext/doc/Cassandra/Type/Tuple.php index 9534c51e5..a13e562f7 100644 --- a/ext/doc/Cassandra/Type/Tuple.php +++ b/ext/doc/Cassandra/Type/Tuple.php @@ -57,7 +57,7 @@ public function types() { } * different type than what the * tuple expects. * - * @return Tuple A tuple with given values. + * @return \Cassandra\Tuple A tuple with given values. */ public function create($values) { } diff --git a/ext/doc/Cassandra/Type/UserType.php b/ext/doc/Cassandra/Type/UserType.php index 8c328668e..77e018252 100644 --- a/ext/doc/Cassandra/Type/UserType.php +++ b/ext/doc/Cassandra/Type/UserType.php @@ -83,7 +83,7 @@ public function types() { } * different types than what the * user type expects. * - * @return UserTypeValue A user type value with given name/value pairs. + * @return \Cassandra\UserTypeValue A user type value with given name/value pairs. */ public function create($value) { } diff --git a/ext/doc/Cassandra/UserTypeValue.php b/ext/doc/Cassandra/UserTypeValue.php index 62c2f14ae..e0262632e 100644 --- a/ext/doc/Cassandra/UserTypeValue.php +++ b/ext/doc/Cassandra/UserTypeValue.php @@ -33,7 +33,7 @@ public function __construct($types) { } /** * The type of this user type value. * - * @return Type + * @return \Cassandra\Type */ public function type() { } diff --git a/ext/doc/Cassandra/Uuid.php b/ext/doc/Cassandra/Uuid.php index e4f2496b4..e22b06667 100644 --- a/ext/doc/Cassandra/Uuid.php +++ b/ext/doc/Cassandra/Uuid.php @@ -40,7 +40,7 @@ public function __toString() { } /** * The type of this uuid. * - * @return Type + * @return \Cassandra\Type */ public function type() { } diff --git a/ext/doc/Cassandra/Value.php b/ext/doc/Cassandra/Value.php index d9d0fe363..96e89bb58 100644 --- a/ext/doc/Cassandra/Value.php +++ b/ext/doc/Cassandra/Value.php @@ -45,7 +45,7 @@ interface Value { /** * The type of represented by the value. * - * @return Type + * @return \Cassandra\Type */ public function type(); diff --git a/ext/doc/Cassandra/Varint.php b/ext/doc/Cassandra/Varint.php index 77feba2f1..dff857d7e 100644 --- a/ext/doc/Cassandra/Varint.php +++ b/ext/doc/Cassandra/Varint.php @@ -40,7 +40,7 @@ public function __toString() { } /** * The type of this varint. * - * @return Type + * @return \Cassandra\Type */ public function type() { } @@ -52,47 +52,47 @@ public function type() { } public function value() { } /** - * @param Numeric $num a number to add to this one - * @return Numeric sum + * @param \Cassandra\Numeric $num a number to add to this one + * @return \Cassandra\Numeric sum */ public function add($num) { } /** - * @param Numeric $num a number to subtract from this one - * @return Numeric difference + * @param \Cassandra\Numeric $num a number to subtract from this one + * @return \Cassandra\Numeric difference */ public function sub($num) { } /** - * @param Numeric $num a number to multiply this one by - * @return Numeric product + * @param \Cassandra\Numeric $num a number to multiply this one by + * @return \Cassandra\Numeric product */ public function mul($num) { } /** - * @param Numeric $num a number to divide this one by - * @return Numeric quotient + * @param \Cassandra\Numeric $num a number to divide this one by + * @return \Cassandra\Numeric quotient */ public function div($num) { } /** - * @param Numeric $num a number to divide this one by - * @return Numeric remainder + * @param \Cassandra\Numeric $num a number to divide this one by + * @return \Cassandra\Numeric remainder */ public function mod($num) { } /** - * @return Numeric absolute value + * @return \Cassandra\Numeric absolute value */ public function abs() { } /** - * @return Numeric negative value + * @return \Cassandra\Numeric negative value */ public function neg() { } /** - * @return Numeric square root + * @return \Cassandra\Numeric square root */ public function sqrt() { } diff --git a/ext/src/Aggregate.yaml b/ext/src/Aggregate.yaml index e59133177..0048eaee4 100644 --- a/ext/src/Aggregate.yaml +++ b/ext/src/Aggregate.yaml @@ -21,27 +21,27 @@ Aggregate: comment: Returns the final function of the aggregate return: comment: Final function of the aggregate - type: Function + type: \Cassandra\Function stateFunction: comment: Returns the state function of the aggregate return: comment: State function of the aggregate - type: Function + type: \Cassandra\Function initialCondition: comment: Returns the initial condition of the aggregate return: comment: Initial condition of the aggregate - type: Value + type: \CassandraValue returnType: comment: Returns the return type of the aggregate return: comment: Return type of the aggregate - type: Type + type: \Cassandra\Type stateType: comment: Returns the state type of the aggregate return: comment: State type of the aggregate - type: Type + type: \Cassandra\Type signature: comment: Returns the signature of the aggregate return: diff --git a/ext/src/BatchStatement.yaml b/ext/src/BatchStatement.yaml index ebe48a729..2e80e1e51 100644 --- a/ext/src/BatchStatement.yaml +++ b/ext/src/BatchStatement.yaml @@ -33,11 +33,11 @@ BatchStatement: params: statement: comment: string or statement to add - type: string|Statement + type: string|\Cassandra\Statement arguments: comment: positional or named arguments (optional) type: array|null return: comment: self - type: BatchStatement + type: \Cassandra\BatchStatement ... diff --git a/ext/src/Bigint.yaml b/ext/src/Bigint.yaml index ea0c5a5fd..27f194bb4 100644 --- a/ext/src/Bigint.yaml +++ b/ext/src/Bigint.yaml @@ -6,12 +6,12 @@ Bigint: comment: Minimum possible Bigint value return: comment: minimum value - type: Bigint + type: \Cassandra\Bigint max: comment: Maximum possible Bigint value return: comment: maximum value - type: Bigint + type: \Cassandra\Bigint __construct: comment: Creates a new 64bit integer. params: @@ -22,7 +22,7 @@ Bigint: comment: The type of this bigint. return: comment: "" - type: Type + type: \Cassandra\Type value: comment: Returns the integer value. return: @@ -38,61 +38,61 @@ Bigint: params: num: comment: "" - type: Numeric + type: \Cassandra\Numeric return: comment: "" - type: Numeric + type: \Cassandra\Numeric sub: comment: "" params: num: comment: "" - type: Numeric + type: \Cassandra\Numeric return: comment: "" - type: Numeric + type: \Cassandra\Numeric mul: comment: "" params: num: comment: "" - type: Numeric + type: \Cassandra\Numeric return: comment: "" - type: Numeric + type: \Cassandra\Numeric div: comment: "" params: num: comment: "" - type: Numeric + type: \Cassandra\Numeric return: comment: "" - type: Numeric + type: \Cassandra\Numeric mod: comment: "" params: num: comment: "" - type: Numeric + type: \Cassandra\Numeric return: comment: "" - type: Numeric + type: \Cassandra\Numeric abs: comment: "" return: comment: "" - type: Numeric + type: \Cassandra\Numeric neg: comment: "" return: comment: "" - type: Numeric + type: \Cassandra\Numeric sqrt: comment: "" return: comment: "" - type: Numeric + type: \Cassandra\Numeric toInt: comment: "" return: diff --git a/ext/src/Blob.yaml b/ext/src/Blob.yaml index a6b9fc088..307d99d18 100644 --- a/ext/src/Blob.yaml +++ b/ext/src/Blob.yaml @@ -12,7 +12,7 @@ Blob: comment: The type of this blob. return: comment: "" - type: Type + type: \Cassandra\Type bytes: comment: Returns bytes as a hex string. return: diff --git a/ext/src/Cluster.yaml b/ext/src/Cluster.yaml index 0bbe4b87d..86748ecb0 100644 --- a/ext/src/Cluster.yaml +++ b/ext/src/Cluster.yaml @@ -11,7 +11,7 @@ Cluster: type: string return: comment: Session instance - type: Session + type: \Cassandra\Session connectAsync: comment: | Creates a new Session instance. @@ -21,5 +21,5 @@ Cluster: type: string return: comment: A Future Session instance - type: Future + type: \Cassandra\Future ... diff --git a/ext/src/Cluster/Builder.yaml b/ext/src/Cluster/Builder.yaml index 024a8de9f..ec6d108b9 100644 --- a/ext/src/Cluster/Builder.yaml +++ b/ext/src/Cluster/Builder.yaml @@ -9,7 +9,7 @@ Cluster\Builder: comment: Returns a Cluster Instance. return: comment: Cluster instance - type: \Cluster + type: \Cassandra\Cluster withDefaultConsistency: comment: | Configures default consistency for all requests. @@ -19,7 +19,7 @@ Cluster\Builder: type: int return: comment: self - type: Builder + type: \Cassandra\Cluster\Builder withDefaultPageSize: comment: | Configures default page size for all results. @@ -30,7 +30,7 @@ Cluster\Builder: type: int|null return: comment: self - type: Builder + type: \Cassandra\Cluster\Builder withDefaultTimeout: comment: | Configures default timeout for future resolution in blocking operations @@ -41,7 +41,7 @@ Cluster\Builder: type: float|null return: comment: self - type: Builder + type: \Cassandra\Cluster\Builder withContactPoints: comment: | Configures the initial endpoints. Note that the driver will @@ -52,7 +52,7 @@ Cluster\Builder: type: string return: comment: self - type: Builder + type: \Cassandra\Cluster\Builder withPort: comment: | Specify a different port to be used when connecting to the cluster. @@ -64,12 +64,12 @@ Cluster\Builder: type: int return: comment: self - type: Builder + type: \Cassandra\Cluster\Builder withRoundRobinLoadBalancingPolicy: comment: Configures this cluster to use a round robin load balancing policy. return: comment: self - type: Builder + type: \Cassandra\Cluster\Builder withDatacenterAwareRoundRobinLoadBalancingPolicy: comment: | Configures this cluster to use a datacenter aware round robin load balancing policy. @@ -86,7 +86,7 @@ Cluster\Builder: type: bool return: comment: self - type: Builder + type: \Cassandra\Cluster\Builder withTokenAwareRouting: comment: | Enable token aware routing. @@ -96,7 +96,7 @@ Cluster\Builder: type: bool return: comment: self - type: Builder + type: \Cassandra\Cluster\Builder withCredentials: comment: | Configures plain-text authentication. @@ -109,7 +109,7 @@ Cluster\Builder: type: string return: comment: self - type: Builder + type: \Cassandra\Cluster\Builder withConnectTimeout: comment: | Timeout used for establishing TCP connections. @@ -119,7 +119,7 @@ Cluster\Builder: type: float return: comment: self - type: Builder + type: \Cassandra\Cluster\Builder withRequestTimeout: comment: | Timeout used for waiting for a response from a node. @@ -129,17 +129,17 @@ Cluster\Builder: type: float return: comment: self - type: Builder + type: \Cassandra\Cluster\Builder withSSL: comment: | Set up ssl context. params: options: comment: a preconfigured ssl context - type: SSLOptions + type: \Cassandra\SSLOptions return: comment: self - type: Builder + type: \Cassandra\Cluster\Builder withPersistentSessions: comment: Enable persistent sessions and clusters. params: @@ -148,7 +148,7 @@ Cluster\Builder: type: bool return: comment: self - type: Builder + type: \Cassandra\Cluster\Builder withProtocolVersion: comment: |- Force the driver to use a specific binary protocol version. @@ -165,7 +165,7 @@ Cluster\Builder: type: int return: comment: self - type: Builder + type: \Cassandra\Cluster\Builder withIOThreads: comment: | Total number of IO threads to use for handling the requests. @@ -178,7 +178,7 @@ Cluster\Builder: type: int return: comment: self - type: Builder + type: \Cassandra\Cluster\Builder withConnectionsPerHost: comment: | Set the size of connection pools used by the driver. Pools are fixed @@ -196,7 +196,7 @@ Cluster\Builder: type: int return: comment: self - type: Builder + type: \Cassandra\Cluster\Builder withReconnectInterval: comment: | Specify interval in seconds that the driver should wait before attempting @@ -207,7 +207,7 @@ Cluster\Builder: type: float return: comment: self - type: Builder + type: \Cassandra\Cluster\Builder withLatencyAwareRouting: comment: | Enables/disables latency-aware routing. @@ -217,7 +217,7 @@ Cluster\Builder: type: bool return: comment: self - type: Builder + type: \Cassandra\Cluster\Builder withTCPNodelay: comment: | Disables nagle algorithm for lower latency. @@ -227,7 +227,7 @@ Cluster\Builder: type: bool return: comment: self - type: Builder + type: \Cassandra\Cluster\Builder withTCPKeepalive: comment: Enables/disables TCP keepalive. params: @@ -240,17 +240,17 @@ Cluster\Builder: type: float|null return: comment: self - type: Builder + type: \Cassandra\Cluster\Builder withRetryPolicy: comment: | Configures the retry policy. params: policy: comment: the retry policy to use. - type: Cluster\RetryPolicy + type: \Cassandra\RetryPolicy return: comment: self - type: Builder + type: \Cassandra\Cluster\Builder withTimestampGenerator: comment: Sets the timestamp generator. params: @@ -258,10 +258,10 @@ Cluster\Builder: comment: |- A timestamp generator that will be used to generate timestamps for statements. - type: TimestampGenerator + type: \Cassandra\TimestampGenerator return: comment: self - type: Builder + type: \Cassandra\Cluster\Builder withSchemaMetadata: comment: | Enables/disables Schema Metadata. @@ -276,7 +276,7 @@ Cluster\Builder: type: bool return: comment: self - type: Builder + type: \Cassandra\Cluster\Builder withHostnameResolution: comment: | Enables/disables Hostname Resolution. @@ -294,7 +294,7 @@ Cluster\Builder: type: bool return: comment: self - type: Builder + type: \Cassandra\Cluster\Builder withRandomizedContactPoints: comment: | Enables/disables Randomized Contact Points. @@ -310,7 +310,7 @@ Cluster\Builder: type: bool return: comment: self - type: Builder + type: \Cassandra\Cluster\Builder withConnectionHeartbeatInterval: comment: | Specify interval in seconds that the driver should wait before attempting @@ -323,7 +323,7 @@ Cluster\Builder: type: float return: comment: self - type: Builder + type: \Cassandra\Cluster\Builder withBlackListHosts: comment: | Sets the blacklist hosts. Any host in the blacklist will be ignored and @@ -335,7 +335,7 @@ Cluster\Builder: type: string return: comment: self - type: Builder + type: \Cassandra\Cluster\Builder withWhiteListHosts: comment: | Sets the whitelist hosts. Any host not in the whitelist will be ignored @@ -347,7 +347,7 @@ Cluster\Builder: type: string return: comment: self - type: Builder + type: \Cassandra\Cluster\Builder withBlackListDCs: comment: | Sets the blacklist datacenters. Any datacenter in the blacklist will be @@ -360,7 +360,7 @@ Cluster\Builder: type: string return: comment: self - type: Builder + type: \Cassandra\Cluster\Builder withWhiteListDCs: comment: | Sets the whitelist datacenters. Any host not in a whitelisted datacenter @@ -372,5 +372,5 @@ Cluster\Builder: type: string return: comment: self - type: Builder + type: \Cassandra\Cluster\Builder ... diff --git a/ext/src/Collection.yaml b/ext/src/Collection.yaml index 3481831e0..6ee671340 100644 --- a/ext/src/Collection.yaml +++ b/ext/src/Collection.yaml @@ -7,12 +7,12 @@ Collection: params: type: comment: "" - type: Type + type: \Cassandra\Type type: comment: The type of this collection. return: comment: "" - type: Type + type: \Cassandra\Type values: comment: Array of values in this collection. return: diff --git a/ext/src/Column.yaml b/ext/src/Column.yaml index 3e657cbe7..5de05dbc9 100644 --- a/ext/src/Column.yaml +++ b/ext/src/Column.yaml @@ -11,7 +11,7 @@ Column: comment: Returns the type of the column. return: comment: Type of the column - type: Type + type: \Cassandra\Type isReversed: comment: Returns whether the column is in descending or ascending order. return: diff --git a/ext/src/Core.yaml b/ext/src/Core.yaml index 232417461..827098e87 100644 --- a/ext/src/Core.yaml +++ b/ext/src/Core.yaml @@ -11,13 +11,13 @@ Cassandra: Creates a new cluster builder for constructing a Cluster object. return: comment: A cluster builder object with default settings - type: Cluster\Builder + type: \Cassandra\Cluster\Builder ssl: comment: | Creates a new ssl builder for constructing a SSLOptions object. return: comment: A SSL options builder with default settings - type: SSLOptions\Builder + type: \Cassandra\SSLOptions\Builder constants: CONSISTENCY_ANY: comment: |- diff --git a/ext/src/Custom.yaml b/ext/src/Custom.yaml index d05c4602c..9c3419f38 100644 --- a/ext/src/Custom.yaml +++ b/ext/src/Custom.yaml @@ -6,5 +6,5 @@ Custom: comment: The type of this value. return: comment: "" - type: Type\Custom + type: \Cassandra\Type\Custom ... diff --git a/ext/src/Date.yaml b/ext/src/Date.yaml index 55d48b0c5..7f0527ba1 100644 --- a/ext/src/Date.yaml +++ b/ext/src/Date.yaml @@ -13,7 +13,7 @@ Date: comment: The type of this date. return: comment: "" - type: Type + type: \Cassandra\Type seconds: comment: "" return: @@ -24,7 +24,7 @@ Date: params: time: comment: An optional Time object that is added to the DateTime object. - type: Time + type: \Cassandra\Time return: comment: PHP representation type: \DateTime diff --git a/ext/src/Decimal.yaml b/ext/src/Decimal.yaml index a9e8264fa..f8bcefc3b 100644 --- a/ext/src/Decimal.yaml +++ b/ext/src/Decimal.yaml @@ -21,7 +21,7 @@ Decimal: comment: The type of this decimal. return: comment: "" - type: Type + type: \Cassandra\Type __toString: comment: String representation of this decimal. return: @@ -42,61 +42,61 @@ Decimal: params: num: comment: "" - type: Numeric + type: \Cassandra\Numeric return: comment: "" - type: Numeric + type: \Cassandra\Numeric sub: comment: "" params: num: comment: "" - type: Numeric + type: \Cassandra\Numeric return: comment: "" - type: Numeric + type: \Cassandra\Numeric mul: comment: "" params: num: comment: "" - type: Numeric + type: \Cassandra\Numeric return: comment: "" - type: Numeric + type: \Cassandra\Numeric div: comment: "" params: num: comment: "" - type: Numeric + type: \Cassandra\Numeric return: comment: "" - type: Numeric + type: \Cassandra\Numeric mod: comment: "" params: num: comment: "" - type: Numeric + type: \Cassandra\Numeric return: comment: "" - type: Numeric + type: \Cassandra\Numeric abs: comment: "" return: comment: "" - type: Numeric + type: \Cassandra\Numeric neg: comment: "" return: comment: "" - type: Numeric + type: \Cassandra\Numeric sqrt: comment: "" return: comment: "" - type: Numeric + type: \Cassandra\Numeric toInt: comment: "" return: diff --git a/ext/src/DefaultAggregate.yaml b/ext/src/DefaultAggregate.yaml index b438df3a2..157ed4244 100644 --- a/ext/src/DefaultAggregate.yaml +++ b/ext/src/DefaultAggregate.yaml @@ -21,27 +21,27 @@ DefaultAggregate: comment: "" return: comment: Final public function of the aggregate - type: Function + type: \Cassandra\Function stateFunction: comment: "" return: comment: State public function of the aggregate - type: Function + type: \Cassandra\Function initialCondition: comment: "" return: comment: "" - type: Value + type: \Cassandra\Value returnType: comment: "" return: comment: "" - type: Type + type: \Cassandra\Type stateType: comment: "" return: comment: "" - type: Type + type: \Cassandra\Type signature: comment: "" return: diff --git a/ext/src/DefaultCluster.yaml b/ext/src/DefaultCluster.yaml index 32867dc20..2bf8799fe 100644 --- a/ext/src/DefaultCluster.yaml +++ b/ext/src/DefaultCluster.yaml @@ -16,7 +16,7 @@ DefaultCluster: type: int return: comment: "" - type: Session + type: \Cassandra\Session connectAsync: comment: "" params: @@ -25,5 +25,5 @@ DefaultCluster: type: string return: comment: "" - type: Future + type: \Cassandra\Future ... diff --git a/ext/src/DefaultColumn.yaml b/ext/src/DefaultColumn.yaml index f239205d1..1919327f4 100644 --- a/ext/src/DefaultColumn.yaml +++ b/ext/src/DefaultColumn.yaml @@ -11,7 +11,7 @@ DefaultColumn: comment: "" return: comment: "" - type: Type + type: \Cassandra\Type isReversed: comment: "" return: diff --git a/ext/src/DefaultFunction.yaml b/ext/src/DefaultFunction.yaml index 7862945aa..f66cfd9bb 100644 --- a/ext/src/DefaultFunction.yaml +++ b/ext/src/DefaultFunction.yaml @@ -21,7 +21,7 @@ DefaultFunction: comment: "" return: comment: "" - type: Type + type: \Cassandra\Type signature: comment: "" return: diff --git a/ext/src/DefaultIndex.yaml b/ext/src/DefaultIndex.yaml index e350f7997..ce0c0e48f 100644 --- a/ext/src/DefaultIndex.yaml +++ b/ext/src/DefaultIndex.yaml @@ -25,7 +25,7 @@ DefaultIndex: type: string return: comment: "" - type: Value + type: \Cassandra\Value options: comment: "" return: diff --git a/ext/src/DefaultKeyspace.yaml b/ext/src/DefaultKeyspace.yaml index c466b4d32..5c623c3a9 100644 --- a/ext/src/DefaultKeyspace.yaml +++ b/ext/src/DefaultKeyspace.yaml @@ -16,7 +16,7 @@ DefaultKeyspace: comment: "" return: comment: "" - type: Map + type: \Cassandra\Map hasDurableWrites: comment: "" return: @@ -30,7 +30,7 @@ DefaultKeyspace: type: string return: comment: "" - type: Table + type: \Cassandra\Table tables: comment: "" return: @@ -44,7 +44,7 @@ DefaultKeyspace: type: string return: comment: "" - type: Type\UserType|null + type: \Cassandra\Type\UserType|null userTypes: comment: "" return: @@ -58,7 +58,7 @@ DefaultKeyspace: type: string return: comment: "" - type: MaterizedView|null + type: \Cassandra\MaterizedView|null materializedViews: comment: "" return: @@ -72,10 +72,10 @@ DefaultKeyspace: type: string '...': comment: "" - type: string|Type + type: string|\Cassandra\Type return: comment: "" - type: Function|null + type: \Cassandra\Function|null functions: comment: "" return: @@ -89,10 +89,10 @@ DefaultKeyspace: type: string '...': comment: "" - type: string|Type + type: string|\Cassandra\Type return: comment: "" - type: Aggregate|null + type: \Cassandra\Aggregate|null aggregates: comment: "" return: diff --git a/ext/src/DefaultMaterializedView.yaml b/ext/src/DefaultMaterializedView.yaml index d454e7c0a..84fd996b7 100644 --- a/ext/src/DefaultMaterializedView.yaml +++ b/ext/src/DefaultMaterializedView.yaml @@ -15,7 +15,7 @@ DefaultMaterializedView: type: string return: comment: "" - type: Value + type: \Cassandra\Value options: comment: "" return: @@ -80,12 +80,12 @@ DefaultMaterializedView: comment: "" return: comment: "" - type: Map + type: \Cassandra\Map compressionParameters: comment: "" return: comment: "" - type: Map + type: \Cassandra\Map populateIOCacheOnFlush: comment: "" return: @@ -114,7 +114,7 @@ DefaultMaterializedView: type: string return: comment: "" - type: Column + type: \Cassandra\Column columns: comment: "" return: @@ -144,5 +144,5 @@ DefaultMaterializedView: comment: "" return: comment: "" - type: Table + type: \Cassandra\Table ... diff --git a/ext/src/DefaultSchema.yaml b/ext/src/DefaultSchema.yaml index 9ab2690a8..27c3f64b9 100644 --- a/ext/src/DefaultSchema.yaml +++ b/ext/src/DefaultSchema.yaml @@ -10,7 +10,7 @@ DefaultSchema: type: string return: comment: "" - type: Keyspace + type: \Cassandra\Keyspace keyspaces: comment: "" return: diff --git a/ext/src/DefaultSession.yaml b/ext/src/DefaultSession.yaml index 76039e267..b8d8ab2be 100644 --- a/ext/src/DefaultSession.yaml +++ b/ext/src/DefaultSession.yaml @@ -6,31 +6,31 @@ DefaultSession: comment: "" return: comment: "" - type: Schema + type: \Cassandra\Schema execute: comment: "" return: comment: "" - type: Rows + type: \Cassandra\Rows params: statement: comment: "" - type: string|Statement + type: string|\Cassandra\Statement options: comment: "" - type: array|ExecutionOptions|null + type: array|\Cassandra\ExecutionOptions|null executeAsync: comment: "" params: statement: comment: "" - type: string|Statement + type: string|\Cassandra\Statement options: comment: "" - type: array|ExecutionOptions|null + type: array|\Cassandra\ExecutionOptions|null return: comment: "" - type: FutureRows + type: \Cassandra\FutureRows prepare: comment: "" params: @@ -39,10 +39,10 @@ DefaultSession: type: string options: comment: "" - type: array|ExecutionOptions|null + type: array|\Cassandra\ExecutionOptions|null return: comment: "" - type: PreparedStatement + type: \Cassandra\PreparedStatement prepareAsync: comment: "" params: @@ -51,10 +51,10 @@ DefaultSession: type: string options: comment: "" - type: array|ExecutionOptions|null + type: array|\Cassandra\ExecutionOptions|null return: comment: "" - type: FuturePreparedStatement + type: \Cassandra\FuturePreparedStatement close: comment: "" params: @@ -68,7 +68,7 @@ DefaultSession: comment: "" return: comment: "" - type: FutureClose + type: \Cassandra\FutureClose metrics: comment: "" return: diff --git a/ext/src/DefaultTable.yaml b/ext/src/DefaultTable.yaml index b32e06899..88ee87266 100644 --- a/ext/src/DefaultTable.yaml +++ b/ext/src/DefaultTable.yaml @@ -15,7 +15,7 @@ DefaultTable: type: string return: comment: "" - type: Value + type: \Cassandra\Value options: comment: "" return: @@ -80,12 +80,12 @@ DefaultTable: comment: "" return: comment: "" - type: Map + type: \Cassandra\Map compressionParameters: comment: "" return: comment: "" - type: Map + type: \Cassandra\Map populateIOCacheOnFlush: comment: "" return: @@ -114,7 +114,7 @@ DefaultTable: type: string return: comment: "" - type: Column + type: \Cassandra\Column columns: comment: "" return: @@ -148,7 +148,7 @@ DefaultTable: type: string return: comment: An index or null - type: Index|null + type: \Cassandra\Index|null indexes: comment: Gets all indexes return: @@ -162,7 +162,7 @@ DefaultTable: type: string return: comment: A materialized view or null - type: MaterizedView|null + type: \Cassandra\MaterizedView|null materializedViews: comment: Gets all materialized views return: diff --git a/ext/src/Duration.yaml b/ext/src/Duration.yaml index 23950599f..0c70ee39d 100644 --- a/ext/src/Duration.yaml +++ b/ext/src/Duration.yaml @@ -7,18 +7,18 @@ Duration: params: months: comment: Months attribute of the duration. - type: long|double|string|Bigint + type: long|double|string|\Cassandra\Bigint days: comment: Days attribute of the duration. - type: long|double|string|Bigint + type: long|double|string|\Cassandra\Bigint nanos: comment: Nanos attribute of the duration. - type: long|double|string|Bigint + type: long|double|string|\Cassandra\Bigint type: comment: "" return: comment: the Cassandra type for Duration - type: Type + type: \Cassandra\Type months: comment: "" return: diff --git a/ext/src/Float.yaml b/ext/src/Float.yaml index 51a12d6a4..f6a20bacb 100644 --- a/ext/src/Float.yaml +++ b/ext/src/Float.yaml @@ -6,23 +6,23 @@ Float: comment: Minimum possible Float value return: comment: minimum value - type: Float + type: \Cassandra\Float max: comment: Maximum possible Float value return: comment: maximum value - type: Float + type: \Cassandra\Float __construct: comment: Creates a new float. params: value: comment: A float value as a string, number or Float - type: double|int|string|Float + type: double|int|string|\Cassandra\Float type: comment: The type of this float. return: comment: "" - type: Type + type: \Cassandra\Type value: comment: Returns the float value. return: @@ -38,61 +38,61 @@ Float: params: num: comment: "" - type: Numeric + type: \Cassandra\Numeric return: comment: "" - type: Numeric + type: \Cassandra\Numeric sub: comment: "" params: num: comment: "" - type: Numeric + type: \Cassandra\Numeric return: comment: "" - type: Numeric + type: \Cassandra\Numeric mul: comment: "" params: num: comment: "" - type: Numeric + type: \Cassandra\Numeric return: comment: "" - type: Numeric + type: \Cassandra\Numeric div: comment: "" params: num: comment: "" - type: Numeric + type: \Cassandra\Numeric return: comment: "" - type: Numeric + type: \Cassandra\Numeric mod: comment: "" params: num: comment: "" - type: Numeric + type: \Cassandra\Numeric return: comment: "" - type: Numeric + type: \Cassandra\Numeric abs: comment: "" return: comment: "" - type: Numeric + type: \Cassandra\Numeric neg: comment: "" return: comment: "" - type: Numeric + type: \Cassandra\Numeric sqrt: comment: "" return: comment: "" - type: Numeric + type: \Cassandra\Numeric toInt: comment: "" return: diff --git a/ext/src/Function.yaml b/ext/src/Function.yaml index 599b20dd9..5482643e6 100644 --- a/ext/src/Function.yaml +++ b/ext/src/Function.yaml @@ -21,7 +21,7 @@ Function: comment: Returns the return type of the function return: comment: Return type of the function - type: Type + type: \Cassandra\Type signature: comment: Returns the signature of the function return: diff --git a/ext/src/FuturePreparedStatement.yaml b/ext/src/FuturePreparedStatement.yaml index 4e16b1d34..65c7730f8 100644 --- a/ext/src/FuturePreparedStatement.yaml +++ b/ext/src/FuturePreparedStatement.yaml @@ -14,5 +14,5 @@ FuturePreparedStatement: type: int|double|null return: comment: A prepared statement - type: PreparedStatement + type: \Cassandra\PreparedStatement ... diff --git a/ext/src/FutureRows.yaml b/ext/src/FutureRows.yaml index a10dabfe4..a0a01e35d 100644 --- a/ext/src/FutureRows.yaml +++ b/ext/src/FutureRows.yaml @@ -13,5 +13,5 @@ FutureRows: type: int|double|null return: comment: The result set - type: Rows|null + type: \Cassandra\Rows|null ... diff --git a/ext/src/FutureSession.yaml b/ext/src/FutureSession.yaml index 3e2d504b6..624b3b2ca 100644 --- a/ext/src/FutureSession.yaml +++ b/ext/src/FutureSession.yaml @@ -13,5 +13,5 @@ FutureSession: type: int|double|null return: comment: A connected session - type: Session + type: \Cassandra\Session ... diff --git a/ext/src/Index.yaml b/ext/src/Index.yaml index 42f470cd2..d65157286 100644 --- a/ext/src/Index.yaml +++ b/ext/src/Index.yaml @@ -25,7 +25,7 @@ Index: type: string return: comment: Value of an option by name - type: Value + type: \Cassandra\Value options: comment: Returns all the index's options return: diff --git a/ext/src/Inet.yaml b/ext/src/Inet.yaml index 869cdc763..1953deed4 100644 --- a/ext/src/Inet.yaml +++ b/ext/src/Inet.yaml @@ -12,7 +12,7 @@ Inet: comment: The type of this inet. return: comment: "" - type: Type + type: \Cassandra\Type address: comment: Returns the normalized string representation of the address. return: diff --git a/ext/src/Keyspace.yaml b/ext/src/Keyspace.yaml index 8bea75b39..704d30aa7 100644 --- a/ext/src/Keyspace.yaml +++ b/ext/src/Keyspace.yaml @@ -16,7 +16,7 @@ Keyspace: comment: Returns replication options return: comment: Replication options - type: Map + type: \Cassandra\Map hasDurableWrites: comment: Returns whether the keyspace has durable writes enabled return: @@ -30,7 +30,7 @@ Keyspace: type: string return: comment: Table instance or null - type: Table|null + type: \Cassandra\Table|null tables: comment: Returns all tables defined in this keyspace return: @@ -44,7 +44,7 @@ Keyspace: type: string return: comment: A user type or null - type: Type\UserType|null + type: \Cassandra\Type\UserType|null userTypes: comment: Get all user types return: @@ -58,7 +58,7 @@ Keyspace: type: string return: comment: A materialized view or null - type: MaterizedView|null + type: \Cassandra\MaterizedView|null materializedViews: comment: Gets all materialized views return: @@ -72,10 +72,10 @@ Keyspace: type: string '...': comment: Function arguments - type: string|Type + type: string|\Cassandra\Type return: comment: A function or null - type: Function|null + type: \Cassandra\Function|null functions: comment: Get all functions return: @@ -89,10 +89,10 @@ Keyspace: type: string '...': comment: Aggregate arguments - type: string|Type + type: string|\Cassandra\Type return: comment: An aggregate or null - type: Aggregate|null + type: \Cassandra\Aggregate|null aggregates: comment: Get all aggregates return: diff --git a/ext/src/Map.yaml b/ext/src/Map.yaml index 4f01033de..9a0daf63c 100644 --- a/ext/src/Map.yaml +++ b/ext/src/Map.yaml @@ -7,15 +7,15 @@ Map: params: keyType: comment: "" - type: Type + type: \Cassandra\Type valueType: comment: "" - type: Type + type: \Cassandra\Type type: comment: The type of this map. return: comment: "" - type: Type + type: \Cassandra\Type keys: comment: Returns all keys in the map as an array. return: diff --git a/ext/src/MaterializedView.yaml b/ext/src/MaterializedView.yaml index 7ebae4b93..e68e8cd10 100644 --- a/ext/src/MaterializedView.yaml +++ b/ext/src/MaterializedView.yaml @@ -6,7 +6,7 @@ MaterializedView: comment: Returns the base table of the view return: comment: Base table of the view - type: Table + type: \Cassandra\Table name: comment: Returns the name of this view return: @@ -20,7 +20,7 @@ MaterializedView: type: string return: comment: "" - type: Value + type: \Cassandra\Value options: comment: Returns all the view's options return: @@ -87,12 +87,12 @@ MaterializedView: comment: "" return: comment: "" - type: Map + type: \Cassandra\Map compressionParameters: comment: "" return: comment: "" - type: Map + type: \Cassandra\Map populateIOCacheOnFlush: comment: "" return: @@ -121,7 +121,7 @@ MaterializedView: type: string return: comment: "" - type: Column + type: \Cassandra\Column columns: comment: Returns all columns in this view return: diff --git a/ext/src/Numeric.yaml b/ext/src/Numeric.yaml index 72b3a10a4..c89654387 100644 --- a/ext/src/Numeric.yaml +++ b/ext/src/Numeric.yaml @@ -14,61 +14,61 @@ Numeric: params: num: comment: a number to add to this one - type: Numeric + type: \Cassandra\Numeric return: comment: sum - type: Numeric + type: \Cassandra\Numeric sub: comment: "" params: num: comment: a number to subtract from this one - type: Numeric + type: \Cassandra\Numeric return: comment: difference - type: Numeric + type: \Cassandra\Numeric mul: comment: "" params: num: comment: a number to multiply this one by - type: Numeric + type: \Cassandra\Numeric return: comment: product - type: Numeric + type: \Cassandra\Numeric div: comment: "" params: num: comment: a number to divide this one by - type: Numeric + type: \Cassandra\Numeric return: comment: quotient - type: Numeric + type: \Cassandra\Numeric mod: comment: "" params: num: comment: a number to divide this one by - type: Numeric + type: \Cassandra\Numeric return: comment: remainder - type: Numeric + type: \Cassandra\Numeric abs: comment: "" return: comment: absolute value - type: Numeric + type: \Cassandra\Numeric neg: comment: "" return: comment: negative value - type: Numeric + type: \Cassandra\Numeric sqrt: comment: "" return: comment: square root - type: Numeric + type: \Cassandra\Numeric toInt: comment: "" return: diff --git a/ext/src/RetryPolicy/Logging.yaml b/ext/src/RetryPolicy/Logging.yaml index 89efb5f39..2d836dfd9 100644 --- a/ext/src/RetryPolicy/Logging.yaml +++ b/ext/src/RetryPolicy/Logging.yaml @@ -7,5 +7,5 @@ RetryPolicy\Logging: params: childPolicy: comment: Any retry policy other than Logging - type: RetryPolicy + type: \Cassandra\RetryPolicy ... diff --git a/ext/src/Rows.yaml b/ext/src/Rows.yaml index 4f554f96c..fa9aeaf64 100644 --- a/ext/src/Rows.yaml +++ b/ext/src/Rows.yaml @@ -123,12 +123,12 @@ Rows: type: float|null return: comment: loads and returns next result page - type: Rows|null + type: \Cassandra\Rows|null nextPageAsync: comment: Get the next page of results asynchronously. return: comment: returns future of the next result page - type: Future + type: \Cassandra\Future pagingStateToken: comment: Returns the raw paging state token. return: diff --git a/ext/src/SSLOptions/Builder.yaml b/ext/src/SSLOptions/Builder.yaml index d210da502..a6d4a52da 100644 --- a/ext/src/SSLOptions/Builder.yaml +++ b/ext/src/SSLOptions/Builder.yaml @@ -17,7 +17,7 @@ SSLOptions\Builder: type: string return: comment: self - type: Builder + type: \Cassandra\SSLOptions\Builder withVerifyFlags: comment: | Disable certificate verification. @@ -29,7 +29,7 @@ SSLOptions\Builder: type: int return: comment: self - type: Builder + type: \Cassandra\SSLOptions\Builder withClientCert: comment: | Set client-side certificate chain. @@ -44,7 +44,7 @@ SSLOptions\Builder: type: string return: comment: self - type: Builder + type: \Cassandra\SSLOptions\Builder withPrivateKey: comment: | Set client-side private key. This is used to authenticate the client on @@ -60,10 +60,10 @@ SSLOptions\Builder: type: string|null return: comment: self - type: Builder + type: \Cassandra\SSLOptions\Builder build: comment: Builds SSL options. return: comment: ssl options configured accordingly. - type: \SSLOptions + type: \Cassandra\SSLOptions ... diff --git a/ext/src/Schema.yaml b/ext/src/Schema.yaml index 18e3855e1..9aa079fa1 100644 --- a/ext/src/Schema.yaml +++ b/ext/src/Schema.yaml @@ -10,7 +10,7 @@ Schema: type: string return: comment: Keyspace instance or null - type: Keyspace + type: \Cassandra\Keyspace keyspaces: comment: Returns all keyspaces defined in the schema. return: diff --git a/ext/src/Session.yaml b/ext/src/Session.yaml index 982f3705d..99ae60e1d 100644 --- a/ext/src/Session.yaml +++ b/ext/src/Session.yaml @@ -26,13 +26,13 @@ Session: params: statement: comment: string or statement to be executed. - type: string|Statement + type: string|\Cassandra\Statement options: comment: Options to control execution of the query. - type: array|ExecutionOptions|null + type: array|\Cassandra\ExecutionOptions|null return: comment: A collection of rows. - type: Rows + type: \Cassandra\Rows executeAsync: comment: |- Execute a query asynchronously. This method returns immediately, but @@ -42,13 +42,13 @@ Session: params: statement: comment: string or statement to be executed. - type: string|Statement + type: string|\Cassandra\Statement options: comment: Options to control execution of the query. - type: array|ExecutionOptions|null + type: array|\Cassandra\ExecutionOptions|null return: comment: A future that can be used to retrieve the result. - type: FutureRows + type: \Cassandra\FutureRows prepare: comment: | Prepare a query for execution. @@ -63,10 +63,10 @@ Session: options: comment: | Options to control preparing the query. - type: array|ExecutionOptions|null + type: array|\Cassandra\ExecutionOptions|null return: comment: A prepared statement that can be bound with parameters and executed. - type: PreparedStatement + type: \Cassandra\PreparedStatement prepareAsync: comment: | Asynchronously prepare a query for execution. @@ -78,10 +78,10 @@ Session: type: string options: comment: Options to control preparing the query. - type: array|ExecutionOptions|null + type: array|\Cassandra\ExecutionOptions|null return: comment: A future that can be used to retrieve the prepared statement. - type: FuturePreparedStatement + type: \Cassandra\FuturePreparedStatement close: comment: | Close the session and all its connections. @@ -99,12 +99,12 @@ Session: comment: Asynchronously close the session and all its connections. return: comment: A future that can be waited on. - type: FutureClose + type: \Cassandra\FutureClose schema: comment: Get a snapshot of the cluster's current schema. return: comment: A snapshot of the cluster's schema. - type: Schema + type: \Cassandra\Schema metrics: comment: Get performance and diagnostic metrics. return: diff --git a/ext/src/Set.yaml b/ext/src/Set.yaml index 06e0bc1f6..2b8f5166a 100644 --- a/ext/src/Set.yaml +++ b/ext/src/Set.yaml @@ -7,12 +7,12 @@ Set: params: type: comment: "" - type: Type + type: \Cassandra\Type type: comment: The type of this set. return: comment: "" - type: Type + type: \Cassandra\Type values: comment: Array of values in this set. return: diff --git a/ext/src/Smallint.yaml b/ext/src/Smallint.yaml index 5ba0b4564..2745ecaae 100644 --- a/ext/src/Smallint.yaml +++ b/ext/src/Smallint.yaml @@ -6,12 +6,12 @@ Smallint: comment: Minimum possible Smallint value return: comment: minimum value - type: Smallint + type: \Cassandra\Smallint max: comment: Maximum possible Smallint value return: comment: maximum value - type: Smallint + type: \Cassandra\Smallint __construct: comment: Creates a new 16-bit signed integer. params: @@ -23,61 +23,61 @@ Smallint: params: num: comment: "" - type: Numeric + type: \Cassandra\Numeric return: comment: "" - type: Numeric + type: \Cassandra\Numeric sub: comment: "" params: num: comment: "" - type: Numeric + type: \Cassandra\Numeric return: comment: "" - type: Numeric + type: \Cassandra\Numeric mul: comment: "" params: num: comment: "" - type: Numeric + type: \Cassandra\Numeric return: comment: "" - type: Numeric + type: \Cassandra\Numeric div: comment: "" params: num: comment: "" - type: Numeric + type: \Cassandra\Numeric return: comment: "" - type: Numeric + type: \Cassandra\Numeric mod: comment: "" params: num: comment: "" - type: Numeric + type: \Cassandra\Numeric return: comment: "" - type: Numeric + type: \Cassandra\Numeric abs: comment: "" return: comment: "" - type: Numeric + type: \Cassandra\Numeric neg: comment: "" return: comment: "" - type: Numeric + type: \Cassandra\Numeric sqrt: comment: "" return: comment: "" - type: Numeric + type: \Cassandra\Numeric toInt: comment: "" return: @@ -92,7 +92,7 @@ Smallint: comment: The type of this value (smallint). return: comment: "" - type: Type + type: \Cassandra\Type value: comment: Returns the integer value. return: diff --git a/ext/src/Table.yaml b/ext/src/Table.yaml index f81d2cf00..96f1741ba 100644 --- a/ext/src/Table.yaml +++ b/ext/src/Table.yaml @@ -15,7 +15,7 @@ Table: type: string return: comment: Value of an option by name - type: Value + type: \Cassandra\Value options: comment: Returns all the table's options return: @@ -80,12 +80,12 @@ Table: comment: Returns compaction strategy options return: comment: Compaction strategy options - type: Map + type: \Cassandra\Map compressionParameters: comment: Returns compression parameters return: comment: Compression parameters - type: Map + type: \Cassandra\Map populateIOCacheOnFlush: comment: Returns whether or not the `populate_io_cache_on_flush` is true return: @@ -114,7 +114,7 @@ Table: type: string return: comment: Column instance - type: Column + type: \Cassandra\Column columns: comment: Returns all columns in this table return: diff --git a/ext/src/Time.yaml b/ext/src/Time.yaml index ece49978a..842138457 100644 --- a/ext/src/Time.yaml +++ b/ext/src/Time.yaml @@ -12,12 +12,12 @@ Time: comment: Creates a new Time object with the current time. return: comment: "" - type: Time + type: \Cassandra\Time type: comment: The type of this date. return: comment: "" - type: Type + type: \Cassandra\Type nanoseconds: comment: |2- the last full second since the last full minute since the @@ -40,8 +40,8 @@ Time: params: datetime: comment: "" - type: DateTime + type: \DateTime return: comment: "" - type: Time + type: \Cassandra\Time ... diff --git a/ext/src/Timestamp.yaml b/ext/src/Timestamp.yaml index d2fe6e3d7..6e378f88c 100644 --- a/ext/src/Timestamp.yaml +++ b/ext/src/Timestamp.yaml @@ -17,7 +17,7 @@ Timestamp: comment: The type of this timestamp. return: comment: "" - type: Type + type: \Cassandra\Type time: comment: |- Unix timestamp. diff --git a/ext/src/Timeuuid.yaml b/ext/src/Timeuuid.yaml index 1721047d7..eeef0223a 100644 --- a/ext/src/Timeuuid.yaml +++ b/ext/src/Timeuuid.yaml @@ -12,7 +12,7 @@ Timeuuid: comment: The type of this timeuuid. return: comment: "" - type: Type + type: \Cassandra\Type __toString: comment: Returns this timeuuid as string. return: diff --git a/ext/src/Tinyint.yaml b/ext/src/Tinyint.yaml index cabb2ebd0..3aabe3d69 100644 --- a/ext/src/Tinyint.yaml +++ b/ext/src/Tinyint.yaml @@ -6,12 +6,12 @@ Tinyint: comment: Minimum possible Tinyint value return: comment: minimum value - type: Tinyint + type: \Cassandra\Tinyint max: comment: Maximum possible Tinyint value return: comment: maximum value - type: Tinyint + type: \Cassandra\Tinyint __construct: comment: Creates a new 8-bit signed integer. params: @@ -23,61 +23,61 @@ Tinyint: params: num: comment: "" - type: Numeric + type: \Cassandra\Numeric return: comment: "" - type: Numeric + type: \Cassandra\Numeric sub: comment: "" params: num: comment: "" - type: Numeric + type: \Cassandra\Numeric return: comment: "" - type: Numeric + type: \Cassandra\Numeric mul: comment: "" params: num: comment: "" - type: Numeric + type: \Cassandra\Numeric return: comment: "" - type: Numeric + type: \Cassandra\Numeric div: comment: "" params: num: comment: "" - type: Numeric + type: \Cassandra\Numeric return: comment: "" - type: Numeric + type: \Cassandra\Numeric mod: comment: "" params: num: comment: "" - type: Numeric + type: \Cassandra\Numeric return: comment: "" - type: Numeric + type: \Cassandra\Numeric abs: comment: "" return: comment: "" - type: Numeric + type: \Cassandra\Numeric neg: comment: "" return: comment: "" - type: Numeric + type: \Cassandra\Numeric sqrt: comment: "" return: comment: "" - type: Numeric + type: \Cassandra\Numeric toInt: comment: "" return: @@ -92,7 +92,7 @@ Tinyint: comment: The type of this value (tinyint). return: comment: "" - type: Type + type: \Cassandra\Type value: comment: Returns the integer value. return: diff --git a/ext/src/Tuple.yaml b/ext/src/Tuple.yaml index 739b18d25..328539d4b 100644 --- a/ext/src/Tuple.yaml +++ b/ext/src/Tuple.yaml @@ -12,7 +12,7 @@ Tuple: comment: The type of this tuple. return: comment: "" - type: Type + type: \Cassandra\Type values: comment: Array of values in this tuple. return: diff --git a/ext/src/Type.yaml b/ext/src/Type.yaml index af776fb25..05d5d3a68 100644 --- a/ext/src/Type.yaml +++ b/ext/src/Type.yaml @@ -6,107 +6,107 @@ Type: comment: Get representation of varchar type return: comment: varchar type - type: Type + type: \Cassandra\Type text: comment: Get representation of text type return: comment: text type - type: Type + type: \Cassandra\Type blob: comment: Get representation of blob type return: comment: blob type - type: Type + type: \Cassandra\Type ascii: comment: Get representation of ascii type return: comment: ascii type - type: Type + type: \Cassandra\Type bigint: comment: Get representation of bigint type return: comment: bigint type - type: Type + type: \Cassandra\Type counter: comment: Get representation of counter type return: comment: counter type - type: Type + type: \Cassandra\Type int: comment: Get representation of int type return: comment: int type - type: Type + type: \Cassandra\Type varint: comment: Get representation of varint type return: comment: varint type - type: Type + type: \Cassandra\Type boolean: comment: Get representation of boolean type return: comment: boolean type - type: Type + type: \Cassandra\Type decimal: comment: Get representation of decimal type return: comment: decimal type - type: Type + type: \Cassandra\Type double: comment: Get representation of double type return: comment: double type - type: Type + type: \Cassandra\Type float: comment: Get representation of float type return: comment: float type - type: Type + type: \Cassandra\Type inet: comment: Get representation of inet type return: comment: inet type - type: Type + type: \Cassandra\Type timestamp: comment: Get representation of timestamp type return: comment: timestamp type - type: Type + type: \Cassandra\Type uuid: comment: Get representation of uuid type return: comment: uuid type - type: Type + type: \Cassandra\Type timeuuid: comment: Get representation of timeuuid type return: comment: timeuuid type - type: Type + type: \Cassandra\Type smallint: comment: Get representation of smallint type return: comment: smallint type - type: Type + type: \Cassandra\Type tinyint: comment: Get representation of tinyint type return: comment: tinyint type - type: Type + type: \Cassandra\Type date: comment: Get representation of date type return: comment: date type - type: Type + type: \Cassandra\Type time: comment: Get representation of time type return: comment: time type - type: Type + type: \Cassandra\Type duration: comment: Get representation of duration type return: comment: duration type - type: Type + type: \Cassandra\Type collection: comment: |- Initialize a Collection type @@ -122,10 +122,10 @@ Type: params: type: comment: The type of values - type: Type + type: \Cassandra\Type return: comment: ' The collection type' - type: Type + type: \Cassandra\Type map: comment: |- Initialize a map type @@ -141,13 +141,13 @@ Type: params: keyType: comment: The type of keys - type: Type + type: \Cassandra\Type valueType: comment: The type of values - type: Type + type: \Cassandra\Type return: comment: ' The map type' - type: Type + type: \Cassandra\Type set: comment: |- Initialize a set type @@ -163,10 +163,10 @@ Type: params: type: comment: The types of values - type: Type + type: \Cassandra\Type return: comment: The set type - type: Type + type: \Cassandra\Type tuple: comment: |- Initialize a tuple type @@ -182,10 +182,10 @@ Type: params: types: comment: A variadic list of types - type: Type + type: \Cassandra\Type return: comment: The tuple type - type: Type + type: \Cassandra\Type userType: comment: |- Initialize a user type @@ -201,10 +201,10 @@ Type: params: types: comment: A variadic list of name/type pairs - type: Type + type: \Cassandra\Type return: comment: The user type - type: Type + type: \Cassandra\Type name: comment: Returns the name of this type as string. return: diff --git a/ext/src/Type/Collection.yaml b/ext/src/Type/Collection.yaml index a159f677e..189ec5670 100644 --- a/ext/src/Type/Collection.yaml +++ b/ext/src/Type/Collection.yaml @@ -18,7 +18,7 @@ Type\Collection: comment: Returns type of values return: comment: Type of values - type: Type + type: \Cassandra\Type create: comment: |- Creates a new Collection from the given values. When no values @@ -33,5 +33,5 @@ Type\Collection: type: mixed return: comment: ' A list with given values.' - type: Collection + type: \Cassandra\Collection ... diff --git a/ext/src/Type/Map.yaml b/ext/src/Type/Map.yaml index d4ed97cfc..3a69bba9a 100644 --- a/ext/src/Type/Map.yaml +++ b/ext/src/Type/Map.yaml @@ -18,12 +18,12 @@ Type\Map: comment: Returns type of keys return: comment: Type of keys - type: Type + type: \Cassandra\Type valueType: comment: Returns type of values return: comment: Type of values - type: Type + type: \Cassandra\Type create: comment: |- Creates a new Map from the given values. @@ -54,5 +54,5 @@ Type\Map: type: mixed return: comment: ' A set with given values.' - type: Map + type: \Cassandra\Map ... diff --git a/ext/src/Type/Set.yaml b/ext/src/Type/Set.yaml index 4f7ad47b0..29f8db962 100644 --- a/ext/src/Type/Set.yaml +++ b/ext/src/Type/Set.yaml @@ -18,7 +18,7 @@ Type\Set: comment: Returns type of values return: comment: Type of values - type: Type + type: \Cassandra\Type create: comment: |- Creates a new Set from the given values. @@ -33,5 +33,5 @@ Type\Set: type: mixed return: comment: ' A set with given values.' - type: Set + type: \Cassandra\Set ... diff --git a/ext/src/Type/Tuple.yaml b/ext/src/Type/Tuple.yaml index 0720fab58..8ee0416fc 100644 --- a/ext/src/Type/Tuple.yaml +++ b/ext/src/Type/Tuple.yaml @@ -33,5 +33,5 @@ Type\Tuple: type: mixed return: comment: A tuple with given values. - type: Tuple + type: \Cassandra\Tuple ... diff --git a/ext/src/Type/UserType.yaml b/ext/src/Type/UserType.yaml index 50728decb..91d95662e 100644 --- a/ext/src/Type/UserType.yaml +++ b/ext/src/Type/UserType.yaml @@ -41,7 +41,7 @@ Type\UserType: type: mixed return: comment: ' A user type value with given name/value pairs.' - type: UserTypeValue + type: \Cassandra\UserTypeValue withName: comment: Associate the user type with a name. params: diff --git a/ext/src/UserTypeValue.yaml b/ext/src/UserTypeValue.yaml index 98c9f180e..74f298be9 100644 --- a/ext/src/UserTypeValue.yaml +++ b/ext/src/UserTypeValue.yaml @@ -12,7 +12,7 @@ UserTypeValue: comment: The type of this user type value. return: comment: "" - type: Type + type: \Cassandra\Type values: comment: Array of values in this user type value. return: diff --git a/ext/src/Uuid.yaml b/ext/src/Uuid.yaml index b9214e6f8..15769df09 100644 --- a/ext/src/Uuid.yaml +++ b/ext/src/Uuid.yaml @@ -17,7 +17,7 @@ Uuid: comment: The type of this uuid. return: comment: "" - type: Type + type: \Cassandra\Type uuid: comment: "" return: diff --git a/ext/src/Value.yaml b/ext/src/Value.yaml index 5dac06002..47e3719b5 100644 --- a/ext/src/Value.yaml +++ b/ext/src/Value.yaml @@ -26,5 +26,5 @@ Value: comment: The type of represented by the value. return: comment: "" - type: Type + type: \Cassandra\Type ... diff --git a/ext/src/Varint.yaml b/ext/src/Varint.yaml index 1831983a1..d4b8fe785 100644 --- a/ext/src/Varint.yaml +++ b/ext/src/Varint.yaml @@ -17,7 +17,7 @@ Varint: comment: The type of this varint. return: comment: "" - type: Type + type: \Cassandra\Type value: comment: Returns the integer value. return: @@ -28,61 +28,61 @@ Varint: params: num: comment: "" - type: Numeric + type: \Cassandra\Numeric return: comment: "" - type: Numeric + type: \Cassandra\Numeric sub: comment: "" params: num: comment: "" - type: Numeric + type: \Cassandra\Numeric return: comment: "" - type: Numeric + type: \Cassandra\Numeric mul: comment: "" params: num: comment: "" - type: Numeric + type: \Cassandra\Numeric return: comment: "" - type: Numeric + type: \Cassandra\Numeric div: comment: "" params: num: comment: "" - type: Numeric + type: \Cassandra\Numeric return: comment: "" - type: Numeric + type: \Cassandra\Numeric mod: comment: "" params: num: comment: "" - type: Numeric + type: \Cassandra\Numeric return: comment: "" - type: Numeric + type: \Cassandra\Numeric abs: comment: "" return: comment: "" - type: Numeric + type: \Cassandra\Numeric neg: comment: "" return: comment: "" - type: Numeric + type: \Cassandra\Numeric sqrt: comment: "" return: comment: "" - type: Numeric + type: \Cassandra\Numeric toInt: comment: "" return: From c1c50dba5d9322f0f0c823ba2d341eb1f8f59aa9 Mon Sep 17 00:00:00 2001 From: Virgile Cabane <129596@supinfo.com> Date: Fri, 21 Sep 2018 08:36:46 +0200 Subject: [PATCH 05/10] Remove composer require on self repository --- composer.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 9400d0355..8091d3ec4 100644 --- a/composer.json +++ b/composer.json @@ -24,8 +24,7 @@ } ], "require": { - "php": ">=5.6.0", - "ext-cassandra": "^1.0.0" + "php": ">=5.6.0" }, "require-dev": { "behat/behat": "~3.0.6", From 735c5794a003124f5924753472b190a2cb332824 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 23 May 2019 15:29:45 +0200 Subject: [PATCH 06/10] SPL is always there --- ext/php_driver.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/ext/php_driver.h b/ext/php_driver.h index 10680d221..bc42b6fcf 100644 --- a/ext/php_driver.h +++ b/ext/php_driver.h @@ -46,12 +46,8 @@ typedef int pid_t; # error PHP 5.6.0 or later is required in order to build the driver #endif -#if HAVE_SPL -# include -# include -#else -# error SPL must be enabled in order to build the driver -#endif +#include +#include #include "version.h" From bca7c3e90133c1f9c250457affc914f689857e75 Mon Sep 17 00:00:00 2001 From: Michael Penick Date: Thu, 6 Jun 2019 08:54:38 -0400 Subject: [PATCH 07/10] Update copyright in README (#134) --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 25d8591ff..58c4c1976 100644 --- a/README.md +++ b/README.md @@ -129,16 +129,16 @@ cd /usr/local/src/php-driver ## Copyright -Copyright 2015-2017 DataStax, Inc. +© DataStax, Inc. -Licensed under the Apache License, Version 2.0 (the "License"); you may not use +Licensed under the Apache License, Version 2.0 (the “License”); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed -under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +under the License is distributed on an “AS IS” BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. From 84eb59673485cfcbb7c64a6916cd6a115915c233 Mon Sep 17 00:00:00 2001 From: George Peter Banyard Date: Fri, 12 Jul 2019 14:58:00 +0200 Subject: [PATCH 08/10] Convert php_error_docref0() to php_error_docref() --- ext/src/Cluster/Builder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/src/Cluster/Builder.c b/ext/src/Cluster/Builder.c index 22c5c7b86..97ca0d870 100644 --- a/ext/src/Cluster/Builder.c +++ b/ext/src/Cluster/Builder.c @@ -130,7 +130,7 @@ PHP_METHOD(ClusterBuilder, build) rc = cass_cluster_set_use_hostname_resolution(cluster->cluster, self->enable_hostname_resolution); if (rc == CASS_ERROR_LIB_NOT_IMPLEMENTED) { if (self->enable_hostname_resolution) { - php_error_docref0(NULL TSRMLS_CC, E_WARNING, + php_error_docref(NULL TSRMLS_CC, E_WARNING, "The underlying C/C++ driver does not implement hostname resolution it will be disabled"); } } else { From f73debf39e395817dd2ced76acfc64249d4d3a0a Mon Sep 17 00:00:00 2001 From: Oleg Andreyev Date: Sat, 9 Nov 2019 18:24:10 +0200 Subject: [PATCH 09/10] added 7.2 and 7.3 --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index f243a14bb..002a2de19 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,8 @@ php: - 5.6 - 7.0 - 7.1 + - 7.2 + - 7.3 env: global: From 5a5d1b69a5cc2bf4c5e02f9ebde82cf3221e96b3 Mon Sep 17 00:00:00 2001 From: ngfw Date: Fri, 27 Dec 2019 11:42:45 +0400 Subject: [PATCH 10/10] allow PACL to build --- ext/package.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/package.xml b/ext/package.xml index cc5f8bcf2..79aa07907 100644 --- a/ext/package.xml +++ b/ext/package.xml @@ -17,8 +17,8 @@ protocol and Cassandra Query Language v3. 2019-01-16 - 1.3.3-dev - 1.3.3-dev + 1.3.4 + 1.3.4 devel