Merge branch 'master' into develop

This commit is contained in:
Taylor Otwell 2017-12-19 08:16:16 -06:00
commit 5a08a3572d
2 changed files with 8 additions and 5 deletions

View File

@ -50,11 +50,11 @@
'sqs' => [
'driver' => 'sqs',
'key' => 'your-public-key',
'secret' => 'your-secret-key',
'prefix' => 'https://sqs.us-east-1.amazonaws.com/your-account-id',
'queue' => 'your-queue-name',
'region' => 'us-east-1',
'key' => env('SQS_KEY', 'your-public-key'),
'secret' => env('SQS_SECRET', 'your-secret-key'),
'prefix' => env('SQS_PREFIX', 'https://sqs.us-east-1.amazonaws.com/your-account-id'),
'queue' => env('SQS_QUEUE', 'your-queue-name'),
'region' => env('SQS_REGION', 'us-east-1'),
],
'redis' => [

View File

@ -2,6 +2,7 @@
namespace Tests;
use Illuminate\Support\Facades\Hash;
use Illuminate\Contracts\Console\Kernel;
trait CreatesApplication
@ -17,6 +18,8 @@ public function createApplication()
$app->make(Kernel::class)->bootstrap();
Hash::setRounds(4);
return $app;
}
}