mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix scrutinizer issues

This commit is contained in:
Bernhard Posselt 2014-04-19 15:25:36 +02:00
parent f260951825
commit 93237d87ec
3 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/public/appframework/db/entity.php
View File

@ -24,6 +24,10 @@
namespace OCP\AppFramework\Db; namespace OCP\AppFramework\Db;
/**
* @method integer getId()
* @method void setId(integer $id)
*/
abstract class Entity { abstract class Entity {
public $id; public $id;

15
tests/lib/appframework/db/EntityTest.php
View File

@ -24,7 +24,20 @@
namespace OCP\AppFramework\Db; namespace OCP\AppFramework\Db;
/**
* @method integer getId()
* @method void setId(integer $id)
* @method integer getTestId()
* @method void setTestId(integer $id)
* @method string getName()
* @method void setName(string $name)
* @method string getName()
* @method void setEmail(string $email)
* @method string getEmail()
* @method void setEmailName(string $email)
* @method string getPreName()
* @method void setPreName(string $preName)
*/
class TestEntity extends Entity { class TestEntity extends Entity {
public $name; public $name;
public $email; public $email;

20
tests/lib/appframework/db/MapperTest.php
View File

@ -38,10 +38,8 @@ class ExampleMapper extends Mapper {
public function __construct(IDb $db){ parent::__construct($db, 'table'); } public function __construct(IDb $db){ parent::__construct($db, 'table'); }
public function find($table, $id){ return $this->findOneQuery($table, $id); } public function find($table, $id){ return $this->findOneQuery($table, $id); }
public function findOneEntity($table, $id){ return $this->findEntity($table, $id); } public function findOneEntity($table, $id){ return $this->findEntity($table, $id); }
public function findAll($table){ return $this->findAllQuery($table); }
public function findAllEntities($table){ return $this->findEntities($table); } public function findAllEntities($table){ return $this->findEntities($table); }
public function mapRow($row){ return $this->mapRowToEntity($row); } public function mapRow($row){ return $this->mapRowToEntity($row); }
public function pDeleteQuery($table, $id){ $this->deleteQuery($table, $id); }
} }
@ -66,7 +64,7 @@ class MapperTest extends MapperTestUtility {
$rows = array( $rows = array(
array('hi') array('hi')
); );
$row = $this->setMapperResult($sql, $params, $rows); $this->setMapperResult($sql, $params, $rows);
$this->mapper->find($sql, $params); $this->mapper->find($sql, $params);
} }
@ -76,7 +74,7 @@ class MapperTest extends MapperTestUtility {
$rows = array( $rows = array(
array('pre_name' => 'hi') array('pre_name' => 'hi')
); );
$row = $this->setMapperResult($sql, $params, $rows); $this->setMapperResult($sql, $params, $rows);
$this->mapper->findOneEntity($sql, $params); $this->mapper->findOneEntity($sql, $params);
} }
@ -84,7 +82,7 @@ class MapperTest extends MapperTestUtility {
$sql = 'hi'; $sql = 'hi';
$params = array('jo'); $params = array('jo');
$rows = array(); $rows = array();
$row = $this->setMapperResult($sql, $params, $rows); $this->setMapperResult($sql, $params, $rows);
$this->setExpectedException( $this->setExpectedException(
'\OCP\AppFramework\Db\DoesNotExistException'); '\OCP\AppFramework\Db\DoesNotExistException');
$this->mapper->find($sql, $params); $this->mapper->find($sql, $params);
@ -94,7 +92,7 @@ class MapperTest extends MapperTestUtility {
$sql = 'hi'; $sql = 'hi';
$params = array('jo'); $params = array('jo');
$rows = array(); $rows = array();
$row = $this->setMapperResult($sql, $params, $rows); $this->setMapperResult($sql, $params, $rows);
$this->setExpectedException( $this->setExpectedException(
'\OCP\AppFramework\Db\DoesNotExistException'); '\OCP\AppFramework\Db\DoesNotExistException');
$this->mapper->findOneEntity($sql, $params); $this->mapper->findOneEntity($sql, $params);
@ -106,7 +104,7 @@ class MapperTest extends MapperTestUtility {
$rows = array( $rows = array(
array('jo'), array('ho') array('jo'), array('ho')
); );
$row = $this->setMapperResult($sql, $params, $rows); $this->setMapperResult($sql, $params, $rows);
$this->setExpectedException( $this->setExpectedException(
'\OCP\AppFramework\Db\MultipleObjectsReturnedException'); '\OCP\AppFramework\Db\MultipleObjectsReturnedException');
$this->mapper->find($sql, $params); $this->mapper->find($sql, $params);
@ -118,7 +116,7 @@ class MapperTest extends MapperTestUtility {
$rows = array( $rows = array(
array('jo'), array('ho') array('jo'), array('ho')
); );
$row = $this->setMapperResult($sql, $params, $rows); $this->setMapperResult($sql, $params, $rows);
$this->setExpectedException( $this->setExpectedException(
'\OCP\AppFramework\Db\MultipleObjectsReturnedException'); '\OCP\AppFramework\Db\MultipleObjectsReturnedException');
$this->mapper->findOneEntity($sql, $params); $this->mapper->findOneEntity($sql, $params);
@ -233,7 +231,7 @@ class MapperTest extends MapperTestUtility {
$entity = new Example(); $entity = new Example();
$entity->setPreName('hi'); $entity->setPreName('hi');
$entity->resetUpdatedFields(); $entity->resetUpdatedFields();
$row = $this->setMapperResult($sql, array(), $rows); $this->setMapperResult($sql, array(), $rows);
$result = $this->mapper->findAllEntities($sql); $result = $this->mapper->findAllEntities($sql);
$this->assertEquals(array($entity), $result); $this->assertEquals(array($entity), $result);
} }
@ -241,7 +239,7 @@ class MapperTest extends MapperTestUtility {
public function testFindEntitiesNotFound(){ public function testFindEntitiesNotFound(){
$sql = 'hi'; $sql = 'hi';
$rows = array(); $rows = array();
$row = $this->setMapperResult($sql, array(), $rows); $this->setMapperResult($sql, array(), $rows);
$result = $this->mapper->findAllEntities($sql); $result = $this->mapper->findAllEntities($sql);
$this->assertEquals(array(), $result); $this->assertEquals(array(), $result);
} }
@ -257,7 +255,7 @@ class MapperTest extends MapperTestUtility {
$entity2 = new Example(); $entity2 = new Example();
$entity2->setEmail('ho'); $entity2->setEmail('ho');
$entity2->resetUpdatedFields(); $entity2->resetUpdatedFields();
$row = $this->setMapperResult($sql, array(), $rows); $this->setMapperResult($sql, array(), $rows);
$result = $this->mapper->findAllEntities($sql); $result = $this->mapper->findAllEntities($sql);
$this->assertEquals(array($entity1, $entity2), $result); $this->assertEquals(array($entity1, $entity2), $result);
} }