fixed those exception handling tests

This commit is contained in:
Daniel Klabbers 2017-10-05 13:57:31 +02:00
parent 2037371886
commit 1c01145a14
4 changed files with 14 additions and 8 deletions

View File

@ -1,11 +1,14 @@
language: php
php:
- 5.6
- 7.0
- 7.1
- 7.2
- hhvm
services:
- mysql
matrix:
allow_failures:
- php: hhvm

View File

@ -12,7 +12,7 @@
namespace Flarum\Api\ExceptionHandler;
use Exception;
use Illuminate\Contracts\Validation\ValidationException;
use Illuminate\Validation\ValidationException;
use Tobscure\JsonApi\Exception\Handler\ExceptionHandlerInterface;
use Tobscure\JsonApi\Exception\Handler\ResponseBag;
@ -32,7 +32,8 @@ class IlluminateValidationExceptionHandler implements ExceptionHandlerInterface
public function handle(Exception $e)
{
$status = 422;
$errors = $this->formatErrors($e->errors()->toArray());
$errors = $this->formatErrors($e->errors());
return new ResponseBag($status, $errors);
}

View File

@ -13,9 +13,11 @@ namespace Tests\Flarum\Api\Handler;
use Exception;
use Flarum\Api\ExceptionHandler\IlluminateValidationExceptionHandler;
use Illuminate\Contracts\Validation\ValidationException;
use Illuminate\Translation\{
Translator, ArrayLoader
};
use Illuminate\Validation\ValidationException;
use Illuminate\Validation\Factory;
use Symfony\Component\Translation\Translator;
use Tests\Test\TestCase;
class IlluminateValidationExceptionHandlerTest extends TestCase
@ -54,7 +56,7 @@ class IlluminateValidationExceptionHandlerTest extends TestCase
private function makeValidator($data = [], $rules = [])
{
$translator = new Translator('en');
$translator = new Translator(new ArrayLoader(), 'en');
$factory = new Factory($translator);
return $factory->make($data, $rules);

View File

@ -12,9 +12,9 @@
namespace Tests\Test;
use Mockery;
use PHPUnit_Framework_TestCase;
use PHPUnit\Framework\TestCase as Test;
abstract class TestCase extends PHPUnit_Framework_TestCase
abstract class TestCase extends Test
{
public function setUp()
{