From a02e013e34d2008b7254b46c36245b4b6f1d24ef Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Mon, 26 Feb 2018 16:01:41 -0500
Subject: [PATCH] Update tools.
---
composer.json | 12 ++--
composer.lock | 182 ++++++++++++++++++++------------------------------
2 files changed, 77 insertions(+), 117 deletions(-)
diff --git a/composer.json b/composer.json
index 262fc39ac0b..6401df9cabf 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,7 @@
"pear/file_marc": "1.1.5",
"pear/http_request2": "2.3.0",
"pear/validate_ispn": "dev-master",
- "phing/phing": "2.16.0",
+ "phing/phing": "2.16.1",
"serialssolutions/summon": "1.1.0",
"symfony/yaml": "3.3.10",
"swagger-api/swagger-ui": "2.2.10",
@@ -74,12 +74,12 @@
"require-dev": {
"behat/mink": "1.7.1",
"behat/mink-selenium2-driver": "1.3.1",
- "friendsofphp/php-cs-fixer": "2.7.1",
- "phploc/phploc": "4.0.0",
+ "friendsofphp/php-cs-fixer": "2.10.3",
+ "phploc/phploc": "4.0.1",
"phpmd/phpmd": "2.6.0",
- "phpunit/phpunit": "5.7.23",
- "sebastian/phpcpd": "3.0.0",
- "squizlabs/php_codesniffer": "3.1.1"
+ "phpunit/phpunit": "5.7.27",
+ "sebastian/phpcpd": "3.0.1",
+ "squizlabs/php_codesniffer": "3.2.3"
},
"scripts": {
"phing-install-dependencies": "phing installsolr installswaggerui",
diff --git a/composer.lock b/composer.lock
index dce9687d23e..c47bd17b8d8 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": "85ffc6bae749899fb81b5d44023ba507",
+ "content-hash": "2cb9c3e391d5393ae3155b35f2430093",
"packages": [
{
"name": "aferrandini/phpqrcode",
@@ -1128,21 +1128,21 @@
},
{
"name": "phing/phing",
- "version": "2.16.0",
+ "version": "2.16.1",
"source": {
"type": "git",
"url": "https://github.com/phingofficial/phing.git",
- "reference": "151a0f4d8cebf7711eccc62dde3f09bc36a00d7b"
+ "reference": "cbe0f969e434e269af91b4160b86fe899c6e07c7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phingofficial/phing/zipball/151a0f4d8cebf7711eccc62dde3f09bc36a00d7b",
- "reference": "151a0f4d8cebf7711eccc62dde3f09bc36a00d7b",
+ "url": "https://api.github.com/repos/phingofficial/phing/zipball/cbe0f969e434e269af91b4160b86fe899c6e07c7",
+ "reference": "cbe0f969e434e269af91b4160b86fe899c6e07c7",
"shasum": ""
},
"require": {
"php": ">=5.2.0",
- "symfony/yaml": "^3.1"
+ "symfony/yaml": "^3.1 || ^4.0"
},
"require-dev": {
"ext-pdo_sqlite": "*",
@@ -1217,7 +1217,7 @@
"task",
"tool"
],
- "time": "2016-12-22T20:16:33+00:00"
+ "time": "2018-01-25T13:18:09+00:00"
},
{
"name": "psr/container",
@@ -4441,16 +4441,16 @@
},
{
"name": "friendsofphp/php-cs-fixer",
- "version": "v2.7.1",
+ "version": "v2.10.3",
"source": {
"type": "git",
"url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
- "reference": "ab2e189d94698178988f9732bc75bb4ce8d16f77"
+ "reference": "1634a2c250bf4640f1c5c963f63b413c2d966c8a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/ab2e189d94698178988f9732bc75bb4ce8d16f77",
- "reference": "ab2e189d94698178988f9732bc75bb4ce8d16f77",
+ "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/1634a2c250bf4640f1c5c963f63b413c2d966c8a",
+ "reference": "1634a2c250bf4640f1c5c963f63b413c2d966c8a",
"shasum": ""
},
"require": {
@@ -4458,29 +4458,31 @@
"doctrine/annotations": "^1.2",
"ext-json": "*",
"ext-tokenizer": "*",
- "gecko-packages/gecko-php-unit": "^2.0",
"php": "^5.6 || >=7.0 <7.3",
- "php-cs-fixer/diff": "^1.0",
- "symfony/console": "^3.2",
- "symfony/event-dispatcher": "^3.0",
- "symfony/filesystem": "^3.0",
- "symfony/finder": "^3.0",
- "symfony/options-resolver": "^3.0",
+ "php-cs-fixer/diff": "^1.2",
+ "symfony/console": "^3.2 || ^4.0",
+ "symfony/event-dispatcher": "^3.0 || ^4.0",
+ "symfony/filesystem": "^3.0 || ^4.0",
+ "symfony/finder": "^3.0 || ^4.0",
+ "symfony/options-resolver": "^3.0 || ^4.0",
"symfony/polyfill-php70": "^1.0",
"symfony/polyfill-php72": "^1.4",
- "symfony/process": "^3.0",
- "symfony/stopwatch": "^3.0"
+ "symfony/process": "^3.0 || ^4.0",
+ "symfony/stopwatch": "^3.0 || ^4.0"
},
"conflict": {
"hhvm": "*"
},
"require-dev": {
- "johnkary/phpunit-speedtrap": "^1.1",
+ "johnkary/phpunit-speedtrap": "^1.1 || ^2.0@dev",
"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": "^4.8.35 || ^5.4.3",
- "satooshi/php-coveralls": "^1.0",
- "symfony/phpunit-bridge": "^3.2.2"
+ "phpunit/phpunit": "^5.7.23 || ^6.4.3",
+ "phpunitgoodpractices/traits": "^1.0",
+ "symfony/phpunit-bridge": "^3.2.2 || ^4.0"
},
"suggest": {
"ext-mbstring": "For handling non-UTF8 characters in cache signature.",
@@ -4495,11 +4497,16 @@
"PhpCsFixer\\": "src/"
},
"classmap": [
- "tests/Test/Assert/AssertTokensTrait.php",
"tests/Test/AbstractFixerTestCase.php",
+ "tests/Test/AbstractIntegrationCaseFactory.php",
"tests/Test/AbstractIntegrationTestCase.php",
+ "tests/Test/Assert/AssertTokensTrait.php",
+ "tests/Test/Constraint/SameStringsConstraint.php",
"tests/Test/IntegrationCase.php",
- "tests/Test/IntegrationCaseFactory.php"
+ "tests/Test/IntegrationCaseFactory.php",
+ "tests/Test/IntegrationCaseFactoryInterface.php",
+ "tests/Test/InternalIntegrationCaseFactory.php",
+ "tests/TestCase.php"
]
},
"notification-url": "https://packagist.org/downloads/",
@@ -4517,54 +4524,7 @@
}
],
"description": "A tool to automatically fix PHP code style",
- "time": "2017-10-02T12:16:05+00:00"
- },
- {
- "name": "gecko-packages/gecko-php-unit",
- "version": "v2.2.1",
- "source": {
- "type": "git",
- "url": "https://github.com/GeckoPackages/GeckoPHPUnit.git",
- "reference": "a06beb80f63645140c251cfd757ba94a4a540be5"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/GeckoPackages/GeckoPHPUnit/zipball/a06beb80f63645140c251cfd757ba94a4a540be5",
- "reference": "a06beb80f63645140c251cfd757ba94a4a540be5",
- "shasum": ""
- },
- "require": {
- "php": "^5.3.6 || ^7.0"
- },
- "conflict": {
- "phpunit/phpunit": ">=6.0"
- },
- "require-dev": {
- "phpunit/phpunit": "^4.8.35 || ^5.4.3"
- },
- "suggest": {
- "ext-dom": "When testing with xml.",
- "ext-libxml": "When testing with xml.",
- "phpunit/phpunit": "This is an extension for PHPUnit so make sure you have that in some way."
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "GeckoPackages\\PHPUnit\\": "src/PHPUnit"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "description": "Additional PHPUnit asserts and constraints.",
- "homepage": "https://github.com/GeckoPackages",
- "keywords": [
- "extension",
- "filesystem",
- "phpunit"
- ],
- "time": "2018-02-05T09:26:06+00:00"
+ "time": "2018-02-22T16:49:33+00:00"
},
{
"name": "instaclick/php-webdriver",
@@ -4712,23 +4672,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",
@@ -4759,7 +4719,7 @@
"keywords": [
"diff"
],
- "time": "2017-10-21T10:28:17+00:00"
+ "time": "2018-02-15T16:58:55+00:00"
},
{
"name": "phpdocumentor/reflection-common",
@@ -4909,23 +4869,23 @@
},
{
"name": "phploc/phploc",
- "version": "4.0.0",
+ "version": "4.0.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phploc.git",
- "reference": "7335bb2173c687759631fe4901db6897245f6e2b"
+ "reference": "6a8a9416517b82d6326ac9c2d040ad53c13654eb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phploc/zipball/7335bb2173c687759631fe4901db6897245f6e2b",
- "reference": "7335bb2173c687759631fe4901db6897245f6e2b",
+ "url": "https://api.github.com/repos/sebastianbergmann/phploc/zipball/6a8a9416517b82d6326ac9c2d040ad53c13654eb",
+ "reference": "6a8a9416517b82d6326ac9c2d040ad53c13654eb",
"shasum": ""
},
"require": {
"php": "^5.6 || ^7.0",
"sebastian/finder-facade": "^1.1",
"sebastian/version": "^2.0",
- "symfony/console": "^2.7|^3.0"
+ "symfony/console": "^2.7|^3.0|^4.0"
},
"bin": [
"phploc"
@@ -4954,7 +4914,7 @@
],
"description": "A tool for quickly measuring the size of a PHP project.",
"homepage": "https://github.com/sebastianbergmann/phploc",
- "time": "2017-06-06T13:07:11+00:00"
+ "time": "2017-11-18T17:35:43+00:00"
},
{
"name": "phpmd/phpmd",
@@ -5024,16 +4984,16 @@
},
{
"name": "phpspec/prophecy",
- "version": "1.7.4",
+ "version": "1.7.5",
"source": {
"type": "git",
"url": "https://github.com/phpspec/prophecy.git",
- "reference": "9f901e29c93dae4aa77c0bb161df4276f9c9a1be"
+ "reference": "dfd6be44111a7c41c2e884a336cc4f461b3b2401"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpspec/prophecy/zipball/9f901e29c93dae4aa77c0bb161df4276f9c9a1be",
- "reference": "9f901e29c93dae4aa77c0bb161df4276f9c9a1be",
+ "url": "https://api.github.com/repos/phpspec/prophecy/zipball/dfd6be44111a7c41c2e884a336cc4f461b3b2401",
+ "reference": "dfd6be44111a7c41c2e884a336cc4f461b3b2401",
"shasum": ""
},
"require": {
@@ -5083,7 +5043,7 @@
"spy",
"stub"
],
- "time": "2018-02-11T18:49:29+00:00"
+ "time": "2018-02-19T10:16:54+00:00"
},
{
"name": "phpunit/php-code-coverage",
@@ -5336,16 +5296,16 @@
},
{
"name": "phpunit/phpunit",
- "version": "5.7.23",
+ "version": "5.7.27",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "78532d5269d984660080d8e0f4c99c5c2ea65ffe"
+ "reference": "b7803aeca3ccb99ad0a506fa80b64cd6a56bbc0c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/78532d5269d984660080d8e0f4c99c5c2ea65ffe",
- "reference": "78532d5269d984660080d8e0f4c99c5c2ea65ffe",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b7803aeca3ccb99ad0a506fa80b64cd6a56bbc0c",
+ "reference": "b7803aeca3ccb99ad0a506fa80b64cd6a56bbc0c",
"shasum": ""
},
"require": {
@@ -5369,8 +5329,8 @@
"sebastian/global-state": "^1.1",
"sebastian/object-enumerator": "~2.0",
"sebastian/resource-operations": "~1.0",
- "sebastian/version": "~1.0.3|~2.0",
- "symfony/yaml": "~2.1|~3.0"
+ "sebastian/version": "^1.0.6|^2.0.1",
+ "symfony/yaml": "~2.1|~3.0|~4.0"
},
"conflict": {
"phpdocumentor/reflection-docblock": "3.0.2"
@@ -5414,7 +5374,7 @@
"testing",
"xunit"
],
- "time": "2017-10-15T06:13:55+00:00"
+ "time": "2018-02-01T05:50:59+00:00"
},
{
"name": "phpunit/phpunit-mock-objects",
@@ -5891,24 +5851,24 @@
},
{
"name": "sebastian/phpcpd",
- "version": "3.0.0",
+ "version": "3.0.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpcpd.git",
- "reference": "d7006078b75a34c9250831c3453a2e256a687615"
+ "reference": "dfed51c1288790fc957c9433e2f49ab152e8a564"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpcpd/zipball/d7006078b75a34c9250831c3453a2e256a687615",
- "reference": "d7006078b75a34c9250831c3453a2e256a687615",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpcpd/zipball/dfed51c1288790fc957c9433e2f49ab152e8a564",
+ "reference": "dfed51c1288790fc957c9433e2f49ab152e8a564",
"shasum": ""
},
"require": {
"php": "^5.6|^7.0",
"phpunit/php-timer": "^1.0.6",
"sebastian/finder-facade": "^1.1",
- "sebastian/version": "^2.0",
- "symfony/console": "^3.0"
+ "sebastian/version": "^1.0|^2.0",
+ "symfony/console": "^2.7|^3.0|^4.0"
},
"bin": [
"phpcpd"
@@ -5937,7 +5897,7 @@
],
"description": "Copy/Paste Detector (CPD) for PHP code.",
"homepage": "https://github.com/sebastianbergmann/phpcpd",
- "time": "2017-02-05T07:48:01+00:00"
+ "time": "2017-11-16T08:49:28+00:00"
},
{
"name": "sebastian/recursion-context",
@@ -6079,16 +6039,16 @@
},
{
"name": "squizlabs/php_codesniffer",
- "version": "3.1.1",
+ "version": "3.2.3",
"source": {
"type": "git",
"url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
- "reference": "d667e245d5dcd4d7bf80f26f2c947d476b66213e"
+ "reference": "4842476c434e375f9d3182ff7b89059583aa8b27"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/d667e245d5dcd4d7bf80f26f2c947d476b66213e",
- "reference": "d667e245d5dcd4d7bf80f26f2c947d476b66213e",
+ "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/4842476c434e375f9d3182ff7b89059583aa8b27",
+ "reference": "4842476c434e375f9d3182ff7b89059583aa8b27",
"shasum": ""
},
"require": {
@@ -6098,7 +6058,7 @@
"php": ">=5.4.0"
},
"require-dev": {
- "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0"
+ "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
},
"bin": [
"bin/phpcs",
@@ -6126,7 +6086,7 @@
"phpcs",
"standards"
],
- "time": "2017-10-16T22:40:25+00:00"
+ "time": "2018-02-20T21:35:23+00:00"
},
{
"name": "symfony/config",
--
GitLab