From 89742ecd5542c740f3625af76c843a7471dbe98a Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Wed, 27 Nov 2019 19:11:37 +0100
Subject: Response: Added with and withInput methods and back/redirect
 functions

---
 src/Middleware/ErrorHandler.php | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

(limited to 'src/Middleware')

diff --git a/src/Middleware/ErrorHandler.php b/src/Middleware/ErrorHandler.php
index 46e6e5a8..85f315d4 100644
--- a/src/Middleware/ErrorHandler.php
+++ b/src/Middleware/ErrorHandler.php
@@ -63,17 +63,11 @@ class ErrorHandler implements MiddlewareInterface
         } catch (HttpException $e) {
             $response = $this->createResponse($e->getMessage(), $e->getStatusCode(), $e->getHeaders());
         } catch (ValidationException $e) {
-            $response = $this->createResponse('', 302, ['Location' => $this->getPreviousUrl($request)]);
+            $response = $this->redirectBack();
+            $response->with('errors', ['validation' => $e->getValidator()->getErrors()]);
 
             if ($request instanceof Request) {
-                $session = $request->getSession();
-                $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));
+                $response->withInput(Arr::except($request->request->all(), $this->formIgnore));
             }
         }
 
@@ -140,15 +134,12 @@ class ErrorHandler implements MiddlewareInterface
     }
 
     /**
-     * @param ServerRequestInterface $request
-     * @return string
+     * Create a redirect back response
+     *
+     * @return Response
      */
-    protected function getPreviousUrl(ServerRequestInterface $request)
+    protected function redirectBack()
     {
-        if ($header = $request->getHeader('referer')) {
-            return array_pop($header);
-        }
-
-        return '/';
+        return back();
     }
 }
-- 
cgit v1.2.3-54-g00ecf