Merge branch '3.2'

README.md

@@ -219,3 +219,12 @@ This error would only occur if your test suite require actual usage of the encry
 
 </phpunit>
 ```
+### Session not set on request 
+
+The error might pop-up when testing routes with `Request::old()` or `old()` helper inside the requested view. This is due to Testbench not loading the default global middleware made available with Laravel. 
+
+To avoid breaking Backward Compatibility (BC) under 3.1 please add the following code under your `setUp` or `getEnvironmentSetUp` method.
+
+```php
+$app->make('Illuminate\Contracts\Http\Kernel')->pushMiddleware('Illuminate\Session\Middleware\StartSession');
+```

fixture/config/app.php

@@ -2,6 +2,20 @@
 
 return [
 
+
+    /*
+    |--------------------------------------------------------------------------
+    | Application Environment
+    |--------------------------------------------------------------------------
+    |
+    | This value determines the "environment" your application is currently
+    | running in. This may determine how you prefer to configure various
+    | services your application utilizes. Set this in your ".env" file.
+    |
+    */
+
+    'env' => env('APP_ENV', 'testing'),
+
     /*
     |--------------------------------------------------------------------------
     | Application Debug Mode
@@ -78,7 +92,7 @@
     |
     */
 
-    'key' => env('APP_KEY', 'SomeRandomString'),
+    'key' => env('APP_KEY'),
 
     'cipher' => 'AES-256-CBC',
 
@@ -116,7 +130,6 @@
         Illuminate\Bus\BusServiceProvider::class,
         Illuminate\Cache\CacheServiceProvider::class,
         Illuminate\Foundation\Providers\ConsoleSupportServiceProvider::class,
-        Illuminate\Routing\ControllerServiceProvider::class,
         Illuminate\Cookie\CookieServiceProvider::class,
         Illuminate\Database\DatabaseServiceProvider::class,
         Illuminate\Encryption\EncryptionServiceProvider::class,

src/Http/Kernel.php

@@ -11,6 +11,27 @@ class Kernel extends \Illuminate\Foundation\Http\Kernel
      */
     protected $bootstrappers = [];
 
+    /**
+     * The application's middleware stack.
+     *
+     * @var array
+     */
+    protected $middleware = [];
+
+    /**
+     * The application's route middleware groups.
+     *
+     * @var array
+     */
+    protected $middlewareGroups = [
+        'web' => [
+            \Illuminate\Session\Middleware\StartSession::class,
+            \Illuminate\View\Middleware\ShareErrorsFromSession::class,
+        ],
+
+        'api' => [],
+    ];
+
     /**
      * Report the exception to the exception handler.
      *

src/TestCase.php

@@ -35,13 +35,27 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase implements TestCaseI
      */
     protected $baseUrl = 'http://localhost';
 
+    /**
+     * The callbacks that should be run after the application is created.
+     *
+     * @var array
+     */
+    protected $afterApplicationCreatedCallbacks = [];
+
     /**
      * The callbacks that should be run before the application is destroyed.
      *
      * @var array
      */
     protected $beforeApplicationDestroyedCallbacks = [];
 
+    /**
+     * Indicates if we have made it throught the base setUp function.
+     *
+     * @var bool
+     */
+    protected $setUpHasRun = false;
+
     /**
      * Setup the test environment.
      *
@@ -52,6 +66,12 @@ public function setUp()
         if (! $this->app) {
             $this->refreshApplication();
         }
+
+        foreach ($this->afterApplicationCreatedCallbacks as $callback) {
+            call_user_func($callback);
+        }
+
+        $this->setUpHasRun = true;
     }
 
     /**
@@ -85,9 +105,30 @@ public function tearDown()
             $this->app = null;
         }
 
+        $this->setUpHasRun = false;
+
         if (property_exists($this, 'serverVariables')) {
             $this->serverVariables = [];
         }
+
+        $this->afterApplicationCreatedCallbacks    = [];
+        $this->beforeApplicationDestroyedCallbacks = [];
+    }
+
+    /**
+     * Register a callback to be run after the application is created.
+     *
+     * @param  callable  $callback
+     *
+     * @return void
+     */
+    protected function afterApplicationCreated(callable $callback)
+    {
+        $this->afterApplicationCreatedCallbacks[] = $callback;
+
+        if ($this->setUpHasRun) {
+            call_user_func($callback);
+        }
     }
 
     /**