From 704e05f90ba40f795092fc73125c48d838512d1d Mon Sep 17 00:00:00 2001 From: Anand Capur Date: Thu, 25 Jul 2019 18:38:09 -0400 Subject: [PATCH] update php-cs-fixer version --- composer.json | 2 +- composer.lock | 59 ++++++++++++++++++++++++--------------------------- 2 files changed, 29 insertions(+), 32 deletions(-) diff --git a/composer.json b/composer.json index dcac00e1d..e1bc76f5e 100644 --- a/composer.json +++ b/composer.json @@ -45,7 +45,7 @@ "barryvdh/laravel-ide-helper": "^2.5", "codedungeon/phpunit-result-printer": "^0.17.1", "filp/whoops": "^2.1", - "friendsofphp/php-cs-fixer": "^2.11.1", + "friendsofphp/php-cs-fixer": "^2.15.1", "fzaninotto/faker": "^1.6", "mockery/mockery": "^1.0", "nunomaduro/collision": "^2.0", diff --git a/composer.lock b/composer.lock index c5530927e..714d18675 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": "8a99f4996405b8080a0dcabb2609c39d", + "content-hash": "175a2431d23dd32f79b42bbc8030ace1", "packages": [ { "name": "appstract/laravel-blade-directives", @@ -46,9 +46,9 @@ "authors": [ { "name": "Gijs Jorissen", + "role": "Developer", "email": "hello@appstract.team", - "homepage": "https://appstract.team", - "role": "Developer" + "homepage": "https://appstract.team" } ], "description": "Handy Blade directives", @@ -973,12 +973,12 @@ "version": "3.0.0", "source": { "type": "git", - "url": "https://github.com/ivanakimov/hashids.php.git", + "url": "https://github.com/vinkla/hashids.git", "reference": "b6c61142bfe36d43740a5419d11c351dddac0458" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ivanakimov/hashids.php/zipball/b6c61142bfe36d43740a5419d11c351dddac0458", + "url": "https://api.github.com/repos/vinkla/hashids/zipball/b6c61142bfe36d43740a5419d11c351dddac0458", "reference": "b6c61142bfe36d43740a5419d11c351dddac0458", "shasum": "" }, @@ -2149,8 +2149,8 @@ "authors": [ { "name": "Antonio Carlos Ribeiro", - "email": "acr@antoniocarlosribeiro.com", - "role": "Creator & Designer" + "role": "Creator & Designer", + "email": "acr@antoniocarlosribeiro.com" } ], "description": "A One Time Password Authentication package, compatible with Google Authenticator.", @@ -2259,9 +2259,9 @@ "authors": [ { "name": "Dries Vints", + "role": "Maintainer", "email": "dries.vints@gmail.com", - "homepage": "http://driesvints.com", - "role": "Maintainer" + "homepage": "http://driesvints.com" } ], "description": "Prologue Alerts is a package that handles global site messages.", @@ -2720,9 +2720,9 @@ "authors": [ { "name": "Jarek Tkaczyk", + "role": "Developer", "email": "jarek@softonsofa.com", - "homepage": "https://softonsofa.com/", - "role": "Developer" + "homepage": "https://softonsofa.com/" } ], "description": "Flexible Searchable, Mappable, Metable, Validation and more extensions for Laravel Eloquent ORM.", @@ -2822,9 +2822,9 @@ "authors": [ { "name": "Jarek Tkaczyk", + "role": "Developer", "email": "jarek@softonsofa.com", - "homepage": "http://softonsofa.com/", - "role": "Developer" + "homepage": "http://softonsofa.com/" } ], "description": "Laravel Eloquent hooks system.", @@ -4968,16 +4968,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v2.13.1", + "version": "v2.15.1", "source": { "type": "git", "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "54814c62d5beef3ba55297b9b3186ed8b8a1b161" + "reference": "20064511ab796593a3990669eff5f5b535001f7c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/54814c62d5beef3ba55297b9b3186ed8b8a1b161", - "reference": "54814c62d5beef3ba55297b9b3186ed8b8a1b161", + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/20064511ab796593a3990669eff5f5b535001f7c", + "reference": "20064511ab796593a3990669eff5f5b535001f7c", "shasum": "" }, "require": { @@ -4986,7 +4986,7 @@ "doctrine/annotations": "^1.2", "ext-json": "*", "ext-tokenizer": "*", - "php": "^5.6 || >=7.0 <7.3", + "php": "^5.6 || ^7.0", "php-cs-fixer/diff": "^1.3", "symfony/console": "^3.4.17 || ^4.1.6", "symfony/event-dispatcher": "^3.0 || ^4.0", @@ -4998,21 +4998,18 @@ "symfony/process": "^3.0 || ^4.0", "symfony/stopwatch": "^3.0 || ^4.0" }, - "conflict": { - "hhvm": "*" - }, "require-dev": { "johnkary/phpunit-speedtrap": "^1.1 || ^2.0 || ^3.0", "justinrainbow/json-schema": "^5.0", - "keradus/cli-executor": "^1.1", + "keradus/cli-executor": "^1.2", "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", - "symfony/phpunit-bridge": "^4.0" + "phpunitgoodpractices/traits": "^1.8", + "symfony/phpunit-bridge": "^4.3" }, "suggest": { "ext-mbstring": "For handling non-UTF8 characters in cache signature.", @@ -5055,7 +5052,7 @@ } ], "description": "A tool to automatically fix PHP code style", - "time": "2018-10-21T00:32:10+00:00" + "time": "2019-06-01T10:32:12+00:00" }, { "name": "fzaninotto/faker", @@ -6102,8 +6099,8 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" + "role": "lead", + "email": "sebastian@phpunit.de" } ], "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", @@ -6375,8 +6372,8 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" + "role": "lead", + "email": "sebastian@phpunit.de" } ], "description": "The PHP Unit Testing framework.",