Skip to content

Commit a1aa2c3

Browse files
committed
major update
1 parent 5175cf3 commit a1aa2c3

File tree

25 files changed

+697
-2378
lines changed

25 files changed

+697
-2378
lines changed

.env.example

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
APP_NAME="Universy of Noland"
1+
APP_NAME=Laravel
22
APP_ENV=local
33
APP_KEY=
44
APP_DEBUG=true
5-
APP_URL=http://localhost:8000
5+
APP_URL=http://localhost
66

77
LOG_CHANNEL=stack
88
LOG_LEVEL=debug
99

1010
DB_CONNECTION=mysql
1111
DB_HOST=127.0.0.1
1212
DB_PORT=3306
13-
DB_DATABASE=laravel
13+
DB_DATABASE=laravel_localization
1414
DB_USERNAME=root
1515
DB_PASSWORD=
1616

@@ -20,13 +20,15 @@ QUEUE_CONNECTION=sync
2020
SESSION_DRIVER=file
2121
SESSION_LIFETIME=120
2222

23+
MEMCACHED_HOST=127.0.0.1
24+
2325
REDIS_HOST=127.0.0.1
2426
REDIS_PASSWORD=null
2527
REDIS_PORT=6379
2628

2729
MAIL_MAILER=smtp
28-
MAIL_HOST=smtp.mailtrap.io
29-
MAIL_PORT=2525
30+
MAIL_HOST=mailhog
31+
MAIL_PORT=1025
3032
MAIL_USERNAME=null
3133
MAIL_PASSWORD=null
3234
MAIL_ENCRYPTION=null
File renamed without changes.

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
.env
77
.env.backup
88
.phpunit.result.cache
9+
docker-compose.override.yml
910
Homestead.json
1011
Homestead.yaml
1112
npm-debug.log
1213
yarn-error.log
13-
/.idea

app/Exceptions/Handler.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace App\Exceptions;
44

55
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
6+
use Throwable;
67

78
class Handler extends ExceptionHandler
89
{
@@ -21,6 +22,7 @@ class Handler extends ExceptionHandler
2122
* @var array
2223
*/
2324
protected $dontFlash = [
25+
'current_password',
2426
'password',
2527
'password_confirmation',
2628
];
@@ -32,6 +34,8 @@ class Handler extends ExceptionHandler
3234
*/
3335
public function register()
3436
{
35-
//
37+
$this->reportable(function (Throwable $e) {
38+
//
39+
});
3640
}
3741
}

app/Http/Middleware/TrimStrings.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ class TrimStrings extends Middleware
1212
* @var array
1313
*/
1414
protected $except = [
15+
'current_password',
1516
'password',
1617
'password_confirmation',
1718
];

app/Http/Middleware/TrustProxies.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ class TrustProxies extends Middleware
1919
*
2020
* @var int
2121
*/
22-
protected $headers = Request::HEADER_X_FORWARDED_ALL;
22+
protected $headers = Request::HEADER_X_FORWARDED_FOR | Request::HEADER_X_FORWARDED_HOST | Request::HEADER_X_FORWARDED_PORT | Request::HEADER_X_FORWARDED_PROTO | Request::HEADER_X_FORWARDED_AWS_ELB;
2323
}

composer.json

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
{
1+
a{
22
"name": "laravel/laravel",
33
"type": "project",
44
"description": "The Laravel Framework.",
5-
"keywords": [
6-
"framework",
7-
"laravel"
8-
],
5+
"keywords": ["framework", "laravel"],
96
"license": "MIT",
107
"require": {
118
"php": "^7.3|^8.0",
@@ -18,7 +15,7 @@
1815
"guzzlehttp/guzzle": "^7.0.1",
1916
"infyomlabs/adminlte-templates": "8.0.x-dev",
2017
"infyomlabs/laravel-generator": "8.0.x-dev",
21-
"laravel/framework": "^8.12",
18+
"laravel/framework": "^8.35",
2219
"laravel/tinker": "^2.5",
2320
"laravel/ui": "^3.0",
2421
"laravelcollective/html": "^6.2",
@@ -28,20 +25,11 @@
2825
"require-dev": {
2926
"facade/ignition": "^2.5",
3027
"fakerphp/faker": "^1.9.1",
28+
"laravel/sail": "^1.0.1",
3129
"mockery/mockery": "^1.4.2",
3230
"nunomaduro/collision": "^5.0",
3331
"phpunit/phpunit": "^9.3.3"
3432
},
35-
"config": {
36-
"optimize-autoloader": true,
37-
"preferred-install": "dist",
38-
"sort-packages": true
39-
},
40-
"extra": {
41-
"laravel": {
42-
"dont-discover": []
43-
}
44-
},
4533
"autoload": {
4634
"psr-4": {
4735
"App\\": "app/",
@@ -54,8 +42,6 @@
5442
"Tests\\": "tests/"
5543
}
5644
},
57-
"minimum-stability": "dev",
58-
"prefer-stable": true,
5945
"scripts": {
6046
"post-autoload-dump": [
6147
"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
@@ -67,5 +53,17 @@
6753
"post-create-project-cmd": [
6854
"@php artisan key:generate --ansi"
6955
]
70-
}
56+
},
57+
"extra": {
58+
"laravel": {
59+
"dont-discover": []
60+
}
61+
},
62+
"config": {
63+
"optimize-autoloader": true,
64+
"preferred-install": "dist",
65+
"sort-packages": true
66+
},
67+
"minimum-stability": "dev",
68+
"prefer-stable": true
7169
}

0 commit comments

Comments
 (0)