Skip to content
This repository was archived by the owner on Apr 19, 2022. It is now read-only.

Commit 74ed681

Browse files
committed
Синхронизация с laravel/laravel
1 parent 6c9a01b commit 74ed681

File tree

23 files changed

+111
-80
lines changed

23 files changed

+111
-80
lines changed

.env.example

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
APP_NAME=Laravel
12
APP_ENV=local
23
APP_KEY=
34
APP_DEBUG=true

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
* text=auto
22
*.css linguist-vendored
33
*.scss linguist-vendored
4+
*.js linguist-vendored

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
/node_modules
2-
/public/storage
32
/public/hot
3+
/public/storage
44
/storage/*.key
55
/vendor
66
/.idea
7+
/.vagrant
78
Homestead.json
89
Homestead.yaml
910
.env

app/Http/Controllers/Auth/LoginController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@ class LoginController extends Controller
3232
*/
3333
public function __construct()
3434
{
35-
$this->middleware('guest', ['except' => 'logout']);
35+
$this->middleware('guest')->except('logout');
3636
}
3737
}

app/Http/Controllers/Auth/RegisterController.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ public function __construct()
4545
protected function validator(array $data)
4646
{
4747
return $this->getValidationFactory()->make($data, [
48-
'name' => 'required|max:255',
49-
'email' => 'required|email|max:255|unique:users',
50-
'password' => 'required|min:6|confirmed',
48+
'name' => 'required|string|max:255',
49+
'email' => 'required|string|email|max:255|unique:users',
50+
'password' => 'required|string|min:6|confirmed',
5151
]);
5252
}
5353

app/Providers/EventServiceProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class EventServiceProvider extends ServiceProvider
1313
* @var array
1414
*/
1515
protected $listen = [
16-
'App\Events\SomeEvent' => [
16+
'App\Events\Event' => [
1717
'App\Listeners\EventListener',
1818
],
1919
];

artisan

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ $status = $kernel->handle(
4040
| Shutdown The Application
4141
|--------------------------------------------------------------------------
4242
|
43-
| Once Artisan has finished running. We will fire off the shutdown events
43+
| Once Artisan has finished running, we will fire off the shutdown events
4444
| so that any final work may be done by the application before we shut
4545
| down the process. This is the last thing to happen to the request.
4646
|

bootstrap/autoload.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
|
1010
| Composer provides a convenient, automatically generated class loader
1111
| for our application. We just need to utilize it! We'll require it
12-
| into the script here so that we do not have to worry about the
13-
| loading of any our classes "manually". Feels great to relax.
12+
| into the script here so we do not have to manually load any of
13+
| our application's PHP classes. It just feels great to relax.
1414
|
1515
*/
1616

composer.json

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,19 @@
11
{
2-
"name": "laravel/laravel",
2+
"name": "laravelrus/skeleton",
33
"description": "The Laravel Framework.",
4-
"keywords": ["framework", "laravel"],
4+
"keywords": ["framework", "laravel", "laravelrus"],
55
"license": "MIT",
66
"type": "project",
7+
"authors": [
8+
{
9+
"name": "JhaoDa",
10+
"email": "jhaoda@gmail.com"
11+
},
12+
{
13+
"name": "atehnix",
14+
"homepage": "https://vk.com/atehnix"
15+
}
16+
],
717
"require": {
818
"php": ">=5.6.4",
919
"laravel/framework": "5.4.*",
@@ -49,6 +59,7 @@
4959
},
5060
"config": {
5161
"preferred-install": "dist",
52-
"sort-packages": true
62+
"sort-packages": true,
63+
"optimize-autoloader": true
5364
}
5465
}

config/app.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
| any other location as required by the application or its packages.
1313
*/
1414

15-
'name' => 'Laravel',
15+
'name' => env('APP_NAME', 'Laravel'),
1616

1717
/*
1818
|--------------------------------------------------------------------------

0 commit comments

Comments
 (0)