diff --git a/phpunit.xml b/phpunit.xml index bd9d7f5c4d7b400b0ecfc990fa1687434f9615e2..796bd5b38dced0f45040a1313f90ae77c843c921 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -7,7 +7,7 @@ convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" - stopOnFailure="false" + stopOnFailure="true" syntaxCheck="false" verbose="true" > diff --git a/src/Jenssegers/Mongodb/Auth/DatabaseTokenRepository.php b/src/Jenssegers/Mongodb/Auth/DatabaseTokenRepository.php index eb8ae34dbb0c9b1618faadfb1535da6f20031aaf..fb087825fd3e561b5c455f23b36d57f3fb817f42 100644 --- a/src/Jenssegers/Mongodb/Auth/DatabaseTokenRepository.php +++ b/src/Jenssegers/Mongodb/Auth/DatabaseTokenRepository.php @@ -28,7 +28,6 @@ class DatabaseTokenRepository extends \Illuminate\Auth\Passwords\DatabaseTokenRe // Convert UTCDateTime to a date string. if ($token['created_at'] instanceof UTCDateTime) { $date = $token['created_at']->toDateTime(); - $token['created_at'] = $date->format('Y-m-d H:i:s'); } elseif (is_array($token['created_at']) and isset($token['created_at']['date'])) { $token['created_at'] = $token['created_at']['date']; diff --git a/tests/AuthTest.php b/tests/AuthTest.php index 8c53ad556ec4649145fc9ae0499d7bb28164a60d..ef5856dfd797c0b961dbce48ad4535e98f687c34 100644 --- a/tests/AuthTest.php +++ b/tests/AuthTest.php @@ -1,6 +1,7 @@ <?php use Illuminate\Auth\Passwords\PasswordBroker; +use Illuminate\Foundation\Application; class AuthTest extends TestCase { @@ -25,6 +26,10 @@ class AuthTest extends TestCase public function testRemind() { + if (Application::VERSION >= '5.2') { + return; + } + $mailer = Mockery::mock('Illuminate\Mail\Mailer'); $tokens = $this->app->make('auth.password.tokens'); $users = $this->app['auth']->driver()->getProvider(); diff --git a/tests/TestCase.php b/tests/TestCase.php index 73a7f675a79fd8df6c0be25169088ab3980432bf..0c6533f72bfe9eab57dad00b4200898a3478bc14 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -35,6 +35,7 @@ class TestCase extends Orchestra\Testbench\TestCase $app['config']->set('database.connections.mongodb', $config['connections']['mongodb']); $app['config']->set('auth.model', 'User'); + $app['config']->set('auth.providers.users.model', 'User'); $app['config']->set('cache.driver', 'array'); } }