iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

PHP 7.4: Fixed xdebug code coverage

This commit is contained in:
Igor Scheller 2019-11-29 16:07:51 +01:00
parent d203071de0
commit a1e1d91a64
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Config/ConfigServiceProvider.php
View File

@ -40,10 +40,11 @@ class ConfigServiceProvider extends ServiceProvider
continue; continue;
} }
$config->set(array_replace_recursive( $configuration = array_replace_recursive(
$config->get(null), $config->get(null),
require $file require $file
)); );
$config->set($configuration);
} }
if (empty($config->get(null))) { if (empty($config->get(null))) {

10
src/Middleware/ErrorHandler.php
View File

@ -67,13 +67,11 @@ class ErrorHandler implements MiddlewareInterface
if ($request instanceof Request) { if ($request instanceof Request) {
$session = $request->getSession(); $session = $request->getSession();
$session->set( $errors = array_merge_recursive(
'errors', $session->get('errors', []),
array_merge_recursive( ['validation' => $e->getValidator()->getErrors()]
$session->get('errors', []),
['validation' => $e->getValidator()->getErrors()]
)
); );
$session->set('errors', $errors);
$session->set('form-data', Arr::except($request->request->all(), $this->formIgnore)); $session->set('form-data', Arr::except($request->request->all(), $this->formIgnore));
} }