Merge branch '3.3'

.php_cs

@@ -33,16 +33,20 @@ return Symfony\CS\Config\Config::create()
         'phpdoc_no_access',
         '-phpdoc_no_empty_return',
         'phpdoc_no_package',
+        'phpdoc_order',
         '-phpdoc_params',
         'phpdoc_scalar',
         'phpdoc_separation',
         'phpdoc_short_description',
         'phpdoc_to_comment',
         'phpdoc_trim',
         'phpdoc_type_to_var',
+        'phpdoc_types',
         'phpdoc_var_without_name',
+        'print_to_echo',
         'remove_leading_slash_use',
         'remove_lines_between_uses',
+        'self_accessor',
         'short_array_syntax',
         'single_array_no_trailing_comma',
         'single_blank_line_before_namespace',

fixture/config/app.php

@@ -111,6 +111,8 @@
 
     'log' => 'daily',
 
+    'log_level' => env('APP_LOG_LEVEL', 'debug'),
+
     /*
     |--------------------------------------------------------------------------
     | Autoloaded Service Providers

fixture/config/broadcasting.php

@@ -11,6 +11,8 @@
     | framework when an event needs to be broadcast. You may set this to
     | any of the connections defined in the "connections" array below.
     |
+    | Supported: "pusher", "redis", "log"
+    |
     */
 
     'default' => env('BROADCAST_DRIVER', 'pusher'),

fixture/config/cache.php

@@ -11,6 +11,8 @@
     | using this caching library. This connection is used when another is
     | not explicitly specified when executing a given caching function.
     |
+    | Supported: "apc", "array", "database", "file", "memcached", "redis"
+    |
     */
 
     'default' => env('CACHE_DRIVER', 'array'),

fixture/config/database.php

@@ -13,7 +13,7 @@
     |
     */
 
-    'fetch' => PDO::FETCH_CLASS,
+    'fetch' => PDO::FETCH_OBJ,
 
     /*
     |--------------------------------------------------------------------------

fixture/config/mail.php

@@ -11,7 +11,8 @@
     | sending of e-mail. You may specify which one you're using throughout
     | your application here. By default, Laravel is setup for SMTP mail.
     |
-    | Supported: "smtp", "mail", "sendmail", "mailgun", "mandrill", "ses", "log"
+    | Supported: "smtp", "mail", "sendmail", "mailgun", "mandrill", "ses",
+    |            "log", "sparkpost"
     |
     */
 

fixture/config/queue.php

@@ -38,14 +38,14 @@
             'driver' => 'database',
             'table' => 'jobs',
             'queue' => 'default',
-            'expire' => 60,
+            'expire' => 90,
         ],
 
         'beanstalkd' => [
             'driver' => 'beanstalkd',
             'host'   => 'localhost',
             'queue'  => 'default',
-            'ttr'    => 60,
+            'ttr'    => 90,
         ],
 
         'sqs' => [
@@ -61,7 +61,7 @@
             'driver' => 'redis',
             'connection' => 'default',
             'queue'  => 'default',
-            'expire' => 60,
+            'expire' => 90,
         ],
 
     ],

fixture/config/session.php

@@ -148,7 +148,7 @@
     |
     */
 
-    'domain' => null,
+    'domain' => env('SESSION_DOMAIN', null),
 
     /*
     |--------------------------------------------------------------------------

fixture/resources/lang/en/validation.php

@@ -38,6 +38,7 @@
     'distinct'             => 'The :attribute field has a duplicate value.',
     'email'                => 'The :attribute must be a valid email address.',
     'exists'               => 'The selected :attribute is invalid.',
+    'file'                 => 'The :attribute must be a file.',
     'filled'               => 'The :attribute field is required.',
     'image'                => 'The :attribute must be an image.',
     'in'                   => 'The selected :attribute is invalid.',

src/Console/Kernel.php

@@ -25,9 +25,9 @@ class Kernel extends \Illuminate\Foundation\Console\Kernel
      *
      * @param  \Exception  $e
      *
-     * @return void
-     *
      * @throws \Exception
+     *
+     * @return void
      */
     protected function reportException(Exception $e)
     {

src/Exceptions/ApplicationHandler.php

@@ -2,54 +2,10 @@
 
 namespace Orchestra\Testbench\Exceptions;
 
-use Exception;
-use Illuminate\Validation\ValidationException;
-use Illuminate\Foundation\Testing\HttpException;
-use Illuminate\Auth\Access\AuthorizationException;
-use Illuminate\Database\Eloquent\ModelNotFoundException;
-use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
-
 /**
  * @deprecated v3.3.0
  */
-class ApplicationHandler extends ExceptionHandler
+class ApplicationHandler extends Handler
 {
-    /**
-     * A list of the exception types that should not be reported.
-     *
-     * @var array
-     */
-    protected $dontReport = [
-        AuthorizationException::class,
-        HttpException::class,
-        ModelNotFoundException::class,
-        ValidationException::class,
-    ];
-
-    /**
-     * Report or log an exception.
-     *
-     * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
-     *
-     * @param  \Exception  $e
-     *
-     * @return void
-     */
-    public function report(Exception $e)
-    {
-        parent::report($e);
-    }
-
-    /**
-     * Render an exception into an HTTP response.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Exception  $e
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function render($request, Exception $e)
-    {
-        return parent::render($request, $e);
-    }
+    //
 }

src/Http/Kernel.php

@@ -46,7 +46,7 @@ class Kernel extends \Illuminate\Foundation\Http\Kernel
      * @var array
      */
     protected $routeMiddleware = [
-        'auth'       => Middleware\Authenticate::class,
+        'auth'       => \Illuminate\Auth\Middleware\Authenticate::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
         'bindings'   => \Illuminate\Routing\Middleware\SubstituteBindings::class,
         'can'        => \Illuminate\Foundation\Http\Middleware\Authorize::class,