Moved Data\Array to DataArray

This commit is contained in:
Thomas Gelf 2013-08-20 23:21:36 +02:00 committed by Eric Lippmann
parent 1eb0fcdff8
commit dc34905315
2 changed files with 17 additions and 13 deletions

View File

@ -1,8 +1,10 @@
<?php <?php
namespace Icinga\Data; namespace Icinga\Data\DataArray;
class ArrayDatasource implements DatasourceInterface use Icinga\Data\DatasourceInterface;
class Datasource implements DatasourceInterface
{ {
protected $data; protected $data;
@ -17,16 +19,16 @@ class ArrayDatasource implements DatasourceInterface
} }
/** /**
* Instantiate an ArrayQuery object * Instantiate a Query object
* *
* @return ArrayQuery * @return Query
*/ */
public function select() public function select()
{ {
return new ArrayQuery($this); return new Query($this);
} }
public function fetchColumn(ArrayQuery $query) public function fetchColumn(Query $query)
{ {
$result = array(); $result = array();
foreach ($this->getResult($query) as $row) { foreach ($this->getResult($query) as $row) {
@ -36,7 +38,7 @@ class ArrayDatasource implements DatasourceInterface
return $result; return $result;
} }
public function fetchPairs(ArrayQuery $query) public function fetchPairs(Query $query)
{ {
$result = array(); $result = array();
$keys = null; $keys = null;
@ -52,19 +54,19 @@ class ArrayDatasource implements DatasourceInterface
return $result; return $result;
} }
public function fetchAll(ArrayQuery $query) public function fetchAll(Query $query)
{ {
$result = $this->getResult($query); $result = $this->getResult($query);
return $result; return $result;
} }
public function count(ArrayQuery $query) public function count(Query $query)
{ {
$this->createResult($query); $this->createResult($query);
return $query->getCount(); return $query->getCount();
} }
protected function createResult(ArrayQuery $query) protected function createResult(Query $query)
{ {
if ($query->hasResult()) { if ($query->hasResult()) {
return $this; return $this;
@ -109,7 +111,7 @@ class ArrayDatasource implements DatasourceInterface
return $this; return $this;
} }
protected function getResult(ArrayQuery $query) protected function getResult(Query $query)
{ {
if (! $query->hasResult()) { if (! $query->hasResult()) {
$this->createResult($query); $this->createResult($query);

View File

@ -1,8 +1,10 @@
<?php <?php
namespace Icinga\Data; namespace Icinga\Data\DataArray;
class ArrayQuery extends AbstractQuery use Icinga\Data\AbstractQuery;
class Query extends AbstractQuery
{ {
/** /**
* Remember the last count * Remember the last count