zhangyuheng/blessing-skin-server
1
0
Fork 0
forked from mirror/blessing-skin-server
Code Pull Requests Activity

Fix CI configuration

Browse Source
This commit is contained in:
printempw 2017-11-09 16:58:37 +08:00
parent dd75c20464
commit f8e033db15
4 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.env.testing
View File

@ -20,14 +20,14 @@ SALT = c67709dd8b7b733aca0d570681fe96cf
APP_KEY = base64:eVX/xzF5NhpGB2luswliFx9XSBsbbAP21wOi68X/P34=
MAIL_DRIVER = smtp
MAIL_HOST = null
MAIL_HOST = localhost
MAIL_PORT = 465
MAIL_USERNAME = null
MAIL_PASSWORD = null
MAIL_ENCRYPTION = ssl
CACHE_DRIVER = file
SESSION_DRIVER = file
CACHE_DRIVER = array
SESSION_DRIVER = array
QUEUE_DRIVER = sync
REDIS_HOST = 127.0.0.1

2
composer.json
View File

@ -9,6 +9,7 @@
"gregwar/captcha": "^1.1",
"erusev/parsedown": "^1.6",
"swiggles/memcache": "^2.0",
"doctrine/inflector": "1.1.0",
"laravel/framework": "5.2.*",
"devitek/yaml-translation": "^2.0",
"printempw/laravel-datatables-lite": "^1.0"
@ -16,6 +17,7 @@
"require-dev": {
"fzaninotto/faker": "~1.4",
"mockery/mockery": "0.9.*",
"phpdocumentor/reflection-docblock": "3.2.2",
"phpunit/phpunit": "~4.0",
"symfony/css-selector": "2.8.*|3.0.*",
"symfony/dom-crawler": "2.8.*|3.0.*",

48
composer.lock generated
View File

@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"hash": "3854d272397b13ed4762292c1f21a68f",
"content-hash": "59e3c57198b3c0d6bf273ebc2bf8d6b0",
"hash": "ca7b01bddec85ddc69c737deef9d5d4b",
"content-hash": "80623bc8ebd1101cdd3b9ba86629b68c",
"packages": [
{
"name": "classpreloader/classpreloader",
@ -134,33 +134,33 @@
},
{
"name": "doctrine/inflector",
"version": "v1.2.0",
"version": "v1.1.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/inflector.git",
"reference": "e11d84c6e018beedd929cff5220969a3c6d1d462"
"reference": "90b2128806bfde671b6952ab8bea493942c1fdae"
},
"dist": {
"type": "zip",
"url": "https://files.phpcomposer.com/files/doctrine/inflector/e11d84c6e018beedd929cff5220969a3c6d1d462.zip",
"reference": "e11d84c6e018beedd929cff5220969a3c6d1d462",
"url": "https://files.phpcomposer.com/files/doctrine/inflector/90b2128806bfde671b6952ab8bea493942c1fdae.zip",
"reference": "90b2128806bfde671b6952ab8bea493942c1fdae",
"shasum": ""
},
"require": {
"php": "^7.0"
"php": ">=5.3.2"
},
"require-dev": {
"phpunit/phpunit": "^6.2"
"phpunit/phpunit": "4.*"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.2.x-dev"
"dev-master": "1.1.x-dev"
}
},
"autoload": {
"psr-4": {
"Doctrine\\Common\\Inflector\\": "lib/Doctrine/Common/Inflector"
"psr-0": {
"Doctrine\\Common\\Inflector\\": "lib/"
}
},
"notification-url": "https://packagist.org/downloads/",
@ -197,7 +197,7 @@
"singularize",
"string"
],
"time": "2017-07-22 12:18:28"
"time": "2015-11-06 14:35:42"
},
{
"name": "erusev/parsedown",
@ -2646,22 +2646,22 @@
},
{
"name": "phpdocumentor/reflection-docblock",
"version": "4.1.1",
"version": "3.2.2",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
"reference": "2d3d238c433cf69caeb4842e97a3223a116f94b2"
"reference": "4aada1f93c72c35e22fb1383b47fee43b8f1d157"
},
"dist": {
"type": "zip",
"url": "https://files.phpcomposer.com/files/phpDocumentor/ReflectionDocBlock/2d3d238c433cf69caeb4842e97a3223a116f94b2.zip",
"reference": "2d3d238c433cf69caeb4842e97a3223a116f94b2",
"url": "https://files.phpcomposer.com/files/phpDocumentor/ReflectionDocBlock/4aada1f93c72c35e22fb1383b47fee43b8f1d157.zip",
"reference": "4aada1f93c72c35e22fb1383b47fee43b8f1d157",
"shasum": ""
},
"require": {
"php": "^7.0",
"php": ">=5.5",
"phpdocumentor/reflection-common": "^1.0@dev",
"phpdocumentor/type-resolver": "^0.4.0",
"phpdocumentor/type-resolver": "^0.3.0",
"webmozart/assert": "^1.0"
},
"require-dev": {
@ -2687,20 +2687,20 @@
}
],
"description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
"time": "2017-08-30 18:51:59"
"time": "2017-08-08 06:39:58"
},
{
"name": "phpdocumentor/type-resolver",
"version": "0.4.0",
"version": "0.3.0",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/TypeResolver.git",
"reference": "9c977708995954784726e25d0cd1dddf4e65b0f7"
"reference": "fb3933512008d8162b3cdf9e18dba9309b7c3773"
},
"dist": {
"type": "zip",
"url": "https://files.phpcomposer.com/files/phpDocumentor/TypeResolver/9c977708995954784726e25d0cd1dddf4e65b0f7.zip",
"reference": "9c977708995954784726e25d0cd1dddf4e65b0f7",
"url": "https://files.phpcomposer.com/files/phpDocumentor/TypeResolver/fb3933512008d8162b3cdf9e18dba9309b7c3773.zip",
"reference": "fb3933512008d8162b3cdf9e18dba9309b7c3773",
"shasum": ""
},
"require": {
@ -2734,7 +2734,7 @@
"email": "me@mikevanriel.com"
}
],
"time": "2017-07-14 14:27:02"
"time": "2017-06-03 08:32:36"
},
{
"name": "phpspec/prophecy",

5
phpunit.xml
View File

@ -23,10 +23,5 @@
</filter>
<php>
<env name="APP_ENV" value="testing"/>
<env name="DB_DATABASE" value="blessing_test"/>
<env name="MAIL_HOST" value="localhost" />
<env name="CACHE_DRIVER" value="array"/>
<env name="SESSION_DRIVER" value="array"/>
<env name="QUEUE_DRIVER" value="sync"/>
</php>
</phpunit>