summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Scheller <igor.scheller@igorshp.de>2019-10-08 14:18:51 +0200
committerIgor Scheller <igor.scheller@igorshp.de>2019-10-08 14:30:18 +0200
commit810068dcf811b17805ee9958b877a827bf8125ed (patch)
tree9b64b9db3b0ced08580445f7fbccedbf155ac674
parentae0816ce8de46c38cd6f4b6d95abb17a6703d280 (diff)
Fixes: AuthController session error merging and StatsTest
-rw-r--r--src/Controllers/AuthController.php2
-rw-r--r--tests/Unit/Controllers/AuthControllerTest.php4
-rw-r--r--tests/Unit/Controllers/Metrics/StatsTest.php4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/Controllers/AuthController.php b/src/Controllers/AuthController.php
index c69c2377..7892064b 100644
--- a/src/Controllers/AuthController.php
+++ b/src/Controllers/AuthController.php
@@ -88,7 +88,7 @@ class AuthController extends BaseController
$user = $this->auth->authenticate($data['login'], $data['password']);
if (!$user instanceof User) {
- $this->session->set('errors', $this->session->get('errors', []) + ['auth.not-found']);
+ $this->session->set('errors', array_merge($this->session->get('errors', []), ['auth.not-found']));
return $this->showLogin();
}
diff --git a/tests/Unit/Controllers/AuthControllerTest.php b/tests/Unit/Controllers/AuthControllerTest.php
index 50ce014d..a12ed6d6 100644
--- a/tests/Unit/Controllers/AuthControllerTest.php
+++ b/tests/Unit/Controllers/AuthControllerTest.php
@@ -13,7 +13,6 @@ use Engelsystem\Models\User\Settings;
use Engelsystem\Models\User\User;
use Engelsystem\Test\Unit\HasDatabase;
use Engelsystem\Test\Unit\TestCase;
-use Illuminate\Support\Collection;
use PHPUnit\Framework\MockObject\MockObject;
use Symfony\Component\HttpFoundation\Session\Session;
use Symfony\Component\HttpFoundation\Session\SessionInterface;
@@ -66,6 +65,7 @@ class AuthControllerTest extends TestCase
$session = new Session(new MockArraySessionStorage());
/** @var Validator|MockObject $validator */
$validator = new Validator();
+ $session->set('errors', [['bar' => 'some.bar.error']]);
$user = new User([
'name' => 'foo',
@@ -89,7 +89,7 @@ class AuthControllerTest extends TestCase
$response->expects($this->once())
->method('withView')
- ->with('pages/login', ['errors' => Collection::make(['auth.not-found'])])
+ ->with('pages/login', ['errors' => collect(['some.bar.error', 'auth.not-found'])])
->willReturn($response);
$response->expects($this->once())
->method('redirectTo')
diff --git a/tests/Unit/Controllers/Metrics/StatsTest.php b/tests/Unit/Controllers/Metrics/StatsTest.php
index fa78d8c3..9204f7db 100644
--- a/tests/Unit/Controllers/Metrics/StatsTest.php
+++ b/tests/Unit/Controllers/Metrics/StatsTest.php
@@ -155,8 +155,8 @@ class StatsTest extends TestCase
$this->initDatabase();
$this->addUsers();
- (new PasswordReset(['use_id' => 1, 'token' => 'loremIpsum123']))->save();
- (new PasswordReset(['use_id' => 3, 'token' => '5omeR4nd0mTok3N']))->save();
+ (new PasswordReset(['user_id' => 1, 'token' => 'loremIpsum123']))->save();
+ (new PasswordReset(['user_id' => 3, 'token' => '5omeR4nd0mTok3N']))->save();
$stats = new Stats($this->database);
$this->assertEquals(2, $stats->passwordResets());