Skip to content

Commit

Permalink
Merge pull request #1482 from rappasoft/development
Browse files Browse the repository at this point in the history
Development
  • Loading branch information
rappasoft authored Dec 13, 2020
2 parents 6bb9746 + 9174afb commit bea73f3
Show file tree
Hide file tree
Showing 19 changed files with 2,182 additions and 1,429 deletions.
1 change: 1 addition & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name: Tests
on:
push:
branches:
- main
- master
- development

Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ _ide_helper.php
.project
composer.phar
coverage.xml
docker-compose.override.yml
error.log
Homestead.json
Homestead.yaml
Expand Down
14 changes: 13 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file.

## [Unreleased]

## [8.0.1] - 2020-12-12

## Changed

- Update dependencies
- Update to laravel commit: ddb26fbc504cd64fb1b89511773aa8d03c758c6d
- Update exception handling to match laravel
- Added sail docker file
- Update FA language
- Add 'main' branch to workflow

## [8.0.0] - 2020-10-21

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

[Unreleased]: https://github.com/rappasoft/laravel-boilerplate/compare/v8.0.0...development
[Unreleased]: https://github.com/rappasoft/laravel-boilerplate/compare/v8.0.1...development
[8.0.1]: https://github.com/rappasoft/laravel-boilerplate/compare/v8.0.0...v8.0.1
[8.0.0]: https://github.com/rappasoft/laravel-boilerplate/compare/v7.2.6...v8.0.0
[7.2.6]: https://github.com/rappasoft/laravel-boilerplate/compare/v7.2.5...v7.2.6
[7.2.5]: https://github.com/rappasoft/laravel-boilerplate/compare/v7.2.4...v7.2.5
Expand Down
10 changes: 10 additions & 0 deletions app/Exceptions/Handler.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,16 @@ class Handler extends ExceptionHandler
GeneralException::class,
];

/**
* A list of the inputs that are never flashed for validation exceptions.
*
* @var array
*/
protected $dontFlash = [
'password',
'password_confirmation',
];

/**
* Report or log an exception.
*
Expand Down
2 changes: 1 addition & 1 deletion app/Providers/RouteServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public function boot()
protected function configureRateLimiting()
{
RateLimiter::for('api', function (Request $request) {
return Limit::perMinute(60);
return Limit::perMinute(60)->by(optional($request->user())->id ?: $request->ip());
});
}
}
17 changes: 9 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@
],
"license": "MIT",
"require": {
"php": "^7.3",
"php": "^7.3|^8.0",
"arcanedev/log-viewer": "8.x",
"darkghosthunter/laraguard": "dev-master",
"fideloper/proxy": "^4.2",
"fideloper/proxy": "^4.4",
"fruitcake/laravel-cors": "^2.0",
"guzzlehttp/guzzle": "^7.0.1",
"jamesmills/laravel-timezone": "^1.9",
"lab404/laravel-impersonate": "^1.6",
"langleyfoxall/laravel-nist-password-rules": "^4.1",
"laravel/framework": "^8.0",
"laravel/framework": "^8.12",
"laravel/socialite": "^5.0",
"laravel/tinker": "^2.0",
"laravel/tinker": "^2.5",
"laravel/ui": "^3.0",
"livewire/livewire": "^2.0",
"rappasoft/laravel-livewire-tables": "^0.3",
Expand All @@ -34,12 +34,13 @@
"barryvdh/laravel-debugbar": "^3.2",
"barryvdh/laravel-ide-helper": "^2.6",
"codedungeon/phpunit-result-printer": "^0.29",
"facade/ignition": "^2.3.6",
"facade/ignition": "^2.5",
"friendsofphp/php-cs-fixer": "^2.16",
"fzaninotto/faker": "^1.9.1",
"mockery/mockery": "^1.3.1",
"fakerphp/faker": "^1.9.1",
"laravel/sail": "^0.0.5",
"mockery/mockery": "^1.4.2",
"nunomaduro/collision": "^5.0",
"phpunit/phpunit": "^9.0"
"phpunit/phpunit": "^9.3.3"
},
"config": {
"optimize-autoloader": true,
Expand Down
Loading

0 comments on commit bea73f3

Please sign in to comment.