From c50a2e82bcb76c95f3c3c995aee8c8d002245aa6 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sat, 3 Feb 2018 13:09:09 +0100 Subject: [PATCH] phpcbf --- Admin/Update.php | 1 - Controller.php | 15 ++++++--------- Models/NullDepartment.php | 2 +- Models/NullPosition.php | 2 +- Models/NullUnit.php | 2 +- Models/PermissionState.php | 4 ++-- Models/Status.php | 4 ++-- 7 files changed, 13 insertions(+), 17 deletions(-) diff --git a/Admin/Update.php b/Admin/Update.php index 71b2c09..caf9ef0 100644 --- a/Admin/Update.php +++ b/Admin/Update.php @@ -19,7 +19,6 @@ use phpOMS\Module\UpdateAbstract; use phpOMS\System\File\Directory; use phpOMS\Module\InfoManager; - /** * Navigation class. * diff --git a/Controller.php b/Controller.php index 7f89e4e..3ea3340 100644 --- a/Controller.php +++ b/Controller.php @@ -359,8 +359,7 @@ class Controller extends ModuleAbstract implements WebInterface private function validateUnitCreate(RequestAbstract $request) : array { $val = []; - if ( - ($val['name'] = empty($request->getData('name'))) + if (($val['name'] = empty($request->getData('name'))) || ($val['parent'] = ( !empty($request->getData('parent')) && !is_numeric($request->getData('parent')) @@ -424,7 +423,7 @@ class Controller extends ModuleAbstract implements WebInterface return; } - $unit = UnitMapper::get((int) $request->getData('id')); + $unit = UnitMapper::get((int) $request->getData('id')); $status = UnitMapper::delete($unit); $response->set($request->__toString(), $status); @@ -462,8 +461,7 @@ class Controller extends ModuleAbstract implements WebInterface private function validatePositionCreate(RequestAbstract $request) : array { $val = []; - if ( - ($val['name'] = empty($request->getData('name'))) + if (($val['name'] = empty($request->getData('name'))) || ($val['parent'] = ( !empty($request->getData('parent')) && !is_numeric($request->getData('parent')) @@ -504,7 +502,7 @@ class Controller extends ModuleAbstract implements WebInterface } $position = PositionMapper::get((int) $request->getData('id')); - $status = PositionMapper::delete($position); + $status = PositionMapper::delete($position); $response->set($request->__toString(), $status); } @@ -571,8 +569,7 @@ class Controller extends ModuleAbstract implements WebInterface private function validateDepartmentCreate(RequestAbstract $request) : array { $val = []; - if ( - ($val['name'] = empty($request->getData('name'))) + if (($val['name'] = empty($request->getData('name'))) || ($val['parent'] = ( !empty($request->getData('parent')) && !is_numeric($request->getData('parent')) @@ -639,7 +636,7 @@ class Controller extends ModuleAbstract implements WebInterface } $department = DepartmentMapper::get((int) $request->getData('id')); - $status = DepartmentMapper::delete($department); + $status = DepartmentMapper::delete($department); $response->set($request->__toString(), $status); } diff --git a/Models/NullDepartment.php b/Models/NullDepartment.php index e2e9506..004e440 100644 --- a/Models/NullDepartment.php +++ b/Models/NullDepartment.php @@ -16,4 +16,4 @@ namespace Modules\Organization\Models; class NullDepartment extends Department { -} \ No newline at end of file +} diff --git a/Models/NullPosition.php b/Models/NullPosition.php index ac13c87..4278fb0 100644 --- a/Models/NullPosition.php +++ b/Models/NullPosition.php @@ -16,4 +16,4 @@ namespace Modules\Organization\Models; class NullPosition extends Position { -} \ No newline at end of file +} diff --git a/Models/NullUnit.php b/Models/NullUnit.php index 00d1413..c6d5391 100644 --- a/Models/NullUnit.php +++ b/Models/NullUnit.php @@ -16,4 +16,4 @@ namespace Modules\Organization\Models; class NullUnit extends Unit { -} \ No newline at end of file +} diff --git a/Models/PermissionState.php b/Models/PermissionState.php index af41dde..ad6bbbe 100644 --- a/Models/PermissionState.php +++ b/Models/PermissionState.php @@ -26,7 +26,7 @@ use phpOMS\Stdlib\Base\Enum; */ abstract class PermissionState extends Enum { - /* public */ const UNIT = 1; + /* public */ const UNIT = 1; /* public */ const DEPARTMENT = 2; - /* public */ const POSITION = 3; + /* public */ const POSITION = 3; } diff --git a/Models/Status.php b/Models/Status.php index 7dc8f73..f6ef5fc 100644 --- a/Models/Status.php +++ b/Models/Status.php @@ -26,7 +26,7 @@ use phpOMS\Stdlib\Base\Enum; */ abstract class Status extends Enum { - /* public */ const ACTIVE = 1; + /* public */ const ACTIVE = 1; /* public */ const INACTIVE = 2; - /* public */ const HIDDEN = 4; + /* public */ const HIDDEN = 4; }