Merge branch '3.3'

Signed-off-by: crynobone <crynobone@gmail.com>

README.md

@@ -1,4 +1,4 @@
-Laravel Package Unit Testing Helper
+Laravel Testing Helper for Packages Development
 ==============
 
 [![Join the chat at https://gitter.im/orchestral/testbench](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/orchestral/testbench?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
@@ -29,7 +29,7 @@ Testbench Component is a simple package that is supposed to help you write tests
  5.0.x    | 3.0.x
  5.1.x    | 3.1.x
  5.2.x    | 3.2.x
- 5.3.x    | 3.3.x@dev
+ 5.3.x    | 3.3.x
  5.4.x    | 3.4.x@dev
 
 ## Installation

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "orchestra/testbench",
-    "description": "Laravel Package Unit Testing Helper",
+    "description": "Laravel Testing Helper for Packages Development",
     "homepage": "http://orchestraplatform.com/docs/latest/components/testbench/",
     "keywords": ["laravel", "orchestral", "orchestra-platform", "testing", "tdd", "bdd"],
     "license": "MIT",

docs/changes.md

@@ -5,6 +5,14 @@ title: Testbench Change Log
 
 ## Version 3.3 {#v3-3}
 
+### v3.3.3 {#v3-3-3}
+
+* Update application fixture.
+
+### v3.3.2 {#v3-3-2}
+
+* Add `Illuminate\Cookie\Middleware\EncryptCookies` to `web` middleware group by default. ([@jeroennoten](https://github.com/jeroennoten))
+
 ### v3.3.1 {#v3-3-1}
 
 * Bump to Laravel Framework v5.3.3+.

fixture/config/session.php

@@ -161,7 +161,7 @@
     |
     */
 
-    'secure' => false,
+    'secure' => env('SESSION_SECURE_COOKIE', false),
 
     /*
     |--------------------------------------------------------------------------

fixture/resources/lang/en/validation.php

@@ -53,6 +53,7 @@
         'array'   => 'The :attribute may not have more than :max items.',
     ],
     'mimes'                => 'The :attribute must be a file of type: :values.',
+    'mimetypes'            => 'The :attribute must be a file of type: :values.',
     'min'                  => [
         'numeric' => 'The :attribute must be at least :min.',
         'file'    => 'The :attribute must be at least :min kilobytes.',
@@ -80,6 +81,7 @@
     'string'               => 'The :attribute must be a string.',
     'timezone'             => 'The :attribute must be a valid zone.',
     'unique'               => 'The :attribute has already been taken.',
+    'uploaded'             => 'The :attribute failed to upload.',
     'url'                  => 'The :attribute format is invalid.',
 
     /*

src/Http/Kernel.php

@@ -27,6 +27,7 @@ class Kernel extends \Illuminate\Foundation\Http\Kernel
      */
     protected $middlewareGroups = [
         'web' => [
+            \Illuminate\Cookie\Middleware\EncryptCookies::class,
             \Illuminate\Session\Middleware\StartSession::class,
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
             Middleware\VerifyCsrfToken::class,

tests/ConfigTest.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace Orchestra\Testbench\TestCase;
+
+class ConfigTest extends \Orchestra\Testbench\TestCase
+{
+    /**
+     * Setup the test environment.
+     */
+    public function setUp()
+    {
+        parent::setUp();
+    }
+
+    /**
+     * Define environment setup.
+     *
+     * @param  \Illuminate\Foundation\Application  $app
+     *
+     * @return void
+     */
+    protected function getEnvironmentSetUp($app)
+    {
+        $app['config']->set('database.default', 'testing');
+    }
+
+    /**
+     * Test \Illuminate\Support\Facades\Config facade is usable.
+     *
+     * @test
+     */
+    public function testConfigFacadeIsLoaded()
+    {
+        $this->assertEquals('testing', \Config::get('database.default'));
+    }
+
+    /**
+     * Test config() helper is usable.
+     *
+     * @test
+     */
+    public function testConfigHelperIsLoaded()
+    {
+        $this->assertEquals('testing', config('database.default'));
+    }
+}

tests/DatabaseFixtureTest.php

@@ -1,4 +1,6 @@
-<?php namespace Orchestra\Testbench\TestCase;
+<?php
+
+namespace Orchestra\Testbench\TestCase;
 
 class DatabaseFixtureTest extends \Orchestra\Testbench\TestCase
 {

tests/DefaultConfigurationTest.php

@@ -1,4 +1,6 @@
-<?php namespace Orchestra\Testbench\TestCase;
+<?php
+
+namespace Orchestra\Testbench\TestCase;
 
 class DefaultConfigurationTest extends \Orchestra\Testbench\TestCase
 {

tests/Integrations/AggregateServiceProviderTest.php

@@ -1,4 +1,6 @@
-<?php namespace Orchestra\Testbench\Integrations\TestCase;
+<?php
+
+namespace Orchestra\Testbench\Integrations\TestCase;
 
 use Orchestra\Testbench\TestCase;
 use Illuminate\Support\ServiceProvider;

tests/RouteTest.php

@@ -1,4 +1,6 @@
-<?php namespace Orchestra\Testbench\TestCase;
+<?php
+
+namespace Orchestra\Testbench\TestCase;
 
 use Illuminate\Routing\Router;
 

tests/TestCaseTest.php

@@ -1,4 +1,6 @@
-<?php namespace Orchestra\Testbench\TestCase;
+<?php
+
+namespace Orchestra\Testbench\TestCase;
 
 class TestCaseTest extends \PHPUnit_Framework_TestCase
 {