From 40a7255790a4dc2cbc82927e45a0e3aecc01bbaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andor=20D=C3=A1vid?= Date: Sat, 20 Aug 2016 13:02:18 +0200 Subject: [PATCH] Upgrade Robo to 1.0.0-RC1 --- composer.json | 2 +- composer.lock | 226 +++++++++++++++++++++++++------ tests/unit/TaskTsLintRunTest.php | 5 +- 3 files changed, 191 insertions(+), 42 deletions(-) diff --git a/composer.json b/composer.json index 16bb7c1..06b0a85 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ "prefer-stable": true, "require": { "cheppers/asset-jar": "^0.0", - "consolidation/robo": "dev-master#628f807dc6e321ba858cadc00eecc6a40a99efa9" + "consolidation/robo": "1.0.0-RC1" }, "require-dev": { "cheppers/git-hooks": "^0.0.8", diff --git a/composer.lock b/composer.lock index 22e0396..014816c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "1e31018147670e71623805641143b595", - "content-hash": "9f119ce53753221778f9f6878ad9796e", + "hash": "d92bff3bce4ead14b93e062f2f7e6478", + "content-hash": "5b071d04dcf6e9c5748a9437aabc0279", "packages": [ { "name": "cheppers/asset-jar", @@ -41,23 +41,24 @@ }, { "name": "consolidation/annotated-command", - "version": "1.1.1", + "version": "1.2.2", "source": { "type": "git", "url": "https://github.com/consolidation-org/annotated-command.git", - "reference": "46a28a5861c0639c4307390f8920f6147004d644" + "reference": "6d6bacf27893d265d6b71e7c2fa2da661ce891c4" }, "dist": { "type": "zip", - "url": "https://github.com/gitapi/repos/consolidation-org/annotated-command/zipball/46a28a5861c0639c4307390f8920f6147004d644", - "reference": "46a28a5861c0639c4307390f8920f6147004d644", + "url": "https://github.com/gitapi/repos/consolidation-org/annotated-command/zipball/6d6bacf27893d265d6b71e7c2fa2da661ce891c4", + "reference": "6d6bacf27893d265d6b71e7c2fa2da661ce891c4", "shasum": "" }, "require": { "php": ">=5.4.0", - "phpdocumentor/reflection-docblock": "~2", + "phpdocumentor/reflection-docblock": "^2.0|^3.0.2", "psr/log": "~1.0", "symfony/console": "~2.5|~3.0", + "symfony/event-dispatcher": "~2.5|~3.0", "symfony/finder": "~2.5|~3.0" }, "require-dev": { @@ -88,7 +89,7 @@ } ], "description": "Initialize Symfony Console commands from annotated command class methods.", - "time": "2016-07-21 21:52:34" + "time": "2016-08-19 22:56:42" }, { "name": "consolidation/log", @@ -186,23 +187,23 @@ }, { "name": "consolidation/robo", - "version": "dev-master", + "version": "1.0.0-RC1", "source": { "type": "git", "url": "https://github.com/consolidation-org/Robo.git", - "reference": "628f807dc6e321ba858cadc00eecc6a40a99efa9" + "reference": "f82b67307ecc6e96eeb022b1415d5ae9f024b061" }, "dist": { "type": "zip", - "url": "https://github.com/gitapi/repos/consolidation-org/Robo/zipball/628f807dc6e321ba858cadc00eecc6a40a99efa9", - "reference": "628f807dc6e321ba858cadc00eecc6a40a99efa9", + "url": "https://github.com/gitapi/repos/consolidation-org/Robo/zipball/f82b67307ecc6e96eeb022b1415d5ae9f024b061", + "reference": "f82b67307ecc6e96eeb022b1415d5ae9f024b061", "shasum": "" }, "require": { - "consolidation/annotated-command": "~1", + "consolidation/annotated-command": "^1.2", "consolidation/log": "~1", "consolidation/output-formatters": "~1", - "league/container": "~2.2", + "league/container": "^2.2", "php": ">=5.5.0", "symfony/console": "~2.5|~3.0", "symfony/event-dispatcher": "~2.5|~3.0", @@ -215,15 +216,15 @@ }, "require-dev": { "codeception/aspect-mock": "0.5.4", - "codeception/base": "~2.1.5", + "codeception/base": "^2.1.5", "codeception/verify": "0.2.*", - "henrikbjorn/lurker": "~1.0", - "natxet/cssmin": "~3.0", - "patchwork/jsqueeze": "~1.0", - "pear/archive_tar": "~1.0", - "phpunit/php-code-coverage": "2.*", - "satooshi/php-coveralls": "^1.0", - "squizlabs/php_codesniffer": "2.*" + "henrikbjorn/lurker": "~1", + "natxet/cssmin": "~3", + "patchwork/jsqueeze": "~1", + "pear/archive_tar": "~1", + "phpunit/php-code-coverage": "~2", + "satooshi/php-coveralls": "^1", + "squizlabs/php_codesniffer": "~2" }, "suggest": { "henrikbjorn/lurker": "For monitoring filesystem changes in taskWatch", @@ -256,7 +257,7 @@ } ], "description": "Modern task runner", - "time": "2016-07-30 04:24:10" + "time": "2016-08-04 22:12:32" }, { "name": "container-interop/container-interop", @@ -349,39 +350,136 @@ ], "time": "2016-03-17 11:07: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://github.com/gitapi/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": "opensource@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" + }, { "name": "phpdocumentor/reflection-docblock", - "version": "2.0.4", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8" + "reference": "9270140b940ff02e58ec577c237274e92cd40cdd" }, "dist": { "type": "zip", - "url": "https://github.com/gitapi/repos/phpDocumentor/ReflectionDocBlock/zipball/d68dbdc53dc358a816f00b300704702b2eaff7b8", - "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8", + "url": "https://github.com/gitapi/repos/phpDocumentor/ReflectionDocBlock/zipball/9270140b940ff02e58ec577c237274e92cd40cdd", + "reference": "9270140b940ff02e58ec577c237274e92cd40cdd", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=5.5", + "phpdocumentor/reflection-common": "^1.0@dev", + "phpdocumentor/type-resolver": "^0.2.0", + "webmozart/assert": "^1.0" }, "require-dev": { - "phpunit/phpunit": "~4.0" + "mockery/mockery": "^0.9.4", + "phpunit/phpunit": "^4.4" }, - "suggest": { - "dflydev/markdown": "~1.0", - "erusev/parsedown": "~1.0" + "type": "library", + "autoload": { + "psr-4": { + "phpDocumentor\\Reflection\\": [ + "src/" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Mike van Riel", + "email": "me@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://github.com/gitapi/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" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "1.0.x-dev" } }, "autoload": { - "psr-0": { - "phpDocumentor": [ + "psr-4": { + "phpDocumentor\\Reflection\\": [ "src/" ] } @@ -393,10 +491,10 @@ "authors": [ { "name": "Mike van Riel", - "email": "mike.vanriel@naenius.com" + "email": "me@mikevanriel.com" } ], - "time": "2015-02-03 12:10:50" + "time": "2016-06-10 07:14:17" }, { "name": "psr/log", @@ -761,6 +859,56 @@ "description": "Symfony Process Component", "homepage": "https://symfony.com", "time": "2016-07-28 11:13:48" + }, + { + "name": "webmozart/assert", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://github.com/webmozart/assert.git", + "reference": "bb2d123231c095735130cc8f6d31385a44c7b308" + }, + "dist": { + "type": "zip", + "url": "https://github.com/gitapi/repos/webmozart/assert/zipball/bb2d123231c095735130cc8f6d31385a44c7b308", + "reference": "bb2d123231c095735130cc8f6d31385a44c7b308", + "shasum": "" + }, + "require": { + "php": "^5.3.3|^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.6", + "sebastian/version": "^1.0.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.2-dev" + } + }, + "autoload": { + "psr-4": { + "Webmozart\\Assert\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Bernhard Schussek", + "email": "bschussek@gmail.com" + } + ], + "description": "Assertions to validate method input/output with nice error messages.", + "keywords": [ + "assert", + "check", + "validate" + ], + "time": "2016-08-09 15:02:57" } ], "packages-dev": [ @@ -2819,9 +2967,7 @@ ], "aliases": [], "minimum-stability": "dev", - "stability-flags": { - "consolidation/robo": 20 - }, + "stability-flags": [], "prefer-stable": true, "prefer-lowest": false, "platform": [], diff --git a/tests/unit/TaskTsLintRunTest.php b/tests/unit/TaskTsLintRunTest.php index 1d0def2..eb2628b 100644 --- a/tests/unit/TaskTsLintRunTest.php +++ b/tests/unit/TaskTsLintRunTest.php @@ -2,6 +2,7 @@ use Cheppers\Robo\Task\TsLint\TaskTsLintRun; use Codeception\Util\Stub; +use Robo\Robo; /** * Class TaskTsLintRunTest. @@ -24,7 +25,7 @@ protected function _before() { // @codingStandardsIgnoreEnd $this->container = new \League\Container\Container(); - \Robo\Robo::setContainer($this->container); + Robo::setContainer($this->container); \Robo\Runner::configureContainer($this->container, null, new \Helper\Dummy\Output()); $this->container->addServiceProvider(Cheppers\Robo\Task\TsLint\LoadTasks::getTsLintServiceProvider()); } @@ -352,6 +353,7 @@ public function testRun($exit_code, $std_output, $with_jar) \Helper\Dummy\Process::$exitCode = $exit_code; \Helper\Dummy\Process::$stdOutput = $with_jar ? json_encode($std_output) : $std_output; + $task->setConfig(Robo::config()); $task->setLogger($this->container->get('logger')); $asset_jar = null; if ($with_jar) { @@ -399,6 +401,7 @@ public function testRunFailed() \Helper\Dummy\Process::$exitCode = $exit_code; \Helper\Dummy\Process::$stdOutput = $std_output; + $task->setConfig(Robo::config()); $task->setLogger($this->container->get('logger')); $asset_jar = new \Cheppers\AssetJar\AssetJar(); $task->setAssetJar($asset_jar);