Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ext/doc/Cassandra.php
Original file line number Diff line number Diff line change
Expand Up @@ -379,12 +379,12 @@ final class Cassandra
/**
* The current version of the extension.
*/
const VERSION = '1.4.0';
const VERSION = '1.5.0';

/**
* The version of the cpp-driver the extension is compiled against.
*/
const CPP_DRIVER_VERSION = '2.16.2';
const CPP_DRIVER_VERSION = '2.17.1';

/**
* Creates a new cluster builder for constructing a Cluster object.
Expand Down
2 changes: 1 addition & 1 deletion ext/doc/Cassandra/BatchStatement.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ final class BatchStatement implements Statement
*
* @param int $type must be one of \Cassandra::BATCH_* (default: \Cassandra::BATCH_LOGGED).
*/
public function __construct(int $type = null)
public function __construct(?int $type = null)
{
}

Expand Down
4 changes: 2 additions & 2 deletions ext/doc/Cassandra/Cluster.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ interface Cluster
*
* @return \Cassandra\Session Session instance
*/
public function connect(string $keyspace = null, int $timeout = null): \Cassandra\Session;
public function connect(?string $keyspace = null, ?int $timeout = null): \Cassandra\Session;

/**
* Creates a new Session instance.
Expand All @@ -40,5 +40,5 @@ public function connect(string $keyspace = null, int $timeout = null): \Cassandr
*
* @return \Cassandra\Future A Future Session instance
*/
public function connectAsync(string $keyspace = null): \Cassandra\Future;
public function connectAsync(?string $keyspace = null): \Cassandra\Future;
}
16 changes: 8 additions & 8 deletions ext/doc/Cassandra/Cluster/Builder.php
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ public function withWhiteListDCs(string $dcs): \Cassandra\Cluster\Builder
*
* @return \Cassandra\Cluster\Builder self
*/
public function withTokenAwareRouting(bool $enabled = null): \Cassandra\Cluster\Builder
public function withTokenAwareRouting(?bool $enabled = null): \Cassandra\Cluster\Builder
{
}

Expand Down Expand Up @@ -232,7 +232,7 @@ public function withSSL(\Cassandra\SSLOptions $options): \Cassandra\Cluster\Buil
*
* @return \Cassandra\Cluster\Builder self
*/
public function withPersistentSessions(bool $enabled = null): \Cassandra\Cluster\Builder
public function withPersistentSessions(?bool $enabled = null): \Cassandra\Cluster\Builder
{
}

Expand Down Expand Up @@ -281,7 +281,7 @@ public function withIOThreads(int $count): \Cassandra\Cluster\Builder
*
* @return \Cassandra\Cluster\Builder self
*/
public function withConnectionsPerHost(int $core, int $max = null): \Cassandra\Cluster\Builder
public function withConnectionsPerHost(int $core, ?int $max = null): \Cassandra\Cluster\Builder
{
}

Expand All @@ -304,7 +304,7 @@ public function withReconnectInterval(float $interval): \Cassandra\Cluster\Build
*
* @return \Cassandra\Cluster\Builder self
*/
public function withLatencyAwareRouting(bool $enabled = null): \Cassandra\Cluster\Builder
public function withLatencyAwareRouting(?bool $enabled = null): \Cassandra\Cluster\Builder
{
}

Expand All @@ -315,7 +315,7 @@ public function withLatencyAwareRouting(bool $enabled = null): \Cassandra\Cluste
*
* @return \Cassandra\Cluster\Builder self
*/
public function withTCPNodelay(bool $enabled = null): \Cassandra\Cluster\Builder
public function withTCPNodelay(?bool $enabled = null): \Cassandra\Cluster\Builder
{
}

Expand Down Expand Up @@ -368,7 +368,7 @@ public function withTimestampGenerator(\Cassandra\TimestampGenerator $generator)
*
* @return \Cassandra\Cluster\Builder self
*/
public function withSchemaMetadata(bool $enabled = null): \Cassandra\Cluster\Builder
public function withSchemaMetadata(?bool $enabled = null): \Cassandra\Cluster\Builder
{
}

Expand All @@ -387,7 +387,7 @@ public function withSchemaMetadata(bool $enabled = null): \Cassandra\Cluster\Bui
*
* @return \Cassandra\Cluster\Builder self
*/
public function withHostnameResolution(bool $enabled = null): \Cassandra\Cluster\Builder
public function withHostnameResolution(?bool $enabled = null): \Cassandra\Cluster\Builder
{
}

Expand All @@ -404,7 +404,7 @@ public function withHostnameResolution(bool $enabled = null): \Cassandra\Cluster
*
* @return \Cassandra\Cluster\Builder self
*/
public function withRandomizedContactPoints(bool $enabled = null): \Cassandra\Cluster\Builder
public function withRandomizedContactPoints(?bool $enabled = null): \Cassandra\Cluster\Builder
{
}

Expand Down
6 changes: 6 additions & 0 deletions ext/doc/Cassandra/Column.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ public function type(): \Cassandra\Type;
/**
* Returns whether the column is in descending or ascending order.
*
* @deprecated
*
* @return bool Whether the column is stored in descending order.
*/
public function isReversed(): bool;
Expand All @@ -61,13 +63,17 @@ public function isFrozen(): bool;
/**
* Returns name of the index if defined.
*
* @deprecated
*
* @return string Name of the index if defined or null
*/
public function indexName(): string;

/**
* Returns index options if present.
*
* @deprecated
*
* @return string Index options if present or null
*/
public function indexOptions(): string;
Expand Down
4 changes: 2 additions & 2 deletions ext/doc/Cassandra/Date.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ final class Date implements \Stringable, Value
*
* @param int $seconds Absolute seconds from epoch (1970, 1, 1), can be negative, defaults to current time.
*/
public function __construct(int $seconds = null)
public function __construct(?int $seconds = null)
{
}

Expand All @@ -55,7 +55,7 @@ public function seconds(): int
*
* @return \DateTime PHP representation
*/
public function toDateTime(\Cassandra\Time $time = null): \DateTime
public function toDateTime(?\Cassandra\Time $time = null): \DateTime
{
}

Expand Down
4 changes: 2 additions & 2 deletions ext/doc/Cassandra/DefaultCluster.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ final class DefaultCluster implements Cluster
*
* @return \Cassandra\Session Session instance
*/
public function connect(string $keyspace = null, int $timeout = null): \Cassandra\Session
public function connect(?string $keyspace = null, ?int $timeout = null): \Cassandra\Session
{
}

Expand All @@ -44,7 +44,7 @@ public function connect(string $keyspace = null, int $timeout = null): \Cassandr
*
* @return \Cassandra\Future A Future Session instance
*/
public function connectAsync(string $keyspace = null): \Cassandra\Future
public function connectAsync(?string $keyspace = null): \Cassandra\Future
{
}
}
6 changes: 6 additions & 0 deletions ext/doc/Cassandra/DefaultColumn.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ public function type(): \Cassandra\Type
/**
* Returns whether the column is in descending or ascending order.
*
* @deprecated
*
* @return bool Whether the column is stored in descending order.
*/
public function isReversed(): bool
Expand Down Expand Up @@ -71,6 +73,8 @@ public function isFrozen(): bool
/**
* Returns name of the index if defined.
*
* @deprecated
*
* @return string Name of the index if defined or null
*/
public function indexName(): string
Expand All @@ -80,6 +84,8 @@ public function indexName(): string
/**
* Returns index options if present.
*
* @deprecated
*
* @return string Index options if present or null
*/
public function indexOptions(): string
Expand Down
2 changes: 1 addition & 1 deletion ext/doc/Cassandra/DefaultKeyspace.php
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ public function materializedViews(): array
*
* @return \Cassandra\Function_|null A function or null
*/
public function function_(string $name, ...$params)
public function function(string $name, ...$params)
{
}

Expand Down
2 changes: 1 addition & 1 deletion ext/doc/Cassandra/DefaultSchema.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ final class DefaultSchema implements Schema
*
* @param string $name Name of the keyspace to get
*
* @return \Cassandra\Keyspace Keyspace instance or null
* @return \Cassandra\Keyspace
*/
public function keyspace(string $name): \Cassandra\Keyspace
{
Expand Down
4 changes: 2 additions & 2 deletions ext/doc/Cassandra/DefaultSession.php
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public function prepareAsync(string $cql, $options = null): \Cassandra\FuturePre
*
* @return void Nothing.
*/
public function close(float $timeout = null): void
public function close(?float $timeout = null): void
{
}

Expand All @@ -131,7 +131,7 @@ public function metrics(): array
/**
* Get a snapshot of the cluster's current schema.
*
* @return \Cassandra\Schema A snapshot of the cluster's schema.
* @return \Cassandra\Schema
*/
public function schema(): \Cassandra\Schema
{
Expand Down
2 changes: 1 addition & 1 deletion ext/doc/Cassandra/Exception/AlreadyExistsException.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class AlreadyExistsException extends ConfigurationException
* @param int $code
* @param \Exception $previous
*/
public function __construct(string $message = '', int $code = 0, \Exception $previous = null)
public function __construct(string $message = '', int $code = 0, ?\Exception $previous = null)
{
}

Expand Down
2 changes: 1 addition & 1 deletion ext/doc/Cassandra/Exception/AuthenticationException.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class AuthenticationException extends RuntimeException
* @param int $code
* @param \Exception $previous
*/
public function __construct(string $message = '', int $code = 0, \Exception $previous = null)
public function __construct(string $message = '', int $code = 0, ?\Exception $previous = null)
{
}

Expand Down
2 changes: 1 addition & 1 deletion ext/doc/Cassandra/Exception/ConfigurationException.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class ConfigurationException extends ValidationException
* @param int $code
* @param \Exception $previous
*/
public function __construct(string $message = '', int $code = 0, \Exception $previous = null)
public function __construct(string $message = '', int $code = 0, ?\Exception $previous = null)
{
}

Expand Down
2 changes: 1 addition & 1 deletion ext/doc/Cassandra/Exception/DivideByZeroException.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class DivideByZeroException extends RangeException
* @param int $code
* @param \Exception $previous
*/
public function __construct(string $message = '', int $code = 0, \Exception $previous = null)
public function __construct(string $message = '', int $code = 0, ?\Exception $previous = null)
{
}

Expand Down
2 changes: 1 addition & 1 deletion ext/doc/Cassandra/Exception/DomainException.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class DomainException extends \DomainException implements \Cassandra\Exception
* @param int $code
* @param \Exception $previous
*/
public function __construct(string $message = '', int $code = 0, \Exception $previous = null)
public function __construct(string $message = '', int $code = 0, ?\Exception $previous = null)
{
}

Expand Down
2 changes: 1 addition & 1 deletion ext/doc/Cassandra/Exception/ExecutionException.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class ExecutionException extends RuntimeException
* @param int $code
* @param \Exception $previous
*/
public function __construct(string $message = '', int $code = 0, \Exception $previous = null)
public function __construct(string $message = '', int $code = 0, ?\Exception $previous = null)
{
}

Expand Down
2 changes: 1 addition & 1 deletion ext/doc/Cassandra/Exception/InvalidArgumentException.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class InvalidArgumentException extends \InvalidArgumentException implements \Cas
* @param int $code
* @param \Exception $previous
*/
public function __construct(string $message = '', int $code = 0, \Exception $previous = null)
public function __construct(string $message = '', int $code = 0, ?\Exception $previous = null)
{
}

Expand Down
2 changes: 1 addition & 1 deletion ext/doc/Cassandra/Exception/InvalidQueryException.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class InvalidQueryException extends ValidationException
* @param int $code
* @param \Exception $previous
*/
public function __construct(string $message = '', int $code = 0, \Exception $previous = null)
public function __construct(string $message = '', int $code = 0, ?\Exception $previous = null)
{
}

Expand Down
2 changes: 1 addition & 1 deletion ext/doc/Cassandra/Exception/InvalidSyntaxException.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class InvalidSyntaxException extends ValidationException
* @param int $code
* @param \Exception $previous
*/
public function __construct(string $message = '', int $code = 0, \Exception $previous = null)
public function __construct(string $message = '', int $code = 0, ?\Exception $previous = null)
{
}

Expand Down
2 changes: 1 addition & 1 deletion ext/doc/Cassandra/Exception/IsBootstrappingException.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class IsBootstrappingException extends ServerException
* @param int $code
* @param \Exception $previous
*/
public function __construct(string $message = '', int $code = 0, \Exception $previous = null)
public function __construct(string $message = '', int $code = 0, ?\Exception $previous = null)
{
}

Expand Down
2 changes: 1 addition & 1 deletion ext/doc/Cassandra/Exception/LogicException.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class LogicException extends \LogicException implements \Cassandra\Exception
* @param int $code
* @param \Exception $previous
*/
public function __construct(string $message = '', int $code = 0, \Exception $previous = null)
public function __construct(string $message = '', int $code = 0, ?\Exception $previous = null)
{
}

Expand Down
2 changes: 1 addition & 1 deletion ext/doc/Cassandra/Exception/OverloadedException.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class OverloadedException extends ServerException
* @param int $code
* @param \Exception $previous
*/
public function __construct(string $message = '', int $code = 0, \Exception $previous = null)
public function __construct(string $message = '', int $code = 0, ?\Exception $previous = null)
{
}

Expand Down
2 changes: 1 addition & 1 deletion ext/doc/Cassandra/Exception/ProtocolException.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class ProtocolException extends RuntimeException
* @param int $code
* @param \Exception $previous
*/
public function __construct(string $message = '', int $code = 0, \Exception $previous = null)
public function __construct(string $message = '', int $code = 0, ?\Exception $previous = null)
{
}

Expand Down
2 changes: 1 addition & 1 deletion ext/doc/Cassandra/Exception/RangeException.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class RangeException extends \RangeException implements \Cassandra\Exception
* @param int $code
* @param \Exception $previous
*/
public function __construct(string $message = '', int $code = 0, \Exception $previous = null)
public function __construct(string $message = '', int $code = 0, ?\Exception $previous = null)
{
}

Expand Down
2 changes: 1 addition & 1 deletion ext/doc/Cassandra/Exception/ReadTimeoutException.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class ReadTimeoutException extends ExecutionException
* @param int $code
* @param \Exception $previous
*/
public function __construct(string $message = '', int $code = 0, \Exception $previous = null)
public function __construct(string $message = '', int $code = 0, ?\Exception $previous = null)
{
}

Expand Down
2 changes: 1 addition & 1 deletion ext/doc/Cassandra/Exception/RuntimeException.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class RuntimeException extends \RuntimeException implements \Cassandra\Exception
* @param int $code
* @param \Exception $previous
*/
public function __construct(string $message = '', int $code = 0, \Exception $previous = null)
public function __construct(string $message = '', int $code = 0, ?\Exception $previous = null)
{
}

Expand Down
2 changes: 1 addition & 1 deletion ext/doc/Cassandra/Exception/ServerException.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class ServerException extends RuntimeException
* @param int $code
* @param \Exception $previous
*/
public function __construct(string $message = '', int $code = 0, \Exception $previous = null)
public function __construct(string $message = '', int $code = 0, ?\Exception $previous = null)
{
}

Expand Down
2 changes: 1 addition & 1 deletion ext/doc/Cassandra/Exception/TimeoutException.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class TimeoutException extends RuntimeException
* @param int $code
* @param \Exception $previous
*/
public function __construct(string $message = '', int $code = 0, \Exception $previous = null)
public function __construct(string $message = '', int $code = 0, ?\Exception $previous = null)
{
}

Expand Down
Loading