diff --git a/.git-hooks b/.git-hooks index e27bc32..3eac639 100644 --- a/.git-hooks +++ b/.git-hooks @@ -1,10 +1,10 @@ #!/usr/bin/env bash -echo "BEGIN Git hook: ${cghHookName}" +echo "BEGIN Git hook: ${sghHookName}" -function cghExit () +function sghExit () { - echo "END Git hook: ${cghHookName}" + echo "END Git hook: ${sghHookName}" exit $1 } @@ -12,20 +12,20 @@ function cghExit () export COMPOSER_DISABLE_XDEBUG_WARN=1 # @todo Better detection for executables: php, composer.phar. -cghRobo="$(composer config 'bin-dir')/robo" +sghRobo="$(composer config 'bin-dir')/robo" -test -s "${cghBridge}.local" && . "${cghBridge}.local" +test -s "${sghBridge}.local" && . "${sghBridge}.local" -cghTask="githook:${cghHookName}" +sghTask="githook:${sghHookName}" # Exit without error if "robo" doesn't exists or it has no corresponding task. -test -x "$cghRobo" || cghExit 0 -"${cghRobo}" help "${cghTask}" 1> /dev/null 2>&1 || cghExit 0 +test -x "$sghRobo" || sghExit 0 +"${sghRobo}" help "${sghTask}" 1> /dev/null 2>&1 || sghExit 0 -if [ "$cghHasInput" = 'true' ]; then - "$cghRobo" "${cghTask}" $@ <<< $(- - BREW_PHP=php71 +# - +# os: 'osx' +# language: 'generic' before_install: - 'export COMPOSER_NO_INTERACTION=1' - 'export COMPOSER_DISABLE_XDEBUG_WARN=1' - - "export CUSTOM_RUBY_VERSION=2.3.1" + - 'export BREW_PHP=php71' + - "export CUSTOM_RUBY_VERSION=$(bundle platform --ruby | awk '{print $2}')" - 'src-dev/scripts/travis/before_install.sh' - 'rvm install "${CUSTOM_RUBY_VERSION}"' - 'rvm --default use "${CUSTOM_RUBY_VERSION}"' diff --git a/Gemfile.lock b/Gemfile.lock index 6f5d653..84f6b96 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -30,7 +30,7 @@ DEPENDENCIES compass-validator (>= 3.0.1) RUBY VERSION - ruby 2.3.1p112 + ruby 2.3.1 BUNDLED WITH 1.14.5 diff --git a/README.md b/README.md index 41dbd12..f09bbed 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Robo task wrapper for Compass -[![Build Status](https://travis-ci.org/Cheppers/robo-compass.svg?branch=master)](https://travis-ci.org/Cheppers/robo-compass) -[![codecov](https://codecov.io/gh/Cheppers/robo-compass/branch/master/graph/badge.svg)](https://codecov.io/gh/Cheppers/robo-compass) +[![Build Status](https://travis-ci.org/Sweetchuck/robo-compass.svg?branch=master)](https://travis-ci.org/Sweetchuck/robo-compass) +[![codecov](https://codecov.io/gh/Sweetchuck/robo-compass/branch/master/graph/badge.svg)](https://codecov.io/gh/Sweetchuck/robo-compass) @todo diff --git a/RoboFile.php b/RoboFile.php index 7a3ae72..255cd5f 100644 --- a/RoboFile.php +++ b/RoboFile.php @@ -1,10 +1,12 @@ initComposerInfo() - ->initEnvNamePrefix(); + ->initEnvVarNamePrefix() + ->initEnvironmentTypeAndName(); } /** @@ -86,15 +97,13 @@ public function setContainer(ContainerInterface $container) */ public function githookPreCommit(): CollectionBuilder { - $this->environment = 'git-hook'; + $this->gitHook = 'pre-commit'; return $this ->collectionBuilder() - ->addTaskList([ - 'lint.composer.lock' => $this->taskComposerValidate(), - 'lint.phpcs.psr2' => $this->getTaskPhpcsLint(), - 'codecept' => $this->getTaskCodeceptRunSuites(), - ]); + ->addTask($this->taskComposerValidate()) + ->addTask($this->getTaskPhpcsLint()) + ->addTask($this->getTaskCodeceptRunSuites()); } /** @@ -114,10 +123,8 @@ public function lint(): CollectionBuilder { return $this ->collectionBuilder() - ->addTaskList([ - 'lint.composer.lock' => $this->taskComposerValidate(), - 'lint.phpcs.psr2' => $this->getTaskPhpcsLint(), - ]); + ->addTask($this->taskComposerValidate()) + ->addTask($this->getTaskPhpcsLint()); } protected function errorOutput(): ?OutputInterface @@ -130,35 +137,65 @@ protected function errorOutput(): ?OutputInterface /** * @return $this */ - protected function initEnvNamePrefix() + protected function initEnvVarNamePrefix() { - $this->envNamePrefix = strtoupper(str_replace('-', '_', $this->packageName)); + $this->envVarNamePrefix = strtoupper(str_replace('-', '_', $this->packageName)); return $this; } - protected function getEnvName(string $name): string + /** + * @return $this + */ + protected function initEnvironmentTypeAndName() { - return "{$this->envNamePrefix}_" . strtoupper($name); - } + $this->environmentType = getenv($this->getEnvVarName('environment_type')); + $this->environmentName = getenv($this->getEnvVarName('environment_name')); + + if (!$this->environmentType) { + if (getenv('CI') === 'true') { + // Travis and GitLab. + $this->environmentType = 'ci'; + } elseif (getenv('JENKINS_HOME')) { + $this->environmentType = 'ci'; + if (!$this->environmentName) { + $this->environmentName = 'jenkins'; + } + } + } - protected function getEnvironment(): string - { - if ($this->environment) { - return $this->environment; + if (!$this->environmentName && $this->environmentType === 'ci') { + if (getenv('GITLAB_CI') === 'true') { + $this->environmentName = 'gitlab'; + } elseif (getenv('TRAVIS') === 'true') { + $this->environmentName = 'travis'; + } + } + + if (!$this->environmentType) { + $this->environmentType = 'dev'; } - return getenv($this->getEnvName('environment')) ?: 'dev'; + if (!$this->environmentName) { + $this->environmentName = 'local'; + } + + return $this; + } + + protected function getEnvVarName(string $name): string + { + return "{$this->envVarNamePrefix}_" . strtoupper($name); } protected function getPhpExecutable(): string { - return getenv($this->getEnvName('php_executable')) ?: PHP_BINARY; + return getenv($this->getEnvVarName('php_executable')) ?: PHP_BINARY; } protected function getPhpdbgExecutable(): string { - return getenv($this->getEnvName('phpdbg_executable')) ?: Path::join(PHP_BINDIR, 'phpdbg'); + return getenv($this->getEnvVarName('phpdbg_executable')) ?: Path::join(PHP_BINDIR, 'phpdbg'); } /** @@ -220,15 +257,12 @@ protected function getTaskCodeceptRunSuites(array $suiteNames = []): CollectionB protected function getTaskCodeceptRunSuite(string $suite): CollectionBuilder { $this->initCodeceptionInfo(); - $environment = $this->getEnvironment(); - $withCoverageHtml = in_array($environment, ['dev', 'git-hook']); - $withCoverageSerialized = in_array($environment, ['jenkins', 'travis']); - $withCoverageXml = in_array($environment, ['dev', 'jenkins', 'travis']); - $withCoverageAny = $withCoverageSerialized || $withCoverageXml || $withCoverageHtml; + $withCoverageHtml = in_array($this->environmentType, ['dev']); + $withCoverageXml = in_array($this->environmentType, ['ci']); - $withUnitReportHtml = in_array($environment, ['dev', 'git-hook']); - $withUnitReportXml = in_array($environment, ['travis', 'jenkins']); + $withUnitReportHtml = in_array($this->environmentType, ['dev']); + $withUnitReportXml = in_array($this->environmentType, ['ci']); $logDir = $this->getLogDir(); @@ -247,40 +281,54 @@ protected function getTaskCodeceptRunSuite(string $suite): CollectionBuilder $cmdPattern .= ' --ansi'; $cmdPattern .= ' --verbose'; - $tasks = []; + $cb = $this->collectionBuilder(); if ($withCoverageHtml) { $cmdPattern .= ' --coverage-html=%s'; - $cmdArgs[] = escapeshellarg("test/$suite/coverage/html"); + $cmdArgs[] = escapeshellarg("human/coverage/$suite/html"); + + $cb->addTask( + $this + ->taskFilesystemStack() + ->mkdir("$logDir/human/coverage/$suite") + ); } if ($withCoverageXml) { $cmdPattern .= ' --coverage-xml=%s'; - $cmdArgs[] = escapeshellarg("test/$suite/coverage/coverage.xml"); + $cmdArgs[] = escapeshellarg("machine/coverage/$suite/coverage.xml"); } - if ($withCoverageAny) { + if ($withCoverageHtml || $withCoverageXml) { $cmdPattern .= ' --coverage=%s'; - $cmdArgs[] = escapeshellarg("test/$suite/coverage/coverage.serialized"); + $cmdArgs[] = escapeshellarg("machine/coverage/$suite/coverage.serialized"); - $tasks['prepareCoverageDir'] = $this - ->taskFilesystemStack() - ->mkdir("$logDir/test/$suite/coverage"); + $cb->addTask( + $this + ->taskFilesystemStack() + ->mkdir("$logDir/machine/coverage/$suite") + ); } if ($withUnitReportHtml) { $cmdPattern .= ' --html=%s'; - $cmdArgs[] = escapeshellarg("test/$suite/junit/junit.html"); + $cmdArgs[] = escapeshellarg("human/junit/junit.$suite.html"); + + $cb->addTask( + $this + ->taskFilesystemStack() + ->mkdir("$logDir/human/junit") + ); } if ($withUnitReportXml) { $cmdPattern .= ' --xml=%s'; - $cmdArgs[] = escapeshellarg("test/$suite/junit/junit.xml"); - } + $cmdArgs[] = escapeshellarg("machine/junit/junit.$suite.xml"); - if ($withUnitReportXml || $withUnitReportHtml) { - $tasks['prepareJUnitDir'] = $this - ->taskFilesystemStack() - ->mkdir("$logDir/test/$suite/junit"); + $cb->addTask( + $this + ->taskFilesystemStack() + ->mkdir("$logDir/machine/junit") + ); } $cmdPattern .= ' run'; @@ -289,16 +337,14 @@ protected function getTaskCodeceptRunSuite(string $suite): CollectionBuilder $cmdArgs[] = escapeshellarg($suite); } - if ($environment === 'jenkins') { + if ($this->environmentType === 'ci' && $this->environmentName === 'jenkins') { // Jenkins has to use a post-build action to mark the build "unstable". $cmdPattern .= ' || [[ "${?}" == "1" ]]'; } $command = vsprintf($cmdPattern, $cmdArgs); - return $this - ->collectionBuilder() - ->addTaskList($tasks) + return $cb ->addCode(function () use ($command) { $this->output()->writeln(strtr( '[{name}] runs {command}', @@ -307,7 +353,7 @@ protected function getTaskCodeceptRunSuite(string $suite): CollectionBuilder '{command}' => $command, ] )); - $process = new Process($command); + $process = new Process($command, null, null, null, null); $exitCode = $process->run(function ($type, $data) { switch ($type) { case Process::OUT: @@ -325,65 +371,54 @@ protected function getTaskCodeceptRunSuite(string $suite): CollectionBuilder } /** - * @return \Cheppers\Robo\Phpcs\Task\PhpcsLintFiles|\Robo\Collection\CollectionBuilder + * @return \Sweetchuck\Robo\Phpcs\Task\PhpcsLintFiles|\Robo\Collection\CollectionBuilder */ protected function getTaskPhpcsLint() { - $env = $this->getEnvironment(); - - $files = [ - 'src/', - 'tests/_support/Helper/', - 'tests/acceptance/', - 'tests/unit/', - 'RoboFile.php', - ]; - $options = [ 'failOn' => 'warning', - 'standard' => 'PSR2', 'lintReporters' => [ 'lintVerboseReporter' => null, ], - 'ignore' => [ - 'src/GitHooks/', - ], ]; - if ($env === 'jenkins') { + if ($this->environmentType === 'ci') { $logDir = $this->getLogDir(); - $options['failOn'] = 'never'; + if ($this->environmentName === 'jenkins') { + $options['failOn'] = 'never'; + } + $options['lintReporters']['lintCheckstyleReporter'] = (new CheckstyleReporter()) - ->setDestination("$logDir/checkstyle/phpcs.psr2.xml"); + ->setDestination("$logDir/machine/checkstyle/phpcs.psr2.xml"); } - if ($env !== 'git-hook') { - return $this->taskPhpcsLintFiles($options + ['files' => $files]); + if ($this->gitHook !== 'pre-commit') { + return $this->taskPhpcsLintFiles($options); } - $assetJar = new Cheppers\AssetJar\AssetJar(); + $files = [ + 'src/', + 'src-dev/Composer/', + 'tests/_support/', + 'tests/acceptance/', + 'tests/unit/', + 'RoboFile.php', + ]; + + $options['ignore'] = [ + '*.yml', + ]; return $this ->collectionBuilder() - ->addTaskList([ - 'git.readStagedFiles' => $this - ->taskGitReadStagedFiles() - ->setCommandOnly(true) - ->setAssetJar($assetJar) - ->setAssetJarMap('files', ['files']) - ->setPaths($files), - 'lint.phpcs.psr2' => $this - ->taskPhpcsLintInput($options) - ->setIgnore([ - '*/composer.json', - '*/.gitignore', - '*.txt', - '*.yml', - ]) - ->setAssetJar($assetJar) - ->setAssetJarMap('files', ['files']), - ]); + ->addTask($this + ->taskGitReadStagedFiles() + ->setCommandOnly(true) + ->setPaths($files)) + ->addTask($this + ->taskPhpcsLintInput($options) + ->deferTaskConfiguration('setFiles', 'files')); } protected function isPhpExtensionAvailable(string $extension): bool diff --git a/codeception.yml b/codeception.yml index 1291c21..728fcdd 100644 --- a/codeception.yml +++ b/codeception.yml @@ -1,5 +1,5 @@ -namespace: Cheppers\Robo\Compass\Test +namespace: Sweetchuck\Robo\Compass\Test actor: Tester diff --git a/composer.json b/composer.json index 87cc50a..0720983 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "cheppers/robo-compass", + "name": "sweetchuck/robo-compass", "description": "Wrapper Robo task for Compass commands.", "license": "GPL-2.0", "config": { @@ -10,36 +10,37 @@ "prefer-stable": true, "require": { "php": ">=7.1", - "cheppers/asset-jar": "^0.0", "consolidation/robo": "^1.0" }, "require-dev": { - "cheppers/git-hooks": "^0.0", - "cheppers/robo-git": "^0.0", - "cheppers/robo-phpcs": "^0.0", "codeception/codeception": "^2.2", "danielstjules/stringy": "^3.0", + "sweetchuck/codeception-module-robo-task-runner": "^0.0.1", + "sweetchuck/git-hooks": "^0.0", + "sweetchuck/robo-git": "^0.0", + "sweetchuck/robo-phpcs": "^0.0", "symfony/finder": "^3.2", "webmozart/path-util": "^2.3" }, "autoload": { "psr-4": { - "Cheppers\\Robo\\Compass\\": "src/" + "Sweetchuck\\Robo\\Compass\\": "src/" } }, "autoload-dev": { "psr-4": { - "Cheppers\\Robo\\Compass\\Test\\Helper\\": "tests/_support/Helper/", - "Cheppers\\Robo\\Compass\\Tests\\Acceptance\\": "tests/acceptance/", - "Cheppers\\Robo\\Compass\\Tests\\Unit\\": "tests/unit/" + "Sweetchuck\\Robo\\Compass\\Composer\\": "src-dev/Composer/", + "Sweetchuck\\Robo\\Compass\\Test\\Helper\\": "tests/_support/Helper/", + "Sweetchuck\\Robo\\Compass\\Tests\\Acceptance\\": "tests/acceptance/", + "Sweetchuck\\Robo\\Compass\\Tests\\Unit\\": "tests/unit/" } }, "scripts": { "post-install-cmd": [ - "\\Cheppers\\Robo\\Compass\\Composer\\Scripts::postInstallCmd" + "\\Sweetchuck\\Robo\\Compass\\Composer\\Scripts::postInstallCmd" ], "post-update-cmd": [ - "\\Cheppers\\Robo\\Compass\\Composer\\Scripts::postUpdateCmd" + "\\Sweetchuck\\Robo\\Compass\\Composer\\Scripts::postUpdateCmd" ] } } diff --git a/composer.lock b/composer.lock index 43c734a..c756cd3 100644 --- a/composer.lock +++ b/composer.lock @@ -4,77 +4,94 @@ "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": "9b28eaec0feb676e26847264b0025768", + "content-hash": "d0cafe95f8e1c136c7e915d7d10fbff4", "packages": [ { - "name": "cheppers/asset-jar", - "version": "v0.0.1", + "name": "consolidation/annotated-command", + "version": "2.4.11", "source": { "type": "git", - "url": "https://github.com/Cheppers/asset-jar.git", - "reference": "ef34273299c55defb0da78090b92a44125cf8ab2" + "url": "https://github.com/consolidation/annotated-command.git", + "reference": "7fbf68dc6abf2f1f0746ceab0701dee1ee97516e" }, "dist": { "type": "zip", - "url": "https://github.com/gitapi/repos/Cheppers/asset-jar/zipball/ef34273299c55defb0da78090b92a44125cf8ab2", - "reference": "ef34273299c55defb0da78090b92a44125cf8ab2", + "url": "https://github.com/gitapi/repos/consolidation/annotated-command/zipball/7fbf68dc6abf2f1f0746ceab0701dee1ee97516e", + "reference": "7fbf68dc6abf2f1f0746ceab0701dee1ee97516e", "shasum": "" }, + "require": { + "consolidation/output-formatters": "^3.1.10", + "php": ">=5.4.0", + "phpdocumentor/reflection-docblock": "^2.0|^3.0.2", + "psr/log": "^1", + "symfony/console": "^2.8|~3", + "symfony/event-dispatcher": "^2.5|^3", + "symfony/finder": "^2.5|^3" + }, "require-dev": { - "phpunit/php-code-coverage": "^4.0", - "phpunit/phpunit": "^5.4", - "squizlabs/php_codesniffer": "^2.6" + "phpunit/phpunit": "^4.8", + "satooshi/php-coveralls": "^1.0", + "squizlabs/php_codesniffer": "^2.7" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.x-dev" + } + }, "autoload": { "psr-4": { - "Cheppers\\AssetJar\\": "src/" + "Consolidation\\AnnotatedCommand\\": "src" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "GPL-2.0+" + "MIT" + ], + "authors": [ + { + "name": "Greg Anderson", + "email": "greg.1.anderson@greenknowe.org" + } ], - "description": "Provides a very simple, shared, in-memory data storage.", - "time": "2016-07-30T09:09:38+00:00" + "description": "Initialize Symfony Console commands from annotated command class methods.", + "time": "2017-07-27T20:29:17+00:00" }, { - "name": "consolidation/annotated-command", - "version": "2.4.8", + "name": "consolidation/config", + "version": "1.0.1", "source": { "type": "git", - "url": "https://github.com/consolidation/annotated-command.git", - "reference": "6672ea38212f8bffb71fec7eadc8b3372154b17e" + "url": "https://github.com/consolidation/config.git", + "reference": "e3c7311f8926488fe2fbce0ec6af56be417da504" }, "dist": { "type": "zip", - "url": "https://github.com/gitapi/repos/consolidation/annotated-command/zipball/6672ea38212f8bffb71fec7eadc8b3372154b17e", - "reference": "6672ea38212f8bffb71fec7eadc8b3372154b17e", + "url": "https://github.com/gitapi/repos/consolidation/config/zipball/e3c7311f8926488fe2fbce0ec6af56be417da504", + "reference": "e3c7311f8926488fe2fbce0ec6af56be417da504", "shasum": "" }, "require": { - "consolidation/output-formatters": "^3.1.5", - "php": ">=5.4.0", - "phpdocumentor/reflection-docblock": "^2.0|^3.0.2", - "psr/log": "^1", - "symfony/console": "^2.8|~3", - "symfony/event-dispatcher": "^2.5|^3", - "symfony/finder": "^2.5|^3" + "dflydev/dot-access-data": "^1.1.0", + "grasmash/yaml-expander": "^1.1", + "php": ">=5.4.0" }, "require-dev": { - "phpunit/phpunit": "^4.8", + "phpunit/phpunit": "^4", "satooshi/php-coveralls": "^1.0", - "squizlabs/php_codesniffer": "^2.7" + "squizlabs/php_codesniffer": "2.*", + "symfony/console": "^2.5|^3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.x-dev" + "dev-master": "1.x-dev" } }, "autoload": { "psr-4": { - "Consolidation\\AnnotatedCommand\\": "src" + "Consolidation\\Config\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -87,8 +104,8 @@ "email": "greg.1.anderson@greenknowe.org" } ], - "description": "Initialize Symfony Console commands from annotated command class methods.", - "time": "2017-04-03T22:37:00+00:00" + "description": "Provide configuration services for a commandline tool.", + "time": "2017-07-28T18:05:53+00:00" }, { "name": "consolidation/log", @@ -139,16 +156,16 @@ }, { "name": "consolidation/output-formatters", - "version": "3.1.8", + "version": "3.1.10", "source": { "type": "git", "url": "https://github.com/consolidation/output-formatters.git", - "reference": "0b50ba1134d581fd55376f3e21508dab009ced47" + "reference": "3872f19517bfc9da0e14c9e5b6fe0f8c7439ea3a" }, "dist": { "type": "zip", - "url": "https://github.com/gitapi/repos/consolidation/output-formatters/zipball/0b50ba1134d581fd55376f3e21508dab009ced47", - "reference": "0b50ba1134d581fd55376f3e21508dab009ced47", + "url": "https://github.com/gitapi/repos/consolidation/output-formatters/zipball/3872f19517bfc9da0e14c9e5b6fe0f8c7439ea3a", + "reference": "3872f19517bfc9da0e14c9e5b6fe0f8c7439ea3a", "shasum": "" }, "require": { @@ -165,7 +182,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.x-dev" + "dev-master": "3.x-dev" } }, "autoload": { @@ -184,31 +201,29 @@ } ], "description": "Format text by applying transformations provided by plug-in formatters.", - "time": "2017-03-01T20:54:45+00:00" + "time": "2017-06-06T19:08:54+00:00" }, { "name": "consolidation/robo", - "version": "1.0.6", + "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/consolidation/Robo.git", - "reference": "de6225256b2ed88822af1cd8cc3a01bf933add8c" + "reference": "46340c0ba2477e6f30a22ebaa072da0ba2b15bb1" }, "dist": { "type": "zip", - "url": "https://github.com/gitapi/repos/consolidation/Robo/zipball/de6225256b2ed88822af1cd8cc3a01bf933add8c", - "reference": "de6225256b2ed88822af1cd8cc3a01bf933add8c", + "url": "https://github.com/gitapi/repos/consolidation/Robo/zipball/46340c0ba2477e6f30a22ebaa072da0ba2b15bb1", + "reference": "46340c0ba2477e6f30a22ebaa072da0ba2b15bb1", "shasum": "" }, "require": { "consolidation/annotated-command": "^2.2", + "consolidation/config": "^1.0.1", "consolidation/log": "~1", "consolidation/output-formatters": "^3.1.5", - "dflydev/dot-access-data": "^1.1.0", - "grasmash/yaml-expander": "^1.1", "league/container": "^2.2", "php": ">=5.5.0", - "squizlabs/php_codesniffer": "^2.8", "symfony/console": "~2.8|~3.0", "symfony/event-dispatcher": "~2.5|~3.0", "symfony/filesystem": "~2.5|~3.0", @@ -227,11 +242,12 @@ "patchwork/jsqueeze": "~2", "pear/archive_tar": "^1.4.2", "phpunit/php-code-coverage": "~2|~4", - "satooshi/php-coveralls": "~1" + "satooshi/php-coveralls": "~1", + "squizlabs/php_codesniffer": "^2.8" }, "suggest": { "henrikbjorn/lurker": "For monitoring filesystem changes in taskWatch", - "natxet/CssMin": "For minifying JS files in taskMinify", + "natxet/CssMin": "For minifying CSS files in taskMinify", "patchwork/jsqueeze": "For minifying JS files in taskMinify", "pear/archive_tar": "Allows tar archives to be created and extracted in taskPack and taskExtract, respectively." }, @@ -241,7 +257,8 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.x-dev" + "dev-master": "1.x-dev", + "dev-state": "1.x-dev" } }, "autoload": { @@ -263,7 +280,7 @@ } ], "description": "Modern task runner", - "time": "2017-03-31T18:23:36+00:00" + "time": "2017-07-28T21:29:52+00:00" }, { "name": "container-interop/container-interop", @@ -357,22 +374,21 @@ }, { "name": "grasmash/yaml-expander", - "version": "1.1.0", + "version": "1.1.1", "source": { "type": "git", "url": "https://github.com/grasmash/yaml-expander.git", - "reference": "95f9c876ca31f31bf5bfd9c8e89cc1f065c45528" + "reference": "720c54b2c99b80d5d696714b6826183d34edce93" }, "dist": { "type": "zip", - "url": "https://github.com/gitapi/repos/grasmash/yaml-expander/zipball/95f9c876ca31f31bf5bfd9c8e89cc1f065c45528", - "reference": "95f9c876ca31f31bf5bfd9c8e89cc1f065c45528", + "url": "https://github.com/gitapi/repos/grasmash/yaml-expander/zipball/720c54b2c99b80d5d696714b6826183d34edce93", + "reference": "720c54b2c99b80d5d696714b6826183d34edce93", "shasum": "" }, "require": { "dflydev/dot-access-data": "^1.1.0", "php": ">=5.4", - "symfony/console": "^2.8.11|^3", "symfony/yaml": "^2.8.11|^3" }, "require-dev": { @@ -401,20 +417,20 @@ } ], "description": "Expands internal property references in a yaml file.", - "time": "2017-03-24T20:31:04+00:00" + "time": "2017-08-01T16:15:05+00:00" }, { "name": "league/container", - "version": "2.4.0", + "version": "2.4.1", "source": { "type": "git", "url": "https://github.com/thephpleague/container.git", - "reference": "5ec434f4760d83c2a479266b618fb3e3be24c974" + "reference": "43f35abd03a12977a60ffd7095efd6a7808488c0" }, "dist": { "type": "zip", - "url": "https://github.com/gitapi/repos/thephpleague/container/zipball/5ec434f4760d83c2a479266b618fb3e3be24c974", - "reference": "5ec434f4760d83c2a479266b618fb3e3be24c974", + "url": "https://github.com/gitapi/repos/thephpleague/container/zipball/43f35abd03a12977a60ffd7095efd6a7808488c0", + "reference": "43f35abd03a12977a60ffd7095efd6a7808488c0", "shasum": "" }, "require": { @@ -466,7 +482,7 @@ "provider", "service" ], - "time": "2017-03-06T15:24:06+00:00" + "time": "2017-05-10T09:20:27+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -524,22 +540,22 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "3.1.1", + "version": "3.2.1", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e" + "reference": "183824db76118b9dddffc7e522b91fa175f75119" }, "dist": { "type": "zip", - "url": "https://github.com/gitapi/repos/phpDocumentor/ReflectionDocBlock/zipball/8331b5efe816ae05461b7ca1e721c01b46bafb3e", - "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e", + "url": "https://github.com/gitapi/repos/phpDocumentor/ReflectionDocBlock/zipball/183824db76118b9dddffc7e522b91fa175f75119", + "reference": "183824db76118b9dddffc7e522b91fa175f75119", "shasum": "" }, "require": { "php": ">=5.5", "phpdocumentor/reflection-common": "^1.0@dev", - "phpdocumentor/type-resolver": "^0.2.0", + "phpdocumentor/type-resolver": "^0.3.0", "webmozart/assert": "^1.0" }, "require-dev": { @@ -565,24 +581,24 @@ } ], "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-09-30T07:12:33+00:00" + "time": "2017-08-04T20:55:59+00:00" }, { "name": "phpdocumentor/type-resolver", - "version": "0.2.1", + "version": "0.3.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb" + "reference": "fb3933512008d8162b3cdf9e18dba9309b7c3773" }, "dist": { "type": "zip", - "url": "https://github.com/gitapi/repos/phpDocumentor/TypeResolver/zipball/e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb", - "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb", + "url": "https://github.com/gitapi/repos/phpDocumentor/TypeResolver/zipball/fb3933512008d8162b3cdf9e18dba9309b7c3773", + "reference": "fb3933512008d8162b3cdf9e18dba9309b7c3773", "shasum": "" }, "require": { - "php": ">=5.5", + "php": "^5.5 || ^7.0", "phpdocumentor/reflection-common": "^1.0" }, "require-dev": { @@ -612,7 +628,7 @@ "email": "me@mikevanriel.com" } ], - "time": "2016-11-25T06:54:22+00:00" + "time": "2017-06-03T08:32:36+00:00" }, { "name": "psr/container", @@ -710,96 +726,18 @@ ], "time": "2016-10-10T12:19:37+00:00" }, - { - "name": "squizlabs/php_codesniffer", - "version": "2.8.1", - "source": { - "type": "git", - "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "d7cf0d894e8aa4c73712ee4a331cc1eaa37cdc7d" - }, - "dist": { - "type": "zip", - "url": "https://github.com/gitapi/repos/squizlabs/PHP_CodeSniffer/zipball/d7cf0d894e8aa4c73712ee4a331cc1eaa37cdc7d", - "reference": "d7cf0d894e8aa4c73712ee4a331cc1eaa37cdc7d", - "shasum": "" - }, - "require": { - "ext-simplexml": "*", - "ext-tokenizer": "*", - "ext-xmlwriter": "*", - "php": ">=5.1.2" - }, - "require-dev": { - "phpunit/phpunit": "~4.0" - }, - "bin": [ - "scripts/phpcs", - "scripts/phpcbf" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.x-dev" - } - }, - "autoload": { - "classmap": [ - "CodeSniffer.php", - "CodeSniffer/CLI.php", - "CodeSniffer/Exception.php", - "CodeSniffer/File.php", - "CodeSniffer/Fixer.php", - "CodeSniffer/Report.php", - "CodeSniffer/Reporting.php", - "CodeSniffer/Sniff.php", - "CodeSniffer/Tokens.php", - "CodeSniffer/Reports/", - "CodeSniffer/Tokenizers/", - "CodeSniffer/DocGenerators/", - "CodeSniffer/Standards/AbstractPatternSniff.php", - "CodeSniffer/Standards/AbstractScopeSniff.php", - "CodeSniffer/Standards/AbstractVariableSniff.php", - "CodeSniffer/Standards/IncorrectPatternException.php", - "CodeSniffer/Standards/Generic/Sniffs/", - "CodeSniffer/Standards/MySource/Sniffs/", - "CodeSniffer/Standards/PEAR/Sniffs/", - "CodeSniffer/Standards/PSR1/Sniffs/", - "CodeSniffer/Standards/PSR2/Sniffs/", - "CodeSniffer/Standards/Squiz/Sniffs/", - "CodeSniffer/Standards/Zend/Sniffs/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Greg Sherwood", - "role": "lead" - } - ], - "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", - "homepage": "http://www.squizlabs.com/php-codesniffer", - "keywords": [ - "phpcs", - "standards" - ], - "time": "2017-03-01T22:17:45+00:00" - }, { "name": "symfony/console", - "version": "v3.2.7", + "version": "v3.3.6", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "c30243cc51f726812be3551316b109a2f5deaf8d" + "reference": "b0878233cb5c4391347e5495089c7af11b8e6201" }, "dist": { "type": "zip", - "url": "https://github.com/gitapi/repos/symfony/console/zipball/c30243cc51f726812be3551316b109a2f5deaf8d", - "reference": "c30243cc51f726812be3551316b109a2f5deaf8d", + "url": "https://github.com/gitapi/repos/symfony/console/zipball/b0878233cb5c4391347e5495089c7af11b8e6201", + "reference": "b0878233cb5c4391347e5495089c7af11b8e6201", "shasum": "" }, "require": { @@ -807,10 +745,16 @@ "symfony/debug": "~2.8|~3.0", "symfony/polyfill-mbstring": "~1.0" }, + "conflict": { + "symfony/dependency-injection": "<3.3" + }, "require-dev": { "psr/log": "~1.0", + "symfony/config": "~3.3", + "symfony/dependency-injection": "~3.3", "symfony/event-dispatcher": "~2.8|~3.0", "symfony/filesystem": "~2.8|~3.0", + "symfony/http-kernel": "~2.8|~3.0", "symfony/process": "~2.8|~3.0" }, "suggest": { @@ -822,7 +766,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -849,20 +793,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2017-04-04T14:33:42+00:00" + "time": "2017-07-29T21:27:59+00:00" }, { "name": "symfony/debug", - "version": "v3.2.7", + "version": "v3.3.6", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "56f613406446a4a0a031475cfd0a01751de22659" + "reference": "7c13ae8ce1e2adbbd574fc39de7be498e1284e13" }, "dist": { "type": "zip", - "url": "https://github.com/gitapi/repos/symfony/debug/zipball/56f613406446a4a0a031475cfd0a01751de22659", - "reference": "56f613406446a4a0a031475cfd0a01751de22659", + "url": "https://github.com/gitapi/repos/symfony/debug/zipball/7c13ae8ce1e2adbbd574fc39de7be498e1284e13", + "reference": "7c13ae8ce1e2adbbd574fc39de7be498e1284e13", "shasum": "" }, "require": { @@ -873,13 +817,12 @@ "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2" }, "require-dev": { - "symfony/class-loader": "~2.8|~3.0", "symfony/http-kernel": "~2.8|~3.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -906,29 +849,32 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2017-03-28T21:38:24+00:00" + "time": "2017-07-28T15:27:31+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v3.2.7", + "version": "v3.3.6", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "154bb1ef7b0e42ccc792bd53edbce18ed73440ca" + "reference": "67535f1e3fd662bdc68d7ba317c93eecd973617e" }, "dist": { "type": "zip", - "url": "https://github.com/gitapi/repos/symfony/event-dispatcher/zipball/154bb1ef7b0e42ccc792bd53edbce18ed73440ca", - "reference": "154bb1ef7b0e42ccc792bd53edbce18ed73440ca", + "url": "https://github.com/gitapi/repos/symfony/event-dispatcher/zipball/67535f1e3fd662bdc68d7ba317c93eecd973617e", + "reference": "67535f1e3fd662bdc68d7ba317c93eecd973617e", "shasum": "" }, "require": { "php": ">=5.5.9" }, + "conflict": { + "symfony/dependency-injection": "<3.3" + }, "require-dev": { "psr/log": "~1.0", "symfony/config": "~2.8|~3.0", - "symfony/dependency-injection": "~2.8|~3.0", + "symfony/dependency-injection": "~3.3", "symfony/expression-language": "~2.8|~3.0", "symfony/stopwatch": "~2.8|~3.0" }, @@ -939,7 +885,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -966,20 +912,20 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2017-04-04T07:26:27+00:00" + "time": "2017-06-09T14:53:08+00:00" }, { "name": "symfony/filesystem", - "version": "v3.2.7", + "version": "v3.3.6", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "64421e6479c4a8e60d790fb666bd520992861b66" + "reference": "427987eb4eed764c3b6e38d52a0f87989e010676" }, "dist": { "type": "zip", - "url": "https://github.com/gitapi/repos/symfony/filesystem/zipball/64421e6479c4a8e60d790fb666bd520992861b66", - "reference": "64421e6479c4a8e60d790fb666bd520992861b66", + "url": "https://github.com/gitapi/repos/symfony/filesystem/zipball/427987eb4eed764c3b6e38d52a0f87989e010676", + "reference": "427987eb4eed764c3b6e38d52a0f87989e010676", "shasum": "" }, "require": { @@ -988,7 +934,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -1015,20 +961,20 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2017-03-26T15:47:15+00:00" + "time": "2017-07-11T07:17:58+00:00" }, { "name": "symfony/finder", - "version": "v3.2.7", + "version": "v3.3.6", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "b20900ce5ea164cd9314af52725b0bb5a758217a" + "reference": "baea7f66d30854ad32988c11a09d7ffd485810c4" }, "dist": { "type": "zip", - "url": "https://github.com/gitapi/repos/symfony/finder/zipball/b20900ce5ea164cd9314af52725b0bb5a758217a", - "reference": "b20900ce5ea164cd9314af52725b0bb5a758217a", + "url": "https://github.com/gitapi/repos/symfony/finder/zipball/baea7f66d30854ad32988c11a09d7ffd485810c4", + "reference": "baea7f66d30854ad32988c11a09d7ffd485810c4", "shasum": "" }, "require": { @@ -1037,7 +983,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -1064,20 +1010,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2017-03-20T09:32:19+00:00" + "time": "2017-06-01T21:01:25+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.3.0", + "version": "v1.4.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4" + "reference": "f29dca382a6485c3cbe6379f0c61230167681937" }, "dist": { "type": "zip", - "url": "https://github.com/gitapi/repos/symfony/polyfill-mbstring/zipball/e79d363049d1c2128f133a2667e4f4190904f7f4", - "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4", + "url": "https://github.com/gitapi/repos/symfony/polyfill-mbstring/zipball/f29dca382a6485c3cbe6379f0c61230167681937", + "reference": "f29dca382a6485c3cbe6379f0c61230167681937", "shasum": "" }, "require": { @@ -1089,7 +1035,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3-dev" + "dev-master": "1.4-dev" } }, "autoload": { @@ -1123,20 +1069,20 @@ "portable", "shim" ], - "time": "2016-11-14T01:06:16+00:00" + "time": "2017-06-09T14:24:12+00:00" }, { "name": "symfony/process", - "version": "v3.2.7", + "version": "v3.3.6", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "57fdaa55827ae14d617550ebe71a820f0a5e2282" + "reference": "07432804942b9f6dd7b7377faf9920af5f95d70a" }, "dist": { "type": "zip", - "url": "https://github.com/gitapi/repos/symfony/process/zipball/57fdaa55827ae14d617550ebe71a820f0a5e2282", - "reference": "57fdaa55827ae14d617550ebe71a820f0a5e2282", + "url": "https://github.com/gitapi/repos/symfony/process/zipball/07432804942b9f6dd7b7377faf9920af5f95d70a", + "reference": "07432804942b9f6dd7b7377faf9920af5f95d70a", "shasum": "" }, "require": { @@ -1145,7 +1091,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -1172,20 +1118,20 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2017-03-27T18:07:02+00:00" + "time": "2017-07-13T13:05:09+00:00" }, { "name": "symfony/yaml", - "version": "v3.2.7", + "version": "v3.3.6", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "62b4cdb99d52cb1ff253c465eb1532a80cebb621" + "reference": "ddc23324e6cfe066f3dd34a37ff494fa80b617ed" }, "dist": { "type": "zip", - "url": "https://github.com/gitapi/repos/symfony/yaml/zipball/62b4cdb99d52cb1ff253c465eb1532a80cebb621", - "reference": "62b4cdb99d52cb1ff253c465eb1532a80cebb621", + "url": "https://github.com/gitapi/repos/symfony/yaml/zipball/ddc23324e6cfe066f3dd34a37ff494fa80b617ed", + "reference": "ddc23324e6cfe066f3dd34a37ff494fa80b617ed", "shasum": "" }, "require": { @@ -1200,7 +1146,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -1227,7 +1173,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2017-03-20T09:45:15+00:00" + "time": "2017-07-23T12:43:26+00:00" }, { "name": "webmozart/assert", @@ -1340,174 +1286,18 @@ ], "time": "2016-10-30T11:50:56+00:00" }, - { - "name": "cheppers/git-hooks", - "version": "v0.0.9", - "source": { - "type": "git", - "url": "https://github.com/Cheppers/git-hooks.git", - "reference": "a846af41a1ea63d09bb8d49d9b1631e1a8eb63f8" - }, - "dist": { - "type": "zip", - "url": "https://github.com/gitapi/repos/Cheppers/git-hooks/zipball/a846af41a1ea63d09bb8d49d9b1631e1a8eb63f8", - "reference": "a846af41a1ea63d09bb8d49d9b1631e1a8eb63f8", - "shasum": "" - }, - "require-dev": { - "behat/behat": "~3.1", - "consolidation/robo": "~1.0", - "pear/archive_tar": "~1.4", - "phpunit/phpunit": "~4.5", - "squizlabs/php_codesniffer": "~2.6", - "symfony/filesystem": "~3.1", - "symfony/process": "~3.1" - }, - "type": "library", - "extra": { - "cheppers/git-hooks": { - "symlink": true - } - }, - "autoload": { - "psr-4": { - "Cheppers\\GitHooks\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "GPL-2.0" - ], - "description": "Provide a bridge between Git hooks and scripts under VCS.", - "time": "2016-10-15T10:06:14+00:00" - }, - { - "name": "cheppers/lint-report", - "version": "v0.0.5", - "source": { - "type": "git", - "url": "https://github.com/Cheppers/lint-report.git", - "reference": "adc7536bea7df3fa8de378e0dff5dcbb9b644af8" - }, - "dist": { - "type": "zip", - "url": "https://github.com/gitapi/repos/Cheppers/lint-report/zipball/adc7536bea7df3fa8de378e0dff5dcbb9b644af8", - "reference": "adc7536bea7df3fa8de378e0dff5dcbb9b644af8", - "shasum": "" - }, - "require": { - "league/container": "^2.2", - "symfony/console": "^2.8 || ^3.1", - "symfony/filesystem": "^2.8 || ^3.1", - "symfony/yaml": "^2.8 || ^3.1" - }, - "require-dev": { - "cheppers/git-hooks": "^0.0.8", - "codeception/codeception": "^2.2", - "squizlabs/php_codesniffer": "2.6.2" - }, - "type": "library", - "autoload": { - "psr-4": { - "Cheppers\\LintReport\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "GPL-2.0+" - ], - "description": "Generate reports from lint results", - "time": "2016-12-14T21:09:07+00:00" - }, - { - "name": "cheppers/robo-git", - "version": "v0.0.5", - "source": { - "type": "git", - "url": "https://github.com/Cheppers/robo-git.git", - "reference": "3c714e25cc2432dab4a73818f8373789db94bc7c" - }, - "dist": { - "type": "zip", - "url": "https://github.com/gitapi/repos/Cheppers/robo-git/zipball/3c714e25cc2432dab4a73818f8373789db94bc7c", - "reference": "3c714e25cc2432dab4a73818f8373789db94bc7c", - "shasum": "" - }, - "require": { - "cheppers/asset-jar": "^0.0", - "consolidation/robo": "^1.0", - "php": ">=7.1" - }, - "require-dev": { - "cheppers/git-hooks": "^0.0", - "codeception/codeception": "^2.2", - "squizlabs/php_codesniffer": "^2.7" - }, - "type": "library", - "autoload": { - "psr-4": { - "Cheppers\\Robo\\Git\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "GPL-2.0" - ], - "description": "Robo task to read the content of the staged files", - "time": "2017-04-09T11:26:24+00:00" - }, - { - "name": "cheppers/robo-phpcs", - "version": "v0.0.12", - "source": { - "type": "git", - "url": "https://github.com/Cheppers/robo-phpcs.git", - "reference": "ac4adfb182062fc6acf8b6151291b4d2666da16a" - }, - "dist": { - "type": "zip", - "url": "https://github.com/gitapi/repos/Cheppers/robo-phpcs/zipball/ac4adfb182062fc6acf8b6151291b4d2666da16a", - "reference": "ac4adfb182062fc6acf8b6151291b4d2666da16a", - "shasum": "" - }, - "require": { - "cheppers/asset-jar": "^0.0", - "cheppers/lint-report": "^0.0", - "consolidation/robo": "^1.0", - "php": ">=7.1", - "squizlabs/php_codesniffer": "^2.6" - }, - "require-dev": { - "cheppers/git-hooks": "^0.0", - "cheppers/robo-git": "^0.0", - "codeception/codeception": "^2.2", - "symfony/yaml": "^2.8 || ^3.1" - }, - "type": "library", - "autoload": { - "psr-4": { - "Cheppers\\Robo\\Phpcs\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "GPL-2.0+" - ], - "description": "Robo task wrapper for PHPCS", - "time": "2017-02-04T16:43:44+00:00" - }, { "name": "codeception/codeception", - "version": "2.2.10", + "version": "2.3.4", "source": { "type": "git", "url": "https://github.com/Codeception/Codeception.git", - "reference": "c32a3f92834db08ceedb4666ea2265c3aa43396e" + "reference": "b5391497f9a3c9d0a9c02ae39b53441e413e35a8" }, "dist": { "type": "zip", - "url": "https://github.com/gitapi/repos/Codeception/Codeception/zipball/c32a3f92834db08ceedb4666ea2265c3aa43396e", - "reference": "c32a3f92834db08ceedb4666ea2265c3aa43396e", + "url": "https://github.com/gitapi/repos/Codeception/Codeception/zipball/b5391497f9a3c9d0a9c02ae39b53441e413e35a8", + "reference": "b5391497f9a3c9d0a9c02ae39b53441e413e35a8", "shasum": "" }, "require": { @@ -1518,9 +1308,10 @@ "guzzlehttp/guzzle": ">=4.1.4 <7.0", "guzzlehttp/psr7": "~1.0", "php": ">=5.4.0 <8.0", - "phpunit/php-code-coverage": ">=2.2.4 <5.0", - "phpunit/phpunit": ">4.8.20 <6.0", - "sebastian/comparator": "~1.1", + "phpunit/php-code-coverage": ">=2.2.4 <6.0", + "phpunit/phpunit": ">4.8.20 <7.0", + "phpunit/phpunit-mock-objects": ">2.3 <5.0", + "sebastian/comparator": ">1.1 <3.0", "sebastian/diff": "^1.4", "stecman/symfony-console-completion": "^0.7.0", "symfony/browser-kit": ">=2.7 <4.0", @@ -1543,6 +1334,7 @@ "php-amqplib/php-amqplib": "~2.4", "predis/predis": "^1.0", "squizlabs/php_codesniffer": "~2.0", + "symfony/process": ">=2.7 <4.0", "vlucas/phpdotenv": "^2.4.0" }, "suggest": { @@ -1587,20 +1379,20 @@ "functional testing", "unit testing" ], - "time": "2017-03-25T03:19:52+00:00" + "time": "2017-07-10T19:45:09+00:00" }, { "name": "danielstjules/stringy", - "version": "3.0.1", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/danielstjules/Stringy.git", - "reference": "2288363663d94ce11c9ca555f7c760e9f799bb74" + "reference": "df24ab62d2d8213bbbe88cc36fc35a4503b4bd7e" }, "dist": { "type": "zip", - "url": "https://github.com/gitapi/repos/danielstjules/Stringy/zipball/2288363663d94ce11c9ca555f7c760e9f799bb74", - "reference": "2288363663d94ce11c9ca555f7c760e9f799bb74", + "url": "https://github.com/gitapi/repos/danielstjules/Stringy/zipball/df24ab62d2d8213bbbe88cc36fc35a4503b4bd7e", + "reference": "df24ab62d2d8213bbbe88cc36fc35a4503b4bd7e", "shasum": "" }, "require": { @@ -1643,36 +1435,36 @@ "utility", "utils" ], - "time": "2017-04-12T15:20:39+00:00" + "time": "2017-06-12T01:10:27+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://github.com/gitapi/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d", - "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d", + "url": "https://github.com/gitapi/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": { @@ -1697,20 +1489,20 @@ "constructor", "instantiate" ], - "time": "2015-06-14T21:17:01+00:00" + "time": "2017-07-22T11:58:36+00:00" }, { "name": "facebook/webdriver", - "version": "1.4.0", + "version": "1.4.1", "source": { "type": "git", "url": "https://github.com/facebook/php-webdriver.git", - "reference": "3ea034c056189e11c0ce7985332a9f4b5b2b5db2" + "reference": "eadb0b7a7c3e6578185197fd40158b08c3164c83" }, "dist": { "type": "zip", - "url": "https://github.com/gitapi/repos/facebook/php-webdriver/zipball/3ea034c056189e11c0ce7985332a9f4b5b2b5db2", - "reference": "3ea034c056189e11c0ce7985332a9f4b5b2b5db2", + "url": "https://github.com/gitapi/repos/facebook/php-webdriver/zipball/eadb0b7a7c3e6578185197fd40158b08c3164c83", + "reference": "eadb0b7a7c3e6578185197fd40158b08c3164c83", "shasum": "" }, "require": { @@ -1749,20 +1541,20 @@ "selenium", "webdriver" ], - "time": "2017-03-22T10:56:03+00:00" + "time": "2017-04-28T14:54:49+00:00" }, { "name": "guzzlehttp/guzzle", - "version": "6.2.3", + "version": "6.3.0", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "8d6c6cc55186db87b7dc5009827429ba4e9dc006" + "reference": "f4db5a78a5ea468d4831de7f0bf9d9415e348699" }, "dist": { "type": "zip", - "url": "https://github.com/gitapi/repos/guzzle/guzzle/zipball/8d6c6cc55186db87b7dc5009827429ba4e9dc006", - "reference": "8d6c6cc55186db87b7dc5009827429ba4e9dc006", + "url": "https://github.com/gitapi/repos/guzzle/guzzle/zipball/f4db5a78a5ea468d4831de7f0bf9d9415e348699", + "reference": "f4db5a78a5ea468d4831de7f0bf9d9415e348699", "shasum": "" }, "require": { @@ -1772,9 +1564,12 @@ }, "require-dev": { "ext-curl": "*", - "phpunit/phpunit": "^4.0", + "phpunit/phpunit": "^4.0 || ^5.0", "psr/log": "^1.0" }, + "suggest": { + "psr/log": "Required for using the Log middleware" + }, "type": "library", "extra": { "branch-alias": { @@ -1811,7 +1606,7 @@ "rest", "web service" ], - "time": "2017-02-28T22:50:30+00:00" + "time": "2017-06-22T18:50:49+00:00" }, { "name": "guzzlehttp/promises", @@ -1972,8 +1767,110 @@ "time": "2017-04-12T18:52:22+00:00" }, { - "name": "phpspec/prophecy", - "version": "v1.7.0", + "name": "phar-io/manifest", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/phar-io/manifest.git", + "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0" + }, + "dist": { + "type": "zip", + "url": "https://github.com/gitapi/repos/phar-io/manifest/zipball/2df402786ab5368a0169091f61a7c1e0eb6852d0", + "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-phar": "*", + "phar-io/version": "^1.0.1", + "php": "^5.6 || ^7.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + }, + { + "name": "Sebastian Heuer", + "email": "sebastian@phpeople.de", + "role": "Developer" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "Developer" + } + ], + "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", + "time": "2017-03-05T18:14:27+00:00" + }, + { + "name": "phar-io/version", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/phar-io/version.git", + "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df" + }, + "dist": { + "type": "zip", + "url": "https://github.com/gitapi/repos/phar-io/version/zipball/a70c0ced4be299a63d32fa96d9281d03e94041df", + "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + }, + { + "name": "Sebastian Heuer", + "email": "sebastian@phpeople.de", + "role": "Developer" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "Developer" + } + ], + "description": "Library for handling version information and constraints", + "time": "2017-03-05T17:38:23+00:00" + }, + { + "name": "phpspec/prophecy", + "version": "v1.7.0", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", @@ -2036,40 +1933,41 @@ }, { "name": "phpunit/php-code-coverage", - "version": "4.0.8", + "version": "5.2.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "ef7b2f56815df854e66ceaee8ebe9393ae36a40d" + "reference": "8ed1902a57849e117b5651fc1a5c48110946c06b" }, "dist": { "type": "zip", - "url": "https://github.com/gitapi/repos/sebastianbergmann/php-code-coverage/zipball/ef7b2f56815df854e66ceaee8ebe9393ae36a40d", - "reference": "ef7b2f56815df854e66ceaee8ebe9393ae36a40d", + "url": "https://github.com/gitapi/repos/sebastianbergmann/php-code-coverage/zipball/8ed1902a57849e117b5651fc1a5c48110946c06b", + "reference": "8ed1902a57849e117b5651fc1a5c48110946c06b", "shasum": "" }, "require": { "ext-dom": "*", "ext-xmlwriter": "*", - "php": "^5.6 || ^7.0", - "phpunit/php-file-iterator": "^1.3", - "phpunit/php-text-template": "^1.2", - "phpunit/php-token-stream": "^1.4.2 || ^2.0", - "sebastian/code-unit-reverse-lookup": "^1.0", - "sebastian/environment": "^1.3.2 || ^2.0", - "sebastian/version": "^1.0 || ^2.0" + "php": "^7.0", + "phpunit/php-file-iterator": "^1.4.2", + "phpunit/php-text-template": "^1.2.1", + "phpunit/php-token-stream": "^1.4.11 || ^2.0", + "sebastian/code-unit-reverse-lookup": "^1.0.1", + "sebastian/environment": "^3.0", + "sebastian/version": "^2.0.1", + "theseer/tokenizer": "^1.1" }, "require-dev": { - "ext-xdebug": "^2.1.4", - "phpunit/phpunit": "^5.7" + "ext-xdebug": "^2.5", + "phpunit/phpunit": "^6.0" }, "suggest": { - "ext-xdebug": "^2.5.1" + "ext-xdebug": "^2.5.5" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0.x-dev" + "dev-master": "5.2.x-dev" } }, "autoload": { @@ -2095,7 +1993,7 @@ "testing", "xunit" ], - "time": "2017-04-02T07:44:40+00:00" + "time": "2017-08-03T12:40:43+00:00" }, { "name": "phpunit/php-file-iterator", @@ -2236,29 +2134,29 @@ }, { "name": "phpunit/php-token-stream", - "version": "1.4.11", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "e03f8f67534427a787e21a385a67ec3ca6978ea7" + "reference": "ecb0b2cdaa0add708fe6f329ef65ae0c5225130b" }, "dist": { "type": "zip", - "url": "https://github.com/gitapi/repos/sebastianbergmann/php-token-stream/zipball/e03f8f67534427a787e21a385a67ec3ca6978ea7", - "reference": "e03f8f67534427a787e21a385a67ec3ca6978ea7", + "url": "https://github.com/gitapi/repos/sebastianbergmann/php-token-stream/zipball/ecb0b2cdaa0add708fe6f329ef65ae0c5225130b", + "reference": "ecb0b2cdaa0add708fe6f329ef65ae0c5225130b", "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": { @@ -2281,20 +2179,20 @@ "keywords": [ "tokenizer" ], - "time": "2017-02-27T10:12:30+00:00" + "time": "2017-08-03T14:17:41+00:00" }, { "name": "phpunit/phpunit", - "version": "5.7.19", + "version": "6.2.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "69c4f49ff376af2692bad9cebd883d17ebaa98a1" + "reference": "ff3a76a58ac293657808aefd58c8aaf05945f4d9" }, "dist": { "type": "zip", - "url": "https://github.com/gitapi/repos/sebastianbergmann/phpunit/zipball/69c4f49ff376af2692bad9cebd883d17ebaa98a1", - "reference": "69c4f49ff376af2692bad9cebd883d17ebaa98a1", + "url": "https://github.com/gitapi/repos/sebastianbergmann/phpunit/zipball/ff3a76a58ac293657808aefd58c8aaf05945f4d9", + "reference": "ff3a76a58ac293657808aefd58c8aaf05945f4d9", "shasum": "" }, "require": { @@ -2303,33 +2201,35 @@ "ext-libxml": "*", "ext-mbstring": "*", "ext-xml": "*", - "myclabs/deep-copy": "~1.3", - "php": "^5.6 || ^7.0", - "phpspec/prophecy": "^1.6.2", - "phpunit/php-code-coverage": "^4.0.4", - "phpunit/php-file-iterator": "~1.4", - "phpunit/php-text-template": "~1.2", + "myclabs/deep-copy": "^1.3", + "phar-io/manifest": "^1.0.1", + "phar-io/version": "^1.0", + "php": "^7.0", + "phpspec/prophecy": "^1.7", + "phpunit/php-code-coverage": "^5.2", + "phpunit/php-file-iterator": "^1.4", + "phpunit/php-text-template": "^1.2", "phpunit/php-timer": "^1.0.6", - "phpunit/phpunit-mock-objects": "^3.2", - "sebastian/comparator": "^1.2.4", - "sebastian/diff": "~1.2", - "sebastian/environment": "^1.3.4 || ^2.0", - "sebastian/exporter": "~2.0", - "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" + "phpunit/phpunit-mock-objects": "^4.0", + "sebastian/comparator": "^2.0", + "sebastian/diff": "^1.4.3", + "sebastian/environment": "^3.0.2", + "sebastian/exporter": "^3.1", + "sebastian/global-state": "^1.1 || ^2.0", + "sebastian/object-enumerator": "^3.0.2", + "sebastian/resource-operations": "^1.0", + "sebastian/version": "^2.0" }, "conflict": { - "phpdocumentor/reflection-docblock": "3.0.2" + "phpdocumentor/reflection-docblock": "3.0.2", + "phpunit/dbunit": "<3.0" }, "require-dev": { "ext-pdo": "*" }, "suggest": { "ext-xdebug": "*", - "phpunit/php-invoker": "~1.1" + "phpunit/php-invoker": "^1.1" }, "bin": [ "phpunit" @@ -2337,7 +2237,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "5.7.x-dev" + "dev-master": "6.2.x-dev" } }, "autoload": { @@ -2363,33 +2263,33 @@ "testing", "xunit" ], - "time": "2017-04-03T02:22:27+00:00" + "time": "2017-08-03T13:59:28+00:00" }, { "name": "phpunit/phpunit-mock-objects", - "version": "3.4.3", + "version": "4.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", - "reference": "3ab72b65b39b491e0c011e2e09bb2206c2aa8e24" + "reference": "2f789b59ab89669015ad984afa350c4ec577ade0" }, "dist": { "type": "zip", - "url": "https://github.com/gitapi/repos/sebastianbergmann/phpunit-mock-objects/zipball/3ab72b65b39b491e0c011e2e09bb2206c2aa8e24", - "reference": "3ab72b65b39b491e0c011e2e09bb2206c2aa8e24", + "url": "https://github.com/gitapi/repos/sebastianbergmann/phpunit-mock-objects/zipball/2f789b59ab89669015ad984afa350c4ec577ade0", + "reference": "2f789b59ab89669015ad984afa350c4ec577ade0", "shasum": "" }, "require": { - "doctrine/instantiator": "^1.0.2", - "php": "^5.6 || ^7.0", - "phpunit/php-text-template": "^1.2", - "sebastian/exporter": "^1.2 || ^2.0" + "doctrine/instantiator": "^1.0.5", + "php": "^7.0", + "phpunit/php-text-template": "^1.2.1", + "sebastian/exporter": "^3.0" }, "conflict": { - "phpunit/phpunit": "<5.4.0" + "phpunit/phpunit": "<6.0" }, "require-dev": { - "phpunit/phpunit": "^5.4" + "phpunit/phpunit": "^6.0" }, "suggest": { "ext-soap": "*" @@ -2397,7 +2297,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2.x-dev" + "dev-master": "4.0.x-dev" } }, "autoload": { @@ -2422,7 +2322,7 @@ "mock", "xunit" ], - "time": "2016-12-08T20:27:08+00:00" + "time": "2017-08-03T14:08:16+00:00" }, { "name": "psr/http-message", @@ -2521,30 +2421,30 @@ }, { "name": "sebastian/comparator", - "version": "1.2.4", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be" + "reference": "20f84f468cb67efee293246e6a09619b891f55f0" }, "dist": { "type": "zip", - "url": "https://github.com/gitapi/repos/sebastianbergmann/comparator/zipball/2b7424b55f5047b47ac6e5ccb20b2aea4011d9be", - "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be", + "url": "https://github.com/gitapi/repos/sebastianbergmann/comparator/zipball/20f84f468cb67efee293246e6a09619b891f55f0", + "reference": "20f84f468cb67efee293246e6a09619b891f55f0", "shasum": "" }, "require": { - "php": ">=5.3.3", - "sebastian/diff": "~1.2", - "sebastian/exporter": "~1.2 || ~2.0" + "php": "^7.0", + "sebastian/diff": "^1.2", + "sebastian/exporter": "^3.0" }, "require-dev": { - "phpunit/phpunit": "~4.4" + "phpunit/phpunit": "^6.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { @@ -2581,27 +2481,27 @@ "compare", "equality" ], - "time": "2017-01-29T09:50:25+00:00" + "time": "2017-03-03T06:26:08+00:00" }, { "name": "sebastian/diff", - "version": "1.4.1", + "version": "1.4.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e" + "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4" }, "dist": { "type": "zip", - "url": "https://github.com/gitapi/repos/sebastianbergmann/diff/zipball/13edfd8706462032c2f52b4b862974dd46b71c9e", - "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e", + "url": "https://github.com/gitapi/repos/sebastianbergmann/diff/zipball/7f066a26a962dbe58ddea9f72a4e82874a3975a4", + "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": "^5.3.3 || ^7.0" }, "require-dev": { - "phpunit/phpunit": "~4.8" + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" }, "type": "library", "extra": { @@ -2633,32 +2533,32 @@ "keywords": [ "diff" ], - "time": "2015-12-08T07:14:41+00:00" + "time": "2017-05-22T07:24:03+00:00" }, { "name": "sebastian/environment", - "version": "2.0.0", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac" + "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5" }, "dist": { "type": "zip", - "url": "https://github.com/gitapi/repos/sebastianbergmann/environment/zipball/5795ffe5dc5b02460c3e34222fee8cbe245d8fac", - "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac", + "url": "https://github.com/gitapi/repos/sebastianbergmann/environment/zipball/cd0871b3975fb7fc44d11314fd1ee20925fce4f5", + "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5", "shasum": "" }, "require": { - "php": "^5.6 || ^7.0" + "php": "^7.0" }, "require-dev": { - "phpunit/phpunit": "^5.0" + "phpunit/phpunit": "^6.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "3.1.x-dev" } }, "autoload": { @@ -2683,34 +2583,34 @@ "environment", "hhvm" ], - "time": "2016-11-26T07:53:53+00:00" + "time": "2017-07-01T08:51:00+00:00" }, { "name": "sebastian/exporter", - "version": "2.0.0", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4" + "reference": "234199f4528de6d12aaa58b612e98f7d36adb937" }, "dist": { "type": "zip", - "url": "https://github.com/gitapi/repos/sebastianbergmann/exporter/zipball/ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4", - "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4", + "url": "https://github.com/gitapi/repos/sebastianbergmann/exporter/zipball/234199f4528de6d12aaa58b612e98f7d36adb937", + "reference": "234199f4528de6d12aaa58b612e98f7d36adb937", "shasum": "" }, "require": { - "php": ">=5.3.3", - "sebastian/recursion-context": "~2.0" + "php": "^7.0", + "sebastian/recursion-context": "^3.0" }, "require-dev": { "ext-mbstring": "*", - "phpunit/phpunit": "~4.4" + "phpunit/phpunit": "^6.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "3.1.x-dev" } }, "autoload": { @@ -2750,27 +2650,27 @@ "export", "exporter" ], - "time": "2016-11-19T08:54:04+00:00" + "time": "2017-04-03T13:19:02+00:00" }, { "name": "sebastian/global-state", - "version": "1.1.1", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4" + "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4" }, "dist": { "type": "zip", - "url": "https://github.com/gitapi/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4", - "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4", + "url": "https://github.com/gitapi/repos/sebastianbergmann/global-state/zipball/e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4", + "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": "^7.0" }, "require-dev": { - "phpunit/phpunit": "~4.2" + "phpunit/phpunit": "^6.0" }, "suggest": { "ext-uopz": "*" @@ -2778,7 +2678,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "2.0-dev" } }, "autoload": { @@ -2801,33 +2701,34 @@ "keywords": [ "global state" ], - "time": "2015-10-12T03:26:01+00:00" + "time": "2017-04-27T15:39:26+00:00" }, { "name": "sebastian/object-enumerator", - "version": "2.0.1", + "version": "3.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/object-enumerator.git", - "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7" + "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5" }, "dist": { "type": "zip", - "url": "https://github.com/gitapi/repos/sebastianbergmann/object-enumerator/zipball/1311872ac850040a79c3c058bea3e22d0f09cbb7", - "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7", + "url": "https://github.com/gitapi/repos/sebastianbergmann/object-enumerator/zipball/7cfd9e65d11ffb5af41198476395774d4c8a84c5", + "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5", "shasum": "" }, "require": { - "php": ">=5.6", - "sebastian/recursion-context": "~2.0" + "php": "^7.0", + "sebastian/object-reflector": "^1.1.1", + "sebastian/recursion-context": "^3.0" }, "require-dev": { - "phpunit/phpunit": "~5" + "phpunit/phpunit": "^6.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "3.0.x-dev" } }, "autoload": { @@ -2847,32 +2748,77 @@ ], "description": "Traverses array structures and object graphs to enumerate all referenced objects", "homepage": "https://github.com/sebastianbergmann/object-enumerator/", - "time": "2017-02-18T15:18:39+00:00" + "time": "2017-08-03T12:35:26+00:00" + }, + { + "name": "sebastian/object-reflector", + "version": "1.1.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/object-reflector.git", + "reference": "773f97c67f28de00d397be301821b06708fca0be" + }, + "dist": { + "type": "zip", + "url": "https://github.com/gitapi/repos/sebastianbergmann/object-reflector/zipball/773f97c67f28de00d397be301821b06708fca0be", + "reference": "773f97c67f28de00d397be301821b06708fca0be", + "shasum": "" + }, + "require": { + "php": "^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Allows reflection of object attributes, including inherited and non-public ones", + "homepage": "https://github.com/sebastianbergmann/object-reflector/", + "time": "2017-03-29T09:07:27+00:00" }, { "name": "sebastian/recursion-context", - "version": "2.0.0", + "version": "3.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a" + "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8" }, "dist": { "type": "zip", - "url": "https://github.com/gitapi/repos/sebastianbergmann/recursion-context/zipball/2c3ba150cbec723aa057506e73a8d33bdb286c9a", - "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a", + "url": "https://github.com/gitapi/repos/sebastianbergmann/recursion-context/zipball/5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8", + "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": "^7.0" }, "require-dev": { - "phpunit/phpunit": "~4.4" + "phpunit/phpunit": "^6.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "3.0.x-dev" } }, "autoload": { @@ -2900,7 +2846,7 @@ ], "description": "Provides functionality to recursively process PHP variables", "homepage": "http://www.github.com/sebastianbergmann/recursion-context", - "time": "2016-11-19T07:33:16+00:00" + "time": "2017-03-03T06:23:57+00:00" }, { "name": "sebastian/resource-operations", @@ -2987,6 +2933,84 @@ "homepage": "https://github.com/sebastianbergmann/version", "time": "2016-10-03T07:35:21+00:00" }, + { + "name": "squizlabs/php_codesniffer", + "version": "2.9.1", + "source": { + "type": "git", + "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", + "reference": "dcbed1074f8244661eecddfc2a675430d8d33f62" + }, + "dist": { + "type": "zip", + "url": "https://github.com/gitapi/repos/squizlabs/PHP_CodeSniffer/zipball/dcbed1074f8244661eecddfc2a675430d8d33f62", + "reference": "dcbed1074f8244661eecddfc2a675430d8d33f62", + "shasum": "" + }, + "require": { + "ext-simplexml": "*", + "ext-tokenizer": "*", + "ext-xmlwriter": "*", + "php": ">=5.1.2" + }, + "require-dev": { + "phpunit/phpunit": "~4.0" + }, + "bin": [ + "scripts/phpcs", + "scripts/phpcbf" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.x-dev" + } + }, + "autoload": { + "classmap": [ + "CodeSniffer.php", + "CodeSniffer/CLI.php", + "CodeSniffer/Exception.php", + "CodeSniffer/File.php", + "CodeSniffer/Fixer.php", + "CodeSniffer/Report.php", + "CodeSniffer/Reporting.php", + "CodeSniffer/Sniff.php", + "CodeSniffer/Tokens.php", + "CodeSniffer/Reports/", + "CodeSniffer/Tokenizers/", + "CodeSniffer/DocGenerators/", + "CodeSniffer/Standards/AbstractPatternSniff.php", + "CodeSniffer/Standards/AbstractScopeSniff.php", + "CodeSniffer/Standards/AbstractVariableSniff.php", + "CodeSniffer/Standards/IncorrectPatternException.php", + "CodeSniffer/Standards/Generic/Sniffs/", + "CodeSniffer/Standards/MySource/Sniffs/", + "CodeSniffer/Standards/PEAR/Sniffs/", + "CodeSniffer/Standards/PSR1/Sniffs/", + "CodeSniffer/Standards/PSR2/Sniffs/", + "CodeSniffer/Standards/Squiz/Sniffs/", + "CodeSniffer/Standards/Zend/Sniffs/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Greg Sherwood", + "role": "lead" + } + ], + "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", + "homepage": "http://www.squizlabs.com/php-codesniffer", + "keywords": [ + "phpcs", + "standards" + ], + "time": "2017-05-22T02:43:20+00:00" + }, { "name": "stecman/symfony-console-completion", "version": "0.7.0", @@ -3032,18 +3056,210 @@ "description": "Automatic BASH completion for Symfony Console Component based applications.", "time": "2016-02-24T05:08:54+00:00" }, + { + "name": "sweetchuck/codeception-module-robo-task-runner", + "version": "v0.0.1", + "source": { + "type": "git", + "url": "https://github.com/Sweetchuck/codeception-module-robo-task-runner.git", + "reference": "7fb951ec5f343333e95d450d25a13890cddfe49f" + }, + "dist": { + "type": "zip", + "url": "https://github.com/gitapi/repos/Sweetchuck/codeception-module-robo-task-runner/zipball/7fb951ec5f343333e95d450d25a13890cddfe49f", + "reference": "7fb951ec5f343333e95d450d25a13890cddfe49f", + "shasum": "" + }, + "require": { + "codeception/codeception": "^2.3", + "consolidation/robo": "^1.1" + }, + "require-dev": { + "squizlabs/php_codesniffer": "^3.0", + "sweetchuck/git-hooks": "^0.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Sweetchuck\\Codeception\\Module\\RoboTaskRunner\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "GPL-2.0" + ], + "description": "Runs a Robo task.", + "time": "2017-07-29T11:31:55+00:00" + }, + { + "name": "sweetchuck/git-hooks", + "version": "v0.0.10", + "source": { + "type": "git", + "url": "https://github.com/Sweetchuck/git-hooks.git", + "reference": "59d66a1258c27101a63b35ad35d1bb4546e79071" + }, + "dist": { + "type": "zip", + "url": "https://github.com/gitapi/repos/Sweetchuck/git-hooks/zipball/59d66a1258c27101a63b35ad35d1bb4546e79071", + "reference": "59d66a1258c27101a63b35ad35d1bb4546e79071", + "shasum": "" + }, + "require-dev": { + "behat/behat": "~3.1", + "consolidation/robo": "~1.0", + "php": ">=7.1", + "phpunit/phpunit": "^6.2", + "squizlabs/php_codesniffer": "~2.6", + "symfony/filesystem": "~3.1", + "symfony/process": "~3.1" + }, + "type": "library", + "extra": { + "sweetchuck/git-hooks": { + "symlink": true + } + }, + "autoload": { + "psr-4": { + "Sweetchuck\\GitHooks\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "GPL-2.0" + ], + "description": "Provide a bridge between Git hooks and scripts under VCS.", + "time": "2017-07-28T20:43:48+00:00" + }, + { + "name": "sweetchuck/lint-report", + "version": "v0.0.6", + "source": { + "type": "git", + "url": "https://github.com/Sweetchuck/lint-report.git", + "reference": "ce77db1c44c8662e798b16605d53975d44a9b91c" + }, + "dist": { + "type": "zip", + "url": "https://github.com/gitapi/repos/Sweetchuck/lint-report/zipball/ce77db1c44c8662e798b16605d53975d44a9b91c", + "reference": "ce77db1c44c8662e798b16605d53975d44a9b91c", + "shasum": "" + }, + "require": { + "league/container": "^2.2", + "php": ">=7.1", + "symfony/console": "^2.8 || ^3.1", + "symfony/filesystem": "^2.8 || ^3.1", + "symfony/yaml": "^2.8 || ^3.1" + }, + "require-dev": { + "codeception/codeception": "^2.2", + "squizlabs/php_codesniffer": "2.6.2", + "sweetchuck/git-hooks": "^0.0.10" + }, + "type": "library", + "autoload": { + "psr-4": { + "Sweetchuck\\LintReport\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "GPL-2.0+" + ], + "description": "Generate reports from lint results", + "time": "2017-07-29T07:17:19+00:00" + }, + { + "name": "sweetchuck/robo-git", + "version": "v0.0.7", + "source": { + "type": "git", + "url": "https://github.com/Sweetchuck/robo-git.git", + "reference": "969795e6f75215d93c54dc106b698b8a524ab711" + }, + "dist": { + "type": "zip", + "url": "https://github.com/gitapi/repos/Sweetchuck/robo-git/zipball/969795e6f75215d93c54dc106b698b8a524ab711", + "reference": "969795e6f75215d93c54dc106b698b8a524ab711", + "shasum": "" + }, + "require": { + "consolidation/robo": "^1.0", + "php": ">=7.1" + }, + "require-dev": { + "codeception/codeception": "^2.2", + "squizlabs/php_codesniffer": "^3.0", + "sweetchuck/git-hooks": "^0.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Sweetchuck\\Robo\\Git\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "GPL-2.0" + ], + "description": "Robo task to read the content of the staged files", + "time": "2017-07-29T19:26:47+00:00" + }, + { + "name": "sweetchuck/robo-phpcs", + "version": "v0.0.15", + "source": { + "type": "git", + "url": "https://github.com/Sweetchuck/robo-phpcs.git", + "reference": "8bf185f3d3a1402bb9425b412867456fedc452d1" + }, + "dist": { + "type": "zip", + "url": "https://github.com/gitapi/repos/Sweetchuck/robo-phpcs/zipball/8bf185f3d3a1402bb9425b412867456fedc452d1", + "reference": "8bf185f3d3a1402bb9425b412867456fedc452d1", + "shasum": "" + }, + "require": { + "consolidation/robo": "^1.0", + "php": ">=7.1", + "squizlabs/php_codesniffer": "^2.6", + "sweetchuck/lint-report": "^0.0" + }, + "require-dev": { + "codeception/codeception": "^2.2", + "sweetchuck/codeception-module-robo-task-runner": "^0.0", + "sweetchuck/git-hooks": "^0.0", + "sweetchuck/robo-git": "^0.0", + "symfony/yaml": "^2.8 || ^3.1", + "webmozart/path-util": "^2.3" + }, + "type": "library", + "autoload": { + "psr-4": { + "Sweetchuck\\Robo\\Phpcs\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "GPL-2.0+" + ], + "description": "Robo task wrapper for PHPCS", + "time": "2017-07-29T19:20:40+00:00" + }, { "name": "symfony/browser-kit", - "version": "v3.2.7", + "version": "v3.3.6", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", - "reference": "2fe0caa60c1a1dfeefd0425741182687a9b382b8" + "reference": "8079a6b3668ef15cdbf73a4c7d31081abb8bb5f0" }, "dist": { "type": "zip", - "url": "https://github.com/gitapi/repos/symfony/browser-kit/zipball/2fe0caa60c1a1dfeefd0425741182687a9b382b8", - "reference": "2fe0caa60c1a1dfeefd0425741182687a9b382b8", + "url": "https://github.com/gitapi/repos/symfony/browser-kit/zipball/8079a6b3668ef15cdbf73a4c7d31081abb8bb5f0", + "reference": "8079a6b3668ef15cdbf73a4c7d31081abb8bb5f0", "shasum": "" }, "require": { @@ -3060,7 +3276,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -3087,20 +3303,20 @@ ], "description": "Symfony BrowserKit Component", "homepage": "https://symfony.com", - "time": "2017-02-21T09:12:04+00:00" + "time": "2017-07-12T13:03:20+00:00" }, { "name": "symfony/css-selector", - "version": "v3.2.7", + "version": "v3.3.6", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "a48f13dc83c168f1253a5d2a5a4fb46c36244c4c" + "reference": "4d882dced7b995d5274293039370148e291808f2" }, "dist": { "type": "zip", - "url": "https://github.com/gitapi/repos/symfony/css-selector/zipball/a48f13dc83c168f1253a5d2a5a4fb46c36244c4c", - "reference": "a48f13dc83c168f1253a5d2a5a4fb46c36244c4c", + "url": "https://github.com/gitapi/repos/symfony/css-selector/zipball/4d882dced7b995d5274293039370148e291808f2", + "reference": "4d882dced7b995d5274293039370148e291808f2", "shasum": "" }, "require": { @@ -3109,7 +3325,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -3140,20 +3356,20 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "time": "2017-02-21T09:12:04+00:00" + "time": "2017-05-01T15:01:29+00:00" }, { "name": "symfony/dom-crawler", - "version": "v3.2.7", + "version": "v3.3.6", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "403944e294cf4ceb3b8447f54cbad88ea7b99cee" + "reference": "fc2c588ce376e9fe04a7b8c79e3ec62fe32d95b1" }, "dist": { "type": "zip", - "url": "https://github.com/gitapi/repos/symfony/dom-crawler/zipball/403944e294cf4ceb3b8447f54cbad88ea7b99cee", - "reference": "403944e294cf4ceb3b8447f54cbad88ea7b99cee", + "url": "https://github.com/gitapi/repos/symfony/dom-crawler/zipball/fc2c588ce376e9fe04a7b8c79e3ec62fe32d95b1", + "reference": "fc2c588ce376e9fe04a7b8c79e3ec62fe32d95b1", "shasum": "" }, "require": { @@ -3169,7 +3385,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -3196,7 +3412,47 @@ ], "description": "Symfony DomCrawler Component", "homepage": "https://symfony.com", - "time": "2017-02-21T09:12:04+00:00" + "time": "2017-05-25T23:10:31+00:00" + }, + { + "name": "theseer/tokenizer", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://github.com/theseer/tokenizer.git", + "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b" + }, + "dist": { + "type": "zip", + "url": "https://github.com/gitapi/repos/theseer/tokenizer/zipball/cb2f008f3f05af2893a87208fe6a6c4985483f8b", + "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-tokenizer": "*", + "ext-xmlwriter": "*", + "php": "^7.0" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + } + ], + "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", + "time": "2017-04-07T12:08:54+00:00" }, { "name": "webmozart/path-util", diff --git a/phpcs.xml b/phpcs.xml new file mode 100644 index 0000000..4dbe04f --- /dev/null +++ b/phpcs.xml @@ -0,0 +1,16 @@ + + + src/ + src-dev/Composer/ + tests/ + tests/_data/ + tests/_output/ + tests/_support/_generated/ + RoboFile.php + + + + + RoboFile.php + + diff --git a/src/Composer/Scripts.php b/src-dev/Composer/Scripts.php similarity index 55% rename from src/Composer/Scripts.php rename to src-dev/Composer/Scripts.php index 6277818..11a0258 100644 --- a/src/Composer/Scripts.php +++ b/src-dev/Composer/Scripts.php @@ -1,22 +1,22 @@ action; } - //endregion + // endregion - //region Option - workingDirectory. + // region Option - workingDirectory. /** * @var string */ @@ -82,9 +79,9 @@ public function setWorkingDirectory(string $value) return $this; } - //endregion + // endregion - //region Option - bundleExecutable. + // region Option - bundleExecutable. /** * @var string */ @@ -104,9 +101,9 @@ public function setBundleExecutable(string $value) return $this; } - //endregion + // endregion - //region Option - compassExecutable. + // region Option - compassExecutable. /** * @var string */ @@ -126,8 +123,30 @@ public function setCompassExecutable(string $value) return $this; } - //endregion - //endregion + // endregion + + // region Option - assetNamePrefix. + /** + * @var string + */ + protected $assetNamePrefix = ''; + + public function getAssetNamePrefix(): string + { + return $this->assetNamePrefix; + } + + /** + * @return $this + */ + public function setAssetNamePrefix(string $value) + { + $this->assetNamePrefix = $value; + + return $this; + } + // endregion + // endregion /** * {@inheritdoc} @@ -166,12 +185,8 @@ public function setOptions(array $option) { foreach ($option as $name => $value) { switch ($name) { - case 'assetJar': - $this->setAssetJar($value); - break; - - case 'assetJarMapping': - $this->setAssetJarMapping($value); + case 'assetNamePrefix': + $this->setAssetNamePrefix($value); break; case 'workingDirectory': @@ -281,7 +296,6 @@ public function run() ->runHeader() ->runDoIt() ->runProcessOutputs() - ->runReleaseAssets() ->runReturn(); } @@ -320,34 +334,31 @@ protected function runProcessOutputs() return $this; } - /** - * @return $this - */ - protected function runReleaseAssets() - { - if ($this->hasAssetJar()) { - $assetJar = $this->getAssetJar(); - foreach ($this->assets as $name => $value) { - $mapping = $this->getAssetJarMap($name); - if ($mapping) { - $assetJar->setValue($mapping, $value); - } - } - } - - return $this; - } - protected function runReturn(): Result { return new Result( $this, $this->getTaskResultCode(), $this->getTaskResultMessage(), - $this->assets + $this->getAssetsWithPrefixedNames() ); } + protected function getAssetsWithPrefixedNames(): array + { + $prefix = $this->getAssetNamePrefix(); + if (!$prefix) { + return $this->assets; + } + + $data = []; + foreach ($this->assets as $key => $value) { + $data["{$prefix}{$key}"] = $value; + } + + return $data; + } + protected function runCallback(string $type, string $data): void { switch ($type) { diff --git a/src/Task/CompassCleanTask.php b/src/Task/CompassCleanTask.php index 12b6459..0f4e938 100644 --- a/src/Task/CompassCleanTask.php +++ b/src/Task/CompassCleanTask.php @@ -1,8 +1,8 @@ instanceId = static::$instanceCounter++; - - if (empty($config['stdErr'])) { - $config['stdErr'] = true; - $this->setErrorOutput(new static($config)); - } else { - $this->setErrorOutput($this); - } - } - - /** - * {@inheritdoc} - */ - protected function doWrite($message, $newline) - { - $this->output .= $message . ($newline ? "\n" : ''); - } -} diff --git a/tests/_support/Helper/Module/RoboTaskRunner.php b/tests/_support/Helper/Module/RoboTaskRunner.php deleted file mode 100644 index 10c0717..0000000 --- a/tests/_support/Helper/Module/RoboTaskRunner.php +++ /dev/null @@ -1,70 +0,0 @@ -roboTaskExitCode[$id]; - } - - public function getRoboTaskStdOutput(string $id): string - { - return $this->roboTaskStdOutput[$id]->output; - } - - public function getRoboTaskStdError(string $id): string - { - /** @var \Cheppers\Robo\Compass\Test\Helper\Dummy\Output $errorOutput */ - $errorOutput = $this->roboTaskStdOutput[$id]->getErrorOutput(); - - return $errorOutput->output; - } - - public function runRoboTask(string $id, string $class, string ...$args): void - { - if (isset($this->roboTaskStdOutput[$id])) { - throw new \InvalidArgumentException(); - } - - $config = [ - 'verbosity' => OutputInterface::VERBOSITY_DEBUG, - 'colors' => false, - ]; - $this->roboTaskStdOutput[$id] = new DummyOutput($config); - - array_unshift($args, 'RoboTaskRunner.php', '--no-ansi'); - - $containerBackup = Robo::hasContainer() ? Robo::getContainer() : null; - $container = Robo::createDefaultContainer(null, $this->roboTaskStdOutput[$id]); - $container->add('output', $this->roboTaskStdOutput[$id], false); - Robo::setContainer($container); - - $this->roboTaskExitCode[$id] = (new Runner($class)) - ->setContainer($container) - ->execute($args); - - if ($containerBackup) { - Robo::setContainer($containerBackup); - } else { - Robo::unsetContainer(); - } - } -} diff --git a/tests/_support/Helper/RoboFiles/CompassRoboFile.php b/tests/_support/Helper/RoboFiles/CompassRoboFile.php index 091ed16..eaffb7a 100644 --- a/tests/_support/Helper/RoboFiles/CompassRoboFile.php +++ b/tests/_support/Helper/RoboFiles/CompassRoboFile.php @@ -1,8 +1,8 @@ false, + 'assetNamePrefix' => 'foo:', ], [ 'exitCode' => 0, @@ -120,6 +121,7 @@ public function casesRun(): array ], [ 'failOnInvalid' => true, + 'assetNamePrefix' => 'bar:', ], [ 'exitCode' => 0, @@ -142,15 +144,13 @@ public function testRun(array $expected, array $options, array $processProphecy) $container = Robo::createDefaultContainer(); Robo::setContainer($container); - $mainStdOutput = new DummyOutput([]); - - $assetJar = new AssetJar(); - $options += [ - 'assetJar' => $assetJar, - 'assetJarMapping' => ['invalidFiles' => ['compassValidate', 'files']], + $outputConfig = [ + 'verbosity' => OutputInterface::VERBOSITY_DEBUG, + 'color' => false, ]; + $mainStdOutput = new DummyOutput($outputConfig); - /** @var \Cheppers\Robo\Compass\Task\CompassValidateTask $task */ + /** @var \Sweetchuck\Robo\Compass\Task\CompassValidateTask $task */ $task = Stub::construct( CompassValidateTask::class, [$options, []], @@ -173,15 +173,11 @@ public function testRun(array $expected, array $options, array $processProphecy) 'Exit code is different than the expected.' ); - $this->tester->assertEquals( - $expected['invalidFiles'], - $task->getAssetJarValue('invalidFiles'), - 'AssetJar content: invalidFiles' - ); + $assetNamePrefix = $options['assetNamePrefix'] ?? ''; $this->tester->assertEquals( $expected['invalidFiles'], - $result['invalidFiles'], + $result["{$assetNamePrefix}invalidFiles"], 'Result content: invalidFiles' ); }