Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
doctrine-dbal
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Tomáš Trávníček
doctrine-dbal
Commits
35beaca3
Unverified
Commit
35beaca3
authored
Dec 31, 2019
by
Luís Cobucci
Committed by
Sergei Morozov
Mar 29, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Declare return types in a BC compatible manner
parent
f440d92c
Changes
24
Hide whitespace changes
Inline
Side-by-side
Showing
24 changed files
with
71 additions
and
24 deletions
+71
-24
Configuration.php
lib/Doctrine/DBAL/Configuration.php
+2
-0
Connection.php
lib/Doctrine/DBAL/Connection.php
+8
-2
MysqliConnection.php
lib/Doctrine/DBAL/Driver/Mysqli/MysqliConnection.php
+2
-2
MysqliStatement.php
lib/Doctrine/DBAL/Driver/Mysqli/MysqliStatement.php
+2
-2
LastInsertId.php
lib/Doctrine/DBAL/Driver/SQLSrv/LastInsertId.php
+2
-0
AbstractPlatform.php
lib/Doctrine/DBAL/Platforms/AbstractPlatform.php
+6
-0
DB2Platform.php
lib/Doctrine/DBAL/Platforms/DB2Platform.php
+1
-1
DrizzlePlatform.php
lib/Doctrine/DBAL/Platforms/DrizzlePlatform.php
+2
-1
OraclePlatform.php
lib/Doctrine/DBAL/Platforms/OraclePlatform.php
+4
-1
PostgreSqlPlatform.php
lib/Doctrine/DBAL/Platforms/PostgreSqlPlatform.php
+2
-0
SqlitePlatform.php
lib/Doctrine/DBAL/Platforms/SqlitePlatform.php
+4
-2
QueryBuilder.php
lib/Doctrine/DBAL/Query/QueryBuilder.php
+1
-1
DB2SchemaManager.php
lib/Doctrine/DBAL/Schema/DB2SchemaManager.php
+2
-1
SQLAnywhereSchemaManager.php
lib/Doctrine/DBAL/Schema/SQLAnywhereSchemaManager.php
+4
-0
SqliteSchemaManager.php
lib/Doctrine/DBAL/Schema/SqliteSchemaManager.php
+2
-2
AbstractSchemaSynchronizer.php
...e/DBAL/Schema/Synchronizer/AbstractSchemaSynchronizer.php
+4
-0
Table.php
lib/Doctrine/DBAL/Schema/Table.php
+2
-0
NamespaceVisitor.php
lib/Doctrine/DBAL/Schema/Visitor/NamespaceVisitor.php
+2
-0
SchemaDiffVisitor.php
lib/Doctrine/DBAL/Schema/Visitor/SchemaDiffVisitor.php
+11
-0
ImportCommand.php
lib/Doctrine/DBAL/Tools/Console/Command/ImportCommand.php
+1
-3
ReservedWordsCommand.php
...trine/DBAL/Tools/Console/Command/ReservedWordsCommand.php
+1
-3
RunSqlCommand.php
lib/Doctrine/DBAL/Tools/Console/Command/RunSqlCommand.php
+1
-3
ConsoleRunner.php
lib/Doctrine/DBAL/Tools/Console/ConsoleRunner.php
+2
-0
ConversionException.php
lib/Doctrine/DBAL/Types/ConversionException.php
+3
-0
No files found.
lib/Doctrine/DBAL/Configuration.php
View file @
35beaca3
...
...
@@ -140,6 +140,8 @@ class Configuration
* @see getAutoCommit
*
* @param bool $autoCommit True to enable auto-commit mode; false to disable it.
*
* @return void
*/
public
function
setAutoCommit
(
$autoCommit
)
{
...
...
lib/Doctrine/DBAL/Connection.php
View file @
35beaca3
...
...
@@ -383,7 +383,7 @@ class Connection implements DriverConnection
*
* @throws DBALException If an invalid platform was specified for this connection.
*/
private
function
detectDatabasePlatform
()
private
function
detectDatabasePlatform
()
:
void
{
$version
=
$this
->
getDatabasePlatformVersion
();
...
...
@@ -504,6 +504,8 @@ class Connection implements DriverConnection
* @see isAutoCommit
*
* @param bool $autoCommit True to enable auto-commit mode; false to disable it.
*
* @return void
*/
public
function
setAutoCommit
(
$autoCommit
)
{
...
...
@@ -1316,7 +1318,7 @@ class Connection implements DriverConnection
/**
* Commits all current nesting transactions.
*/
private
function
commitAll
()
private
function
commitAll
()
:
void
{
while
(
$this
->
transactionNestingLevel
!==
0
)
{
if
(
$this
->
autoCommit
===
false
&&
$this
->
transactionNestingLevel
===
1
)
{
...
...
@@ -1334,6 +1336,8 @@ class Connection implements DriverConnection
/**
* Cancels any database changes done during the current transaction.
*
* @return bool
*
* @throws ConnectionException If the rollback operation failed.
*/
public
function
rollBack
()
...
...
@@ -1373,6 +1377,8 @@ class Connection implements DriverConnection
$this
->
isRollbackOnly
=
true
;
--
$this
->
transactionNestingLevel
;
}
return
true
;
}
/**
...
...
lib/Doctrine/DBAL/Driver/Mysqli/MysqliConnection.php
View file @
35beaca3
...
...
@@ -222,7 +222,7 @@ class MysqliConnection implements Connection, PingableConnection, ServerInfoAwar
* @throws MysqliException When one of of the options is not supported.
* @throws MysqliException When applying doesn't work - e.g. due to incorrect value.
*/
private
function
setDriverOptions
(
array
$driverOptions
=
[])
private
function
setDriverOptions
(
array
$driverOptions
=
[])
:
void
{
$supportedDriverOptions
=
[
MYSQLI_OPT_CONNECT_TIMEOUT
,
...
...
@@ -281,7 +281,7 @@ class MysqliConnection implements Connection, PingableConnection, ServerInfoAwar
*
* @throws MysqliException
*/
private
function
setSecureConnection
(
array
$params
)
private
function
setSecureConnection
(
array
$params
)
:
void
{
if
(
!
isset
(
$params
[
'ssl_key'
])
&&
!
isset
(
$params
[
'ssl_cert'
])
&&
...
...
lib/Doctrine/DBAL/Driver/Mysqli/MysqliStatement.php
View file @
35beaca3
...
...
@@ -207,7 +207,7 @@ class MysqliStatement implements IteratorAggregate, Statement
/**
* Binds parameters with known types previously bound to the statement
*/
private
function
bindTypedParameters
()
private
function
bindTypedParameters
()
:
void
{
$streams
=
$values
=
[];
$types
=
$this
->
types
;
...
...
@@ -245,7 +245,7 @@ class MysqliStatement implements IteratorAggregate, Statement
*
* @throws MysqliException
*/
private
function
sendLongData
(
$streams
)
private
function
sendLongData
(
$streams
)
:
void
{
foreach
(
$streams
as
$paramNr
=>
$stream
)
{
while
(
!
feof
(
$stream
))
{
...
...
lib/Doctrine/DBAL/Driver/SQLSrv/LastInsertId.php
View file @
35beaca3
...
...
@@ -12,6 +12,8 @@ class LastInsertId
/**
* @param int $id
*
* @return void
*/
public
function
setId
(
$id
)
{
...
...
lib/Doctrine/DBAL/Platforms/AbstractPlatform.php
View file @
35beaca3
...
...
@@ -156,6 +156,8 @@ abstract class AbstractPlatform
/**
* Sets the EventManager used by the Platform.
*
* @return void
*/
public
function
setEventManager
(
EventManager
$eventManager
)
{
...
...
@@ -391,6 +393,8 @@ abstract class AbstractPlatform
* @param string $dbType
* @param string $doctrineType
*
* @return void
*
* @throws DBALException If the type is not found.
*/
public
function
registerDoctrineTypeMapping
(
$dbType
,
$doctrineType
)
...
...
@@ -3291,6 +3295,8 @@ abstract class AbstractPlatform
/**
* @deprecated
*
* @return string
*
* @todo Remove in 3.0
*/
public
function
getIdentityColumnNullInsertSQL
()
...
...
lib/Doctrine/DBAL/Platforms/DB2Platform.php
View file @
35beaca3
...
...
@@ -628,7 +628,7 @@ class DB2Platform extends AbstractPlatform
* @param string[] $sql The sequence of table alteration statements to fill.
* @param mixed[] $queryParts The sequence of column alteration clauses to fill.
*/
private
function
gatherAlterColumnSQL
(
Identifier
$table
,
ColumnDiff
$columnDiff
,
array
&
$sql
,
array
&
$queryParts
)
private
function
gatherAlterColumnSQL
(
Identifier
$table
,
ColumnDiff
$columnDiff
,
array
&
$sql
,
array
&
$queryParts
)
:
void
{
$alterColumnClauses
=
$this
->
getAlterColumnClausesSQL
(
$columnDiff
);
...
...
lib/Doctrine/DBAL/Platforms/DrizzlePlatform.php
View file @
35beaca3
...
...
@@ -435,7 +435,8 @@ class DrizzlePlatform extends AbstractPlatform
}
/**
* {@inheritDoc}
*
* @return string
*/
protected
function
getDropPrimaryKeySQL
(
$table
)
{
...
...
lib/Doctrine/DBAL/Platforms/OraclePlatform.php
View file @
35beaca3
...
...
@@ -37,6 +37,8 @@ class OraclePlatform extends AbstractPlatform
*
* @param string $identifier
*
* @return void
*
* @throws DBALException
*/
public
static
function
assertValidIdentifier
(
$identifier
)
...
...
@@ -59,7 +61,8 @@ class OraclePlatform extends AbstractPlatform
}
/**
* {@inheritDoc}
*
* @return string
*/
public
function
getNowExpression
(
$type
=
'timestamp'
)
{
...
...
lib/Doctrine/DBAL/Platforms/PostgreSqlPlatform.php
View file @
35beaca3
...
...
@@ -69,6 +69,8 @@ class PostgreSqlPlatform extends AbstractPlatform
* Enables use of 'true'/'false' or otherwise 1 and 0 instead.
*
* @param bool $flag
*
* @return void
*/
public
function
setUseBooleanTrueFalseStrings
(
$flag
)
{
...
...
lib/Doctrine/DBAL/Platforms/SqlitePlatform.php
View file @
35beaca3
...
...
@@ -222,7 +222,8 @@ class SqlitePlatform extends AbstractPlatform
}
/**
* {@inheritDoc}
*
* @return string
*/
public
function
getTinyIntTypeDeclarationSql
(
array
$field
)
{
...
...
@@ -248,7 +249,8 @@ class SqlitePlatform extends AbstractPlatform
}
/**
* {@inheritDoc}
*
* @return string
*/
public
function
getMediumIntTypeDeclarationSql
(
array
$field
)
{
...
...
lib/Doctrine/DBAL/Query/QueryBuilder.php
View file @
35beaca3
...
...
@@ -1174,7 +1174,7 @@ class QueryBuilder
*
* @throws QueryException
*/
private
function
verifyAllAliasesAreKnown
(
array
$knownAliases
)
private
function
verifyAllAliasesAreKnown
(
array
$knownAliases
)
:
void
{
foreach
(
$this
->
sqlParts
[
'join'
]
as
$fromAlias
=>
$joins
)
{
if
(
!
isset
(
$knownAliases
[
$fromAlias
]))
{
...
...
lib/Doctrine/DBAL/Schema/DB2SchemaManager.php
View file @
35beaca3
...
...
@@ -178,7 +178,8 @@ class DB2SchemaManager extends AbstractSchemaManager
}
/**
* {@inheritdoc}
*
* @return string|null
*/
protected
function
_getPortableForeignKeyRuleDef
(
$def
)
{
...
...
lib/Doctrine/DBAL/Schema/SQLAnywhereSchemaManager.php
View file @
35beaca3
...
...
@@ -47,6 +47,8 @@ class SQLAnywhereSchemaManager extends AbstractSchemaManager
* Starts a database.
*
* @param string $database The name of the database to start.
*
* @return void
*/
public
function
startDatabase
(
$database
)
{
...
...
@@ -58,6 +60,8 @@ class SQLAnywhereSchemaManager extends AbstractSchemaManager
* Stops a database.
*
* @param string $database The name of the database to stop.
*
* @return void
*/
public
function
stopDatabase
(
$database
)
{
...
...
lib/Doctrine/DBAL/Schema/SqliteSchemaManager.php
View file @
35beaca3
...
...
@@ -223,9 +223,9 @@ class SqliteSchemaManager extends AbstractSchemaManager
}
/**
* {@inheritdoc}
*
* @deprecated
*
* @return array<string, bool|string>
*/
protected
function
_getPortableTableIndexDefinition
(
$tableIndex
)
{
...
...
lib/Doctrine/DBAL/Schema/Synchronizer/AbstractSchemaSynchronizer.php
View file @
35beaca3
...
...
@@ -20,6 +20,8 @@ abstract class AbstractSchemaSynchronizer implements SchemaSynchronizer
/**
* @param string[] $sql
*
* @return void
*/
protected
function
processSqlSafely
(
array
$sql
)
{
...
...
@@ -33,6 +35,8 @@ abstract class AbstractSchemaSynchronizer implements SchemaSynchronizer
/**
* @param string[] $sql
*
* @return void
*/
protected
function
processSql
(
array
$sql
)
{
...
...
lib/Doctrine/DBAL/Schema/Table.php
View file @
35beaca3
...
...
@@ -300,6 +300,8 @@ class Table extends AbstractAsset
* @param string $oldColumnName
* @param string $newColumnName
*
* @return void
*
* @throws DBALException
*/
public
function
renameColumn
(
$oldColumnName
,
$newColumnName
)
...
...
lib/Doctrine/DBAL/Schema/Visitor/NamespaceVisitor.php
View file @
35beaca3
...
...
@@ -11,6 +11,8 @@ interface NamespaceVisitor
* Accepts a schema namespace name.
*
* @param string $namespaceName The schema namespace name to accept.
*
* @return void
*/
public
function
acceptNamespace
(
$namespaceName
);
}
lib/Doctrine/DBAL/Schema/Visitor/SchemaDiffVisitor.php
View file @
35beaca3
...
...
@@ -14,26 +14,37 @@ interface SchemaDiffVisitor
{
/**
* Visit an orphaned foreign key whose table was deleted.
*
* @return void
*/
public
function
visitOrphanedForeignKey
(
ForeignKeyConstraint
$foreignKey
);
/**
* Visit a sequence that has changed.
*
* @return void
*/
public
function
visitChangedSequence
(
Sequence
$sequence
);
/**
* Visit a sequence that has been removed.
*
* @return void
*/
public
function
visitRemovedSequence
(
Sequence
$sequence
);
/** @return void */
public
function
visitNewSequence
(
Sequence
$sequence
);
/** @return void */
public
function
visitNewTable
(
Table
$table
);
/** @return void */
public
function
visitNewTableForeignKey
(
Table
$table
,
ForeignKeyConstraint
$foreignKey
);
/** @return void */
public
function
visitRemovedTable
(
Table
$table
);
/** @return void */
public
function
visitChangedTable
(
TableDiff
$tableDiff
);
}
lib/Doctrine/DBAL/Tools/Console/Command/ImportCommand.php
View file @
35beaca3
...
...
@@ -28,9 +28,7 @@ use function sprintf;
*/
class
ImportCommand
extends
Command
{
/**
* {@inheritdoc}
*/
/** @return void */
protected
function
configure
()
{
$this
...
...
lib/Doctrine/DBAL/Tools/Console/Command/ReservedWordsCommand.php
View file @
35beaca3
...
...
@@ -66,9 +66,7 @@ class ReservedWordsCommand extends Command
$this
->
keywordListClasses
[
$name
]
=
$class
;
}
/**
* {@inheritdoc}
*/
/** @return void */
protected
function
configure
()
{
$this
...
...
lib/Doctrine/DBAL/Tools/Console/Command/RunSqlCommand.php
View file @
35beaca3
...
...
@@ -21,9 +21,7 @@ use function stripos;
*/
class
RunSqlCommand
extends
Command
{
/**
* {@inheritdoc}
*/
/** @return void */
protected
function
configure
()
{
$this
...
...
lib/Doctrine/DBAL/Tools/Console/ConsoleRunner.php
View file @
35beaca3
...
...
@@ -63,6 +63,8 @@ class ConsoleRunner
/**
* Prints the instructions to create a configuration file
*
* @return void
*/
public
static
function
printCliConfigTemplate
()
{
...
...
lib/Doctrine/DBAL/Types/ConversionException.php
View file @
35beaca3
...
...
@@ -90,6 +90,9 @@ class ConversionException extends DBALException
),
0
,
$previous
);
}
/**
* @return ConversionException
*/
public
static
function
conversionFailedSerialization
(
$value
,
$format
,
$error
)
{
$actualType
=
is_object
(
$value
)
?
get_class
(
$value
)
:
gettype
(
$value
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment