Merge pull request #10 from naillizard/laravel-6-support

Laravel 6 support

.gitignore

@@ -2,4 +2,5 @@
 /build/
 /vendor/
 composer.lock
-.php_cs.cache
+.php_cs.cache
+.phpunit.result.cache

.travis.yml

@@ -3,9 +3,8 @@ dist: trusty
 language: php
 
 php:
-  - 5.6
-  - 7.0
-  - 7.1
+  - 7.2
+  - 7.3
 
 sudo: false
 
@@ -21,7 +20,3 @@ before_script:
 
 script:
   - vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover
-
-after_script:
-  - if [ "$TRAVIS_PHP_VERSION" == "5.6" ]; then wget https://scrutinizer-ci.com/ocular.phar; fi
-  - if [ "$TRAVIS_PHP_VERSION" == "5.6" ]; then php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml; fi

composer.json

@@ -11,13 +11,13 @@
         }
     ],
     "require": {
-        "php": ">=5.6.0",
-        "illuminate/support": "^5.3"
+        "php": "^7.2",
+        "illuminate/support": "^6.0"
     },
     "require-dev": {
-        "orchestra/testbench": "~3.4",
-        "phpunit/phpunit": "~5.7",
-        "mockery/mockery": "0.9.*"
+        "orchestra/testbench": "^4.0",
+        "phpunit/phpunit": "^8.0",
+        "mockery/mockery": "^1.0"
     },
     "autoload": {
         "psr-4": {

phpunit.xml

@@ -8,7 +8,6 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
 >
     <testsuites>
         <testsuite name="Package Test Suite">

src/ApiException.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Contracts\Support\Jsonable;
+use Illuminate\Support\Str;
 use Lanin\Laravel\ApiExceptions\Contracts\ShowsPrevious;
 use Lanin\Laravel\ApiExceptions\Contracts\ShowsTrace;
 use Symfony\Component\Debug\Exception\FlattenException;
@@ -71,7 +72,7 @@ public function toArray()
         }
 
         $return = [];
-        $return['id'] = $e instanceof IdException ? $e->getId() : snake_case(class_basename($e));
+        $return['id'] = $e instanceof IdException ? $e->getId() : Str::snake(class_basename($e));
         $return['message'] = $e->getMessage();
 
         if ($e instanceof ApiException) {

src/Support/Request.php

@@ -38,6 +38,6 @@ public function authorize()
      */
     protected function failedValidation(Validator $validator)
     {
-        throw new ValidationFailedApiException($this->formatErrors($validator));
+        throw new ValidationFailedApiException($validator->getMessageBag()->toArray());
     }
 }

src/Support/Validator.php

@@ -2,6 +2,8 @@
 
 namespace Lanin\Laravel\ApiExceptions\Support;
 
+use Illuminate\Support\Str;
+
 class Validator extends \Illuminate\Validation\Validator
 {
     /**
@@ -18,7 +20,7 @@ protected function addError($attribute, $rule, $parameters)
         $message = $this->doReplacements($message, $attribute, $rule, $parameters);
 
         $return  = [
-            'rule' => snake_case($rule),
+            'rule' => Str::snake($rule),
             'message' => $message,
         ];
 

tests/ApiExceptionsServiceProviderTest.php

@@ -9,13 +9,13 @@ class ApiExceptionsServiceProviderTest extends TestCase
     /** @var ApiExceptionsServiceProvider */
     private $provider;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->provider = $this->app->getProvider(ApiExceptionsServiceProvider::class);
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         parent::tearDown();
         unset($this->provider);

tests/TestCase.php

@@ -2,26 +2,28 @@
 
 namespace Lanin\Laravel\ApiExceptions\Tests;
 
-use Illuminate\Support\Str;
+use Illuminate\Foundation\Application;
 use Lanin\Laravel\ApiExceptions\ApiExceptionsServiceProvider;
 use Orchestra\Testbench\TestCase as BaseTestCase;
-use PHPUnit_Framework_ExpectationFailedException as PHPUnitException;
 use ReflectionClass;
+use ReflectionException;
+use ReflectionMethod;
+use ReflectionProperty;
 
 abstract class TestCase extends BaseTestCase
 {
     /**
      * Setup the test environment.
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
     }
 
     /**
      * Get package providers.
      *
-     * @param  \Illuminate\Foundation\Application $app
+     * @param  Application $app
      *
      * @return array
      */
@@ -35,7 +37,7 @@ protected function getPackageProviders($app)
     /**
      * Define environment setup.
      *
-     * @param  \Illuminate\Foundation\Application $app
+     * @param  Application $app
      * @return void
      */
     protected function getEnvironmentSetUp($app)
@@ -49,9 +51,10 @@ protected function getEnvironmentSetUp($app)
     /**
      * Make protected/private class property accessible.
      *
-     * @param  string|object $class
-     * @param  string $name
-     * @return \ReflectionProperty
+     * @param string|object $class
+     * @param string $name
+     * @return ReflectionProperty
+     * @throws ReflectionException
      */
     protected function getPublicProperty($class, $name)
     {
@@ -69,9 +72,10 @@ protected function getPublicProperty($class, $name)
     /**
      * Make protected/private class method accessible.
      *
-     * @param  string $name
-     * @param  string|object $class
-     * @return \ReflectionMethod
+     * @param string $name
+     * @param string|object $class
+     * @return ReflectionMethod
+     * @throws ReflectionException
      */
     protected function getPublicMethod($name, $class)
     {