diff --git a/.env b/.env index d4848a1..0a5cbad 100644 --- a/.env +++ b/.env @@ -1,3 +1,3 @@ -PHP_BASE_IMAGE=php:7.2-cli +PHP_BASE_IMAGE=php:7.3-cli PHP_IMAGE=homepage-php NODE_IMAGE=node:12-alpine diff --git a/.php_cs b/.php_cs index 3796e84..f0e69a6 100644 --- a/.php_cs +++ b/.php_cs @@ -11,11 +11,11 @@ return PhpCsFixer\Config::create() ->setFinder($finder) ->setRules([ '@Symfony' => true, - '@PHP71Migration' => true, + '@PHP73Migration' => true, 'array_syntax' => ['syntax' => 'short'], + 'no_useless_return' => true, 'ordered_imports' => true, 'phpdoc_order' => true, - 'no_useless_return' => true, 'semicolon_after_instruction' => false, 'yoda_style' => false, ]) diff --git a/composer.json b/composer.json index b07b965..54bc01f 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ }, "require-dev": { "gajus/dindent": "^2.0", - "friendsofphp/php-cs-fixer": "^2.12", + "friendsofphp/php-cs-fixer": "^2.15", "sculpin/sculpin": "^3.0" }, "autoload": { diff --git a/composer.lock b/composer.lock index 0cd470b..b967eac 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "b63732988d00fd669ea934d62402fd48", + "content-hash": "c6dbaa9f2424b9e4e8e3e4fd3d854e0d", "packages": [], "packages-dev": [ { @@ -677,16 +677,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v2.14.2", + "version": "v2.15.0", "source": { "type": "git", "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "ff401e58261ffc5934a58f795b3f95b355e276cb" + "reference": "adfab51ae979ee8b0fcbc55aa231ec2786cb1f91" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/ff401e58261ffc5934a58f795b3f95b355e276cb", - "reference": "ff401e58261ffc5934a58f795b3f95b355e276cb", + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/adfab51ae979ee8b0fcbc55aa231ec2786cb1f91", + "reference": "adfab51ae979ee8b0fcbc55aa231ec2786cb1f91", "shasum": "" }, "require": { @@ -714,10 +714,10 @@ "mikey179/vfsstream": "^1.6", "php-coveralls/php-coveralls": "^2.1", "php-cs-fixer/accessible-object": "^1.0", - "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.0.1", - "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.0.1", + "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.1", + "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.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" }, "suggest": { @@ -730,6 +730,11 @@ "php-cs-fixer" ], "type": "application", + "extra": { + "branch-alias": { + "dev-master": "2.15-dev" + } + }, "autoload": { "psr-4": { "PhpCsFixer\\": "src/" @@ -761,7 +766,7 @@ } ], "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",