Merge pull request dingo#1625 from mallardduck/patch-1

Add new methods to satisfy Application contract for Laravel 5.8

Author: specialtactics

src/Exception/Handler.php

@@ -78,6 +78,18 @@ public function report(Exception $exception)
         $this->parentHandler->report($exception);
     }
 
+    /**
+     * Determine if the exception should be reported.
+     *
+     * @param  \Exception  $e
+     *
+     * @return bool
+     */
+    public function shouldReport(Exception $e)
+    {
+        return true;
+    }
+
     /**
      * Render an exception into an HTTP response.
      *

tests/ChecksLaravelVersionTrait.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace Dingo\Api\Tests;
+
+use Dingo\Api\Tests\Stubs\ApplicationStub;
+use Dingo\Api\Tests\Stubs\Application58Stub;
+
+trait ChecksLaravelVersionTrait
+{
+    public $installed_file_path = __DIR__.'/../vendor/composer/installed.json';
+    public $current_release = '5.8';
+
+    private function getFrameworkVersion()
+    {
+        $contents = file_get_contents($this->installed_file_path);
+        $parsed_data = json_decode($contents, true);
+        $just_laravel = array_filter($parsed_data, function ($val) {
+            if ('laravel/framework' === $val['name'] || 'laravel/lumen-framework' === $val['name']) {
+                return true;
+            }
+        });
+        $laravelVersion = array_map(function ($val) {
+            return $val['version'];
+        }, array_values($just_laravel))[0];
+
+        return $laravelVersion;
+    }
+
+    private function getApplicationStub()
+    {
+        $version = $this->getFrameworkVersion();
+        if ('dev-master' === $version) {
+            $version = $this->current_release;
+        }
+        $compared_versions = version_compare('5.8', $version);
+        // If comparison is Less Than, or Equal To, provide the 5.8 stub.
+        if ($compared_versions === -1 || $compared_versions === 0) {
+            return new Application58Stub;
+        }
+
+        return new ApplicationStub;
+    }
+}

tests/Http/Middleware/RequestTest.php

@@ -12,7 +12,7 @@
 use Dingo\Api\Http\Validation\Accept;
 use Dingo\Api\Http\Validation\Domain;
 use Dingo\Api\Http\Validation\Prefix;
-use Dingo\Api\Tests\Stubs\ApplicationStub;
+use Dingo\Api\Tests\ChecksLaravelVersionTrait;
 use Dingo\Api\Http\Parser\Accept as AcceptParser;
 use Illuminate\Http\Request as IlluminateRequest;
 use Illuminate\Events\Dispatcher as EventDispatcher;
@@ -28,9 +28,11 @@ class RequestTest extends TestCase
     protected $events;
     protected $middleware;
 
+    use ChecksLaravelVersionTrait;
+
     public function setUp()
     {
-        $this->app = new ApplicationStub;
+        $this->app = $this->getApplicationStub();
         $this->router = m::mock(Router::class);
         $this->validator = new RequestValidator($this->app);
         $this->handler = m::mock(Handler::class);

tests/Stubs/Application58Stub.php

@@ -0,0 +1,199 @@
+<?php
+
+namespace Dingo\Api\Tests\Stubs;
+
+use Illuminate\Container\Container;
+use Illuminate\Contracts\Foundation\Application;
+
+class Application58Stub extends Container implements Application
+{
+    public function version()
+    {
+        return 'v1';
+    }
+
+    public function basePath()
+    {
+        //
+    }
+
+    public function bootstrapPath($path = '')
+    {
+        //
+    }
+
+    public function configPath($path = '')
+    {
+        //
+    }
+
+    public function databasePath($path = '')
+    {
+        //
+    }
+
+    public function environmentPath()
+    {
+        //
+    }
+
+    public function resourcePath($path = '')
+    {
+        //
+    }
+
+    public function storagePath()
+    {
+        //
+    }
+
+    public function environment(...$environments)
+    {
+        return 'testing';
+    }
+
+    public function runningInConsole()
+    {
+        //
+    }
+
+    public function runningUnitTests()
+    {
+        // TODO: Implement runningUnitTests() method.
+    }
+
+    public function isDownForMaintenance()
+    {
+        return false;
+    }
+
+    public function registerConfiguredProviders()
+    {
+        //
+    }
+
+    public function register($provider, $options = [], $force = false)
+    {
+        //
+    }
+
+    public function registerDeferredProvider($provider, $service = null)
+    {
+        //
+    }
+
+    public function resolveProvider($provider)
+    {
+        //
+    }
+
+    public function boot()
+    {
+        //
+    }
+
+    public function booting($callback)
+    {
+        //
+    }
+
+    public function booted($callback)
+    {
+        //
+    }
+
+    public function bootstrapWith(array $bootstrappers)
+    {
+        //
+    }
+
+    public function configurationIsCached()
+    {
+        //
+    }
+
+    public function detectEnvironment(\Closure $callback)
+    {
+        //
+    }
+
+    public function environmentFile()
+    {
+        //
+    }
+
+    public function environmentFilePath()
+    {
+        //
+    }
+
+    public function getCachedConfigPath()
+    {
+        //
+    }
+
+    public function getCachedServicesPath()
+    {
+        //
+    }
+
+    public function getCachedPackagesPath()
+    {
+        //
+    }
+
+    public function getCachedRoutesPath()
+    {
+        //
+    }
+
+    public function getLocale()
+    {
+        //
+    }
+
+    public function getNamespace()
+    {
+        //
+    }
+
+    public function getProviders($provider)
+    {
+        //
+    }
+
+    public function hasBeenBootstrapped()
+    {
+        //
+    }
+
+    public function loadDeferredProviders()
+    {
+        //
+    }
+
+    public function loadEnvironmentFrom($file)
+    {
+        //
+    }
+
+    public function routesAreCached()
+    {
+        //
+    }
+
+    public function setLocale($locale)
+    {
+        //
+    }
+
+    public function shouldSkipMiddleware()
+    {
+        //
+    }
+
+    public function terminate()
+    {
+        //
+    }
+}