projects
/
yaffs-website
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull merge.
[yaffs-website]
/
web
/
core
/
lib
/
Drupal
/
Core
/
Database
/
StatementPrefetch.php
diff --git
a/web/core/lib/Drupal/Core/Database/StatementPrefetch.php
b/web/core/lib/Drupal/Core/Database/StatementPrefetch.php
index 80252209e694ba9de0917f05a8c905fcf1f55ab8..fb7b0b4e0a03d2ae281ee64af5b66c57caf618fb 100644
(file)
--- a/
web/core/lib/Drupal/Core/Database/StatementPrefetch.php
+++ b/
web/core/lib/Drupal/Core/Database/StatementPrefetch.php
@@
-20,7
+20,7
@@
class StatementPrefetch implements \Iterator, StatementInterface {
/**
* Driver-specific options. Can be used by child classes.
*
/**
* Driver-specific options. Can be used by child classes.
*
- * @var
A
rray
+ * @var
a
rray
*/
protected $driverOptions;
*/
protected $driverOptions;
@@
-41,14
+41,14
@@
class StatementPrefetch implements \Iterator, StatementInterface {
/**
* Main data store.
*
/**
* Main data store.
*
- * @var
A
rray
+ * @var
a
rray
*/
protected $data = [];
/**
* The current row, retrieved in \PDO::FETCH_ASSOC format.
*
*/
protected $data = [];
/**
* The current row, retrieved in \PDO::FETCH_ASSOC format.
*
- * @var
A
rray
+ * @var
a
rray
*/
protected $currentRow = NULL;
*/
protected $currentRow = NULL;
@@
-62,7
+62,7
@@
class StatementPrefetch implements \Iterator, StatementInterface {
/**
* The list of column names in this result set.
*
/**
* The list of column names in this result set.
*
- * @var
A
rray
+ * @var
a
rray
*/
protected $columnNames = NULL;
*/
protected $columnNames = NULL;
@@
-91,7
+91,7
@@
class StatementPrefetch implements \Iterator, StatementInterface {
/**
* Holds supplementary current fetch options (which will be used by the next fetch).
*
/**
* Holds supplementary current fetch options (which will be used by the next fetch).
*
- * @var
A
rray
+ * @var
a
rray
*/
protected $fetchOptions = [
'class' => 'stdClass',
*/
protected $fetchOptions = [
'class' => 'stdClass',
@@
-110,7
+110,7
@@
class StatementPrefetch implements \Iterator, StatementInterface {
/**
* Holds supplementary default fetch options.
*
/**
* Holds supplementary default fetch options.
*
- * @var
A
rray
+ * @var
a
rray
*/
protected $defaultFetchOptions = [
'class' => 'stdClass',
*/
protected $defaultFetchOptions = [
'class' => 'stdClass',
@@
-214,8
+214,8
@@
class StatementPrefetch implements \Iterator, StatementInterface {
*
* @param $query
* The query.
*
* @param $query
* The query.
- * @param array $args
- * An array of arguments.
+ * @param array
|null
$args
+ * An array of arguments.
This can be NULL.
* @return \PDOStatement
* A PDOStatement object.
*/
* @return \PDOStatement
* A PDOStatement object.
*/
@@
-497,8
+497,9
@@
class StatementPrefetch implements \Iterator, StatementInterface {
* {@inheritdoc}
*/
public function fetchAllKeyed($key_index = 0, $value_index = 1) {
* {@inheritdoc}
*/
public function fetchAllKeyed($key_index = 0, $value_index = 1) {
- if (!isset($this->columnNames[$key_index]) || !isset($this->columnNames[$value_index]))
+ if (!isset($this->columnNames[$key_index]) || !isset($this->columnNames[$value_index]))
{
return [];
return [];
+ }
$key = $this->columnNames[$key_index];
$value = $this->columnNames[$value_index];
$key = $this->columnNames[$key_index];
$value = $this->columnNames[$value_index];