Skip to content
This repository was archived by the owner on Jun 12, 2018. It is now read-only.

Commit d84f88b

Browse files
committed
L 5.5.28
1 parent 23881c2 commit d84f88b

File tree

8 files changed

+18
-12
lines changed

8 files changed

+18
-12
lines changed

.env.example

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,4 @@ MAIL_ENCRYPTION=null
3232
PUSHER_APP_ID=
3333
PUSHER_APP_KEY=
3434
PUSHER_APP_SECRET=
35+
PUSHER_APP_CLUSTER=mt1

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
"filp/whoops": "~2.0",
1616
"fzaninotto/faker": "~1.4",
1717
"mockery/mockery": "~1.0",
18-
"phpunit/phpunit": "~6.0"
18+
"phpunit/phpunit": "~6.0",
19+
"symfony/thanks": "^1.0"
1920
},
2021
"autoload": {
2122
"classmap": [

config/broadcasting.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@
3636
'secret' => env('PUSHER_APP_SECRET'),
3737
'app_id' => env('PUSHER_APP_ID'),
3838
'options' => [
39-
//
39+
'cluster' => env('PUSHER_APP_CLUSTER'),
40+
'encrypted' => true,
4041
],
4142
],
4243

config/queue.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@
5050

5151
'sqs' => [
5252
'driver' => 'sqs',
53-
'key' => 'your-public-key',
54-
'secret' => 'your-secret-key',
55-
'prefix' => 'https://sqs.us-east-1.amazonaws.com/your-account-id',
56-
'queue' => 'your-queue-name',
57-
'region' => 'us-east-1',
53+
'key' => env('SQS_KEY', 'your-public-key'),
54+
'secret' => env('SQS_SECRET', 'your-secret-key'),
55+
'prefix' => env('SQS_PREFIX', 'https://sqs.us-east-1.amazonaws.com/your-account-id'),
56+
'queue' => env('SQS_QUEUE', 'your-queue-name'),
57+
'region' => env('SQS_REGION', 'us-east-1'),
5858
],
5959

6060
'redis' => [

database/factories/UserFactory.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,10 @@
1414
*/
1515

1616
$factory->define(App\User::class, function (Faker $faker) {
17-
static $password;
18-
1917
return [
2018
'name' => $faker->name,
2119
'email' => $faker->unique()->safeEmail,
22-
'password' => $password ?: $password = bcrypt('secret'),
20+
'password' => '$2y$10$TKh8H1.PfQx37YgCzwiKb.KjNyWgaHb9cbcoQgdIVFlYg7B77UdFm', // secret
2321
'remember_token' => str_random(10),
2422
];
2523
});

public/.htaccess

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# Handle Authorization Header
99
RewriteCond %{HTTP:Authorization} .
1010
RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
11-
11+
1212
# Redirect Trailing Slashes If Not A Folder...
1313
RewriteCond %{REQUEST_FILENAME} !-d
1414
RewriteCond %{REQUEST_URI} (.+)/$

resources/assets/js/bootstrap.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,7 @@ if (token) {
4949

5050
// window.Echo = new Echo({
5151
// broadcaster: 'pusher',
52-
// key: 'your-pusher-key'
52+
// key: 'your-pusher-key',
53+
// cluster: 'mt1',
54+
// encrypted: true
5355
// });

tests/CreatesApplication.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace Tests;
44

5+
use Illuminate\Support\Facades\Hash;
56
use Illuminate\Contracts\Console\Kernel;
67

78
trait CreatesApplication
@@ -17,6 +18,8 @@ public function createApplication()
1718

1819
$app->make(Kernel::class)->bootstrap();
1920

21+
Hash::setRounds(4);
22+
2023
return $app;
2124
}
2225
}

0 commit comments

Comments
 (0)