From 53108d3fe06228abe7f558b50ffcdfe3548e37e8 Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Mon, 26 Mar 2018 10:59:01 -0400
Subject: [PATCH] Update php-cs-fixer.
---
composer.json | 2 +-
composer.lock | 27 +++++++++++++++++----------
2 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/composer.json b/composer.json
index 68008a9aff8..178d5d41976 100644
--- a/composer.json
+++ b/composer.json
@@ -74,7 +74,7 @@
"require-dev": {
"behat/mink": "1.7.1",
"behat/mink-selenium2-driver": "1.3.1",
- "friendsofphp/php-cs-fixer": "2.10.3",
+ "friendsofphp/php-cs-fixer": "2.11.1",
"phploc/phploc": "4.0.1",
"phpmd/phpmd": "2.6.0",
"phpunit/phpunit": "6.5.7",
diff --git a/composer.lock b/composer.lock
index 81422aced60..b2e4ed760e2 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "content-hash": "017fcba32570fd18e6f1dc81ac082cf1",
+ "content-hash": "799cbc2f88dbcf4c6e78e1c0ece3e31a",
"packages": [
{
"name": "aferrandini/phpqrcode",
@@ -4508,16 +4508,16 @@
},
{
"name": "friendsofphp/php-cs-fixer",
- "version": "v2.10.3",
+ "version": "v2.11.1",
"source": {
"type": "git",
"url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
- "reference": "1634a2c250bf4640f1c5c963f63b413c2d966c8a"
+ "reference": "ad94441c17b8ef096e517acccdbf3238af8a2da8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/1634a2c250bf4640f1c5c963f63b413c2d966c8a",
- "reference": "1634a2c250bf4640f1c5c963f63b413c2d966c8a",
+ "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/ad94441c17b8ef096e517acccdbf3238af8a2da8",
+ "reference": "ad94441c17b8ef096e517acccdbf3238af8a2da8",
"shasum": ""
},
"require": {
@@ -4526,7 +4526,7 @@
"ext-json": "*",
"ext-tokenizer": "*",
"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",
@@ -4541,14 +4541,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": {
@@ -4559,6 +4559,11 @@
"php-cs-fixer"
],
"type": "application",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.11-dev"
+ }
+ },
"autoload": {
"psr-4": {
"PhpCsFixer\\": "src/"
@@ -4569,6 +4574,8 @@
"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",
@@ -4591,7 +4598,7 @@
}
],
"description": "A tool to automatically fix PHP code style",
- "time": "2018-02-22T16:49:33+00:00"
+ "time": "2018-03-21T17:41:26+00:00"
},
{
"name": "instaclick/php-webdriver",
--
GitLab