Laravel-Backpack / CRUD

src/app/Http/Controllers/CrudFeatures/Reorder.php

Spacing +1 added lines, -1 removed lines

@@ -174,7 +174,7 @@
     {
         $this->crud->hasAccessOrFail('reorder');
 
-        if (! $this->crud->isReorderEnabled()) {
+        if (!$this->crud->isReorderEnabled()) {
             abort(403, 'Reorder is disabled.');
         }
 

src/app/Http/Controllers/CrudFeatures/AjaxTable.php

Spacing +2 added lines, -2 removed lines

@@ -14,7 +14,7 @@ 
 
         // crate an array with the names of the searchable columns
         $columns = collect($this->crud->columns)
-                    ->reject(function ($column, $key) {
+                    ->reject(function($column, $key) {
                         // the select_multiple columns are not searchable
                         return isset($column['type']) && $column['type'] == 'select_multiple';
                     })
@@ -27,7 +27,7 @@ 
         $dataTable = new \LiveControl\EloquentDataTable\DataTable($this->crud->query, $columns);
 
         // make the datatable use the column types instead of just echoing the text
-        $dataTable->setFormatRowFunction(function ($entry) {
+        $dataTable->setFormatRowFunction(function($entry) {
             // get the actual HTML for each row's cell
             $row_items = $this->crud->getRowViews($entry, $this->crud);
 

src/resources/views/columns/multidimensional_array.blade.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
     if (is_array($array) && count($array)) {
         $list = [];
         foreach ($array as $item) {
-            if( isset( $item->{$column['visible_key']} ) ) {
+            if (isset($item->{$column['visible_key']} )) {
                 $list[] = $item->{$column['visible_key']};
             } elseif (is_array($item) && isset($item[$column['visible_key']])) {
                 $list[] = $item[$column['visible_key']];

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

Spacing +3 added lines, -3 removed lines

@@ -3,13 +3,13 @@
 <?php
     $max = isset($field['max']) ? $field['max'] : -1;
     $min = isset($field['min']) ? $field['min'] : -1;
-    $item_name = strtolower( isset($field['entity_singular']) && !empty($field['entity_singular']) ? $field['entity_singular'] : $field['label']);
+    $item_name = strtolower(isset($field['entity_singular']) && !empty($field['entity_singular']) ? $field['entity_singular'] : $field['label']);
 
-    $items = old($field['name']) ? (old($field['name'])) : (isset($field['value']) ? ($field['value']) : (isset($field['default']) ? ($field['default']) : '' ));
+    $items = old($field['name']) ? (old($field['name'])) : (isset($field['value']) ? ($field['value']) : (isset($field['default']) ? ($field['default']) : ''));
 
     // make sure not matter the attribute casting
     // the $items variable contains a properly defined JSON
-    if(is_array($items)) {
+    if (is_array($items)) {
         if (count($items)) {
             $items = json_encode($items);
         }

src/resources/lang/en/crud.php

Spacing +1 added lines, -13 removed lines

@@ -109,16 +109,4 @@
     'external_link' => 'External link',
     'choose_file' => 'Choose file',
 
-<<<<<<< HEAD
-    //Unique Fields
-    'unique_error' => 'Sorry something went wrong, please check your configuration and try again',
-    'unique_field_name_missing' => 'field_name is missing from unicity check',
-    'unique_check_value_missing' => 'check_value is missing from unicity check',
-    'unique_exists' => 'already exists',
-=======
-    //Table field
-    'table_cant_add' => 'Cannot add new :entity',
-    'table_max_reached' => 'Maximum number of :max reached',
-
->>>>>>> master
-];
+<< << <<< HEAD

src/app/Http/Controllers/CrudController.php

Spacing +4 added lines, -8 removed lines

@@ -29,7 +29,7 @@ 
 
         // call the setup function inside this closure to also have the request there
         // this way, developers can use things stored in session (auth variables, etc)
-        $this->middleware(function ($request, $next) {
+        $this->middleware(function($request, $next) {
             $this->setup();
 
             return $next($request);
@@ -56,7 +56,7 @@ 
         $this->data['title'] = ucfirst($this->crud->entity_name_plural);
 
         // get all entries if AJAX is not enabled
-        if (! $this->data['crud']->ajaxTable()) {
+        if (!$this->data['crud']->ajaxTable()) {
             $this->data['entries'] = $this->data['crud']->getEntries();
         }
 
@@ -211,7 +211,7 @@ 
 
         return $this->crud->delete($id);
     }
-<<<<<<< HEAD
+<< << <<< HEAD
 
     /**
      *  Reorder the items in the database using the Nested Set pattern.
@@ -353,8 +353,4 @@ 
              }
          }
 
-         return $response;
-     }
-=======
->>>>>>> master
-}
+         return $response
\ No newline at end of file