Merge pull request #5681 from Laravel-Backpack/poc-user-special-header-to-escape-message

pxpm · web-flow · commit bf39d8226778 · 2024-10-08T10:43:41.000+01:00
dont escape when developer error header is present
diff --git a/src/app/Exceptions/BackpackProRequiredException.php b/src/app/Exceptions/BackpackProRequiredException.php
@@ -20,6 +20,6 @@ public function render($request)
                 break;
         }
 
-        return abort(500, $this->getMessage());
+        return abort(500, $this->getMessage(), ['developer-error-exception']);
     }
 }
diff --git a/src/app/Library/CrudPanel/CrudButton.php b/src/app/Library/CrudPanel/CrudButton.php
@@ -184,7 +184,7 @@ public function position($position)
                 break;
 
             default:
-                abort(500, "Unknown button position - please use 'beginning' or 'end'.");
+                abort(500, "Unknown button position - please use 'beginning' or 'end'.", ['developer-error-exception']);
         }
 
         return $this;
@@ -314,7 +314,7 @@ public function getHtml($entry = null)
             return view($button->getFinalViewPath(), compact('button', 'crud', 'entry'));
         }
 
-        abort(500, 'Unknown button type');
+        abort(500, 'Unknown button type', ['developer-error-exception']);
     }
 
     /**
@@ -342,7 +342,7 @@ private function getFinalViewPath()
             }
         }
 
-        abort(500, 'Button view and fallbacks do not exist for '.$this->name.' button.');
+        abort(500, 'Button view and fallbacks do not exist for '.$this->name.' button.', ['developer-error-exception']);
     }
 
     /**
diff --git a/src/app/Library/CrudPanel/CrudColumn.php b/src/app/Library/CrudPanel/CrudColumn.php
@@ -88,7 +88,7 @@ public static function name($name)
     public function key(string $key)
     {
         if (! isset($this->attributes['name'])) {
-            abort(500, 'Column name must be defined before changing the key.');
+            abort(500, 'Column name must be defined before changing the key.', ['developer-error-exception']);
         }
 
         $columns = $this->crud()->columns();
diff --git a/src/app/Library/CrudPanel/CrudField.php b/src/app/Library/CrudPanel/CrudField.php
@@ -46,7 +46,7 @@ class CrudField
     public function __construct($nameOrDefinitionArray)
     {
         if (empty($nameOrDefinitionArray)) {
-            abort(500, 'Field name can\'t be empty.');
+            abort(500, 'Field name can\'t be empty.', ['developer-error-exception']);
         }
 
         if (is_array($nameOrDefinitionArray)) {
@@ -57,7 +57,7 @@ public function __construct($nameOrDefinitionArray)
         }
 
         if (is_array($name)) {
-            abort(500, 'Field name can\'t be an array. It should be a string. Error in field: '.json_encode($name));
+            abort(500, 'Field name can\'t be an array. It should be a string. Error in field: '.json_encode($name), ['developer-error-exception']);
         }
 
         $field = $this->crud()->firstFieldWhere('name', $name);
@@ -325,7 +325,7 @@ public function morphTypeField(array $configs)
         $morphField = $this->crud()->fields()[$this->attributes['name']];
 
         if (empty($morphField) || ($morphField['relation_type'] ?? '') !== 'MorphTo') {
-            throw new \Exception('Trying to configure the morphType on a non-morphTo field. Check if field and relation name matches.');
+            abort(500, 'Trying to configure the morphType on a non-morphTo field. Check if field and relation name matches.', ['developer-error-exception']);
         }
         [$morphTypeField, $morphIdField] = $morphField['subfields'];
 
@@ -351,7 +351,7 @@ public function morphIdField(array $configs)
         $morphField = $this->crud()->fields()[$this->attributes['name']];
 
         if (empty($morphField) || ($morphField['relation_type'] ?? '') !== 'MorphTo') {
-            throw new \Exception('Trying to configure the morphType on a non-morphTo field. Check if field and relation name matches.');
+            abort(500, 'Trying to configure the morphType on a non-morphTo field. Check if field and relation name matches.', ['developer-error-exception']);
         }
 
         [$morphTypeField, $morphIdField] = $morphField['subfields'];
diff --git a/src/app/Library/CrudPanel/CrudFilter.php b/src/app/Library/CrudPanel/CrudFilter.php
@@ -558,7 +558,7 @@ private function applyDefaultLogic($name, $operator, $input = null)
                 break;
 
             default:
-                abort(500, 'Unknown filter operator.');
+                abort(500, 'Unknown filter operator.', ['developer-error-exception']);
                 break;
         }
     }
diff --git a/src/app/Library/CrudPanel/Traits/Buttons.php b/src/app/Library/CrudPanel/Traits/Buttons.php
@@ -38,7 +38,7 @@ public function orderButtons(string $stack, array $order)
         // we parse the ordered buttons
         collect($order)->each(function ($btnKey) use ($newButtons, $stackButtons) {
             if (! $button = $stackButtons->where('name', $btnKey)->first()) {
-                abort(500, 'Button name [«'.$btnKey.'»] not found.');
+                abort(500, 'Button name [«'.$btnKey.'»] not found.', ['developer-error-exception']);
             }
             $newButtons->push($button);
         });
@@ -117,7 +117,7 @@ public function modifyButton($name, $modifications = null)
         $button = $this->buttons()->firstWhere('name', $name);
 
         if (! $button) {
-            abort(500, 'CRUD Button "'.$name.'" not found. Please ensure the button exists before you modify it.');
+            abort(500, 'CRUD Button "'.$name.'" not found. Please ensure the button exists before you modify it.', ['developer-error-exception']);
         }
 
         if (is_array($modifications)) {
diff --git a/src/app/Library/CrudPanel/Traits/Fields.php b/src/app/Library/CrudPanel/Traits/Fields.php
@@ -475,7 +475,7 @@ public function getStrippedSaveRequest($request)
         if (is_string($setting) && class_exists($setting)) {
             $setting = new $setting();
 
-            return is_callable($setting) ? $setting($request) : abort(500, get_class($setting).' is not invokable.');
+            return is_callable($setting) ? $setting($request) : abort(500, get_class($setting).' is not invokable.', ['developer-error-exception']);
         }
 
         return $request->only($this->getAllFieldNames());
diff --git a/src/app/Library/CrudPanel/Traits/FieldsProtectedMethods.php b/src/app/Library/CrudPanel/Traits/FieldsProtectedMethods.php
@@ -108,19 +108,19 @@ public function overwriteFieldNamesFromDotNotationToArray($fields)
     protected function makeSureFieldHasName($field)
     {
         if (empty($field)) {
-            abort(500, 'Field name can\'t be empty');
+            abort(500, 'Field name can\'t be empty', ['developer-error-exception']);
         }
 
         if (is_string($field)) {
             return ['name' => Str::replace(' ', '', $field)];
         }
 
         if (is_array($field) && ! isset($field['name'])) {
-            abort(500, 'All fields must have their name defined');
+            abort(500, 'All fields must have their name defined', ['developer-error-exception']);
         }
 
         if (is_array($field['name'])) {
-            abort(500, 'Field name can\'t be an array. It should be a string. Error in field: '.json_encode($field['name']));
+            abort(500, 'Field name can\'t be an array. It should be a string. Error in field: '.json_encode($field['name']), ['developer-error-exception']);
         }
 
         $field['name'] = Str::replace(' ', '', $field['name']);
@@ -265,12 +265,12 @@ protected function makeSureSubfieldsHaveNecessaryAttributes($field)
         }
 
         if (! is_multidimensional_array($field['subfields'], true)) {
-            abort(500, 'Subfields of «'.$field['name'].'» are malformed. Make sure you provide an array of subfields.');
+            abort(500, 'Subfields of «'.$field['name'].'» are malformed. Make sure you provide an array of subfields.', ['developer-error-exception']);
         }
 
         foreach ($field['subfields'] as $key => $subfield) {
             if (empty($subfield) || ! isset($subfield['name'])) {
-                abort(500, 'A subfield of «'.$field['name'].'» is malformed. Subfield attribute name can\'t be empty.');
+                abort(500, 'A subfield of «'.$field['name'].'» is malformed. Subfield attribute name can\'t be empty.', ['developer-error-exception']);
             }
 
             // make sure the field definition is an array
diff --git a/src/app/Library/CrudPanel/Traits/Filters.php b/src/app/Library/CrudPanel/Traits/Filters.php
@@ -73,11 +73,11 @@ protected function addFilterToCollection($options, $values = false, $filterLogic
 
         // check if another filter with the same name exists
         if (! isset($options['name'])) {
-            abort(500, 'All your filters need names.');
+            abort(500, 'All your filters need names.', ['developer-error-exception']);
         }
 
         if ($this->filters()->contains('name', $options['name'])) {
-            abort(500, "Sorry, you can't have two filters with the same name.");
+            abort(500, "Sorry, you can't have two filters with the same name.", ['developer-error-exception']);
         }
 
         // add a new filter to the interface
@@ -168,7 +168,7 @@ public function modifyFilter($name, $modifications)
         $filter = $this->filters()->firstWhere('name', $name);
 
         if (! $filter) {
-            abort(500, 'CRUD Filter "'.$name.'" not found. Please check the filter exists before you modify it.');
+            abort(500, 'CRUD Filter "'.$name.'" not found. Please check the filter exists before you modify it.', ['developer-error-exception']);
         }
 
         if (is_array($modifications)) {
diff --git a/src/app/Library/CrudPanel/Traits/Macroable.php b/src/app/Library/CrudPanel/Traits/Macroable.php
@@ -21,7 +21,7 @@ trait Macroable
     public static function macro($name, $macro)
     {
         if (method_exists(new static(), $name)) {
-            abort(500, "Cannot register '$name' macro. '$name()' already exists on ".get_called_class());
+            abort(500, "Cannot register '$name' macro. '$name()' already exists on ".get_called_class(), ['developer-error-exception']);
         }
 
         static::parentMacro($name, $macro);
diff --git a/src/app/Library/CrudPanel/Traits/Read.php b/src/app/Library/CrudPanel/Traits/Read.php
@@ -385,7 +385,7 @@ public function getPageLengthMenu()
     private function abortIfInvalidPageLength($value)
     {
         if ($value === 0 || (is_array($value) && in_array(0, $value))) {
-            abort(500, 'You should not use 0 as a key in paginator. If you are looking for "ALL" option, use -1 instead.');
+            abort(500, 'You should not use 0 as a key in paginator. If you are looking for "ALL" option, use -1 instead.', ['developer-error-exception']);
         }
     }
 
diff --git a/src/app/Library/CrudPanel/Traits/Relationships.php b/src/app/Library/CrudPanel/Traits/Relationships.php
@@ -33,7 +33,7 @@ public function getRelationInstance($field)
             return $relation;
         }
 
-        abort(500, 'Looks like field <code>'.$field['name'].'</code> is not properly defined. The <code>'.$field['entity'].'()</code> relationship doesn\'t seem to exist on the <code>'.get_class($model).'</code> model.');
+        abort(500, 'Looks like field <code>'.$field['name'].'</code> is not properly defined. The <code>'.$field['entity'].'()</code> relationship doesn\'t seem to exist on the <code>'.get_class($model).'</code> model.', ['developer-error-exception']);
     }
 
     /**
diff --git a/src/app/Library/CrudPanel/Traits/SaveActions.php b/src/app/Library/CrudPanel/Traits/SaveActions.php
@@ -80,7 +80,7 @@ public function addSaveAction(array $saveAction)
     {
         $orderCounter = $this->getOperationSetting('save_actions') !== null ? (count($this->getOperationSetting('save_actions')) + 1) : 1;
         //check for some mandatory fields
-        $saveAction['name'] ?? abort(500, 'Please define save action name.');
+        $saveAction['name'] ?? abort(500, 'Please define save action name.', ['developer-error-exception']);
         $saveAction['redirect'] = $saveAction['redirect'] ?? fn ($crud, $request, $itemId) => $request->has('_http_referrer') ? $request->get('_http_referrer') : $crud->route;
         $saveAction['visible'] = $saveAction['visible'] ?? true;
         $saveAction['button_text'] = $saveAction['button_text'] ?? $saveAction['name'];
diff --git a/src/app/Library/CrudPanel/Traits/Search.php b/src/app/Library/CrudPanel/Traits/Search.php
@@ -25,7 +25,7 @@ public function applySearchTerm($searchTerm)
         return $this->query->where(function ($query) use ($searchTerm) {
             foreach ($this->columns() as $column) {
                 if (! isset($column['type'])) {
-                    abort(400, 'Missing column type when trying to apply search term.');
+                    abort(500, 'Missing column type when trying to apply search term.', ['developer-error-exception']);
                 }
 
                 $this->applySearchLogicForColumn($query, $column, $searchTerm);
diff --git a/src/app/Library/CrudPanel/Traits/Validation.php b/src/app/Library/CrudPanel/Traits/Validation.php
@@ -73,7 +73,7 @@ public function setValidation($classOrRulesArray = false, $messages = [], $attri
         } elseif (is_string($classOrRulesArray) && class_exists($classOrRulesArray) && is_a($classOrRulesArray, FormRequest::class, true)) {
             $this->setValidationFromRequest($classOrRulesArray);
         } else {
-            abort(500, 'Please pass setValidation() nothing, a rules array or a FormRequest class.');
+            abort(500, 'Please pass setValidation() nothing, a rules array or a FormRequest class.', ['developer-error-exception']);
         }
     }
 
diff --git a/src/app/Library/Uploaders/Support/RegisterUploadEvents.php b/src/app/Library/Uploaders/Support/RegisterUploadEvents.php
@@ -21,7 +21,7 @@ public function __construct(
         $this->crudObjectType = is_a($crudObject, CrudField::class) ? 'field' : (is_a($crudObject, CrudColumn::class) ? 'column' : null);
 
         if (! $this->crudObjectType) {
-            abort(500, 'Upload handlers only work for CrudField and CrudColumn classes.');
+            abort(500, 'Upload handlers only work for CrudField and CrudColumn classes.', ['developer-error-exception']);
         }
     }
 
diff --git a/src/app/Library/Widget.php b/src/app/Library/Widget.php
@@ -172,7 +172,7 @@ public function getFinalViewPath()
         if (! backpack_pro()) {
             throw new BackpackProRequiredException('Cannot find the widget view: '.$this->attributes['type'].'. Please check for typos.'.(backpack_pro() ? '' : ' If you are trying to use a PRO widget, please first purchase and install the backpack/pro addon from backpackforlaravel.com'), 1);
         }
-        abort(500, 'Cannot find the view for «'.$this->attributes['type'].'» widget type. Please check for typos.');
+        abort(500, 'Cannot find the view for «'.$this->attributes['type'].'» widget type. Please check for typos.', ['developer-error-exception']);
     }
 
     // -------
diff --git a/src/app/Models/Traits/HasEnumFields.php b/src/app/Models/Traits/HasEnumFields.php
@@ -27,7 +27,7 @@ public static function getPossibleEnumValues($field_name)
 
             $type = $connection->select($select)[0]->Type;
         } catch (\Exception $e) {
-            abort(500, 'Enum field type is not supported - it only works on MySQL. Please use select_from_array instead.');
+            abort(500, 'Enum field type is not supported - it only works on MySQL. Please use select_from_array instead.', ['developer-error-exception']);
         }
 
         preg_match('/^enum\((.*)\)$/', $type, $matches);
diff --git a/src/helpers.php b/src/helpers.php
@@ -272,7 +272,7 @@ function backpack_view($view)
             return '- Called in: '.Str::after($functionFile, base_path()).' on line: '.$functionLine;
         })();
 
-        abort(500, $errorMessage.$errorDetails);
+        abort(500, $errorMessage.$errorDetails, ['developer-error-exception']);
     }
 }
 
diff --git a/src/resources/views/ui/errors/4xx.blade.php b/src/resources/views/ui/errors/4xx.blade.php
@@ -2,14 +2,15 @@
 
 @php
   $error_number ??= 400;
+  $shouldEscape = ! in_array('developer-error-exception', $exception->getHeaders());
 @endphp
 
 @section('title')
   {{ trans('backpack::base.error_page.'.$error_number) }}
 @endsection
 
 @section('description')
-  {!! $exception?->getMessage() && config('app.debug') ? e($exception->getMessage()) : trans('backpack::base.error_page.message_4xx', [
+  {!! $exception?->getMessage() && config('app.debug') ? ($shouldEscape ? e($exception->getMessage()) : $exception->getMessage()) : trans('backpack::base.error_page.message_4xx', [
     'href_back' => 'href="javascript:history.back()"',
     'href_homepage' => 'href="'.url('').'"',
   ]) !!}
diff --git a/src/resources/views/ui/errors/500.blade.php b/src/resources/views/ui/errors/500.blade.php
@@ -2,12 +2,13 @@
 
 @php
   $error_number = 500;
+  $shouldEscape = ! in_array('developer-error-exception', $exception->getHeaders());
 @endphp
 
 @section('title')
   {{ trans('backpack::base.error_page.500') }}
 @endsection
 
 @section('description')
-  {!! $exception?->getMessage() && config('app.debug') ? e($exception->getMessage()) : trans('backpack::base.error_page.message_500') !!}
+  {!! $exception?->getMessage() && config('app.debug') ? ($shouldEscape ? e($exception->getMessage()) : $exception->getMessage()) : trans('backpack::base.error_page.message_500') !!}
 @endsection
diff --git a/src/resources/views/ui/errors/503.blade.php b/src/resources/views/ui/errors/503.blade.php
@@ -2,12 +2,13 @@
 
 @php
   $error_number = 503;
+  $shouldEscape = ! in_array('developer-error-exception', $exception->getHeaders());
 @endphp
 
 @section('title')
   {{ trans('backpack::base.error_page.503') }}
 @endsection
 
 @section('description')
-  {!! $exception?->getMessage() && config('app.debug') ? e($exception->getMessage()) : trans('backpack::base.error_page.message_503') !!}
+  {!! $exception?->getMessage() && config('app.debug') ? ($shouldEscape ? e($exception->getMessage()) : $exception->getMessage()) : trans('backpack::base.error_page.message_503') !!}
 @endsection
diff --git a/tests/Unit/CrudPanel/CrudPanelButtonsTest.php b/tests/Unit/CrudPanel/CrudPanelButtonsTest.php
@@ -362,7 +362,7 @@ public function testThrowsErrorInUnknownPosition()
         } catch (\Throwable $e) {
         }
         $this->assertEquals(
-            new \Symfony\Component\HttpKernel\Exception\HttpException(500, 'Unknown button position - please use \'beginning\' or \'end\'.'),
+            new \Symfony\Component\HttpKernel\Exception\HttpException(500, 'Unknown button position - please use \'beginning\' or \'end\'.', null, ['developer-error-exception']),
             $e
         );
     }
diff --git a/tests/Unit/CrudPanel/CrudPanelFieldsTest.php b/tests/Unit/CrudPanel/CrudPanelFieldsTest.php
@@ -658,7 +658,7 @@ public function testItAbortsOnUnexpectedEntity()
         } catch (\Throwable $e) {
         }
         $this->assertEquals(
-            new \Symfony\Component\HttpKernel\Exception\HttpException(500, 'Looks like field <code>doesNotExist</code> is not properly defined. The <code>doesNotExist()</code> relationship doesn\'t seem to exist on the <code>Backpack\CRUD\Tests\Config\Models\TestModel</code> model.'),
+            new \Symfony\Component\HttpKernel\Exception\HttpException(500, 'Looks like field <code>doesNotExist</code> is not properly defined. The <code>doesNotExist()</code> relationship doesn\'t seem to exist on the <code>Backpack\CRUD\Tests\Config\Models\TestModel</code> model.', null, ['developer-error-exception']),
             $e
         );
     }
@@ -903,7 +903,7 @@ public function testItAbortsWithEmptyNamesFluently()
         } catch (\Throwable $e) {
         }
         $this->assertEquals(
-            new \Symfony\Component\HttpKernel\Exception\HttpException(500, 'Field name can\'t be empty.'),
+            new \Symfony\Component\HttpKernel\Exception\HttpException(500, 'Field name can\'t be empty.', null, ['developer-error-exception']),
             $e
         );
     }
diff --git a/tests/Unit/CrudPanel/CrudPanelMacroTest.php b/tests/Unit/CrudPanel/CrudPanelMacroTest.php
@@ -27,7 +27,7 @@ public function testThrowsErrorIfMacroExists()
         } catch (\Throwable $e) {
         }
         $this->assertEquals(
-            new \Symfony\Component\HttpKernel\Exception\HttpException(500, 'Cannot register \'setModel\' macro. \'setModel()\' already exists on Backpack\CRUD\app\Library\CrudPanel\CrudPanel'),
+            new \Symfony\Component\HttpKernel\Exception\HttpException(500, 'Cannot register \'setModel\' macro. \'setModel()\' already exists on Backpack\CRUD\app\Library\CrudPanel\CrudPanel', null, ['developer-error-exception']),
             $e
         );
     }
diff --git a/tests/Unit/CrudPanel/CrudPanelValidationTest.php b/tests/Unit/CrudPanel/CrudPanelValidationTest.php
@@ -203,7 +203,7 @@ public function testItThrowsExceptionWithInvalidValidationClass()
         } catch (\Throwable $e) {
         }
         $this->assertEquals(
-            new \Symfony\Component\HttpKernel\Exception\HttpException(500, 'Please pass setValidation() nothing, a rules array or a FormRequest class.'),
+            new \Symfony\Component\HttpKernel\Exception\HttpException(500, 'Please pass setValidation() nothing, a rules array or a FormRequest class.', null, ['developer-error-exception']),
             $e
         );
     }

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,6 @@ public function render($request)`
`20`	`20`	`break;`
`21`	`21`	`}`
`22`	`22`
`23`		`- return abort(500, $this->getMessage());`
	`23`	`+ return abort(500, $this->getMessage(), ['developer-error-exception']);`
`24`	`24`	`}`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ public function position($position)`
`184`	`184`	`break;`
`185`	`185`
`186`	`186`	`default:`
`187`		`- abort(500, "Unknown button position - please use 'beginning' or 'end'.");`
	`187`	`+ abort(500, "Unknown button position - please use 'beginning' or 'end'.", ['developer-error-exception']);`
`188`	`188`	`}`
`189`	`189`
`190`	`190`	`return $this;`
`@@ -314,7 +314,7 @@ public function getHtml($entry = null)`
`314`	`314`	`return view($button->getFinalViewPath(), compact('button', 'crud', 'entry'));`
`315`	`315`	`}`
`316`	`316`
`317`		`- abort(500, 'Unknown button type');`
	`317`	`+ abort(500, 'Unknown button type', ['developer-error-exception']);`
`318`	`318`	`}`
`319`	`319`
`320`	`320`	`/**`
`@@ -342,7 +342,7 @@ private function getFinalViewPath()`
`342`	`342`	`}`
`343`	`343`	`}`
`344`	`344`
`345`		`- abort(500, 'Button view and fallbacks do not exist for '.$this->name.' button.');`
	`345`	`+ abort(500, 'Button view and fallbacks do not exist for '.$this->name.' button.', ['developer-error-exception']);`
`346`	`346`	`}`
`347`	`347`
`348`	`348`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ public static function name($name)`
`88`	`88`	`public function key(string $key)`
`89`	`89`	`{`
`90`	`90`	`if (! isset($this->attributes['name'])) {`
`91`		`- abort(500, 'Column name must be defined before changing the key.');`
	`91`	`+ abort(500, 'Column name must be defined before changing the key.', ['developer-error-exception']);`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`$columns = $this->crud()->columns();`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ class CrudField`
`46`	`46`	`public function __construct($nameOrDefinitionArray)`
`47`	`47`	`{`
`48`	`48`	`if (empty($nameOrDefinitionArray)) {`
`49`		`- abort(500, 'Field name can\'t be empty.');`
	`49`	`+ abort(500, 'Field name can\'t be empty.', ['developer-error-exception']);`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`if (is_array($nameOrDefinitionArray)) {`
`@@ -57,7 +57,7 @@ public function __construct($nameOrDefinitionArray)`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`if (is_array($name)) {`
`60`		`- abort(500, 'Field name can\'t be an array. It should be a string. Error in field: '.json_encode($name));`
	`60`	`+ abort(500, 'Field name can\'t be an array. It should be a string. Error in field: '.json_encode($name), ['developer-error-exception']);`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`$field = $this->crud()->firstFieldWhere('name', $name);`
`@@ -325,7 +325,7 @@ public function morphTypeField(array $configs)`
`325`	`325`	`$morphField = $this->crud()->fields()[$this->attributes['name']];`
`326`	`326`
`327`	`327`	`if (empty($morphField) \|\| ($morphField['relation_type'] ?? '') !== 'MorphTo') {`
`328`		`- throw new \Exception('Trying to configure the morphType on a non-morphTo field. Check if field and relation name matches.');`
	`328`	`+ abort(500, 'Trying to configure the morphType on a non-morphTo field. Check if field and relation name matches.', ['developer-error-exception']);`
`329`	`329`	`}`
`330`	`330`	`[$morphTypeField, $morphIdField] = $morphField['subfields'];`
`331`	`331`
`@@ -351,7 +351,7 @@ public function morphIdField(array $configs)`
`351`	`351`	`$morphField = $this->crud()->fields()[$this->attributes['name']];`
`352`	`352`
`353`	`353`	`if (empty($morphField) \|\| ($morphField['relation_type'] ?? '') !== 'MorphTo') {`
`354`		`- throw new \Exception('Trying to configure the morphType on a non-morphTo field. Check if field and relation name matches.');`
	`354`	`+ abort(500, 'Trying to configure the morphType on a non-morphTo field. Check if field and relation name matches.', ['developer-error-exception']);`
`355`	`355`	`}`
`356`	`356`
`357`	`357`	`[$morphTypeField, $morphIdField] = $morphField['subfields'];`
Original file line number	Diff line number	Diff line change
`@@ -558,7 +558,7 @@ private function applyDefaultLogic($name, $operator, $input = null)`
`558`	`558`	`break;`
`559`	`559`
`560`	`560`	`default:`
`561`		`- abort(500, 'Unknown filter operator.');`
	`561`	`+ abort(500, 'Unknown filter operator.', ['developer-error-exception']);`
`562`	`562`	`break;`
`563`	`563`	`}`
`564`	`564`	`}`
Original file line number	Diff line number	Diff line change
`@@ -475,7 +475,7 @@ public function getStrippedSaveRequest($request)`
`475`	`475`	`if (is_string($setting) && class_exists($setting)) {`
`476`	`476`	`$setting = new $setting();`
`477`	`477`
`478`		`- return is_callable($setting) ? $setting($request) : abort(500, get_class($setting).' is not invokable.');`
	`478`	`+ return is_callable($setting) ? $setting($request) : abort(500, get_class($setting).' is not invokable.', ['developer-error-exception']);`
`479`	`479`	`}`
`480`	`480`
`481`	`481`	`return $request->only($this->getAllFieldNames());`
Original file line number	Diff line number	Diff line change
`@@ -108,19 +108,19 @@ public function overwriteFieldNamesFromDotNotationToArray($fields)`
`108`	`108`	`protected function makeSureFieldHasName($field)`
`109`	`109`	`{`
`110`	`110`	`if (empty($field)) {`
`111`		`- abort(500, 'Field name can\'t be empty');`
	`111`	`+ abort(500, 'Field name can\'t be empty', ['developer-error-exception']);`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`if (is_string($field)) {`
`115`	`115`	`return ['name' => Str::replace(' ', '', $field)];`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`if (is_array($field) && ! isset($field['name'])) {`
`119`		`- abort(500, 'All fields must have their name defined');`
	`119`	`+ abort(500, 'All fields must have their name defined', ['developer-error-exception']);`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`if (is_array($field['name'])) {`
`123`		`- abort(500, 'Field name can\'t be an array. It should be a string. Error in field: '.json_encode($field['name']));`
	`123`	`+ abort(500, 'Field name can\'t be an array. It should be a string. Error in field: '.json_encode($field['name']), ['developer-error-exception']);`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`$field['name'] = Str::replace(' ', '', $field['name']);`
`@@ -265,12 +265,12 @@ protected function makeSureSubfieldsHaveNecessaryAttributes($field)`
`265`	`265`	`}`
`266`	`266`
`267`	`267`	`if (! is_multidimensional_array($field['subfields'], true)) {`
`268`		`- abort(500, 'Subfields of «'.$field['name'].'» are malformed. Make sure you provide an array of subfields.');`
	`268`	`+ abort(500, 'Subfields of «'.$field['name'].'» are malformed. Make sure you provide an array of subfields.', ['developer-error-exception']);`
`269`	`269`	`}`
`270`	`270`
`271`	`271`	`foreach ($field['subfields'] as $key => $subfield) {`
`272`	`272`	`if (empty($subfield) \|\| ! isset($subfield['name'])) {`
`273`		`- abort(500, 'A subfield of «'.$field['name'].'» is malformed. Subfield attribute name can\'t be empty.');`
	`273`	`+ abort(500, 'A subfield of «'.$field['name'].'» is malformed. Subfield attribute name can\'t be empty.', ['developer-error-exception']);`
`274`	`274`	`}`
`275`	`275`
`276`	`276`	`// make sure the field definition is an array`
Original file line number	Diff line number	Diff line change
`@@ -73,11 +73,11 @@ protected function addFilterToCollection($options, $values = false, $filterLogic`
`73`	`73`
`74`	`74`	`// check if another filter with the same name exists`
`75`	`75`	`if (! isset($options['name'])) {`
`76`		`- abort(500, 'All your filters need names.');`
	`76`	`+ abort(500, 'All your filters need names.', ['developer-error-exception']);`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`if ($this->filters()->contains('name', $options['name'])) {`
`80`		`- abort(500, "Sorry, you can't have two filters with the same name.");`
	`80`	`+ abort(500, "Sorry, you can't have two filters with the same name.", ['developer-error-exception']);`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`// add a new filter to the interface`
`@@ -168,7 +168,7 @@ public function modifyFilter($name, $modifications)`
`168`	`168`	`$filter = $this->filters()->firstWhere('name', $name);`
`169`	`169`
`170`	`170`	`if (! $filter) {`
`171`		`- abort(500, 'CRUD Filter "'.$name.'" not found. Please check the filter exists before you modify it.');`
	`171`	`+ abort(500, 'CRUD Filter "'.$name.'" not found. Please check the filter exists before you modify it.', ['developer-error-exception']);`
`172`	`172`	`}`
`173`	`173`
`174`	`174`	`if (is_array($modifications)) {`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ trait Macroable`
`21`	`21`	`public static function macro($name, $macro)`
`22`	`22`	`{`
`23`	`23`	`if (method_exists(new static(), $name)) {`
`24`		`- abort(500, "Cannot register '$name' macro. '$name()' already exists on ".get_called_class());`
	`24`	`+ abort(500, "Cannot register '$name' macro. '$name()' already exists on ".get_called_class(), ['developer-error-exception']);`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`static::parentMacro($name, $macro);`