Merge branch '2.2'

README.md

@@ -104,6 +104,8 @@ To see a working example of testbench including how to set your configuration, c
 
 ### Cannot redeclare crypt_random_string()
 
+> To avoid this, please use `"phpseclib/phpseclib": ">=0.3.7"` which already solve the issue, otherwise read the alternative solution below.
+
 Due to the requirement with Laravel Framework 4.1, we need to maintain a modified version of `phpseclib/phpseclib` for developing Laravel/PHP packages using workbench. In order to make this work please include the following code in both your `composer.json` file for `app` and `workbench`:
 
 ```json

composer.json

@@ -16,12 +16,6 @@
 			"Orchestra\\Testbench\\" : "src/Testbench/"
 		}
 	},
-	"repositories": [
-		{
-			"type": "vcs",
-			"url": "git://github.com/orchestral/phpseclib.git"
-		}
-	],
 	"require": {
 		"php": ">=5.4.0",
 		"laravel/framework": "4.3.*"

src/Testbench/BehatFeatureContext.php

@@ -1,7 +1,6 @@
 <?php namespace Orchestra\Testbench;
 
 use Behat\Behat\Context\BehatContext;
-use Illuminate\Auth\UserInterface;
 use Orchestra\Testbench\Traits\ApplicationClientTrait;
 use Orchestra\Testbench\Traits\ApplicationTrait;
 use Orchestra\Testbench\Traits\BehatPHPUnitAssertionsTrait;
@@ -46,4 +45,3 @@ protected function getEnvironmentSetUp($app)
         // Define your environment setup.
     }
 }
-

src/Testbench/Traits/ApplicationTrait.php

@@ -1,5 +1,6 @@
 <?php namespace Orchestra\Testbench\Traits;
 
+use Illuminate\Config\EnvironmentVariables;
 use Illuminate\Config\Repository as Config;
 use Illuminate\Foundation\Application;
 use Illuminate\Foundation\AliasLoader;
@@ -151,8 +152,8 @@ public function createApplication()
         $app = new Application;
 
         $app->detectEnvironment(array(
-                'local' => array('your-machine-name'),
-            ));
+            'local' => array('your-machine-name'),
+        ));
 
         $app->bindInstallPaths($this->getApplicationPaths());
 
@@ -163,8 +164,11 @@ public function createApplication()
         Facade::clearResolvedInstances();
         Facade::setFacadeApplication($app);
 
-        $config = new Config($app->getConfigLoader(), $app['env']);
-        $app->instance('config', $config);
+        $app->registerCoreContainerAliases();
+
+        with($envVariables = new EnvironmentVariables($app->getEnvironmentVariablesLoader()))->load($app['env']);
+
+        $app->instance('config', $config = new Config($app->getConfigLoader(), $app['env']));
         $app->startExceptionHandling();
 
         date_default_timezone_set($this->getApplicationTimezone());