Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
U
UserAdminV2
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
庄欣
UserAdminV2
Commits
70f8bb6e
Commit
70f8bb6e
authored
Apr 05, 2016
by
Taylor Otwell
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3738 from laravel/backport
[5.1] Backport various changes
parents
94c9db25
a6e0a2d1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
14 deletions
+18
-14
.env.example
+3
-2
composer.json
+8
-8
database/factories/ModelFactory.php
+1
-1
phpunit.xml
+6
-3
No files found.
.env.example
View file @
70f8bb6e
...
@@ -2,7 +2,8 @@ APP_ENV=local
...
@@ -2,7 +2,8 @@ APP_ENV=local
APP_DEBUG=true
APP_DEBUG=true
APP_KEY=SomeRandomString
APP_KEY=SomeRandomString
DB_HOST=localhost
DB_CONNECTION=mysql
DB_HOST=127.0.0.1
DB_DATABASE=homestead
DB_DATABASE=homestead
DB_USERNAME=homestead
DB_USERNAME=homestead
DB_PASSWORD=secret
DB_PASSWORD=secret
...
@@ -11,7 +12,7 @@ CACHE_DRIVER=file
...
@@ -11,7 +12,7 @@ CACHE_DRIVER=file
SESSION_DRIVER=file
SESSION_DRIVER=file
QUEUE_DRIVER=sync
QUEUE_DRIVER=sync
REDIS_HOST=
localhost
REDIS_HOST=
127.0.0.1
REDIS_PASSWORD=null
REDIS_PASSWORD=null
REDIS_PORT=6379
REDIS_PORT=6379
...
...
composer.json
View file @
70f8bb6e
...
@@ -28,19 +28,19 @@
...
@@ -28,19 +28,19 @@
]
]
},
},
"scripts"
:
{
"scripts"
:
{
"post-install-cmd"
:
[
"php artisan clear-compiled"
,
"php artisan optimize"
],
"post-update-cmd"
:
[
"php artisan clear-compiled"
,
"php artisan optimize"
],
"post-root-package-install"
:
[
"post-root-package-install"
:
[
"php -r
\"
copy('.env.example', '.env');
\"
"
"php -r
\"
copy('.env.example', '.env');
\"
"
],
],
"post-create-project-cmd"
:
[
"post-create-project-cmd"
:
[
"php artisan key:generate"
"php artisan key:generate"
],
"post-install-cmd"
:
[
"Illuminate
\\
Foundation
\\
ComposerScripts::postInstall"
,
"php artisan optimize"
],
"post-update-cmd"
:
[
"Illuminate
\\
Foundation
\\
ComposerScripts::postUpdate"
,
"php artisan optimize"
]
]
},
},
"config"
:
{
"config"
:
{
...
...
database/factories/ModelFactory.php
View file @
70f8bb6e
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
$factory
->
define
(
App\User
::
class
,
function
(
Faker\Generator
$faker
)
{
$factory
->
define
(
App\User
::
class
,
function
(
Faker\Generator
$faker
)
{
return
[
return
[
'name'
=>
$faker
->
name
,
'name'
=>
$faker
->
name
,
'email'
=>
$faker
->
e
mail
,
'email'
=>
$faker
->
safeE
mail
,
'password'
=>
bcrypt
(
str_random
(
10
)),
'password'
=>
bcrypt
(
str_random
(
10
)),
'remember_token'
=>
str_random
(
10
),
'remember_token'
=>
str_random
(
10
),
];
];
...
...
phpunit.xml
View file @
70f8bb6e
...
@@ -10,12 +10,15 @@
...
@@ -10,12 +10,15 @@
stopOnFailure=
"false"
>
stopOnFailure=
"false"
>
<testsuites>
<testsuites>
<testsuite
name=
"Application Test Suite"
>
<testsuite
name=
"Application Test Suite"
>
<directory
>
./tests/
</directory>
<directory
suffix=
"Test.php"
>
./tests
</directory>
</testsuite>
</testsuite>
</testsuites>
</testsuites>
<filter>
<filter>
<whitelist>
<whitelist
processUncoveredFilesFromWhitelist=
"true"
>
<directory
suffix=
".php"
>
app/
</directory>
<directory
suffix=
".php"
>
./app
</directory>
<exclude>
<file>
./app/Http/routes.php
</file>
</exclude>
</whitelist>
</whitelist>
</filter>
</filter>
<php>
<php>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment