Merge remote-tracking branch 'upstream/master'

Author: jakubkratina

.styleci.yml

@@ -1,11 +1,8 @@
-preset: recommended
+preset: laravel
 
 linting: true
 
 enabled:
-  - logical_not_operators_with_successor_space
-
-disabled:
-  - align_double_arrow
-  - new_with_braces
-  - ordered_use
+  - phpdoc_order
+  - phpdoc_separation
+  - unalign_double_arrow

.travis.yml

@@ -13,6 +13,10 @@ env:
   global:
     - setup=basic
 
+cache:
+  directories:
+    - $HOME/.composer/cache
+
 matrix:
   include:
     - php: 5.5.9
@@ -21,9 +25,9 @@ matrix:
       env: setup=stable
 
 install:
-  - if [[ $setup = 'basic' ]]; then travis_retry composer install --no-interaction --prefer-dist; fi
-  - if [[ $setup = 'stable' ]]; then travis_retry composer update --prefer-dist --no-interaction --prefer-stable; fi
-  - if [[ $setup = 'lowest' ]]; then travis_retry composer update --prefer-dist --no-interaction --prefer-lowest --prefer-stable; fi
+  - if [[ $setup = 'basic' ]]; then travis_retry composer install --prefer-dist --no-interaction --no-suggest; fi
+  - if [[ $setup = 'stable' ]]; then travis_retry composer update --prefer-dist --no-interaction --no-suggest --prefer-stable; fi
+  - if [[ $setup = 'lowest' ]]; then travis_retry composer update --prefer-dist --no-interaction --no-suggest --prefer-stable --prefer-lowest; fi
 
 script:
   - vendor/bin/phpunit

composer.json

@@ -16,22 +16,21 @@
     ],
     "require": {
         "php": "^5.5.9 || ^7.0",
-        "dingo/blueprint": "0.1.*",
+        "dingo/blueprint": "0.2.*",
         "doctrine/annotations": "1.2.*",
-        "illuminate/routing": "5.1.* || 5.2.*",
-        "illuminate/support": "5.1.* || 5.2.*",
-        "league/fractal": ">=0.12.0",
-        "phpdocumentor/reflection-docblock": "2.0.*"
+        "illuminate/routing": "5.1.* || 5.2.* || 5.3.*",
+        "illuminate/support": "5.1.* || 5.2.* || 5.3.*",
+        "league/fractal": ">=0.12.0"
     },
     "require-dev": {
-        "illuminate/auth": "5.1.* || 5.2.*",
-        "illuminate/cache": "5.1.* || 5.2.*",
-        "illuminate/console": "5.1.* || 5.2.*",
-        "illuminate/database": "5.1.* || 5.2.*",
-        "illuminate/events": "5.1.* || 5.2.*",
-        "illuminate/filesystem": "5.1.* || 5.2.*",
-        "illuminate/log": "5.1.* || 5.2.*",
-        "illuminate/pagination": "5.1.* || 5.2.*",
+        "illuminate/auth": "5.1.* || 5.2.* || 5.3.*",
+        "illuminate/cache": "5.1.* || 5.2.* || 5.3.*",
+        "illuminate/console": "5.1.* || 5.2.* || 5.3.*",
+        "illuminate/database": "5.1.* || 5.2.* || 5.3.*",
+        "illuminate/events": "5.1.* || 5.2.* || 5.3.*",
+        "illuminate/filesystem": "5.1.* || 5.2.* || 5.3.*",
+        "illuminate/log": "5.1.* || 5.2.* || 5.3.*",
+        "illuminate/pagination": "5.1.* || 5.2.* || 5.3.*",
         "laravel/lumen-framework": "5.1.* || 5.2.*",
         "lucadegasperi/oauth2-server-laravel": "5.0.*",
         "mockery/mockery": "~0.9",
@@ -41,7 +40,7 @@
     },
     "suggest": {
         "lucadegasperi/oauth2-server-laravel": "Protect your API with OAuth 2.0.",
-        "tymon/jwt-auth": "Protect your API with JSON Web Tokens"
+        "tymon/jwt-auth": "Protect your API with JSON Web Tokens."
     },
     "autoload": {
         "psr-4": {

config/api.php

@@ -1,5 +1,6 @@
 <?php
 
+
 return [
 
     /*

src/Console/Command/Cache.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Console\Command;
 use Illuminate\Filesystem\Filesystem;
+use Illuminate\Contracts\Console\Kernel;
 
 class Cache extends Command
 {
@@ -85,7 +86,7 @@ protected function getFreshApplication()
     {
         $app = require $this->laravel->basePath().'/bootstrap/app.php';
 
-        $app->make('Illuminate\Contracts\Console\Kernel')->bootstrap();
+        $app->make(Kernel::class)->bootstrap();
 
         return $app;
     }

src/Console/Command/Docs.php

@@ -19,6 +19,13 @@ class Docs extends Command
      */
     protected $router;
 
+    /**
+     * The blueprint instance.
+     *
+     * @var \Dingo\Blueprint\Blueprint
+     */
+    protected $blueprint;
+
     /**
      * Blueprint instance.
      *

src/Console/Command/Routes.php

@@ -86,15 +86,15 @@ protected function getRoutes()
         foreach ($this->router->getRoutes() as $collection) {
             foreach ($collection->getRoutes() as $route) {
                 $routes[] = $this->filterRoute([
-                    'host'      => $route->domain(),
-                    'method'    => implode('|', $route->methods()),
-                    'uri'       => $route->uri(),
-                    'name'      => $route->getName(),
-                    'action'    => $route->getActionName(),
+                    'host' => $route->domain(),
+                    'method' => implode('|', $route->methods()),
+                    'uri' => $route->uri(),
+                    'name' => $route->getName(),
+                    'action' => $route->getActionName(),
                     'protected' => $route->isProtected() ? 'Yes' : 'No',
-                    'versions'  => implode(', ', $route->versions()),
-                    'scopes'    => implode(', ', $route->scopes()),
-                    'rate'      => $this->routeRateLimit($route),
+                    'versions' => implode(', ', $route->versions()),
+                    'scopes' => implode(', ', $route->scopes()),
+                    'rate' => $this->routeRateLimit($route),
                 ]);
             }
         }

src/Dispatcher.php

@@ -247,7 +247,7 @@ public function json($content)
 
         $this->content = $content;
 
-        return $this->header('content-type', 'application/json');
+        return $this->header('Content-Type', 'application/json');
     }
 
     /**
@@ -539,7 +539,7 @@ protected function dispatch(InternalRequest $request)
 
             $response = $this->router->dispatch($request);
 
-            if (! $response->isSuccessful()) {
+            if (! $response->isSuccessful() && ! $response->isRedirection()) {
                 throw new InternalHttpException($response);
             } elseif (! $this->raw) {
                 $response = $response->getOriginalContent();

src/Event/RequestWasMatched.php

@@ -24,8 +24,8 @@ class RequestWasMatched
     /**
      * Create a new request was matched event.
      *
-     * @param \Dingo\Api\Http\Request                   $response
-     * @param \Illuminate\Contracts\Container\Container $content
+     * @param \Dingo\Api\Http\Request                   $request
+     * @param \Illuminate\Contracts\Container\Container $app
      *
      * @return void
      */

src/Exception/Handler.php

@@ -7,6 +7,7 @@
 use Illuminate\Http\Response;
 use Dingo\Api\Contract\Debug\ExceptionHandler;
 use Dingo\Api\Contract\Debug\MessageBagErrors;
+use Symfony\Component\HttpFoundation\Response as BaseResponse;
 use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
 use Illuminate\Contracts\Debug\ExceptionHandler as IlluminateExceptionHandler;
 
@@ -132,7 +133,7 @@ public function handle(Exception $exception)
             }
 
             if ($response = $handler($exception)) {
-                if (! $response instanceof Response) {
+                if (! $response instanceof BaseResponse) {
                     $response = new Response($response, $this->getExceptionStatusCode($exception));
                 }