From f691910b9de27c40cf27713c575f60c211b1ef19 Mon Sep 17 00:00:00 2001 From: Fred Emmott Date: Wed, 6 Jun 2018 16:06:11 -0700 Subject: [PATCH] Update dependencies and metadata - given we're not near a stable release at the moment, stop targetting LTS versions of HHVM - allow HSL and HHAST v3.26 --- .travis.yml | 1 - composer.json | 8 +- composer.lock | 255 ++++++++++++++++++++++++++++++++------------------ 3 files changed, 170 insertions(+), 94 deletions(-) diff --git a/.travis.yml b/.travis.yml index ec87873..a3060df 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ language: php php: - hhvm - - hhvm-3.24 - hhvm-nightly script: - ./.travis.sh diff --git a/composer.json b/composer.json index 59edce8..d0d2b69 100644 --- a/composer.json +++ b/composer.json @@ -4,9 +4,9 @@ "keywords": ["hack", "router", "routing", "hhvm"], "homepage": "https://github.com/hhvm/hack-router", "require": { - "hhvm": "^3.23.0", + "hhvm": "^3.26.0", "hack-psr/psr7-http-message-hhi": "^0.2.0|^1.0.0", - "hhvm/hsl": "^1.0.0", + "hhvm/hsl": "^1.0.0|^3.26.0", "hhvm/hhvm-autoload": "^1.5.3" }, "extra": { @@ -18,7 +18,7 @@ "phpunit/phpunit": "^5.1", "91carriage/phpunit-hhi": "^5.1", "zendframework/zend-diactoros": "^1.3", - "facebook/fbexpect": "^0.4.0", - "hhvm/hhast": "^1.0" + "facebook/fbexpect": "^0.4.0|^1.0", + "hhvm/hhast": "^1.0|^3.26.0" } } diff --git a/composer.lock b/composer.lock index 46ca1fd..cc37a92 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": "078ebc0cf0f20eb44b6baca2e7ba7f51", + "content-hash": "a5b69254705e2c582287bf930b35c356", "packages": [ { "name": "fredemmott/hack-error-suppressor", @@ -80,16 +80,16 @@ }, { "name": "hhvm/hhvm-autoload", - "version": "v1.6.2", + "version": "v1.6.5", "source": { "type": "git", "url": "https://github.com/hhvm/hhvm-autoload.git", - "reference": "2beebbb5982e77237ec853ee1231860c3c295bf3" + "reference": "df9098e03e5bf9a05ebdc46ec9588e0da25834d6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/hhvm/hhvm-autoload/zipball/2beebbb5982e77237ec853ee1231860c3c295bf3", - "reference": "2beebbb5982e77237ec853ee1231860c3c295bf3", + "url": "https://api.github.com/repos/hhvm/hhvm-autoload/zipball/df9098e03e5bf9a05ebdc46ec9588e0da25834d6", + "reference": "df9098e03e5bf9a05ebdc46ec9588e0da25834d6", "shasum": "" }, "require": { @@ -125,36 +125,38 @@ ] }, "notification-url": "https://packagist.org/downloads/", - "time": "2018-02-27T18:31:14+00:00" + "time": "2018-06-06T22:45:48+00:00" }, { "name": "hhvm/hsl", - "version": "v1.3.0", + "version": "v3.26.0", "source": { "type": "git", "url": "https://github.com/hhvm/hsl.git", - "reference": "556bb0a0749226417dd0f53567571ecc008f37f2" + "reference": "e046cdba90c8204d9b329ad25ce134e9845761eb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/hhvm/hsl/zipball/556bb0a0749226417dd0f53567571ecc008f37f2", - "reference": "556bb0a0749226417dd0f53567571ecc008f37f2", + "url": "https://api.github.com/repos/hhvm/hsl/zipball/e046cdba90c8204d9b329ad25ce134e9845761eb", + "reference": "e046cdba90c8204d9b329ad25ce134e9845761eb", "shasum": "" }, "require": { + "hhvm": "^3.26.0", "hhvm/hhvm-autoload": "^1.4" }, "require-dev": { "91carriage/phpunit-hhi": "^5.7", - "facebook/definition-finder": "^1.6.1", "facebook/fbexpect": "^0.4", - "hhvm": "^3.23.2", "phpunit/phpunit": "^5.7" }, "type": "library", "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], "description": "The Hack Standard Library", - "time": "2018-02-05T22:10:31+00:00" + "time": "2018-05-08T22:54:05+00:00" }, { "name": "psr/http-message", @@ -210,14 +212,14 @@ "packages-dev": [ { "name": "91carriage/phpunit-hhi", - "version": "5.7.3", + "version": "5.7.4", "source": { "type": "git", "url": "https://git.simon.geek.nz/91-carriage/phpunit-hhi.git", - "reference": "e885e708b0658cc55f57a45c7b5720cdc617c4c9" + "reference": "29e50b1130dc6d72266460f1f303ba1f24937a40" }, "require": { - "hhvm": ">=3.23.0" + "hhvm": ">=3.24.3" }, "conflict": { "phpunit/phpunit": "<5.7.15" @@ -255,36 +257,36 @@ "phpunit", "testing" ], - "time": "2018-02-09T19:25:38+00:00" + "time": "2018-03-02T23:37:33+00:00" }, { "name": "doctrine/instantiator", - "version": "1.0.5", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d" + "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d", - "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda", + "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda", "shasum": "" }, "require": { - "php": ">=5.3,<8.0-DEV" + "php": "^7.1" }, "require-dev": { "athletic/athletic": "~0.1.8", "ext-pdo": "*", "ext-phar": "*", - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "~2.0" + "phpunit/phpunit": "^6.2.3", + "squizlabs/php_codesniffer": "^3.0.2" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.2.x-dev" } }, "autoload": { @@ -309,20 +311,20 @@ "constructor", "instantiate" ], - "time": "2015-06-14T21:17:01+00:00" + "time": "2017-07-22T11:58:36+00:00" }, { "name": "facebook/fbexpect", - "version": "v0.4.1", + "version": "v1.0.0", "source": { "type": "git", "url": "https://github.com/hhvm/fbexpect.git", - "reference": "5af28d762b2bf8c6e7c242ce94eacf5136f61459" + "reference": "1b86ba9bcab71242cf8d1a69aaca5ca3774c5ecf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/hhvm/fbexpect/zipball/5af28d762b2bf8c6e7c242ce94eacf5136f61459", - "reference": "5af28d762b2bf8c6e7c242ce94eacf5136f61459", + "url": "https://api.github.com/repos/hhvm/fbexpect/zipball/1b86ba9bcab71242cf8d1a69aaca5ca3774c5ecf", + "reference": "1b86ba9bcab71242cf8d1a69aaca5ca3774c5ecf", "shasum": "" }, "require": { @@ -341,31 +343,34 @@ ] }, "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], "description": "Unit test helpers for Facebook projects", - "time": "2018-02-09T00:09:55+00:00" + "time": "2018-05-09T17:30:06+00:00" }, { "name": "hhvm/hhast", - "version": "v1.0.1", + "version": "v3.26.0", "source": { "type": "git", "url": "https://github.com/hhvm/hhast.git", - "reference": "97916ba3945d95f89ba6e33ceadbde16bfa0e02e" + "reference": "a34b2650c0b982dac81bca318fa845fbed571063" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/hhvm/hhast/zipball/97916ba3945d95f89ba6e33ceadbde16bfa0e02e", - "reference": "97916ba3945d95f89ba6e33ceadbde16bfa0e02e", + "url": "https://api.github.com/repos/hhvm/hhast/zipball/a34b2650c0b982dac81bca318fa845fbed571063", + "reference": "a34b2650c0b982dac81bca318fa845fbed571063", "shasum": "" }, "require": { - "hhvm": "^3.24.0", - "hhvm/hsl": "^1.0.0", + "hhvm": "^3.26.0", + "hhvm/hsl": "^1.0.0|^3.26.0", "hhvm/type-assert": "^3.1" }, "require-dev": { "91carriage/phpunit-hhi": "^5.7", - "facebook/fbexpect": "^0.4.0", + "facebook/fbexpect": "^0.4.0|^1.0.0", "facebook/hack-codegen": "~3.0.3", "hhvm/hhvm-autoload": "^1.5", "phpunit/phpunit": "^5.7" @@ -375,62 +380,71 @@ ], "type": "library", "notification-url": "https://packagist.org/downloads/", - "time": "2018-03-01T22:15:51+00:00" + "license": [ + "MIT" + ], + "time": "2018-05-10T19:54:22+00:00" }, { "name": "hhvm/type-assert", - "version": "v3.2.1", + "version": "v3.2.2", "source": { "type": "git", "url": "https://github.com/hhvm/type-assert.git", - "reference": "8f70814c8268f50e2fa728893d3ad9cad73df398" + "reference": "9bbe7cac2ff831142d74203479e72046cbc932f8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/hhvm/type-assert/zipball/8f70814c8268f50e2fa728893d3ad9cad73df398", - "reference": "8f70814c8268f50e2fa728893d3ad9cad73df398", + "url": "https://api.github.com/repos/hhvm/type-assert/zipball/9bbe7cac2ff831142d74203479e72046cbc932f8", + "reference": "9bbe7cac2ff831142d74203479e72046cbc932f8", "shasum": "" }, "require": { "hhvm": "^3.23.0", "hhvm/hhvm-autoload": "^1.4", - "hhvm/hsl": "^1.0" + "hhvm/hsl": "^1.0|^3.26.0" }, "require-dev": { "91carriage/phpunit-hhi": "~5.1", - "facebook/fbexpect": "^0.2.0 | ^0.3.0 | ^0.4.0", + "facebook/fbexpect": "^0.4.0|^1.0.0", "phpunit/phpunit": "~5.1" }, "type": "library", "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], "description": "Convert untyped data to typed data", "keywords": [ "TypeAssert", "hack" ], - "time": "2018-02-09T17:05:23+00:00" + "time": "2018-05-09T18:23:07+00:00" }, { "name": "myclabs/deep-copy", - "version": "1.7.0", + "version": "1.8.0", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e" + "reference": "478465659fd987669df0bd8a9bf22a8710e5f1b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e", - "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/478465659fd987669df0bd8a9bf22a8710e5f1b6", + "reference": "478465659fd987669df0bd8a9bf22a8710e5f1b6", "shasum": "" }, "require": { - "php": "^5.6 || ^7.0" + "php": "^7.1" + }, + "replace": { + "myclabs/deep-copy": "self.version" }, "require-dev": { "doctrine/collections": "^1.0", "doctrine/common": "^2.6", - "phpunit/phpunit": "^4.1" + "phpunit/phpunit": "^7.1" }, "type": "library", "autoload": { @@ -453,7 +467,7 @@ "object", "object graph" ], - "time": "2017-10-19T19:58:43+00:00" + "time": "2018-05-29T17:25:09+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -511,29 +525,35 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "3.3.2", + "version": "4.3.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "bf329f6c1aadea3299f08ee804682b7c45b326a2" + "reference": "94fd0001232e47129dd3504189fa1c7225010d08" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/bf329f6c1aadea3299f08ee804682b7c45b326a2", - "reference": "bf329f6c1aadea3299f08ee804682b7c45b326a2", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/94fd0001232e47129dd3504189fa1c7225010d08", + "reference": "94fd0001232e47129dd3504189fa1c7225010d08", "shasum": "" }, "require": { - "php": "^5.6 || ^7.0", + "php": "^7.0", "phpdocumentor/reflection-common": "^1.0.0", "phpdocumentor/type-resolver": "^0.4.0", "webmozart/assert": "^1.0" }, "require-dev": { - "mockery/mockery": "^0.9.4", - "phpunit/phpunit": "^4.4" + "doctrine/instantiator": "~1.0.5", + "mockery/mockery": "^1.0", + "phpunit/phpunit": "^6.4" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.x-dev" + } + }, "autoload": { "psr-4": { "phpDocumentor\\Reflection\\": [ @@ -552,7 +572,7 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2017-11-10T14:09:06+00:00" + "time": "2017-11-30T07:14:17+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -603,23 +623,23 @@ }, { "name": "phpspec/prophecy", - "version": "1.7.5", + "version": "1.7.6", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "dfd6be44111a7c41c2e884a336cc4f461b3b2401" + "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/dfd6be44111a7c41c2e884a336cc4f461b3b2401", - "reference": "dfd6be44111a7c41c2e884a336cc4f461b3b2401", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/33a7e3c4fda54e912ff6338c48823bd5c0f0b712", + "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712", "shasum": "" }, "require": { "doctrine/instantiator": "^1.0.2", "php": "^5.3|^7.0", "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0", - "sebastian/comparator": "^1.1|^2.0", + "sebastian/comparator": "^1.1|^2.0|^3.0", "sebastian/recursion-context": "^1.0|^2.0|^3.0" }, "require-dev": { @@ -662,7 +682,7 @@ "spy", "stub" ], - "time": "2018-02-19T10:16:54+00:00" + "time": "2018-04-18T13:57:24+00:00" }, { "name": "phpunit/php-code-coverage", @@ -866,29 +886,29 @@ }, { "name": "phpunit/php-token-stream", - "version": "1.4.12", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "1ce90ba27c42e4e44e6d8458241466380b51fa16" + "reference": "791198a2c6254db10131eecfe8c06670700904db" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/1ce90ba27c42e4e44e6d8458241466380b51fa16", - "reference": "1ce90ba27c42e4e44e6d8458241466380b51fa16", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/791198a2c6254db10131eecfe8c06670700904db", + "reference": "791198a2c6254db10131eecfe8c06670700904db", "shasum": "" }, "require": { "ext-tokenizer": "*", - "php": ">=5.3.3" + "php": "^7.0" }, "require-dev": { - "phpunit/phpunit": "~4.2" + "phpunit/phpunit": "^6.2.4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "2.0-dev" } }, "autoload": { @@ -911,7 +931,7 @@ "keywords": [ "tokenizer" ], - "time": "2017-12-04T08:55:13+00:00" + "time": "2017-11-27T05:48:46+00:00" }, { "name": "phpunit/phpunit", @@ -1567,22 +1587,78 @@ "homepage": "https://github.com/sebastianbergmann/version", "time": "2016-10-03T07:35:21+00:00" }, + { + "name": "symfony/polyfill-ctype", + "version": "v1.8.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-ctype.git", + "reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/7cc359f1b7b80fc25ed7796be7d96adc9b354bae", + "reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.8-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Ctype\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + }, + { + "name": "Gert de Pagter", + "email": "BackEndTea@gmail.com" + } + ], + "description": "Symfony polyfill for ctype functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "ctype", + "polyfill", + "portable" + ], + "time": "2018-04-30T19:57:29+00:00" + }, { "name": "symfony/yaml", - "version": "v3.4.5", + "version": "v4.1.0", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "6af42631dcf89e9c616242c900d6c52bd53bd1bb" + "reference": "80e4bfa9685fc4a09acc4a857ec16974a9cd944e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/6af42631dcf89e9c616242c900d6c52bd53bd1bb", - "reference": "6af42631dcf89e9c616242c900d6c52bd53bd1bb", + "url": "https://api.github.com/repos/symfony/yaml/zipball/80e4bfa9685fc4a09acc4a857ec16974a9cd944e", + "reference": "80e4bfa9685fc4a09acc4a857ec16974a9cd944e", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8" + "php": "^7.1.3", + "symfony/polyfill-ctype": "~1.8" }, "conflict": { "symfony/console": "<3.4" @@ -1596,7 +1672,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -1623,7 +1699,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2018-02-16T09:50:28+00:00" + "time": "2018-05-30T07:26:09+00:00" }, { "name": "webmozart/assert", @@ -1677,16 +1753,16 @@ }, { "name": "zendframework/zend-diactoros", - "version": "1.7.1", + "version": "1.7.2", "source": { "type": "git", "url": "https://github.com/zendframework/zend-diactoros.git", - "reference": "bf26aff803a11c5cc8eb7c4878a702c403ec67f1" + "reference": "741e7a571836f038de731105f4742ca8a164e43a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/bf26aff803a11c5cc8eb7c4878a702c403ec67f1", - "reference": "bf26aff803a11c5cc8eb7c4878a702c403ec67f1", + "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/741e7a571836f038de731105f4742ca8a164e43a", + "reference": "741e7a571836f038de731105f4742ca8a164e43a", "shasum": "" }, "require": { @@ -1706,7 +1782,8 @@ "extra": { "branch-alias": { "dev-master": "1.7.x-dev", - "dev-develop": "1.8.x-dev" + "dev-develop": "1.8.x-dev", + "dev-release-2.0": "2.0.x-dev" } }, "autoload": { @@ -1725,7 +1802,7 @@ "psr", "psr-7" ], - "time": "2018-02-26T15:44:50+00:00" + "time": "2018-05-29T16:53:08+00:00" } ], "aliases": [], @@ -1734,7 +1811,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "hhvm": "^3.23.0" + "hhvm": "^3.26.0" }, "platform-dev": [] }