Laravel-Backpack / CRUD

src/app/Http/Controllers/CrudController.php

Doc Comments +1 added lines, -1 removed lines

@@ -161,7 +161,7 @@
 	 * Remove the specified resource from storage.
 	 *
 	 * @param  int  $id
-	 * @return string
+	 * @return \Illuminate\Http\Response
 	 */
 	public function destroy($id)
 	{

src/app/Http/Controllers/ToneCrudNestedController.php

Doc Comments +2 added lines, -2 removed lines

@@ -54,7 +54,7 @@ 
      * Store a newly created resource in storage.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function crudStore(Request $request = null)
     {
@@ -101,7 +101,7 @@ 
      *
      * @param  \Illuminate\Http\Request  $request
      * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function crudUpdate($parentId, $id, Request $request = null)
     {

src/Crud.php

Doc Comments +24 added lines, -2 removed lines

@@ -286,6 +286,7 @@ 
      * Delete a row from the database.
      *
      * @param  [int] The id of the item to be deleted.
+     * @param integer $id
      * @return [bool] Deletion confirmation.
      *
      * TODO: should this delete items with relations to it too?
@@ -404,7 +405,8 @@ 
      * Check if a permission is enabled for a Crud Panel. Fail if not.
      *
      * @param  [string] Permission.
-     * @return boolean
+     * @param string $permission
+     * @return boolean|null
      */
     public function hasAccessOrFail($permission)
     {
@@ -433,6 +435,7 @@ 
      * All Create-Read-Update-Delete operations are done using that Eloquent Collection.
      *
      * @param [string] Full model namespace. Ex: App\Models\Article
+     * @param string $model_namespace
      */
     public function setModel($model_namespace)
     {
@@ -460,6 +463,7 @@ 
      *
      * @param [string] Route name.
      * @param [array] Parameters.
+     * @param string $route
      */
     public function setRoute($route)
     {
@@ -492,7 +496,7 @@ 
      * - $this->crud->setRouteName('admin.article')
      * - $this->crud->route = "admin/article"
      *
-     * @return [string]
+     * @return string
      */
     public function getRoute()
     {
@@ -505,6 +509,8 @@ 
      *
      * @param [string] Entity name, in singular. Ex: article
      * @param [string] Entity name, in plural. Ex: articles
+     * @param string $singular
+     * @param string $plural
      */
     public function setEntityNameStrings($singular, $plural) {
         $this->entity_name = $singular;
@@ -1237,6 +1243,9 @@ 
         return array_filter($this->{$entity}[] = $this->syncField($field));
     }
 
+    /**
+     * @param string $entity
+     */
     public function addMultiple($entity, $field)
     {
         $this->{$entity} = array_filter(array_map([$this, 'syncField'], $fields));
@@ -1256,16 +1265,25 @@ 
 
 
 
+    /**
+     * @param string $entity
+     */
     public function remove($entity, $fields)
     {
         return array_values(array_filter($this->{$entity}, function($field) use ($fields) { return !in_array($field['name'], (array)$fields);}));
     }
 
+    /**
+     * @param string $items
+     */
     public function setSort($items, $order)
     {
         $this->sort[$items] = $order;
     }
 
+    /**
+     * @param string $items
+     */
     public function sort($items)
     {
         if (array_key_exists($items, $this->sort))
@@ -1301,6 +1319,10 @@ 
     }
 
     // face un fel de merge intre ce ii dai si ce e in CRUD
+
+    /**
+     * @param string $entity
+     */
     public function syncRelations($entity)
     {
         foreach ($this->relations as $field => $relation) {

Braces +47 added lines, -18 removed lines

@@ -238,7 +238,9 @@ 
         $item = $this->model->findOrFail($id);
         $updated = $item->update($this->compactFakeFields($data));
 
-        if ($updated) $this->syncPivot($item, $data);
+        if ($updated) {
+            $this->syncPivot($item, $data);
+        }
 
         return $item;
     }
@@ -436,7 +438,9 @@ 
      */
     public function setModel($model_namespace)
     {
-        if (!class_exists($model_namespace)) throw new \Exception('This model does not exist.', 404);
+        if (!class_exists($model_namespace)) {
+            throw new \Exception('This model does not exist.', 404);
+        }
 
         $this->model = new $model_namespace();
         $this->query = $this->model->select('*');
@@ -478,7 +482,9 @@ 
     {
         $complete_route = $route.'.index';
 
-        if (!\Route::has($complete_route)) throw new \Exception('There are no routes for this route name.', 404);
+        if (!\Route::has($complete_route)) {
+            throw new \Exception('There are no routes for this route name.', 404);
+        }
 
         $this->route = route($complete_route, $parameters);
         $this->initButtons();
@@ -534,8 +540,7 @@ 
                 // if label and other details have been defined in the array
                 if (is_array($columns[0])) {
                     $this->addColumn($column);
-                }
-                else
+                } else
                 {
                     $this->addColumn([
                                     'name' => $column,
@@ -831,11 +836,17 @@ 
      */
     public function getFieldTypeFromDbColumnType($field)
     {
-        if (!array_key_exists($field, $this->field_types)) return 'text';
+        if (!array_key_exists($field, $this->field_types)) {
+            return 'text';
+        }
 
-        if ($field == 'password') return 'password';
+        if ($field == 'password') {
+            return 'password';
+        }
 
-        if ($field == 'email') return 'email';
+        if ($field == 'email') {
+            return 'email';
+        }
 
         switch ($this->field_types[$field]['type'])
         {
@@ -908,7 +919,9 @@ 
         $columns = \Schema::getColumnListing($this->model->getTable());
         $fillable = $this->model->getFillable();
 
-        if (!empty($fillable)) $columns = array_intersect($columns, $fillable);
+        if (!empty($fillable)) {
+            $columns = array_intersect($columns, $fillable);
+        }
 
         // but not updated_at, deleted_at
         return array_values(array_diff($columns, [$this->model->getKeyName(), 'updated_at', 'deleted_at']));
@@ -1208,7 +1221,9 @@ 
 
     public function syncField($field)
     {
-        if (array_key_exists('name', (array)$field)) return array_merge(['type' => $this->getFieldTypeFromDbColumnType($field['name']), 'value' => '', 'default' => null, 'values' => [], 'attributes' => []], $field);
+        if (array_key_exists('name', (array)$field)) {
+            return array_merge(['type' => $this->getFieldTypeFromDbColumnType($field['name']), 'value' => '', 'default' => null, 'values' => [], 'attributes' => []], $field);
+        }
 
         return false;
     }
@@ -1226,8 +1241,11 @@ 
 
             foreach ($this->{$fields} as $key => $field)
             {
-                if (array_key_exists($field['name'], $this->relations) && $this->relations[$field['name']]['pivot']) $this->{$fields}[$key]['value'] = $this->entry->{$this->relations[$field['name']]['name']}()->lists($this->relations[$field['name']]['model']->getKeyName())->toArray();
-                    else $this->{$fields}[$key]['value'] = $this->entry->{$field['name']};
+                if (array_key_exists($field['name'], $this->relations) && $this->relations[$field['name']]['pivot']) {
+                    $this->{$fields}[$key]['value'] = $this->entry->{$this->relations[$field['name']]['name']}()->lists($this->relations[$field['name']]['model']->getKeyName())->toArray();
+                } else {
+                        $this->{$fields}[$key]['value'] = $this->entry->{$field['name']};
+                    }
             }
         }
     }
@@ -1247,7 +1265,9 @@ 
         if (!empty($this->{$type}))
         {
             $this->{$type} = array_map(function($field) use ($fields, $attributes) {
-                if (in_array($field['name'], (array)$fields)) $field = array_merge($field, $attributes);
+                if (in_array($field['name'], (array)$fields)) {
+                    $field = array_merge($field, $attributes);
+                }
 
                 return $field;
             }, $this->{$type});
@@ -1274,7 +1294,9 @@ 
 
             foreach ($this->sort[$items] as $item)
             {
-                if (is_numeric($key = array_search($item, array_column($this->{$items}, 'name')))) $elements[] = $this->{$items}[$key];
+                if (is_numeric($key = array_search($item, array_column($this->{$items}, 'name')))) {
+                    $elements[] = $this->{$items}[$key];
+                }
             }
 
             return $this->{$items} = array_merge($elements, array_filter($this->{$items}, function($item) use($items) {return !in_array($item['name'], $this->sort[$items]);}));
@@ -1293,9 +1315,13 @@ 
         $order = (array)$order;
         $values = $model->select('*');
 
-        if (!empty($where)) call_user_func_array([$values, $where[0]], array_slice($where, 1));
+        if (!empty($where)) {
+            call_user_func_array([$values, $where[0]], array_slice($where, 1));
+        }
 
-        if (!empty($order)) call_user_func_array([$values, 'orderBy'], $order);
+        if (!empty($order)) {
+            call_user_func_array([$values, 'orderBy'], $order);
+        }
 
         return $values->get()->lists($field, $model->getKeyName())->toArray();
     }
@@ -1304,8 +1330,11 @@ 
     public function syncRelations($entity)
     {
         foreach ($this->relations as $field => $relation) {
-            if ($relation['pivot']) $this->add($entity, ['name' => $field, 'type' => 'multiselect', 'value' => [], 'values' => $this->relations[$field]['values']]);
-                else $this->sync($entity, $field, ['type' => 'select', 'values' => $this->relations[$field]['values']]);
+            if ($relation['pivot']) {
+                $this->add($entity, ['name' => $field, 'type' => 'multiselect', 'value' => [], 'values' => $this->relations[$field]['values']]);
+            } else {
+                    $this->sync($entity, $field, ['type' => 'select', 'values' => $this->relations[$field]['values']]);
+                }
         }
     }
 

src/ToneCrud.php

Doc Comments +25 added lines

@@ -38,6 +38,9 @@ 
         $this->initState();
     }
 
+    /**
+     * @param string $model
+     */
     public function setModel($model)
     {
         if (!class_exists($model)) throw new \Exception('This model does not exist.', 404);
@@ -54,6 +57,10 @@ 
     }
 
     // TODO: make this work without having to specify "index"
+
+    /**
+     * @param string $route
+     */
     public function setRoute($route, $parameters = [])
     {
         if (!\Route::has($route)) throw new \Exception('This route does not exist.', 404);
@@ -259,6 +266,9 @@ 
         return $model;
     }
 
+    /**
+     * @param integer $id
+     */
     public function delete($id) // DONE
     {
         return $this->model->destroy($id);
@@ -489,6 +499,9 @@ 
         return array_filter($this->{$entity}[] = $this->syncField($field));
     }
 
+    /**
+     * @param string $entity
+     */
     private function addMultiple($entity, $field)
     {
         $this->{$entity} = array_filter(array_map([$this, 'syncField'], $fields));
@@ -506,16 +519,25 @@ 
         }
     }
 
+    /**
+     * @param string $entity
+     */
     private function remove($entity, $fields)
     {
         return array_values(array_filter($this->{$entity}, function($field) use ($fields) { return !in_array($field['name'], (array)$fields);}));
     }
 
+    /**
+     * @param string $items
+     */
     private function setSort($items, $order)
     {
         $this->sort[$items] = $order;
     }
 
+    /**
+     * @param string $items
+     */
     private function sort($items)
     {
         if (array_key_exists($items, $this->sort))
@@ -561,6 +583,9 @@ 
         return $values->get()->lists($field, $model->getKeyName())->toArray();
     }
 
+    /**
+     * @param string $entity
+     */
     private function syncRelations($entity)
     {
         foreach ($this->relations as $field => $relation) {

Braces +64 added lines, -22 removed lines

@@ -40,7 +40,9 @@ 
 
     public function setModel($model)
     {
-        if (!class_exists($model)) throw new \Exception('This model does not exist.', 404);
+        if (!class_exists($model)) {
+            throw new \Exception('This model does not exist.', 404);
+        }
 
         $this->model = new $model();
         $this->query = $this->model->select('*');
@@ -56,7 +58,9 @@ 
     // TODO: make this work without having to specify "index"
     public function setRoute($route, $parameters = [])
     {
-        if (!\Route::has($route)) throw new \Exception('This route does not exist.', 404);
+        if (!\Route::has($route)) {
+            throw new \Exception('This route does not exist.', 404);
+        }
 
         $this->route = route($route, $parameters);
         $this->initButtons();
@@ -254,7 +258,9 @@ 
     {
         $model = $this->model->findOrFail($id);
         $updated = $model->update($data);
-        if ($updated) $this->syncPivot($model, $data);
+        if ($updated) {
+            $this->syncPivot($model, $data);
+        }
 
         return $model;
     }
@@ -282,7 +288,9 @@ 
 
     public function checkPermission($permission) // DONE
     {
-        if (!in_array($permission, $this->permissions)) abort(403);
+        if (!in_array($permission, $this->permissions)) {
+            abort(403);
+        }
     }
 
     public function unsetListActions($actions)
@@ -351,11 +359,17 @@ 
 
         $this->state = 'list';
 
-        if (in_array('create', $segments)) $this->state = 'add';
+        if (in_array('create', $segments)) {
+            $this->state = 'add';
+        }
 
-        if (in_array('edit', $segments)) $this->state = 'edit';
+        if (in_array('edit', $segments)) {
+            $this->state = 'edit';
+        }
 
-        if (is_numeric(end($segments))) $this->state = 'view';
+        if (is_numeric(end($segments))) {
+            $this->state = 'view';
+        }
     }
 
     private function removeButtons($buttons)
@@ -373,21 +387,27 @@ 
         $columns = \Schema::getColumnListing($this->model->getTable());
         $fillable = $this->model->getFillable();
 
-        if (!empty($fillable)) $columns = array_intersect($columns, $fillable);
+        if (!empty($fillable)) {
+            $columns = array_intersect($columns, $fillable);
+        }
 
         return array_values(array_diff($columns, [$this->model->getKeyName(), 'updated_at', 'deleted_at']));
     }
 
     private function syncColumn($column)
     {
-        if (array_key_exists('name', (array)$column)) return array_merge(['type' => $this->getType($column['name'])], $column);
+        if (array_key_exists('name', (array)$column)) {
+            return array_merge(['type' => $this->getType($column['name'])], $column);
+        }
 
         return false;
     }
 
     private function syncField($field)
     {
-        if (array_key_exists('name', (array)$field)) return array_merge(['type' => $this->getType($field['name']), 'value' => '', 'default' => null, 'values' => [], 'attributes' => []], $field);
+        if (array_key_exists('name', (array)$field)) {
+            return array_merge(['type' => $this->getType($field['name']), 'value' => '', 'default' => null, 'values' => [], 'attributes' => []], $field);
+        }
 
         return false;
     }
@@ -404,11 +424,17 @@ 
 
     private function getType($field) // DONE
     {
-        if (!array_key_exists($field, $this->fieldTypes)) return 'text';
+        if (!array_key_exists($field, $this->fieldTypes)) {
+            return 'text';
+        }
 
-        if ($field == 'password') return 'password';
+        if ($field == 'password') {
+            return 'password';
+        }
 
-        if ($field == 'email') return 'email';
+        if ($field == 'email') {
+            return 'email';
+        }
 
         switch ($this->fieldTypes[$field]['type'])
         {
@@ -466,7 +492,9 @@ 
 
             $this->fields[] = ['name' => $field, 'value' => '', 'default' => $this->fieldTypes[$field]['default'], 'type' => $this->getType($field), 'values' => [], 'attributes' => []];
 
-            if (!in_array($field, $this->model->getHidden())) $this->columns[] = ['name' => $field, 'type' => $this->getType($field)];
+            if (!in_array($field, $this->model->getHidden())) {
+                $this->columns[] = ['name' => $field, 'type' => $this->getType($field)];
+            }
         }, $this->getColumns());
     }
 
@@ -478,8 +506,11 @@ 
 
             foreach ($this->{$fields} as $key => $field)
             {
-                if (array_key_exists($field['name'], $this->relations) && $this->relations[$field['name']]['pivot']) $this->{$fields}[$key]['value'] = $this->item->{$this->relations[$field['name']]['name']}()->lists($this->relations[$field['name']]['model']->getKeyName())->toArray();
-                    else $this->{$fields}[$key]['value'] = $this->item->{$field['name']};
+                if (array_key_exists($field['name'], $this->relations) && $this->relations[$field['name']]['pivot']) {
+                    $this->{$fields}[$key]['value'] = $this->item->{$this->relations[$field['name']]['name']}()->lists($this->relations[$field['name']]['model']->getKeyName())->toArray();
+                } else {
+                        $this->{$fields}[$key]['value'] = $this->item->{$field['name']};
+                    }
             }
         }
     }
@@ -499,7 +530,9 @@ 
         if (!empty($this->{$type}))
         {
             $this->{$type} = array_map(function($field) use ($fields, $attributes) {
-                if (in_array($field['name'], (array)$fields)) $field = array_merge($field, $attributes);
+                if (in_array($field['name'], (array)$fields)) {
+                    $field = array_merge($field, $attributes);
+                }
 
                 return $field;
             }, $this->{$type});
@@ -524,7 +557,9 @@ 
 
             foreach ($this->sort[$items] as $item)
             {
-                if (is_numeric($key = array_search($item, array_column($this->{$items}, 'name')))) $elements[] = $this->{$items}[$key];
+                if (is_numeric($key = array_search($item, array_column($this->{$items}, 'name')))) {
+                    $elements[] = $this->{$items}[$key];
+                }
             }
 
             return $this->{$items} = array_merge($elements, array_filter($this->{$items}, function($item) use($items) {return !in_array($item['name'], $this->sort[$items]);}));
@@ -554,9 +589,13 @@ 
         $order = (array)$order;
         $values = $model->select('*');
 
-        if (!empty($where)) call_user_func_array([$values, $where[0]], array_slice($where, 1));
+        if (!empty($where)) {
+            call_user_func_array([$values, $where[0]], array_slice($where, 1));
+        }
 
-        if (!empty($order)) call_user_func_array([$values, 'orderBy'], $order);
+        if (!empty($order)) {
+            call_user_func_array([$values, 'orderBy'], $order);
+        }
 
         return $values->get()->lists($field, $model->getKeyName())->toArray();
     }
@@ -564,8 +603,11 @@ 
     private function syncRelations($entity)
     {
         foreach ($this->relations as $field => $relation) {
-            if ($relation['pivot']) $this->add($entity, ['name' => $field, 'type' => 'multiselect', 'value' => [], 'values' => $this->relations[$field]['values']]);
-                else $this->sync($entity, $field, ['type' => 'select', 'values' => $this->relations[$field]['values']]);
+            if ($relation['pivot']) {
+                $this->add($entity, ['name' => $field, 'type' => 'multiselect', 'value' => [], 'values' => $this->relations[$field]['values']]);
+            } else {
+                    $this->sync($entity, $field, ['type' => 'select', 'values' => $this->relations[$field]['values']]);
+                }
         }
     }
 

src/resources/views/fields/checklist_dependency.blade.php

Braces +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
                 $secondary_ids[$second_item] = $second_item;
             }
           }
-        }else{ //create dependecies from relation if not from validate error
+        } else{ //create dependecies from relation if not from validate error
           foreach( $primary_array as $primary_item ){
             foreach($primary_item[$secondary_dependency['entity']] as $second_item ){
                 $secondary_ids[$second_item['id']] = $second_item['id'];