@ -40,10 +40,11 @@ class ConfigServiceProvider extends ServiceProvider
continue;
}
$config->set(array_replace_recursive(
$configuration = array_replace_recursive(
$config->get(null),
require $file
));
);
$config->set($configuration);
if (empty($config->get(null))) {
@ -67,13 +67,11 @@ class ErrorHandler implements MiddlewareInterface
if ($request instanceof Request) {
$session = $request->getSession();
$session->set(
'errors',
array_merge_recursive(
$errors = array_merge_recursive(
$session->get('errors', []),
['validation' => $e->getValidator()->getErrors()]
)
$session->set('errors', $errors);
$session->set('form-data', Arr::except($request->request->all(), $this->formIgnore));