Nullable+void typehint

This commit is contained in:
Dennis Eichhorn 2018-03-13 20:55:24 +01:00
parent a9ab7af658
commit d0ee51050a
5 changed files with 21 additions and 21 deletions

View File

@ -36,7 +36,7 @@ class Navigation
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public static function install(string $path = null, DatabasePool $dbPool = null) /* : void */ public static function install(string $path = null, DatabasePool $dbPool = null) : void
{ {
$navData = json_decode(file_get_contents(__DIR__ . '/Navigation.install.json'), true); $navData = json_decode(file_get_contents(__DIR__ . '/Navigation.install.json'), true);
$class = '\\Modules\\Navigation\\Admin\\Installer'; $class = '\\Modules\\Navigation\\Admin\\Installer';

View File

@ -281,7 +281,7 @@ class Installer extends InstallerAbstract
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public static function installExternal(DatabasePool $dbPool, array $data) /* : void */ public static function installExternal(DatabasePool $dbPool, array $data) : void
{ {
foreach ($data as $type => $element) { foreach ($data as $type => $element) {
if ($type === InstallType::PERMISSION) { if ($type === InstallType::PERMISSION) {
@ -302,7 +302,7 @@ class Installer extends InstallerAbstract
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public static function installPermission(DatabasePool $dbPool, array $data) /* : void */ public static function installPermission(DatabasePool $dbPool, array $data) : void
{ {
$sth = $dbPool->get()->con->prepare( $sth = $dbPool->get()->con->prepare(
'INSERT INTO `' . $dbPool->get()->prefix . 'permission` (`permission_id`, `permission_name`, `permission_description`) VALUES 'INSERT INTO `' . $dbPool->get()->prefix . 'permission` (`permission_id`, `permission_name`, `permission_description`) VALUES
@ -330,7 +330,7 @@ class Installer extends InstallerAbstract
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public static function installGroup(DatabasePool $dbPool, array $data) /* : void */ public static function installGroup(DatabasePool $dbPool, array $data) : void
{ {
$sth = $dbPool->get()->con->prepare( $sth = $dbPool->get()->con->prepare(
'INSERT INTO `' . $dbPool->get()->prefix . 'group` (`group_id`, `group_name`, `group_description`) VALUES 'INSERT INTO `' . $dbPool->get()->prefix . 'group` (`group_id`, `group_name`, `group_description`) VALUES

View File

@ -418,7 +418,7 @@ class Controller extends ModuleAbstract implements WebInterface
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function apiSettingsGet(RequestAbstract $request, ResponseAbstract $response, $data = null) /* : void */ public function apiSettingsGet(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{ {
if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission( if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::SETTINGS) PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::SETTINGS)
@ -442,7 +442,7 @@ class Controller extends ModuleAbstract implements WebInterface
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function apiSettingsSet(RequestAbstract $request, ResponseAbstract $response, $data = null) /* : void */ public function apiSettingsSet(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{ {
if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission( if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
PermissionType::MODIFY, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::SETTINGS) PermissionType::MODIFY, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::SETTINGS)
@ -471,7 +471,7 @@ class Controller extends ModuleAbstract implements WebInterface
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function apiGroupGet(RequestAbstract $request, ResponseAbstract $response, $data = null) /* : void */ public function apiGroupGet(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{ {
if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission( if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::GROUP) PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::GROUP)
@ -501,7 +501,7 @@ class Controller extends ModuleAbstract implements WebInterface
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function apiGroupUpdate(RequestAbstract $request, ResponseAbstract $response, $data = null) /* : void */ public function apiGroupUpdate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{ {
if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission( if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
PermissionType::MODIFY, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::GROUP) PermissionType::MODIFY, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::GROUP)
@ -577,7 +577,7 @@ class Controller extends ModuleAbstract implements WebInterface
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function apiGroupCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) /* : void */ public function apiGroupCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{ {
if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission( if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
PermissionType::CREATE, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::GROUP) PermissionType::CREATE, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::GROUP)
@ -636,7 +636,7 @@ class Controller extends ModuleAbstract implements WebInterface
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function apiGroupDelete(RequestAbstract $request, ResponseAbstract $response, $data = null) /* : void */ public function apiGroupDelete(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{ {
if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission( if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
PermissionType::DELETE, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::GROUP) PermissionType::DELETE, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::GROUP)
@ -668,7 +668,7 @@ class Controller extends ModuleAbstract implements WebInterface
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function apiAccountGet(RequestAbstract $request, ResponseAbstract $response, $data = null) /* : void */ public function apiAccountGet(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{ {
if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission( if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::ACCOUNT) PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::ACCOUNT)
@ -698,7 +698,7 @@ class Controller extends ModuleAbstract implements WebInterface
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function apiAccountFind(RequestAbstract $request, ResponseAbstract $response, $data = null) /* : void */ public function apiAccountFind(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{ {
if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission( if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::ACCOUNT) PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::ACCOUNT)
@ -747,7 +747,7 @@ class Controller extends ModuleAbstract implements WebInterface
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function apiAccountCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) /* : void */ public function apiAccountCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{ {
if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission( if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
PermissionType::CREATE, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::ACCOUNT) PermissionType::CREATE, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::ACCOUNT)
@ -809,7 +809,7 @@ class Controller extends ModuleAbstract implements WebInterface
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function apiAccountDelete(RequestAbstract $request, ResponseAbstract $response, $data = null) /* : void */ public function apiAccountDelete(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{ {
if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission( if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
PermissionType::DELETE, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::ACCOUNT) PermissionType::DELETE, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::ACCOUNT)
@ -841,7 +841,7 @@ class Controller extends ModuleAbstract implements WebInterface
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function apiAccountUpdate(RequestAbstract $request, ResponseAbstract $response, $data = null) /* : void */ public function apiAccountUpdate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{ {
if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission( if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
PermissionType::MODIFY, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::ACCOUNT) PermissionType::MODIFY, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::ACCOUNT)
@ -901,7 +901,7 @@ class Controller extends ModuleAbstract implements WebInterface
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function apiModuleStatusUpdate(RequestAbstract $request, ResponseAbstract $response, $data = null) /* : void */ public function apiModuleStatusUpdate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{ {
$module = $request->getData('module'); $module = $request->getData('module');
$status = $request->getData('status'); $status = $request->getData('status');

View File

@ -93,7 +93,7 @@ class Group extends \phpOMS\Account\Group
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function setCreatedBy($createdBy) /* : void */ public function setCreatedBy($createdBy) : void
{ {
$this->createdBy = $createdBy; $this->createdBy = $createdBy;
} }
@ -107,7 +107,7 @@ class Group extends \phpOMS\Account\Group
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function setDescriptionRaw(string $description) /* : void */ public function setDescriptionRaw(string $description) : void
{ {
$this->descriptionRaw = $description; $this->descriptionRaw = $description;
} }

View File

@ -122,7 +122,7 @@ class Module
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function setName(string $name) /* : void */ public function setName(string $name) : void
{ {
$this->name = $name; $this->name = $name;
} }
@ -148,7 +148,7 @@ class Module
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function setDescription(string $description) /* : void */ public function setDescription(string $description) : void
{ {
$this->description = $description; $this->description = $description;
} }
@ -174,7 +174,7 @@ class Module
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function setStatus(int $status) /* : void */ public function setStatus(int $status) : void
{ {
// todo: check valid // todo: check valid
$this->status = $status; $this->status = $status;