Skip to content

Commit b34dfd5

Browse files
authored
Merge pull request #1510 from rappasoft/development
v8.0.3
2 parents bea73f3 + 5a0f796 commit b34dfd5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+3952
-3438
lines changed

.env.example

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ DB_DATABASE=laravel
2626
DB_USERNAME=root
2727
DB_PASSWORD=
2828

29+
# Cache
30+
MEMCACHED_HOST=127.0.0.1
31+
2932
# Queue
3033
REDIS_HOST=127.0.0.1
3134
REDIS_PASSWORD=null

.github/workflows/main.yml

Lines changed: 41 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,55 @@
11
name: Tests
22

3-
on:
4-
push:
5-
branches:
6-
- main
7-
- master
8-
- development
3+
on: [push, pull_request]
94

105
jobs:
11-
run-tests:
12-
runs-on: ubuntu-latest
6+
test:
7+
runs-on: ${{ matrix.os }}
8+
strategy:
9+
fail-fast: true
10+
matrix:
11+
os: [ubuntu-latest]
12+
php: [7.3]
13+
laravel: [8.*]
14+
stability: [prefer-stable]
15+
include:
16+
- laravel: 8.*
17+
testbench: 6.*
18+
19+
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
20+
1321
steps:
14-
- uses: actions/checkout@v1
22+
- name: Checkout code
23+
uses: actions/checkout@v2
24+
25+
- name: Setup PHP
26+
uses: shivammathur/setup-php@v2
27+
with:
28+
php-version: ${{ matrix.php }}
29+
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
30+
coverage: none
31+
32+
- name: Setup problem matchers
33+
run: |
34+
echo "::add-matcher::${{ runner.tool_cache }}/php.json"
35+
echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
36+
1537
- name: Copy ENV Laravel Configuration for CI
1638
run: php -r "file_exists('.env') || copy('.env.example', '.env');"
17-
- name: Install Dependencies
18-
run: composer install -q --no-ansi --no-interaction --no-scripts --no-suggest --no-progress --prefer-dist
39+
40+
- name: Install dependencies
41+
run: |
42+
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
43+
composer update --${{ matrix.stability }} --prefer-dist --no-interaction
44+
1945
- name: Install NPM Dependencies
2046
run: npm install
47+
2148
- name: Compile Assets
2249
run: npm run production
50+
2351
- name: Generate Key
2452
run: php artisan key:generate
25-
- name: Execute Tests
53+
54+
- name: Execute tests
2655
run: vendor/bin/phpunit

.php_cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ $finder = Symfony\Component\Finder\Finder::create()
88
__DIR__ . '/app',
99
__DIR__ . '/config',
1010
__DIR__ . '/database/factories',
11-
__DIR__ . '/database/seeds',
11+
__DIR__ . '/database/seeders',
1212
__DIR__ . '/resources/lang',
1313
__DIR__ . '/routes',
1414
__DIR__ . '/tests',

CHANGELOG.md

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

44
## [Unreleased]
55

6+
## [8.0.3] - 2021-02-20
7+
8+
### Added
9+
10+
- Added pt_PT language
11+
- Added RO language
12+
- Added missing cors middleware
13+
14+
### Changed
15+
16+
- Updated composer
17+
- Updated yarn
18+
- Update to Laravel commit: f0de9fd9967d4e1b4427d8458bf8983bc2cde201
19+
- Upgrade to Laravel Mix 6
20+
- Fixed 2fa/admin issue (https://github.com/rappasoft/laravel-boilerplate/pull/1488)
21+
- Update pt_BR language
22+
- Updated failed_jobs table (https://github.com/rappasoft/laravel-boilerplate/pull/1503, https://github.com/rappasoft/laravel-boilerplate/issues/1501)
23+
24+
### Removed
25+
26+
- Google Analytics tag and config since it's done differently since that was added
27+
28+
## [8.0.2] - 2020-12-15
29+
30+
### Changed
31+
32+
- Removed the base controller dependency from all controllers as it's not needed for any of the current functionality and is just more overhead for no reason.
33+
- Move verification middleware to routes file
34+
- Update phpunit.xml file to current format
35+
636
## [8.0.1] - 2020-12-12
737

838
## Changed
@@ -393,7 +423,9 @@ Started from scratch with a blank Laravel 7.* installation. This release is not
393423
- Fix yarn tests
394424
- Fix: Socially logged in users get assigned the default role
395425

396-
[Unreleased]: https://github.com/rappasoft/laravel-boilerplate/compare/v8.0.1...development
426+
[Unreleased]: https://github.com/rappasoft/laravel-boilerplate/compare/v8.0.3...development
427+
[8.0.3]: https://github.com/rappasoft/laravel-boilerplate/compare/v8.0.2...v8.0.3
428+
[8.0.2]: https://github.com/rappasoft/laravel-boilerplate/compare/v8.0.1...v8.0.2
397429
[8.0.1]: https://github.com/rappasoft/laravel-boilerplate/compare/v8.0.0...v8.0.1
398430
[8.0.0]: https://github.com/rappasoft/laravel-boilerplate/compare/v7.2.6...v8.0.0
399431
[7.2.6]: https://github.com/rappasoft/laravel-boilerplate/compare/v7.2.5...v7.2.6

app/Domains/Auth/Http/Controllers/Backend/Role/RoleController.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,11 @@
99
use App\Domains\Auth\Models\Role;
1010
use App\Domains\Auth\Services\PermissionService;
1111
use App\Domains\Auth\Services\RoleService;
12-
use App\Http\Controllers\Controller;
1312

1413
/**
1514
* Class RoleController.
1615
*/
17-
class RoleController extends Controller
16+
class RoleController
1817
{
1918
/**
2019
* @var RoleService

app/Domains/Auth/Http/Controllers/Backend/User/DeactivatedUserController.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@
44

55
use App\Domains\Auth\Models\User;
66
use App\Domains\Auth\Services\UserService;
7-
use App\Http\Controllers\Controller;
87
use Illuminate\Http\Request;
98

109
/**
1110
* Class UserStatusController.
1211
*/
13-
class DeactivatedUserController extends Controller
12+
class DeactivatedUserController
1413
{
1514
/**
1615
* @var UserService

app/Domains/Auth/Http/Controllers/Backend/User/DeletedUserController.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,11 @@
44

55
use App\Domains\Auth\Models\User;
66
use App\Domains\Auth\Services\UserService;
7-
use App\Http\Controllers\Controller;
87

98
/**
109
* Class DeletedUserController.
1110
*/
12-
class DeletedUserController extends Controller
11+
class DeletedUserController
1312
{
1413
/**
1514
* @var UserService

app/Domains/Auth/Http/Controllers/Backend/User/UserController.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,11 @@
1010
use App\Domains\Auth\Services\PermissionService;
1111
use App\Domains\Auth\Services\RoleService;
1212
use App\Domains\Auth\Services\UserService;
13-
use App\Http\Controllers\Controller;
1413

1514
/**
1615
* Class UserController.
1716
*/
18-
class UserController extends Controller
17+
class UserController
1918
{
2019
/**
2120
* @var UserService
@@ -47,7 +46,7 @@ public function __construct(UserService $userService, RoleService $roleService,
4746
}
4847

4948
/**
50-
* @return \Illuminate\View\View
49+
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View
5150
*/
5251
public function index()
5352
{

app/Domains/Auth/Http/Controllers/Backend/User/UserPasswordController.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@
66
use App\Domains\Auth\Http\Requests\Backend\User\UpdateUserPasswordRequest;
77
use App\Domains\Auth\Models\User;
88
use App\Domains\Auth\Services\UserService;
9-
use App\Http\Controllers\Controller;
109

1110
/**
1211
* Class UserPasswordController.
1312
*/
14-
class UserPasswordController extends Controller
13+
class UserPasswordController
1514
{
1615
/**
1716
* @var UserService

app/Domains/Auth/Http/Controllers/Backend/User/UserSessionController.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,11 @@
44

55
use App\Domains\Auth\Http\Requests\Backend\User\ClearUserSessionRequest;
66
use App\Domains\Auth\Models\User;
7-
use App\Http\Controllers\Controller;
87

98
/**
109
* Class UserSessionController.
1110
*/
12-
class UserSessionController extends Controller
11+
class UserSessionController
1312
{
1413
/**
1514
* @param ClearUserSessionRequest $request

0 commit comments

Comments
 (0)