av/homepage
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Обновлен php и зависимости

Browse Source
This commit is contained in:
Anton Vakhrushev 2019-05-07 11:14:25 +03:00
parent 12eb7f1f0d
commit 5df29173b7
4 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env
View File

@ -1,3 +1,3 @@
PHP_BASE_IMAGE=php:7.2-cli PHP_BASE_IMAGE=php:7.3-cli
PHP_IMAGE=homepage-php PHP_IMAGE=homepage-php
NODE_IMAGE=node:12-alpine NODE_IMAGE=node:12-alpine

4
.php_cs
View File

@ -11,11 +11,11 @@ return PhpCsFixer\Config::create()
->setFinder($finder) ->setFinder($finder)
->setRules([ ->setRules([
'@Symfony' => true, '@Symfony' => true,
'@PHP71Migration' => true, '@PHP73Migration' => true,
'array_syntax' => ['syntax' => 'short'], 'array_syntax' => ['syntax' => 'short'],
'no_useless_return' => true,
'ordered_imports' => true, 'ordered_imports' => true,
'phpdoc_order' => true, 'phpdoc_order' => true,
'no_useless_return' => true,
'semicolon_after_instruction' => false, 'semicolon_after_instruction' => false,
'yoda_style' => false, 'yoda_style' => false,
]) ])

2
composer.json
View File

@ -12,7 +12,7 @@
}, },
"require-dev": { "require-dev": {
"gajus/dindent": "^2.0", "gajus/dindent": "^2.0",
"friendsofphp/php-cs-fixer": "^2.12", "friendsofphp/php-cs-fixer": "^2.15",
"sculpin/sculpin": "^3.0" "sculpin/sculpin": "^3.0"
}, },
"autoload": { "autoload": {

23
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "b63732988d00fd669ea934d62402fd48", "content-hash": "c6dbaa9f2424b9e4e8e3e4fd3d854e0d",
"packages": [], "packages": [],
"packages-dev": [ "packages-dev": [
{ {
@ -677,16 +677,16 @@
}, },
{ {
"name": "friendsofphp/php-cs-fixer", "name": "friendsofphp/php-cs-fixer",
"version": "v2.14.2", "version": "v2.15.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
"reference": "ff401e58261ffc5934a58f795b3f95b355e276cb" "reference": "adfab51ae979ee8b0fcbc55aa231ec2786cb1f91"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/ff401e58261ffc5934a58f795b3f95b355e276cb", "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/adfab51ae979ee8b0fcbc55aa231ec2786cb1f91",
"reference": "ff401e58261ffc5934a58f795b3f95b355e276cb", "reference": "adfab51ae979ee8b0fcbc55aa231ec2786cb1f91",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -714,10 +714,10 @@
"mikey179/vfsstream": "^1.6", "mikey179/vfsstream": "^1.6",
"php-coveralls/php-coveralls": "^2.1", "php-coveralls/php-coveralls": "^2.1",
"php-cs-fixer/accessible-object": "^1.0", "php-cs-fixer/accessible-object": "^1.0",
"php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.0.1", "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.1",
"php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.0.1", "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.1",
"phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1", "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1",
"phpunitgoodpractices/traits": "^1.5.1", "phpunitgoodpractices/traits": "^1.8",
"symfony/phpunit-bridge": "^4.0" "symfony/phpunit-bridge": "^4.0"
}, },
"suggest": { "suggest": {
@ -730,6 +730,11 @@
"php-cs-fixer" "php-cs-fixer"
], ],
"type": "application", "type": "application",
"extra": {
"branch-alias": {
"dev-master": "2.15-dev"
}
},
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"PhpCsFixer\\": "src/" "PhpCsFixer\\": "src/"
@ -761,7 +766,7 @@
} }
], ],
"description": "A tool to automatically fix PHP code style", "description": "A tool to automatically fix PHP code style",
"time": "2019-02-17T17:44:13+00:00" "time": "2019-05-06T07:13:51+00:00"
}, },
{ {
"name": "gajus/dindent", "name": "gajus/dindent",