Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 5f92393

Browse files
authored
Merge pull request #127 from ghost/master
- Fix for generate_doc.php to generate correct namespaces for "extend...
2 parents 334b8dd + 2547023 commit 5f92393

File tree

127 files changed

+638
-632
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+638
-632
lines changed

‎ext/doc/Cassandra.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -379,24 +379,24 @@ final class Cassandra {
379379
/**
380380
* The current version of the extension.
381381
*/
382-
const VERSION = '1.3.1';
382+
const VERSION = '1.3.2';
383383

384384
/**
385385
* The version of the cpp-driver the extension is compiled against.
386386
*/
387-
const CPP_DRIVER_VERSION = '2.7.0';
387+
const CPP_DRIVER_VERSION = '2.9.0';
388388

389389
/**
390390
* Creates a new cluster builder for constructing a Cluster object.
391391
*
392-
* @return Cluster\Builder A cluster builder object with default settings
392+
* @return \Cassandra\Cluster\Builder A cluster builder object with default settings
393393
*/
394394
public static function cluster() { }
395395

396396
/**
397397
* Creates a new ssl builder for constructing a SSLOptions object.
398398
*
399-
* @return SSLOptions\Builder A SSL options builder with default settings
399+
* @return \Cassandra\SSLOptions\Builder A SSL options builder with default settings
400400
*/
401401
public static function ssl() { }
402402

‎ext/doc/Cassandra/Aggregate.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,35 +47,35 @@ public function argumentTypes();
4747
/**
4848
* Returns the final function of the aggregate
4949
*
50-
* @return Function Final function of the aggregate
50+
* @return \Cassandra\Function Final function of the aggregate
5151
*/
5252
public function finalFunction();
5353

5454
/**
5555
* Returns the state function of the aggregate
5656
*
57-
* @return Function State function of the aggregate
57+
* @return \Cassandra\Function State function of the aggregate
5858
*/
5959
public function stateFunction();
6060

6161
/**
6262
* Returns the initial condition of the aggregate
6363
*
64-
* @return Value Initial condition of the aggregate
64+
* @return \CassandraValue Initial condition of the aggregate
6565
*/
6666
public function initialCondition();
6767

6868
/**
6969
* Returns the return type of the aggregate
7070
*
71-
* @return Type Return type of the aggregate
71+
* @return \Cassandra\Type Return type of the aggregate
7272
*/
7373
public function returnType();
7474

7575
/**
7676
* Returns the state type of the aggregate
7777
*
78-
* @return Type State type of the aggregate
78+
* @return \Cassandra\Type State type of the aggregate
7979
*/
8080
public function stateType();
8181

‎ext/doc/Cassandra/BatchStatement.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@ public function __construct($type) { }
4949
/**
5050
* Adds a statement to this batch.
5151
*
52-
* @param string|Statement $statement string or statement to add
52+
* @param string|\Cassandra\Statement $statement string or statement to add
5353
* @param array|null $arguments positional or named arguments (optional)
5454
*
5555
* @throws Exception\InvalidArgumentException
5656
*
57-
* @return BatchStatement self
57+
* @return \Cassandra\BatchStatement self
5858
*/
5959
public function add($statement, $arguments) { }
6060

‎ext/doc/Cassandra/Bigint.php‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public function __toString() { }
4040
/**
4141
* The type of this bigint.
4242
*
43-
* @return Type
43+
* @return \Cassandra\Type
4444
*/
4545
public function type() { }
4646

@@ -52,47 +52,47 @@ public function type() { }
5252
public function value() { }
5353

5454
/**
55-
* @param Numeric $num a number to add to this one
56-
* @return Numeric sum
55+
* @param \Cassandra\Numeric $num a number to add to this one
56+
* @return \Cassandra\Numeric sum
5757
*/
5858
public function add($num) { }
5959

6060
/**
61-
* @param Numeric $num a number to subtract from this one
62-
* @return Numeric difference
61+
* @param \Cassandra\Numeric $num a number to subtract from this one
62+
* @return \Cassandra\Numeric difference
6363
*/
6464
public function sub($num) { }
6565

6666
/**
67-
* @param Numeric $num a number to multiply this one by
68-
* @return Numeric product
67+
* @param \Cassandra\Numeric $num a number to multiply this one by
68+
* @return \Cassandra\Numeric product
6969
*/
7070
public function mul($num) { }
7171

7272
/**
73-
* @param Numeric $num a number to divide this one by
74-
* @return Numeric quotient
73+
* @param \Cassandra\Numeric $num a number to divide this one by
74+
* @return \Cassandra\Numeric quotient
7575
*/
7676
public function div($num) { }
7777

7878
/**
79-
* @param Numeric $num a number to divide this one by
80-
* @return Numeric remainder
79+
* @param \Cassandra\Numeric $num a number to divide this one by
80+
* @return \Cassandra\Numeric remainder
8181
*/
8282
public function mod($num) { }
8383

8484
/**
85-
* @return Numeric absolute value
85+
* @return \Cassandra\Numeric absolute value
8686
*/
8787
public function abs() { }
8888

8989
/**
90-
* @return Numeric negative value
90+
* @return \Cassandra\Numeric negative value
9191
*/
9292
public function neg() { }
9393

9494
/**
95-
* @return Numeric square root
95+
* @return \Cassandra\Numeric square root
9696
*/
9797
public function sqrt() { }
9898

@@ -109,14 +109,14 @@ public function toDouble() { }
109109
/**
110110
* Minimum possible Bigint value
111111
*
112-
* @return Bigint minimum value
112+
* @return \Cassandra\Bigint minimum value
113113
*/
114114
public static function min() { }
115115

116116
/**
117117
* Maximum possible Bigint value
118118
*
119-
* @return Bigint maximum value
119+
* @return \Cassandra\Bigint maximum value
120120
*/
121121
public static function max() { }
122122

‎ext/doc/Cassandra/Blob.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public function __toString() { }
4040
/**
4141
* The type of this blob.
4242
*
43-
* @return Type
43+
* @return \Cassandra\Type
4444
*/
4545
public function type() { }
4646

‎ext/doc/Cassandra/Cluster.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ interface Cluster {
2828
*
2929
* @param string $keyspace Optional keyspace name
3030
*
31-
* @return Session Session instance
31+
* @return \Cassandra\Session Session instance
3232
*/
3333
public function connect($keyspace);
3434

@@ -37,7 +37,7 @@ public function connect($keyspace);
3737
*
3838
* @param string $keyspace Optional keyspace name
3939
*
40-
* @return Future A Future Session instance
40+
* @return \Cassandra\Future A Future Session instance
4141
*/
4242
public function connectAsync($keyspace);
4343

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /