=

arikaim · Dec 6, 2022 · cce6efa · cce6efa
1 parent 57533e1
commit cce6efa
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/Models/PermissionRelations.php b/Models/PermissionRelations.php
@@ -263,7 +263,7 @@ public function deletePermission($name, int $id, string $type = Self::USER): boo
      * @param array $access - ['read','write','delete','execute]
      * @param integer $id user Id or group Id 
      * @param integer $type
-     * @return Model|bool
+     * @return Model|false
      */
     public function setPermission($name, $access, $id, $type = Self::USER) 
     {

diff --git a/Models/Routes.php b/Models/Routes.php
@@ -204,7 +204,7 @@ public function deleteRoutes(array $filter = []): bool
      * @param integer   $status
      * @return boolean
      */
-    public function setRoutesStatus(array $filter = [], int $status): bool
+    public function setRoutesStatus(array $filter, int $status): bool
     {
         $model = $this;
         foreach ($filter as $key => $value) {

diff --git a/Models/Users.php b/Models/Users.php
@@ -235,21 +235,17 @@ public function getUserById($id): ?array
      *
      * @return Model|null
      */
-    public function getControlPanelUser()
+    public function getControlPanelUser(): ?object
     {
         $permisisonId = DbModel::Permissions()->getId(AccessInterface::CONTROL_PANEL);
         if ($permisisonId == false) {
             return null;
         }
 
         $model = DbModel::PermissionRelations();
-
         $model = $model->where('permission_id','=',$permisisonId)->where('relation_type','=','user')->first();
-        if ($model == null) {
-            return null;
-        }
-
-        return $this->findById($model->relation_id);  
+
+        return ($model == null) ? null : $this->findById($model->relation_id);   
     }
 
     /**