Fix phpstorm inspection issues

Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2017-10-17 00:41:53 +02:00
committed by Julius Härtl
parent 320f2bf5c8
commit c45bb71084
25 changed files with 77 additions and 93 deletions

View File

@@ -23,7 +23,7 @@
namespace OCA\Deck\Db;
class Acl extends RelationalEntity implements \JsonSerializable {
class Acl extends RelationalEntity {
const PERMISSION_READ = 0;
const PERMISSION_EDIT = 1;
@@ -33,7 +33,6 @@ class Acl extends RelationalEntity implements \JsonSerializable {
const PERMISSION_TYPE_USER = 0;
const PERMISSION_TYPE_GROUP = 1;
public $id;
protected $participant;
protected $type;
protected $boardId;
@@ -56,13 +55,13 @@ class Acl extends RelationalEntity implements \JsonSerializable {
public function getPermission($permission) {
switch ($permission) {
case Acl::PERMISSION_READ:
case self::PERMISSION_READ:
return true;
case Acl::PERMISSION_EDIT:
case self::PERMISSION_EDIT:
return $this->getPermissionEdit();
case Acl::PERMISSION_SHARE:
case self::PERMISSION_SHARE:
return $this->getPermissionShare();
case Acl::PERMISSION_MANAGE:
case self::PERMISSION_MANAGE:
return $this->getPermissionManage();
}
return false;
@@ -75,21 +74,22 @@ class Acl extends RelationalEntity implements \JsonSerializable {
}
public function getTypeString() {
if ($this->type === Acl::PERMISSION_TYPE_GROUP) {
if ($this->type === self::PERMISSION_TYPE_GROUP) {
return 'group';
}
return 'user';
}
public function setType($type) {
if(is_numeric($type)) {
return parent::setType($type);
if (is_numeric($type)) {
parent::setType($type);
return;
}
// FIXME: Remove when all javascript uses numeric types
if ($type === 'group' || $type === '1') {
$typeInt = Acl::PERMISSION_TYPE_GROUP;
$typeInt = self::PERMISSION_TYPE_GROUP;
} else {
$typeInt = Acl::PERMISSION_TYPE_USER;
$typeInt = self::PERMISSION_TYPE_USER;
}
$this->markFieldUpdated('type');
$this->type = $typeInt;