Skip to content

Commit 3bae062

Browse files
authored
Merge pull request #420 from manelgavalda/laravel5.7
Adds property mockConsoleOutput on tests for laravel 5.7 compatiblity
2 parents d16f981 + d4c8fae commit 3bae062

File tree

2 files changed

+31
-28
lines changed

2 files changed

+31
-28
lines changed

README.md

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
**IMPORTANT NOTE**: This project is looking for a maintainer please email [email protected] if you are interested.
2-
31
# AdminLTE template Laravel 5 package
42
A Laravel 5 package that switch default Laravel scaffolding / boilerplate to AdminLTE template with Bootstrap 3.0 and Pratt Landing Page
53

@@ -66,7 +64,7 @@ brew install gnu-sed --with-default-names
6664
```
6765

6866
This package assumes that you have in path your composer bin folder:
69-
67+
7068
```
7169
/YOUR_PATH_TO_HOME/.composer/vendor/bin
7270
```
@@ -90,14 +88,17 @@ Please be sure to check you environment.
9088
## Optional requirements
9189
* [Laravel menu](https://github.com/spatie/laravel-menu): only used with command adminlte:menu that replaces default adminlte menu with a menu with spatie/laravel-menu support.
9290

91+
## Laravel 5.7
92+
93+
Compatible with Laravel 5.7.
9394

9495
## Laravel 5.6
9596

96-
This package works smoothly with Laravel 5.6 with 6.0+ versions.
97+
This package works smoothly with Laravel 5.6 with 6.0+ versions.
9798

9899
## Laravel 5.5
99100

100-
This package now use new Laravel 5.5 feature Package Auto Discover.
101+
This package now use new Laravel 5.5 feature Package Auto Discover.
101102

102103
## Laravel 5.4
103104

@@ -116,8 +117,8 @@ Add admin-lte Laravel package with:
116117

117118
<pre>
118119
composer require "acacha/admin-lte-template-laravel:4.*"
119-
</pre>
120-
120+
</pre>
121+
121122
To register the Service Provider edit **config/app.php** file and add to providers array:
122123

123124
```php
@@ -140,9 +141,9 @@ Publish files with:
140141

141142
```php
142143
php artisan vendor:publish --tag=adminlte --force
143-
```
144-
145-
Use force to overwrite Laravel Scaffolding packages. That's all! Open the Laravel project in your browser or homestead machine and enjoy!
144+
```
145+
146+
Use force to overwrite Laravel Scaffolding packages. That's all! Open the Laravel project in your browser or homestead machine and enjoy!
146147

147148

148149
## Laravel 5.3
@@ -177,22 +178,22 @@ Add admin-lte Laravel package with:
177178

178179
<pre>
179180
composer require "acacha/admin-lte-template-laravel:1.*"
180-
</pre>
181-
181+
</pre>
182+
182183
Register ServiceProvider editing **config/app.php** file and adding to providers array:
183184

184185
<pre>
185-
// AdminLTE template provider
186+
// AdminLTE template provider
186187
Acacha\AdminLTETemplateLaravel\app\Providers\AdminLTETemplateServiceProvider::class,
187188
</pre>
188189

189190
Publish files with:
190191

191192
<pre>
192193
php artisan vendor:publish --force --provider="Acacha\AdminLTETemplateLaravel\app\Providers\AdminLTETemplateServiceProvider"
193-
</pre>
194-
195-
Use force to overwrite Laravel Scaffolding packages. That's all! Open the Laravel project in your browser or homestead machine and enjoy!
194+
</pre>
195+
196+
Use force to overwrite Laravel Scaffolding packages. That's all! Open the Laravel project in your browser or homestead machine and enjoy!
196197

197198
Note: use the following for Laravel <5.1 versions:
198199

@@ -206,11 +207,11 @@ Note: use the following for Laravel <5.1 versions:
206207
This package installs Laravel routes that you will not find them at routes.php file. The routes installed by package would be find at file:
207208

208209
https://github.com/acacha/adminlte-laravel/blob/master/src/Http/routes.php
209-
210+
210211
A file included by AdminLTETemplateServiceProvider:
211212

212213
https://github.com/acacha/adminlte-laravel/blob/master/src/Providers/AdminLTETemplateServiceProvider.php
213-
214+
214215
You can override this routes by changing order of ServiceProviders in config/app.php file so if you put:
215216

216217
```php
@@ -226,9 +227,9 @@ Acacha\AdminLTETemplateLaravel\Providers\AdminLTETemplateServiceProvider::class
226227
Your routes in routes.php file will override default adminlte-laravel routes.
227228

228229
Also you can install manually the routes in routes.php file. Adminlte-laravel use same routes as Laravel make:auth command use, see:
229-
230+
230231
https://github.com/laravel/framework/blob/5.2/src/Illuminate/Auth/Console/stubs/make/routes.stub
231-
232+
232233
so you can add this lines to routes.php file:
233234

234235
```php
@@ -237,7 +238,7 @@ Route::auth();
237238
Route::get('/home', 'HomeController@index');
238239
```
239240

240-
And disable AdminLTETemplateServiceProvider in config/app.php file ( take into account that Adminte-laravel Facades and
241+
And disable AdminLTETemplateServiceProvider in config/app.php file ( take into account that Adminte-laravel Facades and
241242
custom commands will not be available).
242243

243244
See issue https://github.com/acacha/adminlte-laravel/issues/69 for more info
@@ -415,7 +416,7 @@ File /home/sergi/Code/AdminLTE/acacha/adminlte-laravel_test/database/seeds/Admin
415416
User Sergi Tur Badenas([email protected]) with the environemnt password (env var ADMIN_PWD) created succesfully!
416417
```
417418

418-
This command use (if exists) environment variables (.env file) ADMIN_USER, ADMIN_EMAIL and ADMIN_PWD. If this env variables does not exists then
419+
This command use (if exists) environment variables (.env file) ADMIN_USER, ADMIN_EMAIL and ADMIN_PWD. If this env variables does not exists then
419420
user git config (~/.gitconfig) to obtain data and if this info does not exists use Admin ([email protected]) and password 123456 as default.
420421

421422
### make:adminUserSeeder
@@ -546,17 +547,17 @@ More info at https://github.com/acacha/adminlte-laravel/issues/58
546547

547548
## How to use username at login instead of email
548549

549-
Execute command:
550+
Execute command:
550551

551552
```
552553
php artisan adminlte:username
553554
```
554555

555556
And then you can use username instead of email for login.
556557

557-
NOTE: when we are using login by username if login by usernames fails then
558+
NOTE: when we are using login by username if login by usernames fails then
558559
system try to use the introduced username as an email for login. So users
559-
can also login using email.
560+
can also login using email.
560561

561562
To come back to email login remove **field** option from **config/auth.php** file:
562563

@@ -570,7 +571,7 @@ To come back to email login remove **field** option from **config/auth.php** fil
570571
```
571572
572573
NOTE: Migration required to add username field to users table requires:
573-
574+
574575
```bash
575576
composer require doctrine/dbal
576577
```
@@ -587,7 +588,7 @@ Optionally you can define a default domain name for username login. Add domain o
587588
],
588589
```
589590
590-
to file **config/auth.php**. Then if an user tries to login with no domain the default domain will be appended whe logging.
591+
to file **config/auth.php**. Then if an user tries to login with no domain the default domain will be appended whe logging.
591592
592593
So with previous example you can type at login:
593594
@@ -604,7 +605,7 @@ [email protected]
604605
# Vue
605606
606607
Laravel adminlte package by default publish Laravel translations into Javascript/Vue.js adding to HTML header the following script:
607-
608+
608609
```javascript
609610
<script>
610611
//See https://laracasts.com/discuss/channels/vue/use-trans-in-vuejs

tests/Feature/AcachaAdminLTELaravelTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ class AcachaAdminLTELaravelTest extends TestCase
1717
{
1818
use DatabaseMigrations;
1919

20+
public $mockConsoleOutput = false;
21+
2022
/**
2123
* Set up tests.
2224
*/

0 commit comments

Comments
 (0)