Skip to content

Commit bea73f3

Browse files
authored
Merge pull request #1482 from rappasoft/development
Development
2 parents 6bb9746 + 9174afb commit bea73f3

File tree

19 files changed

+2182
-1429
lines changed

19 files changed

+2182
-1429
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name: Tests
33
on:
44
push:
55
branches:
6+
- main
67
- master
78
- development
89

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ _ide_helper.php
2222
.project
2323
composer.phar
2424
coverage.xml
25+
docker-compose.override.yml
2526
error.log
2627
Homestead.json
2728
Homestead.yaml

CHANGELOG.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file.
33

44
## [Unreleased]
55

6+
## [8.0.1] - 2020-12-12
7+
8+
## Changed
9+
10+
- Update dependencies
11+
- Update to laravel commit: ddb26fbc504cd64fb1b89511773aa8d03c758c6d
12+
- Update exception handling to match laravel
13+
- Added sail docker file
14+
- Update FA language
15+
- Add 'main' branch to workflow
16+
617
## [8.0.0] - 2020-10-21
718

819
## Added
@@ -382,7 +393,8 @@ Started from scratch with a blank Laravel 7.* installation. This release is not
382393
- Fix yarn tests
383394
- Fix: Socially logged in users get assigned the default role
384395

385-
[Unreleased]: https://github.com/rappasoft/laravel-boilerplate/compare/v8.0.0...development
396+
[Unreleased]: https://github.com/rappasoft/laravel-boilerplate/compare/v8.0.1...development
397+
[8.0.1]: https://github.com/rappasoft/laravel-boilerplate/compare/v8.0.0...v8.0.1
386398
[8.0.0]: https://github.com/rappasoft/laravel-boilerplate/compare/v7.2.6...v8.0.0
387399
[7.2.6]: https://github.com/rappasoft/laravel-boilerplate/compare/v7.2.5...v7.2.6
388400
[7.2.5]: https://github.com/rappasoft/laravel-boilerplate/compare/v7.2.4...v7.2.5

app/Exceptions/Handler.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,16 @@ class Handler extends ExceptionHandler
2222
GeneralException::class,
2323
];
2424

25+
/**
26+
* A list of the inputs that are never flashed for validation exceptions.
27+
*
28+
* @var array
29+
*/
30+
protected $dontFlash = [
31+
'password',
32+
'password_confirmation',
33+
];
34+
2535
/**
2636
* Report or log an exception.
2737
*

app/Providers/RouteServiceProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public function boot()
7171
protected function configureRateLimiting()
7272
{
7373
RateLimiter::for('api', function (Request $request) {
74-
return Limit::perMinute(60);
74+
return Limit::perMinute(60)->by(optional($request->user())->id ?: $request->ip());
7575
});
7676
}
7777
}

composer.json

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@
99
],
1010
"license": "MIT",
1111
"require": {
12-
"php": "^7.3",
12+
"php": "^7.3|^8.0",
1313
"arcanedev/log-viewer": "8.x",
1414
"darkghosthunter/laraguard": "dev-master",
15-
"fideloper/proxy": "^4.2",
15+
"fideloper/proxy": "^4.4",
1616
"fruitcake/laravel-cors": "^2.0",
1717
"guzzlehttp/guzzle": "^7.0.1",
1818
"jamesmills/laravel-timezone": "^1.9",
1919
"lab404/laravel-impersonate": "^1.6",
2020
"langleyfoxall/laravel-nist-password-rules": "^4.1",
21-
"laravel/framework": "^8.0",
21+
"laravel/framework": "^8.12",
2222
"laravel/socialite": "^5.0",
23-
"laravel/tinker": "^2.0",
23+
"laravel/tinker": "^2.5",
2424
"laravel/ui": "^3.0",
2525
"livewire/livewire": "^2.0",
2626
"rappasoft/laravel-livewire-tables": "^0.3",
@@ -34,12 +34,13 @@
3434
"barryvdh/laravel-debugbar": "^3.2",
3535
"barryvdh/laravel-ide-helper": "^2.6",
3636
"codedungeon/phpunit-result-printer": "^0.29",
37-
"facade/ignition": "^2.3.6",
37+
"facade/ignition": "^2.5",
3838
"friendsofphp/php-cs-fixer": "^2.16",
39-
"fzaninotto/faker": "^1.9.1",
40-
"mockery/mockery": "^1.3.1",
39+
"fakerphp/faker": "^1.9.1",
40+
"laravel/sail": "^0.0.5",
41+
"mockery/mockery": "^1.4.2",
4142
"nunomaduro/collision": "^5.0",
42-
"phpunit/phpunit": "^9.0"
43+
"phpunit/phpunit": "^9.3.3"
4344
},
4445
"config": {
4546
"optimize-autoloader": true,

0 commit comments

Comments
 (0)