Merge pull request datastax#127 from ghost/master

- Fix for generate_doc.php to generate correct namespaces for "extend…

Author: mpenick

ext/doc/Cassandra.php

@@ -379,24 +379,24 @@ 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.
      *
-     * @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() { }
 

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();
 

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) { }
 

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() { }
 

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() { }
 

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);