From b5fea3ee7f7068b462a6d9baf0b1b8c2d60b740c Mon Sep 17 00:00:00 2001 From: Lance Pioch Date: Wed, 9 May 2018 12:03:02 -0400 Subject: [PATCH] Update php-cs-fixer --- composer.json | 2 +- composer.lock | 41 ++++++++++++++++++++++++----------------- 2 files changed, 25 insertions(+), 18 deletions(-) diff --git a/composer.json b/composer.json index a98e8d876..a174792b4 100644 --- a/composer.json +++ b/composer.json @@ -46,7 +46,7 @@ "barryvdh/laravel-ide-helper": "^2.4", "codedungeon/phpunit-result-printer": "^0.17.1", "filp/whoops": "^2.1", - "friendsofphp/php-cs-fixer": "^2.8.0", + "friendsofphp/php-cs-fixer": "^2.11.1", "fzaninotto/faker": "^1.6", "mockery/mockery": "^1.0", "php-mock/php-mock-phpunit": "^2.1", diff --git a/composer.lock b/composer.lock index 56f2a3b38..e9234e096 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": "4bc97ee0ff79647903402e6f163435b5", + "content-hash": "d38f96cae1ad0aab57d86796d2209d31", "packages": [ { "name": "appstract/laravel-blade-directives", @@ -4629,16 +4629,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v2.10.2", + "version": "v2.11.1", "source": { "type": "git", "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "74e4682a4073bc8bc2d4ff2b30a4873ac76cc1f1" + "reference": "ad94441c17b8ef096e517acccdbf3238af8a2da8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/74e4682a4073bc8bc2d4ff2b30a4873ac76cc1f1", - "reference": "74e4682a4073bc8bc2d4ff2b30a4873ac76cc1f1", + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/ad94441c17b8ef096e517acccdbf3238af8a2da8", + "reference": "ad94441c17b8ef096e517acccdbf3238af8a2da8", "shasum": "" }, "require": { @@ -4646,9 +4646,8 @@ "doctrine/annotations": "^1.2", "ext-json": "*", "ext-tokenizer": "*", - "gecko-packages/gecko-php-unit": "^2.0 || ^3.0", "php": "^5.6 || >=7.0 <7.3", - "php-cs-fixer/diff": "^1.2", + "php-cs-fixer/diff": "^1.3", "symfony/console": "^3.2 || ^4.0", "symfony/event-dispatcher": "^3.0 || ^4.0", "symfony/filesystem": "^3.0 || ^4.0", @@ -4663,14 +4662,14 @@ "hhvm": "*" }, "require-dev": { - "johnkary/phpunit-speedtrap": "^1.1 || ^2.0@dev", + "johnkary/phpunit-speedtrap": "^1.1 || ^2.0 || ^3.0", "justinrainbow/json-schema": "^5.0", "keradus/cli-executor": "^1.0", "mikey179/vfsstream": "^1.6", "php-coveralls/php-coveralls": "^2.0", "php-cs-fixer/accessible-object": "^1.0", - "phpunit/phpunit": "^5.7.23 || ^6.4.3", - "phpunitgoodpractices/traits": "^1.0", + "phpunit/phpunit": "^5.7.23 || ^6.4.3 || ^7.0", + "phpunitgoodpractices/traits": "^1.3.1", "symfony/phpunit-bridge": "^3.2.2 || ^4.0" }, "suggest": { @@ -4681,6 +4680,11 @@ "php-cs-fixer" ], "type": "application", + "extra": { + "branch-alias": { + "dev-master": "2.11-dev" + } + }, "autoload": { "psr-4": { "PhpCsFixer\\": "src/" @@ -4690,6 +4694,9 @@ "tests/Test/AbstractIntegrationCaseFactory.php", "tests/Test/AbstractIntegrationTestCase.php", "tests/Test/Assert/AssertTokensTrait.php", + "tests/Test/Constraint/SameStringsConstraint.php", + "tests/Test/Constraint/SameStringsConstraintForV5.php", + "tests/Test/Constraint/SameStringsConstraintForV7.php", "tests/Test/IntegrationCase.php", "tests/Test/IntegrationCaseFactory.php", "tests/Test/IntegrationCaseFactoryInterface.php", @@ -4712,7 +4719,7 @@ } ], "description": "A tool to automatically fix PHP code style", - "time": "2018-02-03T08:30:06+00:00" + "time": "2018-03-21T17:41:26+00:00" }, { "name": "fzaninotto/faker", @@ -5196,23 +5203,23 @@ }, { "name": "php-cs-fixer/diff", - "version": "v1.2.1", + "version": "v1.3.0", "source": { "type": "git", "url": "https://github.com/PHP-CS-Fixer/diff.git", - "reference": "b95b8c02c58670b15612cfc60873f3f7f5290484" + "reference": "78bb099e9c16361126c86ce82ec4405ebab8e756" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/b95b8c02c58670b15612cfc60873f3f7f5290484", - "reference": "b95b8c02c58670b15612cfc60873f3f7f5290484", + "url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/78bb099e9c16361126c86ce82ec4405ebab8e756", + "reference": "78bb099e9c16361126c86ce82ec4405ebab8e756", "shasum": "" }, "require": { "php": "^5.6 || ^7.0" }, "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.4.3", + "phpunit/phpunit": "^5.7.23 || ^6.4.3", "symfony/process": "^3.3" }, "type": "library", @@ -5243,7 +5250,7 @@ "keywords": [ "diff" ], - "time": "2017-10-21T10:28:17+00:00" + "time": "2018-02-15T16:58:55+00:00" }, { "name": "php-mock/php-mock",