Skip to content
Snippets Groups Projects
Commit 9e36c331 authored by Bernhard Posselt's avatar Bernhard Posselt
Browse files

use fetch method instead of fetchRow because fetchRow is only an owncloud...

use fetch method instead of fetchRow because fetchRow is only an owncloud internal alias that exists purely for compability
parent 512373fa
No related branches found
No related tags found
No related merge requests found
......@@ -225,12 +225,12 @@ abstract class Mapper {
*/
protected function findOneQuery($sql, array $params=array(), $limit=null, $offset=null){
$result = $this->execute($sql, $params, $limit, $offset);
$row = $result->fetchRow();
$row = $result->fetch();
if($row === false || $row === null){
throw new DoesNotExistException('No matching entry found');
}
$row2 = $result->fetchRow();
$row2 = $result->fetch();
//MDB2 returns null, PDO and doctrine false when no row is available
if( ! ($row2 === false || $row2 === null )) {
throw new MultipleObjectsReturnedException('More than one result');
......@@ -264,7 +264,7 @@ abstract class Mapper {
$entities = array();
while($row = $result->fetchRow()){
while($row = $result->fetch()){
$entities[] = $this->mapRowToEntity($row);
}
......
......@@ -51,7 +51,7 @@ abstract class MapperTestUtility extends \PHPUnit_Framework_TestCase {
->getMock();
$this->query = $this->getMock('Query', array('execute', 'bindValue'));
$this->pdoResult = $this->getMock('Result', array('fetchRow'));
$this->pdoResult = $this->getMock('Result', array('fetch'));
$this->queryAt = 0;
$this->prepareAt = 0;
$this->iterators = array();
......@@ -65,7 +65,7 @@ abstract class MapperTestUtility extends \PHPUnit_Framework_TestCase {
* @param array $arguments the expected arguments for the prepare query
* method
* @param array $returnRows the rows that should be returned for the result
* of the database query. If not provided, it wont be assumed that fetchRow
* of the database query. If not provided, it wont be assumed that fetch
* will be called on the result
*/
protected function setMapperResult($sql, $arguments=array(), $returnRows=array(),
......@@ -77,7 +77,7 @@ abstract class MapperTestUtility extends \PHPUnit_Framework_TestCase {
$fetchAt = $this->fetchAt;
$this->pdoResult->expects($this->any())
->method('fetchRow')
->method('fetch')
->will($this->returnCallback(
function() use ($iterators, $fetchAt){
$iterator = $iterators[$fetchAt];
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment