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
a5738956
Commit
a5738956
authored
Jan 04, 2018
by
Gabriel Caruso
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update comments, use short array syntax and fix redundancy.
parent
80304590
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
8 deletions
+8
-8
ArrayStatement.php
lib/Doctrine/DBAL/Cache/ArrayStatement.php
+1
-1
ResultCacheStatement.php
lib/Doctrine/DBAL/Cache/ResultCacheStatement.php
+1
-1
DriverManager.php
lib/Doctrine/DBAL/DriverManager.php
+5
-5
SchemaManagerFunctionalTestCase.php
...BAL/Functional/Schema/SchemaManagerFunctionalTestCase.php
+1
-1
No files found.
lib/Doctrine/DBAL/Cache/ArrayStatement.php
View file @
a5738956
...
@@ -139,7 +139,7 @@ class ArrayStatement implements \IteratorAggregate, ResultStatement
...
@@ -139,7 +139,7 @@ class ArrayStatement implements \IteratorAggregate, ResultStatement
{
{
$row
=
$this
->
fetch
(
PDO
::
FETCH_NUM
);
$row
=
$this
->
fetch
(
PDO
::
FETCH_NUM
);
// TODO: verify th
is is
correct behavior
// TODO: verify th
at return false is the
correct behavior
return
$row
[
$columnIndex
]
??
false
;
return
$row
[
$columnIndex
]
??
false
;
}
}
}
}
lib/Doctrine/DBAL/Cache/ResultCacheStatement.php
View file @
a5738956
...
@@ -196,7 +196,7 @@ class ResultCacheStatement implements \IteratorAggregate, ResultStatement
...
@@ -196,7 +196,7 @@ class ResultCacheStatement implements \IteratorAggregate, ResultStatement
{
{
$row
=
$this
->
fetch
(
PDO
::
FETCH_NUM
);
$row
=
$this
->
fetch
(
PDO
::
FETCH_NUM
);
// TODO: verify th
is is
correct behavior
// TODO: verify th
at return false is the
correct behavior
return
$row
[
$columnIndex
]
??
false
;
return
$row
[
$columnIndex
]
??
false
;
}
}
...
...
lib/Doctrine/DBAL/DriverManager.php
View file @
a5738956
...
@@ -153,7 +153,7 @@ final class DriverManager
...
@@ -153,7 +153,7 @@ final class DriverManager
self
::
_checkParams
(
$params
);
self
::
_checkParams
(
$params
);
}
}
$className
=
$params
[
'driverClass'
]
??
$className
=
self
::
$_driverMap
[
$params
[
'driver'
]];
$className
=
$params
[
'driverClass'
]
??
self
::
$_driverMap
[
$params
[
'driver'
]];
$driver
=
new
$className
();
$driver
=
new
$className
();
...
@@ -393,11 +393,11 @@ final class DriverManager
...
@@ -393,11 +393,11 @@ final class DriverManager
// URL schemes must not contain underscores, but dashes are ok
// URL schemes must not contain underscores, but dashes are ok
$driver
=
str_replace
(
'-'
,
'_'
,
$url
[
'scheme'
]);
$driver
=
str_replace
(
'-'
,
'_'
,
$url
[
'scheme'
]);
// The requested driver from the URL scheme takes precedence
// The requested driver from the URL scheme takes precedence over the
// over the default driver from the connection parameters (if any).
// default driver from the connection parameters. If the driver is
// an alias (e.g. "postgres"), map it to the actual name ("pdo-pgsql").
// Otherwise, let checkParams decide later if the driver exists.
$params
[
'driver'
]
=
self
::
$driverSchemeAliases
[
$driver
]
??
$driver
;
$params
[
'driver'
]
=
self
::
$driverSchemeAliases
[
$driver
]
??
$driver
;
// use alias like "postgres", else we just let checkParams decide later
// if the driver exists (for literal "pdo-pgsql" etc)
return
$params
;
return
$params
;
}
}
...
...
tests/Doctrine/Tests/DBAL/Functional/Schema/SchemaManagerFunctionalTestCase.php
View file @
a5738956
...
@@ -873,7 +873,7 @@ class SchemaManagerFunctionalTestCase extends \Doctrine\Tests\DbalFunctionalTest
...
@@ -873,7 +873,7 @@ class SchemaManagerFunctionalTestCase extends \Doctrine\Tests\DbalFunctionalTest
*/
*/
protected
function
createTestTable
(
$name
=
'test_table'
,
$data
=
array
())
protected
function
createTestTable
(
$name
=
'test_table'
,
$data
=
array
())
{
{
$options
=
$data
[
'options'
]
??
array
()
;
$options
=
$data
[
'options'
]
??
[]
;
$table
=
$this
->
getTestTable
(
$name
,
$options
);
$table
=
$this
->
getTestTable
(
$name
,
$options
);
...
...
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