mirror/php-dibi
1
0
Fork 0
mirror of https://github.com/dg/dibi.git synced 2025-08-05 13:47:33 +02:00
Code Issues Releases Wiki Activity

added DibiRow::toArray() & Countable

Browse Source
This commit is contained in:
David Grudl
2010-04-26 20:44:17 +02:00
parent 26384626ba
commit 5d95f0ba0d
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dibi/libs/DibiResult.php
View File

@@ -398,7 +398,7 @@ class DibiResult extends DibiObject implements IDataSource
} elseif ($as === '=') { // "record" node } elseif ($as === '=') { // "record" node
if ($x === NULL) { if ($x === NULL) {
$x = (array) $row; $x = $row->toArray();
$x = & $x[ $assoc[$i+1] ]; $x = & $x[ $assoc[$i+1] ];
$x = NULL; // prepare child node $x = NULL; // prepare child node
} else { } else {
@@ -422,7 +422,7 @@ class DibiResult extends DibiObject implements IDataSource
if ($x === NULL) { // build leaf if ($x === NULL) { // build leaf
if ($leaf === '=') { if ($leaf === '=') {
$x = (array) $row; $x = $row->toArray();
} else { } else {
$x = $row; $x = $row;
} }
@@ -457,7 +457,7 @@ class DibiResult extends DibiObject implements IDataSource
} }
// autodetect // autodetect
$tmp = array_keys((array) $row); $tmp = array_keys($row->toArray());
$key = $tmp[0]; $key = $tmp[0];
if (count($row) < 2) { // indexed-array if (count($row) < 2) { // indexed-array
do { do {

20
dibi/libs/DibiRow.php
View File

@@ -18,16 +18,23 @@
* @copyright Copyright (c) 2005, 2010 David Grudl * @copyright Copyright (c) 2005, 2010 David Grudl
* @package dibi * @package dibi
*/ */
class DibiRow implements ArrayAccess, IteratorAggregate class DibiRow implements ArrayAccess, IteratorAggregate, Countable
{ {
function __construct($arr) public function __construct($arr)
{ {
foreach ($arr as $k => $v) $this->$k = $v; foreach ($arr as $k => $v) $this->$k = $v;
} }
public function toArray()
{
return (array) $this;
}
/** /**
* Converts value to DateTime object. * Converts value to DateTime object.
* @param string key * @param string key
@@ -91,7 +98,14 @@ class DibiRow implements ArrayAccess, IteratorAggregate
/********************* interfaces ArrayAccess & IteratorAggregate ****************d*g**/ /********************* interfaces ArrayAccess, Countable & IteratorAggregate ****************d*g**/
final public function count()
{
return count((array) $this);
}