Merge pull request #2999 from carusogabriel/annotation-types

Fix annotation types

lib/Doctrine/DBAL/Cache/ArrayStatement.php

@@ -30,17 +30,17 @@ class ArrayStatement implements \IteratorAggregate, ResultStatement
     private $data;
 
     /**
-     * @var integer
+     * @var int
      */
     private $columnCount = 0;
 
     /**
-     * @var integer
+     * @var int
      */
     private $num = 0;
 
     /**
-     * @var integer
+     * @var int
      */
     private $defaultFetchMode = PDO::FETCH_BOTH;
 

lib/Doctrine/DBAL/Cache/QueryCacheProfile.php

@@ -36,7 +36,7 @@ class QueryCacheProfile
     private $resultCacheDriver;
 
     /**
-     * @var integer
+     * @var int
      */
     private $lifetime = 0;
 
@@ -46,7 +46,7 @@ class QueryCacheProfile
     private $cacheKey;
 
     /**
-     * @param integer                           $lifetime
+     * @param int                               $lifetime
      * @param string|null                       $cacheKey
      * @param \Doctrine\Common\Cache\Cache|null $resultCache
      */
@@ -66,7 +66,7 @@ class QueryCacheProfile
     }
 
     /**
-     * @return integer
+     * @return int
      */
     public function getLifetime()
     {
@@ -135,7 +135,7 @@ class QueryCacheProfile
     }
 
     /**
-     * @param integer $lifetime
+     * @param int $lifetime
      *
      * @return \Doctrine\DBAL\Cache\QueryCacheProfile
      */

lib/Doctrine/DBAL/Cache/ResultCacheStatement.php

@@ -56,7 +56,7 @@ class ResultCacheStatement implements \IteratorAggregate, ResultStatement
     private $realKey;
 
     /**
-     * @var integer
+     * @var int
      */
     private $lifetime;
 
@@ -68,7 +68,7 @@ class ResultCacheStatement implements \IteratorAggregate, ResultStatement
     /**
      * Did we reach the end of the statement?
      *
-     * @var boolean
+     * @var bool
      */
     private $emptied = false;
 
@@ -78,7 +78,7 @@ class ResultCacheStatement implements \IteratorAggregate, ResultStatement
     private $data;
 
     /**
-     * @var integer
+     * @var int
      */
     private $defaultFetchMode = PDO::FETCH_BOTH;
 
@@ -87,7 +87,7 @@ class ResultCacheStatement implements \IteratorAggregate, ResultStatement
      * @param \Doctrine\Common\Cache\Cache    $resultCache
      * @param string                          $cacheKey
      * @param string                          $realKey
-     * @param integer                         $lifetime
+     * @param int                             $lifetime
      */
     public function __construct(Statement $stmt, Cache $resultCache, $cacheKey, $realKey, $lifetime)
     {
@@ -209,7 +209,7 @@ class ResultCacheStatement implements \IteratorAggregate, ResultStatement
      * this behaviour is not guaranteed for all databases and should not be
      * relied on for portable applications.
      *
-     * @return integer The number of rows.
+     * @return int The number of rows.
      */
     public function rowCount()
     {

lib/Doctrine/DBAL/Configuration.php

@@ -119,7 +119,7 @@ class Configuration
      * transactions. Otherwise, its SQL statements are grouped into transactions that are terminated by a call to either
      * the method commit or the method rollback. By default, new connections are in auto-commit mode.
      *
-     * @param boolean $autoCommit True to enable auto-commit mode; false to disable it.
+     * @param bool $autoCommit True to enable auto-commit mode; false to disable it.
      *
      * @see   getAutoCommit
      */
@@ -131,7 +131,7 @@ class Configuration
     /**
      * Returns the default auto-commit mode for connections.
      *
-     * @return boolean True if auto-commit mode is enabled by default for connections, false otherwise.
+     * @return bool True if auto-commit mode is enabled by default for connections, false otherwise.
      *
      * @see    setAutoCommit
      */

lib/Doctrine/DBAL/Connection.php

@@ -73,21 +73,21 @@ class Connection implements DriverConnection
     /**
      * Represents an array of ints to be expanded by Doctrine SQL parsing.
      *
-     * @var integer
+     * @var int
      */
     const PARAM_INT_ARRAY = 101;
 
     /**
      * Represents an array of strings to be expanded by Doctrine SQL parsing.
      *
-     * @var integer
+     * @var int
      */
     const PARAM_STR_ARRAY = 102;
 
     /**
      * Offset by which PARAM_* constants are detected as arrays of the param type.
      *
-     * @var integer
+     * @var int
      */
     const ARRAY_PARAM_OFFSET = 100;
 
@@ -116,35 +116,35 @@ class Connection implements DriverConnection
     /**
      * Whether or not a connection has been established.
      *
-     * @var boolean
+     * @var bool
      */
     private $_isConnected = false;
 
     /**
      * The current auto-commit mode of this connection.
      *
-     * @var boolean
+     * @var bool
      */
     private $autoCommit = true;
 
     /**
      * The transaction nesting level.
      *
-     * @var integer
+     * @var int
      */
     private $_transactionNestingLevel = 0;
 
     /**
      * The currently active transaction isolation level.
      *
-     * @var integer
+     * @var int
      */
     private $_transactionIsolationLevel;
 
     /**
      * If nested transactions should use savepoints.
      *
-     * @var boolean
+     * @var bool
      */
     private $_nestTransactionsWithSavepoints = false;
 
@@ -180,12 +180,12 @@ class Connection implements DriverConnection
     /**
      * Flag that indicates whether the current transaction is marked for rollback only.
      *
-     * @var boolean
+     * @var bool
      */
     private $_isRollbackOnly = false;
 
     /**
-     * @var integer
+     * @var int
      */
     protected $defaultFetchMode = PDO::FETCH_ASSOC;
 
@@ -356,7 +356,7 @@ class Connection implements DriverConnection
     /**
      * Establishes the connection with the database.
      *
-     * @return boolean TRUE if the connection was successfully established, FALSE if
+     * @return bool TRUE if the connection was successfully established, FALSE if
      *              the connection is already open.
      */
     public function connect()
@@ -489,7 +489,7 @@ class Connection implements DriverConnection
     /**
      * Returns the current auto-commit mode for this connection.
      *
-     * @return boolean True if auto-commit mode is currently enabled for this connection, false otherwise.
+     * @return bool True if auto-commit mode is currently enabled for this connection, false otherwise.
      *
      * @see    setAutoCommit
      */
@@ -508,7 +508,7 @@ class Connection implements DriverConnection
      * NOTE: If this method is called during a transaction and the auto-commit mode is changed, the transaction is
      * committed. If this method is called and the auto-commit mode is not changed, the call is a no-op.
      *
-     * @param boolean $autoCommit True to enable auto-commit mode; false to disable it.
+     * @param bool $autoCommit True to enable auto-commit mode; false to disable it.
      *
      * @see   isAutoCommit
      */
@@ -532,7 +532,7 @@ class Connection implements DriverConnection
     /**
      * Sets the fetch mode.
      *
-     * @param integer $fetchMode
+     * @param int $fetchMode
      *
      * @return void
      */
@@ -579,7 +579,7 @@ class Connection implements DriverConnection
      *
      * @param string $statement The SQL query to be executed.
      * @param array  $params    The prepared statement params.
-     * @param integer $column    The 0-indexed column number to retrieve.
+     * @param int    $column    The 0-indexed column number to retrieve.
      * @param array  $types     The query parameter types.
      *
      * @return mixed|bool False is returned if no rows are found.
@@ -594,7 +594,7 @@ class Connection implements DriverConnection
     /**
      * Whether an actual connection to the database is established.
      *
-     * @return boolean
+     * @return bool
      */
     public function isConnected()
     {
@@ -604,7 +604,7 @@ class Connection implements DriverConnection
     /**
      * Checks whether a transaction is currently active.
      *
-     * @return boolean TRUE if a transaction is currently active, FALSE otherwise.
+     * @return bool TRUE if a transaction is currently active, FALSE otherwise.
      */
     public function isTransactionActive()
     {
@@ -650,7 +650,7 @@ class Connection implements DriverConnection
      * @param array  $identifier      The deletion criteria. An associative array containing column-value pairs.
      * @param array  $types           The types of identifiers.
      *
-     * @return integer The number of affected rows.
+     * @return int The number of affected rows.
      *
      * @throws \Doctrine\DBAL\DBALException
      * @throws InvalidArgumentException
@@ -685,9 +685,9 @@ class Connection implements DriverConnection
     /**
      * Sets the transaction isolation level.
      *
-     * @param integer $level The level to set.
+     * @param int $level The level to set.
      *
-     * @return integer
+     * @return int
      */
     public function setTransactionIsolation($level)
     {
@@ -699,7 +699,7 @@ class Connection implements DriverConnection
     /**
      * Gets the currently active transaction isolation level.
      *
-     * @return integer The current transaction isolation level.
+     * @return int The current transaction isolation level.
      */
     public function getTransactionIsolation()
     {
@@ -720,7 +720,7 @@ class Connection implements DriverConnection
      * @param array  $identifier      The update criteria. An associative array containing column-value pairs.
      * @param array  $types           Types of the merged $data and $identifier arrays in that order.
      *
-     * @return integer The number of affected rows.
+     * @return int The number of affected rows.
      *
      * @throws \Doctrine\DBAL\DBALException
      */
@@ -759,7 +759,7 @@ class Connection implements DriverConnection
      * @param array  $data            An associative array containing column-value pairs.
      * @param array  $types           Types of the inserted data.
      *
-     * @return integer The number of affected rows.
+     * @return int The number of affected rows.
      *
      * @throws \Doctrine\DBAL\DBALException
      */
@@ -1042,7 +1042,7 @@ class Connection implements DriverConnection
      * @param array  $params The query parameters.
      * @param array  $types  The parameter types.
      *
-     * @return integer The number of affected rows.
+     * @return int The number of affected rows.
      *
      * @throws \Doctrine\DBAL\DBALException
      */
@@ -1086,7 +1086,7 @@ class Connection implements DriverConnection
      *
      * @param string $statement
      *
-     * @return integer The number of affected rows.
+     * @return int The number of affected rows.
      *
      * @throws \Doctrine\DBAL\DBALException
      */
@@ -1115,7 +1115,7 @@ class Connection implements DriverConnection
     /**
      * Returns the current transaction nesting level.
      *
-     * @return integer The nesting level. A value of 0 means there's no active transaction.
+     * @return int The nesting level. A value of 0 means there's no active transaction.
      */
     public function getTransactionNestingLevel()
     {
@@ -1125,7 +1125,7 @@ class Connection implements DriverConnection
     /**
      * Fetches the SQLSTATE associated with the last database operation.
      *
-     * @return integer The last error code.
+     * @return int The last error code.
      */
     public function errorCode()
     {
@@ -1199,7 +1199,7 @@ class Connection implements DriverConnection
     /**
      * Sets if nested transactions should use savepoints.
      *
-     * @param boolean $nestTransactionsWithSavepoints
+     * @param bool $nestTransactionsWithSavepoints
      *
      * @return void
      *
@@ -1221,7 +1221,7 @@ class Connection implements DriverConnection
     /**
      * Gets if nested transactions should use savepoints.
      *
-     * @return boolean
+     * @return bool
      */
     public function getNestTransactionsWithSavepoints()
     {
@@ -1481,7 +1481,7 @@ class Connection implements DriverConnection
     /**
      * Checks whether the current transaction is marked for rollback only.
      *
-     * @return boolean
+     * @return bool
      *
      * @throws \Doctrine\DBAL\ConnectionException If no transaction is active.
      */

lib/Doctrine/DBAL/Connections/MasterSlaveConnection.php

@@ -93,7 +93,7 @@ class MasterSlaveConnection extends Connection
      * You can keep the slave connection and then switch back to it
      * during the request if you know what you are doing.
      *
-     * @var boolean
+     * @var bool
      */
     protected $keepSlave = false;
 
@@ -129,7 +129,7 @@ class MasterSlaveConnection extends Connection
     /**
      * Checks if the connection is currently towards the master or not.
      *
-     * @return boolean
+     * @return bool
      */
     public function isConnectedToMaster()
     {

lib/Doctrine/DBAL/Driver/AbstractDriverException.php

@@ -31,7 +31,7 @@ abstract class AbstractDriverException extends \Exception implements DriverExcep
     /**
      * The driver specific error code.
      *
-     * @var integer|string|null
+     * @var int|string|null
      */
     private $errorCode;
 
@@ -47,7 +47,7 @@ abstract class AbstractDriverException extends \Exception implements DriverExcep
      *
      * @param string          $message   The driver error message.
      * @param string|null     $sqlState  The SQLSTATE the driver is in at the time the error occurred, if any.
-     * @param integer|string|null $errorCode The driver specific error code if any.
+     * @param int|string|null $errorCode The driver specific error code if any.
      */
     public function __construct($message, $sqlState = null, $errorCode = null)
     {

lib/Doctrine/DBAL/Driver/Connection.php

@@ -49,7 +49,7 @@ interface Connection
      * Quotes a string for use in a query.
      *
      * @param mixed $input
-     * @param integer $type
+     * @param int   $type
      *
      * @return mixed
      */
@@ -60,7 +60,7 @@ interface Connection
      *
      * @param string $statement
      *
-     * @return integer
+     * @return int
      */
     function exec($statement);
 
@@ -76,21 +76,21 @@ interface Connection
     /**
      * Initiates a transaction.
      *
-     * @return boolean TRUE on success or FALSE on failure.
+     * @return bool TRUE on success or FALSE on failure.
      */
     function beginTransaction();
 
     /**
      * Commits a transaction.
      *
-     * @return boolean TRUE on success or FALSE on failure.
+     * @return bool TRUE on success or FALSE on failure.
      */
     function commit();
 
     /**
      * Rolls back the current transaction, as initiated by beginTransaction().
      *
-     * @return boolean TRUE on success or FALSE on failure.
+     * @return bool TRUE on success or FALSE on failure.
      */
     function rollBack();
 

lib/Doctrine/DBAL/Driver/DriverException.php

@@ -37,7 +37,7 @@ interface DriverException extends \Throwable
      * Returns null if no driver specific error code is available
      * for the error raised by the driver.
      *
-     * @return integer|string|null
+     * @return int|string|null
      */
     public function getErrorCode();
 

lib/Doctrine/DBAL/Driver/IBMDB2/DB2Statement.php

@@ -45,7 +45,7 @@ class DB2Statement implements \IteratorAggregate, Statement
     private $defaultFetchClassCtorArgs = [];
 
     /**
-     * @var integer
+     * @var int
      */
     private $_defaultFetchMode = \PDO::FETCH_BOTH;
 

lib/Doctrine/DBAL/Driver/Mysqli/MysqliStatement.php

@@ -77,7 +77,7 @@ class MysqliStatement implements \IteratorAggregate, Statement
     protected $_values = [];
 
     /**
-     * @var integer
+     * @var int
      */
     protected $_defaultFetchMode = PDO::FETCH_BOTH;
 
@@ -227,7 +227,7 @@ class MysqliStatement implements \IteratorAggregate, Statement
      *
      * @param array $values
      *
-     * @return boolean
+     * @return bool
      */
     private function _bindValues($values)
     {
@@ -243,7 +243,7 @@ class MysqliStatement implements \IteratorAggregate, Statement
     }
 
     /**
-     * @return boolean|array
+     * @return bool|array
      */
     private function _fetch()
     {

lib/Doctrine/DBAL/Driver/OCI8/OCI8Connection.php

@@ -35,7 +35,7 @@ class OCI8Connection implements Connection, ServerInfoAwareConnection
     protected $dbh;
 
     /**
-     * @var integer
+     * @var int
      */
     protected $executeMode = OCI_COMMIT_ON_SUCCESS;
 
@@ -46,8 +46,8 @@ class OCI8Connection implements Connection, ServerInfoAwareConnection
      * @param string      $password
      * @param string      $db
      * @param string|null $charset
-     * @param integer     $sessionMode
-     * @param boolean     $persistent
+     * @param int         $sessionMode
+     * @param bool        $persistent
      *
      * @throws OCI8Exception
      */
@@ -164,7 +164,7 @@ class OCI8Connection implements Connection, ServerInfoAwareConnection
     /**
      * Returns the current execution mode.
      *
-     * @return integer
+     * @return int
      */
     public function getExecuteMode()
     {

lib/Doctrine/DBAL/Driver/OCI8/OCI8Statement.php

@@ -63,7 +63,7 @@ class OCI8Statement implements IteratorAggregate, Statement
     ];
 
     /**
-     * @var integer
+     * @var int
      */
     protected $_defaultFetchMode = PDO::FETCH_BOTH;
 

lib/Doctrine/DBAL/Driver/PDOException.php

@@ -31,7 +31,7 @@ class PDOException extends \PDOException implements DriverException
     /**
      * The driver specific error code.
      *
-     * @var integer|string|null
+     * @var int|string|null
      */
     private $errorCode;
 

lib/Doctrine/DBAL/Driver/ResultStatement.php

@@ -29,14 +29,14 @@ interface ResultStatement extends \Traversable
     /**
      * Closes the cursor, enabling the statement to be executed again.
      *
-     * @return boolean TRUE on success or FALSE on failure.
+     * @return bool TRUE on success or FALSE on failure.
      */
     public function closeCursor();
 
     /**
      * Returns the number of columns in the result set
      *
-     * @return integer The number of columns in the result set represented
+     * @return int The number of columns in the result set represented
      *                 by the PDOStatement object. If there is no result set,
      *                 this method should return 0.
      */
@@ -45,11 +45,11 @@ interface ResultStatement extends \Traversable
     /**
      * Sets the fetch mode to use while iterating this statement.
      *
-     * @param integer $fetchMode The fetch mode must be one of the PDO::FETCH_* constants.
+     * @param int   $fetchMode The fetch mode must be one of the PDO::FETCH_* constants.
      * @param mixed $arg2
      * @param mixed $arg3
      *
-     * @return boolean
+     * @return bool
      *
      * @see PDO::FETCH_* constants.
      */
@@ -109,7 +109,7 @@ interface ResultStatement extends \Traversable
     /**
      * Returns a single column from the next row of a result set or FALSE if there are no more rows.
      *
-     * @param integer $columnIndex 0-indexed number of the column you wish to retrieve from the row.
+     * @param int $columnIndex 0-indexed number of the column you wish to retrieve from the row.
      *                         If no value is supplied, PDOStatement->fetchColumn()
      *                         fetches the first column.
      *

lib/Doctrine/DBAL/Driver/SQLAnywhere/Driver.php

@@ -68,7 +68,7 @@ class Driver extends AbstractSQLAnywhereDriver
      * Build the connection string for given connection parameters and driver options.
      *
      * @param string $host          Host address to connect to.
-     * @param integer $port          Port to use for the connection (default to SQL Anywhere standard port 2638).
+     * @param int    $port          Port to use for the connection (default to SQL Anywhere standard port 2638).
      * @param string $server        Database server name on the host to connect to.
      *                              SQL Anywhere allows multiple database server instances on the same host,
      *                              therefore specifying the server instance name to use is mandatory.

lib/Doctrine/DBAL/Driver/SQLAnywhere/SQLAnywhereConnection.php

@@ -42,7 +42,7 @@ class SQLAnywhereConnection implements Connection, ServerInfoAwareConnection
      * Connects to database with given connection string.
      *
      * @param string $dsn        The connection string.
-     * @param boolean $persistent Whether or not to establish a persistent connection.
+     * @param bool   $persistent Whether or not to establish a persistent connection.
      *
      * @throws SQLAnywhereException
      */
@@ -210,7 +210,7 @@ class SQLAnywhereConnection implements Connection, ServerInfoAwareConnection
      *
      * @throws SQLAnywhereException
      *
-     * @return boolean Whether or not ending transactional mode succeeded.
+     * @return bool Whether or not ending transactional mode succeeded.
      */
     private function endTransaction()
     {

lib/Doctrine/DBAL/Driver/SQLSrv/LastInsertId.php

@@ -28,12 +28,12 @@ namespace Doctrine\DBAL\Driver\SQLSrv;
 class LastInsertId
 {
     /**
-     * @var integer
+     * @var int
      */
     private $id;
 
     /**
-     * @param integer $id
+     * @param int $id
      */
     public function setId($id)
     {
@@ -41,7 +41,7 @@ class LastInsertId
     }
 
     /**
-     * @return integer
+     * @return int
      */
     public function getId()
     {

lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvStatement.php

@@ -95,7 +95,7 @@ class SQLSrvStatement implements IteratorAggregate, Statement
     /**
      * The fetch style.
      *
-     * @param integer
+     * @param int
      */
     private $defaultFetchMode = PDO::FETCH_BOTH;
 

lib/Doctrine/DBAL/Driver/ServerInfoAwareConnection.php

@@ -38,7 +38,7 @@ interface ServerInfoAwareConnection
     /**
      * Checks whether a query is required to retrieve the database server version.
      *
-     * @return boolean True if a query is required to retrieve the database server version, false otherwise.
+     * @return bool True if a query is required to retrieve the database server version, false otherwise.
      */
     public function requiresQueryForServerVersion();
 }

lib/Doctrine/DBAL/Driver/Statement.php

@@ -43,9 +43,9 @@ interface Statement extends ResultStatement
      *                     this will be a parameter name of the form :name. For a prepared statement
      *                     using question mark placeholders, this will be the 1-indexed position of the parameter.
      * @param mixed $value The value to bind to the parameter.
-     * @param integer $type  Explicit data type for the parameter using the PDO::PARAM_* constants.
+     * @param int   $type  Explicit data type for the parameter using the PDO::PARAM_* constants.
      *
-     * @return boolean TRUE on success or FALSE on failure.
+     * @return bool TRUE on success or FALSE on failure.
      */
     function bindValue($param, $value, $type = null);
 
@@ -68,13 +68,13 @@ interface Statement extends ResultStatement
      *                           this will be a parameter name of the form :name. For a prepared statement using
      *                           question mark placeholders, this will be the 1-indexed position of the parameter.
      * @param mixed    $variable Name of the PHP variable to bind to the SQL statement parameter.
-     * @param integer|null $type     Explicit data type for the parameter using the PDO::PARAM_* constants. To return
+     * @param int|null $type     Explicit data type for the parameter using the PDO::PARAM_* constants. To return
      *                           an INOUT parameter from a stored procedure, use the bitwise OR operator to set the
      *                           PDO::PARAM_INPUT_OUTPUT bits for the data_type parameter.
-     * @param integer|null $length   You must specify maxlength when using an OUT bind
+     * @param int|null $length   You must specify maxlength when using an OUT bind
      *                           so that PHP allocates enough memory to hold the returned value.
      *
-     * @return boolean TRUE on success or FALSE on failure.
+     * @return bool TRUE on success or FALSE on failure.
      */
     function bindParam($column, &$variable, $type = null, $length = null);
 
@@ -109,7 +109,7 @@ interface Statement extends ResultStatement
      * @param array|null $params An array of values with as many elements as there are
      *                           bound parameters in the SQL statement being executed.
      *
-     * @return boolean TRUE on success or FALSE on failure.
+     * @return bool TRUE on success or FALSE on failure.
      */
     function execute($params = null);
 
@@ -122,7 +122,7 @@ interface Statement extends ResultStatement
      * this behaviour is not guaranteed for all databases and should not be
      * relied on for portable applications.
      *
-     * @return integer The number of rows.
+     * @return int The number of rows.
      */
     function rowCount();
 }

lib/Doctrine/DBAL/Event/SchemaEventArgs.php

@@ -31,7 +31,7 @@ use Doctrine\Common\EventArgs;
 class SchemaEventArgs extends EventArgs
 {
     /**
-     * @var boolean
+     * @var bool
      */
     private $_preventDefault = false;
 
@@ -46,7 +46,7 @@ class SchemaEventArgs extends EventArgs
     }
 
     /**
-     * @return boolean
+     * @return bool
      */
     public function isDefaultPrevented()
     {

lib/Doctrine/DBAL/Exception/DriverException.php

@@ -61,7 +61,7 @@ class DriverException extends DBALException
      *
      * Returns null if no error code was given by the driver.
      *
-     * @return integer|string|null
+     * @return int|string|null
      */
     public function getErrorCode()
     {

lib/Doctrine/DBAL/Id/TableGenerator.php

@@ -99,7 +99,7 @@ class TableGenerator
      *
      * @param string $sequenceName
      *
-     * @return integer
+     * @return int
      *
      * @throws \Doctrine\DBAL\DBALException
      */

lib/Doctrine/DBAL/Logging/DebugStack.php

@@ -41,7 +41,7 @@ class DebugStack implements SQLLogger
     /**
      * If Debug Stack is enabled (log queries) or not.
      *
-     * @var boolean
+     * @var bool
      */
     public $enabled = true;
 
@@ -51,7 +51,7 @@ class DebugStack implements SQLLogger
     public $start = null;
 
     /**
-     * @var integer
+     * @var int
      */
     public $currentQuery = 0;
 

lib/Doctrine/DBAL/Platforms/Keywords/KeywordList.php

@@ -38,7 +38,7 @@ abstract class KeywordList
      *
      * @param string $word
      *
-     * @return boolean
+     * @return bool
      */
     public function isKeyword($word)
     {

lib/Doctrine/DBAL/Platforms/MySqlPlatform.php

@@ -52,8 +52,8 @@ class MySqlPlatform extends AbstractPlatform
      * 18446744073709551615 is 2^64-1 maximum of unsigned BIGINT the biggest limit possible
      *
      * @param string $query
-     * @param integer $limit
-     * @param integer $offset
+     * @param int    $limit
+     * @param int    $offset
      *
      * @return string
      */

lib/Doctrine/DBAL/Platforms/OraclePlatform.php

@@ -485,7 +485,7 @@ class OraclePlatform extends AbstractPlatform
     /**
      * @param string $name
      * @param string $table
-     * @param integer $start
+     * @param int    $start
      *
      * @return array
      */

lib/Doctrine/DBAL/Platforms/PostgreSqlPlatform.php

@@ -631,7 +631,7 @@ class PostgreSqlPlatform extends AbstractPlatform
      *
      * @param ColumnDiff $columnDiff The column diff to check against.
      *
-     * @return boolean True if the given column diff is an unchanged binary type column, false otherwise.
+     * @return bool True if the given column diff is an unchanged binary type column, false otherwise.
      */
     private function isUnchangedBinaryColumn(ColumnDiff $columnDiff)
     {

lib/Doctrine/DBAL/Platforms/SQLAnywherePlatform.php

@@ -42,19 +42,19 @@ use Doctrine\DBAL\Schema\TableDiff;
 class SQLAnywherePlatform extends AbstractPlatform
 {
     /**
-     * @var integer
+     * @var int
      */
     const FOREIGN_KEY_MATCH_SIMPLE = 1;
     /**
-     * @var integer
+     * @var int
      */
     const FOREIGN_KEY_MATCH_FULL = 2;
     /**
-     * @var integer
+     * @var int
      */
     const FOREIGN_KEY_MATCH_SIMPLE_UNIQUE = 129;
     /**
-     * @var integer
+     * @var int
      */
     const FOREIGN_KEY_MATCH_FULL_UNIQUE = 130;
 
@@ -628,7 +628,7 @@ class SQLAnywherePlatform extends AbstractPlatform
     /**
      * Returns foreign key MATCH clause for given type.
      *
-     * @param integer $type The foreign key match type
+     * @param int $type The foreign key match type
      *
      * @return string
      *

lib/Doctrine/DBAL/Platforms/SQLServerPlatform.php

@@ -630,7 +630,7 @@ class SQLServerPlatform extends AbstractPlatform
      *
      * @param ColumnDiff $columnDiff The column diff to evaluate.
      *
-     * @return boolean True if the column alteration requires dropping its default constraint first, false otherwise.
+     * @return bool True if the column alteration requires dropping its default constraint first, false otherwise.
      */
     private function alterColumnRequiresDropDefaultConstraint(ColumnDiff $columnDiff)
     {

lib/Doctrine/DBAL/Platforms/SqlitePlatform.php

@@ -526,7 +526,7 @@ class SqlitePlatform extends AbstractPlatform
     /**
      * User-defined function for Sqlite that is used with PDO::sqliteCreateFunction().
      *
-     * @param integer|float $value
+     * @param int|float $value
      *
      * @return float
      */
@@ -538,10 +538,10 @@ class SqlitePlatform extends AbstractPlatform
     /**
      * User-defined function for Sqlite that implements MOD(a, b).
      *
-     * @param integer $a
-     * @param integer $b
+     * @param int $a
+     * @param int $b
      *
-     * @return integer
+     * @return int
      */
     public static function udfMod($a, $b)
     {
@@ -551,9 +551,9 @@ class SqlitePlatform extends AbstractPlatform
     /**
      * @param string $str
      * @param string $substr
-     * @param integer $offset
+     * @param int    $offset
      *
-     * @return integer
+     * @return int
      */
     public static function udfLocate($str, $substr, $offset = 0)
     {

lib/Doctrine/DBAL/Portability/Connection.php

@@ -46,12 +46,12 @@ class Connection extends \Doctrine\DBAL\Connection
     const PORTABILITY_SQLSRV            = 13;
 
     /**
-     * @var integer
+     * @var int
      */
     private $portability = self::PORTABILITY_NONE;
 
     /**
-     * @var integer
+     * @var int
      */
     private $case;
 
@@ -97,7 +97,7 @@ class Connection extends \Doctrine\DBAL\Connection
     }
 
     /**
-     * @return integer
+     * @return int
      */
     public function getPortability()
     {
@@ -105,7 +105,7 @@ class Connection extends \Doctrine\DBAL\Connection
     }
 
     /**
-     * @return integer
+     * @return int
      */
     public function getFetchCase()
     {

lib/Doctrine/DBAL/Portability/Statement.php

@@ -31,7 +31,7 @@ use PDO;
 class Statement implements \IteratorAggregate, \Doctrine\DBAL\Driver\Statement
 {
     /**
-     * @var integer
+     * @var int
      */
     private $portability;
 
@@ -41,12 +41,12 @@ class Statement implements \IteratorAggregate, \Doctrine\DBAL\Driver\Statement
     private $stmt;
 
     /**
-     * @var integer
+     * @var int
      */
     private $case;
 
     /**
-     * @var integer
+     * @var int
      */
     private $defaultFetchMode = PDO::FETCH_BOTH;
 
@@ -196,8 +196,8 @@ class Statement implements \IteratorAggregate, \Doctrine\DBAL\Driver\Statement
 
     /**
      * @param mixed $row
-     * @param integer $iterateRow
-     * @param boolean $fixCase
+     * @param int   $iterateRow
+     * @param bool  $fixCase
      *
      * @return array
      */

lib/Doctrine/DBAL/Query/Expression/CompositeExpression.php

@@ -107,7 +107,7 @@ class CompositeExpression implements \Countable
     /**
      * Retrieves the amount of expressions on composite expression.
      *
-     * @return integer
+     * @return int
      */
     public function count()
     {

lib/Doctrine/DBAL/Query/QueryBuilder.php

@@ -99,35 +99,35 @@ class QueryBuilder
     /**
      * The type of query this is. Can be select, update or delete.
      *
-     * @var integer
+     * @var int
      */
     private $type = self::SELECT;
 
     /**
      * The state of the query object. Can be dirty or clean.
      *
-     * @var integer
+     * @var int
      */
     private $state = self::STATE_CLEAN;
 
     /**
      * The index of the first result to retrieve.
      *
-     * @var integer
+     * @var int
      */
     private $firstResult = null;
 
     /**
      * The maximum number of results to retrieve.
      *
-     * @var integer
+     * @var int
      */
     private $maxResults = null;
 
     /**
      * The counter of bound parameters used with {@see bindValue).
      *
-     * @var integer
+     * @var int
      */
     private $boundCounter = 0;
 
@@ -165,7 +165,7 @@ class QueryBuilder
     /**
      * Gets the type of the currently built query.
      *
-     * @return integer
+     * @return int
      */
     public function getType()
     {
@@ -185,7 +185,7 @@ class QueryBuilder
     /**
      * Gets the state of this query builder instance.
      *
-     * @return integer Either QueryBuilder::STATE_DIRTY or QueryBuilder::STATE_CLEAN.
+     * @return int Either QueryBuilder::STATE_DIRTY or QueryBuilder::STATE_CLEAN.
      */
     public function getState()
     {
@@ -353,7 +353,7 @@ class QueryBuilder
     /**
      * Sets the position of the first result to retrieve (the "offset").
      *
-     * @param integer $firstResult The first result to return.
+     * @param int $firstResult The first result to return.
      *
      * @return $this This QueryBuilder instance.
      */
@@ -369,7 +369,7 @@ class QueryBuilder
      * Gets the position of the first result the query object was set to retrieve (the "offset").
      * Returns NULL if {@link setFirstResult} was not applied to this QueryBuilder.
      *
-     * @return integer The position of the first result.
+     * @return int The position of the first result.
      */
     public function getFirstResult()
     {
@@ -379,7 +379,7 @@ class QueryBuilder
     /**
      * Sets the maximum number of results to retrieve (the "limit").
      *
-     * @param integer $maxResults The maximum number of results to retrieve.
+     * @param int $maxResults The maximum number of results to retrieve.
      *
      * @return $this This QueryBuilder instance.
      */
@@ -395,7 +395,7 @@ class QueryBuilder
      * Gets the maximum number of results the query object was set to retrieve (the "limit").
      * Returns NULL if {@link setMaxResults} was not applied to this query builder.
      *
-     * @return integer The maximum number of results.
+     * @return int The maximum number of results.
      */
     public function getMaxResults()
     {
@@ -410,7 +410,7 @@ class QueryBuilder
      *
      * @param string $sqlPartName
      * @param string $sqlPart
-     * @param boolean $append
+     * @param bool   $append
      *
      * @return $this This QueryBuilder instance.
      */
@@ -1285,7 +1285,7 @@ class QueryBuilder
      * </code>
      *
      * @param mixed $value
-     * @param integer $type
+     * @param int   $type
      *
      * @return string
      */

lib/Doctrine/DBAL/SQLParserUtils.php

@@ -44,7 +44,7 @@ class SQLParserUtils
      * and a string => int[] pair for a named statement.
      *
      * @param string $statement
-     * @param boolean $isPositional
+     * @param bool   $isPositional
      *
      * @return array
      */

lib/Doctrine/DBAL/Schema/AbstractAsset.php

@@ -46,7 +46,7 @@ abstract class AbstractAsset
     protected $_namespace = null;
 
     /**
-     * @var boolean
+     * @var bool
      */
     protected $_quoted = false;
 
@@ -76,7 +76,7 @@ abstract class AbstractAsset
      *
      * @param string $defaultNamespaceName
      *
-     * @return boolean
+     * @return bool
      */
     public function isInDefaultNamespace($defaultNamespaceName)
     {
@@ -139,7 +139,7 @@ abstract class AbstractAsset
     /**
      * Checks if this asset's name is quoted.
      *
-     * @return boolean
+     * @return bool
      */
     public function isQuoted()
     {
@@ -151,7 +151,7 @@ abstract class AbstractAsset
      *
      * @param string $identifier
      *
-     * @return boolean
+     * @return bool
      */
     protected function isIdentifierQuoted($identifier)
     {
@@ -212,7 +212,7 @@ abstract class AbstractAsset
      *
      * @param array  $columnNames
      * @param string $prefix
-     * @param integer $maxSize
+     * @param int    $maxSize
      *
      * @return string
      */

lib/Doctrine/DBAL/Schema/AbstractSchemaManager.php

@@ -198,7 +198,7 @@ abstract class AbstractSchemaManager
      *
      * @param array $tableNames
      *
-     * @return boolean
+     * @return bool
      */
     public function tablesExist($tableNames)
     {

lib/Doctrine/DBAL/Schema/Column.php

@@ -36,32 +36,32 @@ class Column extends AbstractAsset
     protected $_type;
 
     /**
-     * @var integer|null
+     * @var int|null
      */
     protected $_length = null;
 
     /**
-     * @var integer
+     * @var int
      */
     protected $_precision = 10;
 
     /**
-     * @var integer
+     * @var int
      */
     protected $_scale = 0;
 
     /**
-     * @var boolean
+     * @var bool
      */
     protected $_unsigned = false;
 
     /**
-     * @var boolean
+     * @var bool
      */
     protected $_fixed = false;
 
     /**
-     * @var boolean
+     * @var bool
      */
     protected $_notnull = true;
 
@@ -71,7 +71,7 @@ class Column extends AbstractAsset
     protected $_default = null;
 
     /**
-     * @var boolean
+     * @var bool
      */
     protected $_autoincrement = false;
 
@@ -147,7 +147,7 @@ class Column extends AbstractAsset
     }
 
     /**
-     * @param integer|null $length
+     * @param int|null $length
      *
      * @return Column
      */
@@ -163,7 +163,7 @@ class Column extends AbstractAsset
     }
 
     /**
-     * @param integer $precision
+     * @param int $precision
      *
      * @return Column
      */
@@ -179,7 +179,7 @@ class Column extends AbstractAsset
     }
 
     /**
-     * @param integer $scale
+     * @param int $scale
      *
      * @return Column
      */
@@ -195,7 +195,7 @@ class Column extends AbstractAsset
     }
 
     /**
-     * @param boolean $unsigned
+     * @param bool $unsigned
      *
      * @return Column
      */
@@ -207,7 +207,7 @@ class Column extends AbstractAsset
     }
 
     /**
-     * @param boolean $fixed
+     * @param bool $fixed
      *
      * @return Column
      */
@@ -219,7 +219,7 @@ class Column extends AbstractAsset
     }
 
     /**
-     * @param boolean $notnull
+     * @param bool $notnull
      *
      * @return Column
      */
@@ -288,7 +288,7 @@ class Column extends AbstractAsset
     }
 
     /**
-     * @return integer|null
+     * @return int|null
      */
     public function getLength()
     {
@@ -296,7 +296,7 @@ class Column extends AbstractAsset
     }
 
     /**
-     * @return integer
+     * @return int
      */
     public function getPrecision()
     {
@@ -304,7 +304,7 @@ class Column extends AbstractAsset
     }
 
     /**
-     * @return integer
+     * @return int
      */
     public function getScale()
     {
@@ -312,7 +312,7 @@ class Column extends AbstractAsset
     }
 
     /**
-     * @return boolean
+     * @return bool
      */
     public function getUnsigned()
     {
@@ -320,7 +320,7 @@ class Column extends AbstractAsset
     }
 
     /**
-     * @return boolean
+     * @return bool
      */
     public function getFixed()
     {
@@ -328,7 +328,7 @@ class Column extends AbstractAsset
     }
 
     /**
-     * @return boolean
+     * @return bool
      */
     public function getNotnull()
     {
@@ -354,7 +354,7 @@ class Column extends AbstractAsset
     /**
      * @param string $name
      *
-     * @return boolean
+     * @return bool
      */
     public function hasPlatformOption($name)
     {
@@ -380,7 +380,7 @@ class Column extends AbstractAsset
     }
 
     /**
-     * @return boolean
+     * @return bool
      */
     public function getAutoincrement()
     {
@@ -388,7 +388,7 @@ class Column extends AbstractAsset
     }
 
     /**
-     * @param boolean $flag
+     * @param bool $flag
      *
      * @return Column
      */
@@ -435,7 +435,7 @@ class Column extends AbstractAsset
     /**
      * @param string $name
      *
-     * @return boolean
+     * @return bool
      */
     public function hasCustomSchemaOption($name)
     {

lib/Doctrine/DBAL/Schema/ColumnDiff.php

@@ -65,7 +65,7 @@ class ColumnDiff
     /**
      * @param string $propertyName
      *
-     * @return boolean
+     * @return bool
      */
     public function hasChanged($propertyName)
     {

lib/Doctrine/DBAL/Schema/Comparator.php

@@ -159,7 +159,7 @@ class Comparator
      * @param \Doctrine\DBAL\Schema\Schema   $schema
      * @param \Doctrine\DBAL\Schema\Sequence $sequence
      *
-     * @return boolean
+     * @return bool
      */
     private function isAutoIncrementSequenceInSchema($schema, $sequence)
     {
@@ -176,7 +176,7 @@ class Comparator
      * @param \Doctrine\DBAL\Schema\Sequence $sequence1
      * @param \Doctrine\DBAL\Schema\Sequence $sequence2
      *
-     * @return boolean
+     * @return bool
      */
     public function diffSequence(Sequence $sequence1, Sequence $sequence2)
     {
@@ -199,7 +199,7 @@ class Comparator
      * @param \Doctrine\DBAL\Schema\Table $table1
      * @param \Doctrine\DBAL\Schema\Table $table2
      *
-     * @return boolean|\Doctrine\DBAL\Schema\TableDiff
+     * @return bool|\Doctrine\DBAL\Schema\TableDiff
      */
     public function diffTable(Table $table1, Table $table2)
     {
@@ -386,7 +386,7 @@ class Comparator
      * @param \Doctrine\DBAL\Schema\ForeignKeyConstraint $key1
      * @param \Doctrine\DBAL\Schema\ForeignKeyConstraint $key2
      *
-     * @return boolean
+     * @return bool
      */
     public function diffForeignKey(ForeignKeyConstraint $key1, ForeignKeyConstraint $key2)
     {
@@ -530,7 +530,7 @@ class Comparator
      * @param \Doctrine\DBAL\Schema\Index $index1
      * @param \Doctrine\DBAL\Schema\Index $index2
      *
-     * @return boolean
+     * @return bool
      */
     public function diffIndex(Index $index1, Index $index2)
     {

lib/Doctrine/DBAL/Schema/ForeignKeyConstraint.php

@@ -292,7 +292,7 @@ class ForeignKeyConstraint extends AbstractAsset implements Constraint
      *
      * @param string $name Name of the option to check.
      *
-     * @return boolean
+     * @return bool
      */
     public function hasOption($name)
     {
@@ -372,7 +372,7 @@ class ForeignKeyConstraint extends AbstractAsset implements Constraint
      *
      * @param Index $index The index to be checked against.
      *
-     * @return boolean
+     * @return bool
      */
     public function intersectsIndexColumns(Index $index)
     {

lib/Doctrine/DBAL/Schema/Index.php

@@ -32,12 +32,12 @@ class Index extends AbstractAsset implements Constraint
     protected $_columns = [];
 
     /**
-     * @var boolean
+     * @var bool
      */
     protected $_isUnique = false;
 
     /**
-     * @var boolean
+     * @var bool
      */
     protected $_isPrimary = false;
 
@@ -61,8 +61,8 @@ class Index extends AbstractAsset implements Constraint
     /**
      * @param string   $indexName
      * @param string[] $columns
-     * @param boolean  $isUnique
-     * @param boolean  $isPrimary
+     * @param bool     $isUnique
+     * @param bool     $isPrimary
      * @param string[] $flags
      * @param array    $options
      */
@@ -132,7 +132,7 @@ class Index extends AbstractAsset implements Constraint
     /**
      * Is the index neither unique nor primary key?
      *
-     * @return boolean
+     * @return bool
      */
     public function isSimpleIndex()
     {
@@ -140,7 +140,7 @@ class Index extends AbstractAsset implements Constraint
     }
 
     /**
-     * @return boolean
+     * @return bool
      */
     public function isUnique()
     {
@@ -148,7 +148,7 @@ class Index extends AbstractAsset implements Constraint
     }
 
     /**
-     * @return boolean
+     * @return bool
      */
     public function isPrimary()
     {
@@ -157,9 +157,9 @@ class Index extends AbstractAsset implements Constraint
 
     /**
      * @param string $columnName
-     * @param integer $pos
+     * @param int    $pos
      *
-     * @return boolean
+     * @return bool
      */
     public function hasColumnAtPosition($columnName, $pos = 0)
     {
@@ -174,7 +174,7 @@ class Index extends AbstractAsset implements Constraint
      *
      * @param array $columnNames
      *
-     * @return boolean
+     * @return bool
      */
     public function spansColumns(array $columnNames)
     {
@@ -196,7 +196,7 @@ class Index extends AbstractAsset implements Constraint
      *
      * @param Index $other
      *
-     * @return boolean
+     * @return bool
      */
     public function isFullfilledBy(Index $other)
     {
@@ -241,7 +241,7 @@ class Index extends AbstractAsset implements Constraint
      *
      * @param Index $other
      *
-     * @return boolean
+     * @return bool
      */
     public function overrules(Index $other)
     {
@@ -289,7 +289,7 @@ class Index extends AbstractAsset implements Constraint
      *
      * @param string $flag
      *
-     * @return boolean
+     * @return bool
      */
     public function hasFlag($flag)
     {
@@ -311,7 +311,7 @@ class Index extends AbstractAsset implements Constraint
     /**
      * @param string $name
      *
-     * @return boolean
+     * @return bool
      */
     public function hasOption($name)
     {
@@ -340,7 +340,7 @@ class Index extends AbstractAsset implements Constraint
      * Return whether the two indexes have the same partial index
      * @param \Doctrine\DBAL\Schema\Index $other
      *
-     * @return boolean
+     * @return bool
      */
     private function samePartialIndex(Index $other)
     {

lib/Doctrine/DBAL/Schema/OracleSchemaManager.php

@@ -343,7 +343,7 @@ class OracleSchemaManager extends AbstractSchemaManager
     /**
      * @param string $table
      *
-     * @return boolean
+     * @return bool
      */
     public function dropAutoincrement($table)
     {

lib/Doctrine/DBAL/Schema/Schema.php

@@ -109,7 +109,7 @@ class Schema extends AbstractAsset
     }
 
     /**
-     * @return boolean
+     * @return bool
      */
     public function hasExplicitForeignKeyIndexes()
     {
@@ -237,7 +237,7 @@ class Schema extends AbstractAsset
      *
      * @param string $namespaceName
      *
-     * @return boolean
+     * @return bool
      */
     public function hasNamespace($namespaceName)
     {
@@ -251,7 +251,7 @@ class Schema extends AbstractAsset
      *
      * @param string $tableName
      *
-     * @return boolean
+     * @return bool
      */
     public function hasTable($tableName)
     {
@@ -273,7 +273,7 @@ class Schema extends AbstractAsset
     /**
      * @param string $sequenceName
      *
-     * @return boolean
+     * @return bool
      */
     public function hasSequence($sequenceName)
     {
@@ -387,8 +387,8 @@ class Schema extends AbstractAsset
      * Creates a new sequence.
      *
      * @param string $sequenceName
-     * @param integer $allocationSize
-     * @param integer $initialValue
+     * @param int    $allocationSize
+     * @param int    $initialValue
      *
      * @return \Doctrine\DBAL\Schema\Sequence
      */

lib/Doctrine/DBAL/Schema/SchemaConfig.php

@@ -29,12 +29,12 @@ namespace Doctrine\DBAL\Schema;
 class SchemaConfig
 {
     /**
-     * @var boolean
+     * @var bool
      */
     protected $hasExplicitForeignKeyIndexes = false;
 
     /**
-     * @var integer
+     * @var int
      */
     protected $maxIdentifierLength = 63;
 
@@ -49,7 +49,7 @@ class SchemaConfig
     protected $defaultTableOptions = [];
 
     /**
-     * @return boolean
+     * @return bool
      */
     public function hasExplicitForeignKeyIndexes()
     {
@@ -57,7 +57,7 @@ class SchemaConfig
     }
 
     /**
-     * @param boolean $flag
+     * @param bool $flag
      *
      * @return void
      */
@@ -67,7 +67,7 @@ class SchemaConfig
     }
 
     /**
-     * @param integer $length
+     * @param int $length
      *
      * @return void
      */
@@ -77,7 +77,7 @@ class SchemaConfig
     }
 
     /**
-     * @return integer
+     * @return int
      */
     public function getMaxIdentifierLength()
     {

lib/Doctrine/DBAL/Schema/SchemaDiff.php

@@ -138,7 +138,7 @@ class SchemaDiff
 
     /**
      * @param \Doctrine\DBAL\Platforms\AbstractPlatform $platform
-     * @param boolean                                   $saveMode
+     * @param bool                                      $saveMode
      *
      * @return array
      */

lib/Doctrine/DBAL/Schema/Sequence.php

@@ -31,25 +31,25 @@ use Doctrine\DBAL\Schema\Visitor\Visitor;
 class Sequence extends AbstractAsset
 {
     /**
-     * @var integer
+     * @var int
      */
     protected $allocationSize = 1;
 
     /**
-     * @var integer
+     * @var int
      */
     protected $initialValue = 1;
 
     /**
-     * @var integer|null
+     * @var int|null
      */
     protected $cache = null;
 
     /**
      * @param string   $name
-     * @param integer      $allocationSize
-     * @param integer      $initialValue
-     * @param integer|null $cache
+     * @param int      $allocationSize
+     * @param int      $initialValue
+     * @param int|null $cache
      */
     public function __construct($name, $allocationSize = 1, $initialValue = 1, $cache = null)
     {
@@ -60,7 +60,7 @@ class Sequence extends AbstractAsset
     }
 
     /**
-     * @return integer
+     * @return int
      */
     public function getAllocationSize()
     {
@@ -68,7 +68,7 @@ class Sequence extends AbstractAsset
     }
 
     /**
-     * @return integer
+     * @return int
      */
     public function getInitialValue()
     {
@@ -76,7 +76,7 @@ class Sequence extends AbstractAsset
     }
 
     /**
-     * @return integer|null
+     * @return int|null
      */
     public function getCache()
     {
@@ -84,7 +84,7 @@ class Sequence extends AbstractAsset
     }
 
     /**
-     * @param integer $allocationSize
+     * @param int $allocationSize
      *
      * @return \Doctrine\DBAL\Schema\Sequence
      */
@@ -96,7 +96,7 @@ class Sequence extends AbstractAsset
     }
 
     /**
-     * @param integer $initialValue
+     * @param int $initialValue
      *
      * @return \Doctrine\DBAL\Schema\Sequence
      */
@@ -108,7 +108,7 @@ class Sequence extends AbstractAsset
     }
 
     /**
-     * @param integer $cache
+     * @param int $cache
      *
      * @return \Doctrine\DBAL\Schema\Sequence
      */
@@ -127,7 +127,7 @@ class Sequence extends AbstractAsset
      *
      * @param \Doctrine\DBAL\Schema\Table $table
      *
-     * @return boolean
+     * @return bool
      */
     public function isAutoIncrementsFor(Table $table)
     {

lib/Doctrine/DBAL/Schema/Synchronizer/SchemaSynchronizer.php

@@ -42,7 +42,7 @@ interface SchemaSynchronizer
      * Gets the SQL Statements to update given schema with the underlying db.
      *
      * @param \Doctrine\DBAL\Schema\Schema $toSchema
-     * @param boolean                      $noDrops
+     * @param bool                         $noDrops
      *
      * @return array
      */
@@ -77,7 +77,7 @@ interface SchemaSynchronizer
      * Updates the Schema to new schema version.
      *
      * @param \Doctrine\DBAL\Schema\Schema $toSchema
-     * @param boolean                      $noDrops
+     * @param bool                         $noDrops
      *
      * @return void
      */

lib/Doctrine/DBAL/Schema/Table.php

@@ -77,7 +77,7 @@ class Table extends AbstractAsset
      * @param Column[]               $columns
      * @param Index[]                $indexes
      * @param ForeignKeyConstraint[] $fkConstraints
-     * @param integer                $idGeneratorType
+     * @param int                    $idGeneratorType
      * @param array                  $options
      *
      * @throws DBALException
@@ -116,7 +116,7 @@ class Table extends AbstractAsset
     }
 
     /**
-     * @return integer
+     * @return int
      */
     protected function _getMaxIdentifierLength()
     {
@@ -264,7 +264,7 @@ class Table extends AbstractAsset
      *
      * @param array $columnsNames
      *
-     * @return boolean
+     * @return bool
      */
     public function columnsAreIndexed(array $columnsNames)
     {
@@ -281,8 +281,8 @@ class Table extends AbstractAsset
     /**
      * @param array  $columnNames
      * @param string $indexName
-     * @param boolean $isUnique
-     * @param boolean $isPrimary
+     * @param bool   $isUnique
+     * @param bool   $isPrimary
      * @param array  $flags
      * @param array  $options
      *
@@ -568,7 +568,7 @@ class Table extends AbstractAsset
      *
      * @param string $constraintName
      *
-     * @return boolean
+     * @return bool
      */
     public function hasForeignKey($constraintName)
     {
@@ -660,7 +660,7 @@ class Table extends AbstractAsset
      *
      * @param string $columnName The column name.
      *
-     * @return boolean
+     * @return bool
      */
     public function hasColumn($columnName)
     {
@@ -720,7 +720,7 @@ class Table extends AbstractAsset
     /**
      * Returns whether this table has a primary key.
      *
-     * @return boolean
+     * @return bool
      */
     public function hasPrimaryKey()
     {
@@ -732,7 +732,7 @@ class Table extends AbstractAsset
      *
      * @param string $indexName The index name.
      *
-     * @return boolean
+     * @return bool
      */
     public function hasIndex($indexName)
     {
@@ -781,7 +781,7 @@ class Table extends AbstractAsset
     /**
      * @param string $name
      *
-     * @return boolean
+     * @return bool
      */
     public function hasOption($name)
     {

lib/Doctrine/DBAL/Sharding/PoolingShardConnection.php

@@ -70,7 +70,7 @@ class PoolingShardConnection extends Connection
     private $activeConnections;
 
     /**
-     * @var integer
+     * @var int
      */
     private $activeShardId;
 
@@ -129,7 +129,7 @@ class PoolingShardConnection extends Connection
     /**
      * Get active shard id.
      *
-     * @return integer
+     * @return int
      */
     public function getActiveShardId()
     {
@@ -189,7 +189,7 @@ class PoolingShardConnection extends Connection
      *
      * @param mixed $shardId
      *
-     * @return boolean
+     * @return bool
      *
      * @throws \Doctrine\DBAL\Sharding\ShardingException
      */
@@ -249,7 +249,7 @@ class PoolingShardConnection extends Connection
     /**
      * @param string|null $shardId
      *
-     * @return boolean
+     * @return bool
      */
     public function isConnected($shardId = null)
     {

lib/Doctrine/DBAL/Sharding/SQLAzure/SQLAzureFederationsSynchronizer.php

@@ -191,7 +191,7 @@ class SQLAzureFederationsSynchronizer extends AbstractSchemaSynchronizer
 
     /**
      * @param \Doctrine\DBAL\Schema\Schema $schema
-     * @param boolean                      $isFederation
+     * @param bool                         $isFederation
      *
      * @return \Doctrine\DBAL\Schema\Schema
      *

lib/Doctrine/DBAL/Sharding/SQLAzure/SQLAzureShardManager.php

@@ -37,7 +37,7 @@ class SQLAzureShardManager implements ShardManager
     private $federationName;
 
     /**
-     * @var boolean
+     * @var bool
      */
     private $filteringEnabled;
 
@@ -122,7 +122,7 @@ class SQLAzureShardManager implements ShardManager
     /**
      * Sets Enabled/Disable filtering on the fly.
      *
-     * @param boolean $flag
+     * @param bool $flag
      *
      * @return void
      */

lib/Doctrine/DBAL/Sharding/ShardChoser/ShardChoser.php

@@ -35,7 +35,7 @@ interface ShardChoser
      * @param string                                         $distributionValue
      * @param \Doctrine\DBAL\Sharding\PoolingShardConnection $conn
      *
-     * @return integer
+     * @return int
      */
     function pickShard($distributionValue, PoolingShardConnection $conn);
 }

lib/Doctrine/DBAL/Statement.php

@@ -100,7 +100,7 @@ class Statement implements \IteratorAggregate, DriverStatement
      * @param mixed  $value The value of the parameter.
      * @param mixed  $type  Either a PDO binding type or a DBAL mapping type name or instance.
      *
-     * @return boolean TRUE on success, FALSE on failure.
+     * @return bool TRUE on success, FALSE on failure.
      */
     public function bindValue($name, $value, $type = null)
     {
@@ -130,11 +130,11 @@ class Statement implements \IteratorAggregate, DriverStatement
      *
      * @param string   $name   The name or position of the parameter.
      * @param mixed    $var    The reference to the variable to bind.
-     * @param integer      $type   The PDO binding type.
-     * @param integer|null $length Must be specified when using an OUT bind
+     * @param int      $type   The PDO binding type.
+     * @param int|null $length Must be specified when using an OUT bind
      *                         so that PHP allocates enough memory to hold the returned value.
      *
-     * @return boolean TRUE on success, FALSE on failure.
+     * @return bool TRUE on success, FALSE on failure.
      */
     public function bindParam($name, &$var, $type = PDO::PARAM_STR, $length = null)
     {
@@ -149,7 +149,7 @@ class Statement implements \IteratorAggregate, DriverStatement
      *
      * @param array|null $params
      *
-     * @return boolean TRUE on success, FALSE on failure.
+     * @return bool TRUE on success, FALSE on failure.
      *
      * @throws \Doctrine\DBAL\DBALException
      */
@@ -190,7 +190,7 @@ class Statement implements \IteratorAggregate, DriverStatement
     /**
      * Closes the cursor, freeing the database resources used by this statement.
      *
-     * @return boolean TRUE on success, FALSE on failure.
+     * @return bool TRUE on success, FALSE on failure.
      */
     public function closeCursor()
     {
@@ -200,7 +200,7 @@ class Statement implements \IteratorAggregate, DriverStatement
     /**
      * Returns the number of columns in the result set.
      *
-     * @return integer
+     * @return int
      */
     public function columnCount()
     {
@@ -274,7 +274,7 @@ class Statement implements \IteratorAggregate, DriverStatement
     /**
      * Returns a single column from the next row of a result set.
      *
-     * @param integer $columnIndex
+     * @param int $columnIndex
      *
      * @return mixed A single column from the next row of a result set or FALSE if there are no more rows.
      */
@@ -286,7 +286,7 @@ class Statement implements \IteratorAggregate, DriverStatement
     /**
      * Returns the number of rows affected by the last execution of this statement.
      *
-     * @return integer The number of affected rows.
+     * @return int The number of affected rows.
      */
     public function rowCount()
     {

lib/Doctrine/DBAL/Types/Type.php

@@ -139,7 +139,7 @@ abstract class Type
      *
      * @param \Doctrine\DBAL\Platforms\AbstractPlatform $platform
      *
-     * @return integer|null
+     * @return int|null
      *
      * @todo Needed?
      */
@@ -213,7 +213,7 @@ abstract class Type
      *
      * @param string $name The name of the type.
      *
-     * @return boolean TRUE if type is supported; FALSE otherwise.
+     * @return bool TRUE if type is supported; FALSE otherwise.
      */
     public static function hasType($name)
     {
@@ -255,7 +255,7 @@ abstract class Type
      * PDO::PARAM_STR
      * PDO::PARAM_LOB
      *
-     * @return integer
+     * @return int
      */
     public function getBindingType()
     {
@@ -291,7 +291,7 @@ abstract class Type
      * {@link convertToPHPValueSQL} works for any type and mostly
      * does nothing. This method can additionally be used for optimization purposes.
      *
-     * @return boolean
+     * @return bool
      */
     public function canRequireSQLConversion()
     {
@@ -344,7 +344,7 @@ abstract class Type
      *
      * @param \Doctrine\DBAL\Platforms\AbstractPlatform $platform
      *
-     * @return boolean
+     * @return bool
      */
     public function requiresSQLCommentHint(AbstractPlatform $platform)
     {

lib/Doctrine/DBAL/Version.php

@@ -41,7 +41,7 @@ class Version
      *
      * @param string $version The Doctrine version to compare to.
      *
-     * @return integer -1 if older, 0 if it is the same, 1 if version passed as argument is newer.
+     * @return int -1 if older, 0 if it is the same, 1 if version passed as argument is newer.
      */
     public static function compare($version)
     {

tests/Doctrine/Tests/DBAL/Functional/PortabilityTest.php

@@ -24,8 +24,8 @@ class PortabilityTest extends \Doctrine\Tests\DbalFunctionalTestCase
     }
 
     /**
-     * @param   integer     $portabilityMode
-     * @param   integer     $case
+     * @param int $portabilityMode
+     * @param int $case
      * @return  Connection
      */
     private function getPortableConnection($portabilityMode = \Doctrine\DBAL\Portability\Connection::PORTABILITY_ALL, $case = \PDO::CASE_LOWER)

tests/Doctrine/Tests/DBAL/Platforms/AbstractPlatformTestCase.php

@@ -733,7 +733,7 @@ abstract class AbstractPlatformTestCase extends \Doctrine\Tests\DbalTestCase
     abstract protected function getQuotesReservedKeywordInIndexDeclarationSQL();
 
     /**
-     * @return boolean
+     * @return bool
      */
     protected function supportsInlineIndexDeclaration()
     {

tests/Doctrine/Tests/DBAL/Platforms/AbstractPostgreSqlPlatformTestCase.php

@@ -369,8 +369,8 @@ abstract class AbstractPostgreSqlPlatformTestCase extends AbstractPlatformTestCa
      *
      * @param string $databaseValue
      * @param string $preparedStatementValue
-     * @param integer $integerValue
-     * @param boolean $booleanValue
+     * @param int    $integerValue
+     * @param bool   $booleanValue
      */
     public function testConvertBooleanAsLiteralStrings(
         $databaseValue,
@@ -404,8 +404,8 @@ abstract class AbstractPostgreSqlPlatformTestCase extends AbstractPlatformTestCa
      *
      * @param string $databaseValue
      * @param string $preparedStatementValue
-     * @param integer $integerValue
-     * @param boolean $booleanValue
+     * @param int    $integerValue
+     * @param bool   $booleanValue
      */
     public function testConvertBooleanAsDatabaseValueStrings(
         $databaseValue,
@@ -436,8 +436,8 @@ abstract class AbstractPostgreSqlPlatformTestCase extends AbstractPlatformTestCa
      *
      * @param string $databaseValue
      * @param string $prepareStatementValue
-     * @param integer $integerValue
-     * @param boolean $booleanValue
+     * @param int    $integerValue
+     * @param bool   $booleanValue
      */
     public function testConvertFromBoolean($databaseValue, $prepareStatementValue, $integerValue, $booleanValue)
     {

tests/Doctrine/Tests/Mocks/HydratorMockStatement.php

@@ -54,7 +54,7 @@ class HydratorMockStatement implements \Doctrine\DBAL\Driver\Statement
     /**
      * Closes the cursor, enabling the statement to be executed again.
      *
-     * @return boolean
+     * @return bool
      */
     public function closeCursor()
     {

tests/Doctrine/Tests/TestUtil.php

@@ -13,7 +13,7 @@ use Doctrine\DBAL\DriverManager;
 class TestUtil
 {
     /**
-     * @var boolean Whether the database schema is initialized.
+     * @var bool Whether the database schema is initialized.
      */
     private static $initialized = false;