Merge pull request #17948 from nextcloud/enh/check-if-property-is-bool
Make isXXX available for bool properties only
This commit is contained in:
commit
b607e3e6f4
|
@ -147,7 +147,7 @@ abstract class Entity {
|
||||||
$this->setter(lcfirst(substr($methodName, 3)), $args);
|
$this->setter(lcfirst(substr($methodName, 3)), $args);
|
||||||
} elseif (strpos($methodName, 'get') === 0) {
|
} elseif (strpos($methodName, 'get') === 0) {
|
||||||
return $this->getter(lcfirst(substr($methodName, 3)));
|
return $this->getter(lcfirst(substr($methodName, 3)));
|
||||||
} elseif (strpos($methodName, 'is') === 0) {
|
} elseif ($this->isGetterForBoolProperty($methodName)) {
|
||||||
return $this->getter(lcfirst(substr($methodName, 2)));
|
return $this->getter(lcfirst(substr($methodName, 2)));
|
||||||
} else {
|
} else {
|
||||||
throw new \BadFunctionCallException($methodName .
|
throw new \BadFunctionCallException($methodName .
|
||||||
|
@ -156,6 +156,18 @@ abstract class Entity {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param string $methodName
|
||||||
|
* @return bool
|
||||||
|
* @since 18.0.0
|
||||||
|
*/
|
||||||
|
protected function isGetterForBoolProperty(string $methodName): bool {
|
||||||
|
if (strpos($methodName, 'is') === 0) {
|
||||||
|
$fieldName = lcfirst(substr($methodName, 2));
|
||||||
|
return isset($this->_fieldTypes[$fieldName]) && strpos($this->_fieldTypes[$fieldName], 'bool') === 0;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Mark am attribute as updated
|
* Mark am attribute as updated
|
||||||
|
|
|
@ -25,6 +25,7 @@ namespace Test\AppFramework\Db;
|
||||||
|
|
||||||
|
|
||||||
use OCP\AppFramework\Db\Entity;
|
use OCP\AppFramework\Db\Entity;
|
||||||
|
use PHPUnit\Framework\Constraint\IsType;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @method integer getId()
|
* @method integer getId()
|
||||||
|
@ -37,18 +38,28 @@ use OCP\AppFramework\Db\Entity;
|
||||||
* @method void setEmail(string $email)
|
* @method void setEmail(string $email)
|
||||||
* @method string getPreName()
|
* @method string getPreName()
|
||||||
* @method void setPreName(string $preName)
|
* @method void setPreName(string $preName)
|
||||||
|
* @method bool getTrueOrFalse()
|
||||||
|
* @method bool isTrueOrFalse()
|
||||||
|
* @method void setTrueOrFalse(bool $trueOrFalse)
|
||||||
|
* @method bool getAnotherBool()
|
||||||
|
* @method bool isAnotherBool()
|
||||||
|
* @method void setAnotherBool(bool $anotherBool)
|
||||||
*/
|
*/
|
||||||
class TestEntity extends Entity {
|
class TestEntity extends Entity {
|
||||||
protected $name;
|
protected $name;
|
||||||
protected $email;
|
protected $email;
|
||||||
protected $testId;
|
protected $testId;
|
||||||
protected $preName;
|
protected $preName;
|
||||||
|
protected $trueOrFalse;
|
||||||
|
protected $anotherBool;
|
||||||
|
|
||||||
public function __construct($name = null) {
|
public function __construct($name = null) {
|
||||||
$this->addType('testId', 'integer');
|
$this->addType('testId', 'integer');
|
||||||
|
$this->addType('trueOrFalse', 'bool');
|
||||||
|
$this->addType('anotherBool', 'boolean');
|
||||||
$this->name = $name;
|
$this->name = $name;
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
|
|
||||||
|
|
||||||
class EntityTest extends \Test\TestCase {
|
class EntityTest extends \Test\TestCase {
|
||||||
|
@ -136,7 +147,6 @@ class EntityTest extends \Test\TestCase {
|
||||||
/**
|
/**
|
||||||
* @expectedException \BadFunctionCallException
|
* @expectedException \BadFunctionCallException
|
||||||
*/
|
*/
|
||||||
|
|
||||||
public function testSetterShouldFailIfAttributeNotDefined(){
|
public function testSetterShouldFailIfAttributeNotDefined(){
|
||||||
$this->entity->setTest();
|
$this->entity->setTest();
|
||||||
}
|
}
|
||||||
|
@ -207,7 +217,9 @@ class EntityTest extends \Test\TestCase {
|
||||||
$entity = new TestEntity();
|
$entity = new TestEntity();
|
||||||
$this->assertEquals(array(
|
$this->assertEquals(array(
|
||||||
'id' => 'integer',
|
'id' => 'integer',
|
||||||
'testId' => 'integer'
|
'testId' => 'integer',
|
||||||
|
'trueOrFalse' => 'bool',
|
||||||
|
'anotherBool' => 'boolean',
|
||||||
), $entity->getFieldTypes());
|
), $entity->getFieldTypes());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -225,5 +237,20 @@ class EntityTest extends \Test\TestCase {
|
||||||
$this->assertEquals(0, count($entity->getUpdatedFields()));
|
$this->assertEquals(0, count($entity->getUpdatedFields()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testIsGetter() {
|
||||||
|
$entity = new TestEntity();
|
||||||
|
$entity->setTrueOrFalse(false);
|
||||||
|
$entity->setAnotherBool(false);
|
||||||
|
$this->assertThat($entity->isTrueOrFalse(), new IsType(IsType::TYPE_BOOL));
|
||||||
|
$this->assertThat($entity->isAnotherBool(), new IsType(IsType::TYPE_BOOL));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @expectedException BadFunctionCallException
|
||||||
|
*/
|
||||||
|
public function testIsGetterShoudFailForOtherType() {
|
||||||
|
$entity = new TestEntity();
|
||||||
|
$entity->setName('hello');
|
||||||
|
$this->assertThat($entity->isName(), new IsType(IsType::TYPE_BOOL));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue