Merge branch 'master' into 3.next

src/Database/Type.php

@@ -21,7 +21,7 @@
  * Encapsulates all conversion functions for values coming from database into PHP and
  * going from PHP into database.
  */
-class Type
+class Type implements TypeInterface
 {
 
     /**

src/Database/Type/BinaryType.php

@@ -17,6 +17,7 @@
 use Cake\Core\Exception\Exception;
 use Cake\Database\Driver;
 use Cake\Database\Driver\Sqlserver;
+use Cake\Database\Type;
 use Cake\Database\TypeInterface;
 use PDO;
 
@@ -25,7 +26,7 @@
  *
  * Use to convert binary data between PHP and the database types.
  */
-class BinaryType implements TypeInterface
+class BinaryType extends Type implements TypeInterface
 {
 
     /**
@@ -45,19 +46,6 @@ public function __construct($name = null)
         $this->_name = $name;
     }
 
-    /**
-     * Returns the base type name that this class is inheriting.
-     * This is useful when extending base type for adding extra functionality
-     * but still want the rest of the framework to use the same assumptions it would
-     * do about the base type it inherits from.
-     *
-     * @return string
-     */
-    public function getBaseType()
-    {
-        return $this->_name;
-    }
-
     /**
      * Convert binary data into the database format.
      *

src/Database/Type/BoolType.php

@@ -15,6 +15,7 @@
 namespace Cake\Database\Type;
 
 use Cake\Database\Driver;
+use Cake\Database\Type;
 use Cake\Database\TypeInterface;
 use InvalidArgumentException;
 use PDO;
@@ -24,7 +25,7 @@
  *
  * Use to convert bool data between PHP and the database types.
  */
-class BoolType implements TypeInterface
+class BoolType extends Type implements TypeInterface
 {
 
     /**
@@ -44,19 +45,6 @@ public function __construct($name = null)
         $this->_name = $name;
     }
 
-    /**
-     * Returns the base type name that this class is inheriting.
-     * This is useful when extending base type for adding extra functionality
-     * but still want the rest of the framework to use the same assumptions it would
-     * do about the base type it inherits from.
-     *
-     * @return string
-     */
-    public function getBaseType()
-    {
-        return $this->_name;
-    }
-
     /**
      * Convert bool data into the database format.
      *

src/Database/Type/DateTimeType.php

@@ -15,6 +15,7 @@
 namespace Cake\Database\Type;
 
 use Cake\Database\Driver;
+use Cake\Database\Type;
 use Cake\Database\TypeInterface;
 use DateTimeInterface;
 use Exception;
@@ -26,7 +27,7 @@
  *
  * Use to convert datetime instances to strings & back.
  */
-class DateTimeType implements TypeInterface
+class DateTimeType extends Type implements TypeInterface
 {
 
     /**

src/Database/Type/FloatType.php

@@ -15,6 +15,7 @@
 namespace Cake\Database\Type;
 
 use Cake\Database\Driver;
+use Cake\Database\Type;
 use Cake\Database\TypeInterface;
 use PDO;
 use RuntimeException;
@@ -24,7 +25,7 @@
  *
  * Use to convert float/decimal data between PHP and the database types.
  */
-class FloatType implements TypeInterface
+class FloatType extends Type implements TypeInterface
 {
 
     /**
@@ -44,19 +45,6 @@ public function __construct($name = null)
         $this->_name = $name;
     }
 
-    /**
-     * Returns the base type name that this class is inheriting.
-     * This is useful when extending base type for adding extra functionality
-     * but still want the rest of the framework to use the same assumptions it would
-     * do about the base type it inherits from.
-     *
-     * @return string
-     */
-    public function getBaseType()
-    {
-        return $this->_name;
-    }
-
     /**
      * The class to use for representing number objects
      *

src/Database/Type/IntegerType.php

@@ -15,6 +15,7 @@
 namespace Cake\Database\Type;
 
 use Cake\Database\Driver;
+use Cake\Database\Type;
 use Cake\Database\TypeInterface;
 use InvalidArgumentException;
 use PDO;
@@ -24,53 +25,9 @@
  *
  * Use to convert integer data between PHP and the database types.
  */
-class IntegerType implements TypeInterface
+class IntegerType extends Type implements TypeInterface
 {
 
-    /**
-     * Identifier name for this type
-     *
-     * @var string|null
-     */
-    protected $_name = null;
-
-    /**
-     * Constructor
-     *
-     * @param string|null $name The name identifying this type
-     */
-    public function __construct($name = null)
-    {
-        $this->_name = $name;
-    }
-
-    /**
-     * Returns the base type name that this class is inheriting.
-     * This is useful when extending base type for adding extra functionality
-     * but still want the rest of the framework to use the same assumptions it would
-     * do about the base type it inherits from.
-     *
-     * @return string
-     */
-    public function getBaseType()
-    {
-        return $this->_name;
-    }
-
-    /**
-     * Generate a new primary key value for a given type.
-     *
-     * This method can be used by types to create new primary key values
-     * when entities are inserted.
-     *
-     * @return mixed A new primary key value.
-     * @see \Cake\Database\Type\UuidType
-     */
-    public function newId()
-    {
-        return null;
-    }
-
     /**
      * Convert integer data into the database format.
      *

src/Database/TypeInterface.php

@@ -58,4 +58,14 @@ public function toStatement($value, Driver $driver);
      * @return mixed Converted value.
      */
     public function marshal($value);
+
+    /**
+     * Returns the base type name that this class is inheriting.
+     * This is useful when extending base type for adding extra functionality
+     * but still want the rest of the framework to use the same assumptions it would
+     * do about the base type it inherits from.
+     *
+     * @return string
+     */
+    public function getBaseType();
 }