BryanDavis has uploaded a new change for review. https://gerrit.wikimedia.org/r/295956
Change subject: Fix composer.lock and .travis.yaml for testing on PHP <5.5 ...................................................................... Fix composer.lock and .travis.yaml for testing on PHP <5.5 The composer.json file was setup properly for testing on older versions of PHP, but the composer.lock that was committed in 58b42af included pinned versions that require PHP 5.5+. Fix this by reset the pinned versions to versions that work with PHP 5.3+ and add a Travis step to upgrade phpunit and mediawiki-codesniffer to newer versions when the PHP version supports them. Change-Id: Ic8525031e2fe48960fd6f6413954724f9a6e2820 --- M .travis.yml M composer.lock 2 files changed, 38 insertions(+), 137 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/slimapp refs/changes/56/295956/1 diff --git a/.travis.yml b/.travis.yml index 6cc9250..46bda53 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,11 +5,12 @@ - "5.5" - "5.6" - "hhvm" -matrix: - allow_failures: - - php: "hhvm" # https://github.com/facebook/hhvm/issues/5836 sudo: false +env: + global: + - COMPOSER_DISABLE_XDEBUG_WARN=1 install: - composer install + - composer update mediawiki/mediawiki-codesniffer phpunit/phpunit script: - composer test diff --git a/composer.lock b/composer.lock index f674f09..77cd220 100644 --- a/composer.lock +++ b/composer.lock @@ -549,26 +549,24 @@ }, { "name": "mediawiki/mediawiki-codesniffer", - "version": "v0.7.2", + "version": "v0.5.1", "source": { "type": "git", "url": "https://github.com/wikimedia/mediawiki-tools-codesniffer.git";, - "reference": "6b713bcbb9c20a3bdad76f9477458c9b4ae0773b" + "reference": "e1ee95d0beb1c0eed8d98b6e4aa322130ac04d50" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wikimedia/mediawiki-tools-codesniffer/zipball/6b713bcbb9c20a3bdad76f9477458c9b4ae0773b";, - "reference": "6b713bcbb9c20a3bdad76f9477458c9b4ae0773b", + "url": "https://api.github.com/repos/wikimedia/mediawiki-tools-codesniffer/zipball/e1ee95d0beb1c0eed8d98b6e4aa322130ac04d50";, + "reference": "e1ee95d0beb1c0eed8d98b6e4aa322130ac04d50", "shasum": "" }, "require": { - "php": ">= 5.5.9", - "squizlabs/php_codesniffer": "2.6.0" + "squizlabs/php_codesniffer": "2.5.0" }, "require-dev": { "jakub-onderka/php-parallel-lint": "0.9.*", - "mikey179/vfsstream": "~1.6", - "phpunit/phpunit": "~4.1" + "phpunit/phpunit": "~4.8.18" }, "type": "library", "notification-url": "https://packagist.org/downloads/";, @@ -581,138 +579,41 @@ "codesniffer", "mediawiki" ], - "time": "2016-05-28 01:08:59" - }, - { - "name": "phpdocumentor/reflection-common", - "version": "1.0", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/ReflectionCommon.git";, - "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c";, - "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c", - "shasum": "" - }, - "require": { - "php": ">=5.5" - }, - "require-dev": { - "phpunit/phpunit": "^4.6" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": [ - "src" - ] - } - }, - "notification-url": "https://packagist.org/downloads/";, - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jaap van Otterdijk", - "email": "opensou...@ijaap.nl" - } - ], - "description": "Common reflection classes used by phpdocumentor to reflect the code structure", - "homepage": "http://www.phpdoc.org";, - "keywords": [ - "FQSEN", - "phpDocumentor", - "phpdoc", - "reflection", - "static analysis" - ], - "time": "2015-12-27 11:43:31" + "time": "2015-12-29 01:03:51" }, { "name": "phpdocumentor/reflection-docblock", - "version": "3.1.0", + "version": "2.0.4", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git";, - "reference": "9270140b940ff02e58ec577c237274e92cd40cdd" + "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/9270140b940ff02e58ec577c237274e92cd40cdd";, - "reference": "9270140b940ff02e58ec577c237274e92cd40cdd", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/d68dbdc53dc358a816f00b300704702b2eaff7b8";, + "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8", "shasum": "" }, "require": { - "php": ">=5.5", - "phpdocumentor/reflection-common": "^1.0@dev", - "phpdocumentor/type-resolver": "^0.2.0", - "webmozart/assert": "^1.0" + "php": ">=5.3.3" }, "require-dev": { - "mockery/mockery": "^0.9.4", - "phpunit/phpunit": "^4.4" + "phpunit/phpunit": "~4.0" }, - "type": "library", - "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": [ - "src/" - ] - } - }, - "notification-url": "https://packagist.org/downloads/";, - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Mike van Riel", - "email": "m...@mikevanriel.com" - } - ], - "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2016-06-10 09:48:41" - }, - { - "name": "phpdocumentor/type-resolver", - "version": "0.2", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/TypeResolver.git";, - "reference": "b39c7a5b194f9ed7bd0dd345c751007a41862443" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/b39c7a5b194f9ed7bd0dd345c751007a41862443";, - "reference": "b39c7a5b194f9ed7bd0dd345c751007a41862443", - "shasum": "" - }, - "require": { - "php": ">=5.5", - "phpdocumentor/reflection-common": "^1.0" - }, - "require-dev": { - "mockery/mockery": "^0.9.4", - "phpunit/phpunit": "^5.2||^4.8.24" + "suggest": { + "dflydev/markdown": "~1.0", + "erusev/parsedown": "~1.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": [ + "psr-0": { + "phpDocumentor": [ "src/" ] } @@ -724,10 +625,10 @@ "authors": [ { "name": "Mike van Riel", - "email": "m...@mikevanriel.com" + "email": "mike.vanr...@naenius.com" } ], - "time": "2016-06-10 07:14:17" + "time": "2015-02-03 12:10:50" }, { "name": "phpspec/prophecy", @@ -1536,20 +1437,19 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "2.6.0", + "version": "2.5.0", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git";, - "reference": "1bcdf03b068a530ac1962ce671dead356eeba43b" + "reference": "e4fb41d5d0387d556e2c25534d630b3cce90ea67" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/1bcdf03b068a530ac1962ce671dead356eeba43b";, - "reference": "1bcdf03b068a530ac1962ce671dead356eeba43b", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/e4fb41d5d0387d556e2c25534d630b3cce90ea67";, + "reference": "e4fb41d5d0387d556e2c25534d630b3cce90ea67", "shasum": "" }, "require": { - "ext-simplexml": "*", "ext-tokenizer": "*", "ext-xmlwriter": "*", "php": ">=5.1.2" @@ -1564,7 +1464,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { @@ -1610,29 +1510,29 @@ "phpcs", "standards" ], - "time": "2016-04-03 22:58:34" + "time": "2015-12-11 00:12:46" }, { "name": "symfony/yaml", - "version": "v3.1.1", + "version": "v2.8.7", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git";, - "reference": "c5a7e7fc273c758b92b85dcb9c46149ccda89623" + "reference": "815fabf3f48c7d1df345a69d1ad1a88f59757b34" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/c5a7e7fc273c758b92b85dcb9c46149ccda89623";, - "reference": "c5a7e7fc273c758b92b85dcb9c46149ccda89623", + "url": "https://api.github.com/repos/symfony/yaml/zipball/815fabf3f48c7d1df345a69d1ad1a88f59757b34";, + "reference": "815fabf3f48c7d1df345a69d1ad1a88f59757b34", "shasum": "" }, "require": { - "php": ">=5.5.9" + "php": ">=5.3.9" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev" + "dev-master": "2.8-dev" } }, "autoload": { @@ -1659,7 +1559,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com";, - "time": "2016-06-14 11:18:07" + "time": "2016-06-06 11:11:27" }, { "name": "webmozart/assert", -- To view, visit https://gerrit.wikimedia.org/r/295956 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic8525031e2fe48960fd6f6413954724f9a6e2820 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/slimapp Gerrit-Branch: master Gerrit-Owner: BryanDavis <bda...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
