From 5d4fb47e46d9893d00d2397b7f0b37a80fc78356 Mon Sep 17 00:00:00 2001 From: Greg Anderson Date: Wed, 29 Mar 2017 12:45:43 -0700 Subject: [PATCH] Update to fix upcoming changes in Robo. --- composer.json | 2 +- composer.lock | 341 ++++++++++++++++++++++------------ src/Config/DefaultsConfig.php | 2 + src/Config/DotEnvConfig.php | 2 + src/Config/EnvConfig.php | 2 + src/Config/TerminusConfig.php | 2 +- src/Config/YamlConfig.php | 2 + 7 files changed, 235 insertions(+), 118 deletions(-) diff --git a/composer.json b/composer.json index fba58deb9..aca66773a 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ "require": { "php": ">=5.5.9", "composer/semver": "^1.4", - "consolidation/robo": "^1.0.5", + "consolidation/robo": "^1.0.6", "guzzlehttp/guzzle": "^6.2", "psy/psysh": "^0.8", "symfony/console": "^3.2", diff --git a/composer.lock b/composer.lock index 5f76626f9..f2e3760ee 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "dcf243de35a0ee2d0dd936e5a5fb2ee5", + "content-hash": "f68950dbec6a6414fe38994b0191f498", "packages": [ { "name": "composer/semver", @@ -218,24 +218,27 @@ }, { "name": "consolidation/robo", - "version": "1.0.5", + "version": "1.0.6", "source": { "type": "git", "url": "https://github.com/consolidation/Robo.git", - "reference": "d06450370e8e303ebd1495dfc956f4c6c1b9dd01" + "reference": "de6225256b2ed88822af1cd8cc3a01bf933add8c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/Robo/zipball/d06450370e8e303ebd1495dfc956f4c6c1b9dd01", - "reference": "d06450370e8e303ebd1495dfc956f4c6c1b9dd01", + "url": "https://api.github.com/repos/consolidation/Robo/zipball/de6225256b2ed88822af1cd8cc3a01bf933add8c", + "reference": "de6225256b2ed88822af1cd8cc3a01bf933add8c", "shasum": "" }, "require": { "consolidation/annotated-command": "^2.2", "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", @@ -254,8 +257,7 @@ "patchwork/jsqueeze": "~2", "pear/archive_tar": "^1.4.2", "phpunit/php-code-coverage": "~2|~4", - "satooshi/php-coveralls": "~1", - "squizlabs/php_codesniffer": "~2" + "satooshi/php-coveralls": "~1" }, "suggest": { "henrikbjorn/lurker": "For monitoring filesystem changes in taskWatch", @@ -291,7 +293,7 @@ } ], "description": "Modern task runner", - "time": "2016-11-24T02:07:48+00:00" + "time": "2017-03-31T18:23:36+00:00" }, { "name": "container-interop/container-interop", @@ -324,6 +326,65 @@ "homepage": "https://github.com/container-interop/container-interop", "time": "2017-02-14T19:40:03+00:00" }, + { + "name": "dflydev/dot-access-data", + "version": "v1.1.0", + "source": { + "type": "git", + "url": "https://github.com/dflydev/dflydev-dot-access-data.git", + "reference": "3fbd874921ab2c041e899d044585a2ab9795df8a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/dflydev/dflydev-dot-access-data/zipball/3fbd874921ab2c041e899d044585a2ab9795df8a", + "reference": "3fbd874921ab2c041e899d044585a2ab9795df8a", + "shasum": "" + }, + "require": { + "php": ">=5.3.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-0": { + "Dflydev\\DotAccessData": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Dragonfly Development Inc.", + "email": "info@dflydev.com", + "homepage": "http://dflydev.com" + }, + { + "name": "Beau Simensen", + "email": "beau@dflydev.com", + "homepage": "http://beausimensen.com" + }, + { + "name": "Carlos Frutos", + "email": "carlos@kiwing.it", + "homepage": "https://github.com/cfrutos" + } + ], + "description": "Given a deep data structure, access data by dot notation.", + "homepage": "https://github.com/dflydev/dflydev-dot-access-data", + "keywords": [ + "access", + "data", + "dot", + "notation" + ], + "time": "2017-01-20T21:14:22+00:00" + }, { "name": "dnoegel/php-xdg-base-dir", "version": "0.1", @@ -357,6 +418,54 @@ "description": "implementation of xdg base directory specification for php", "time": "2014-10-24T07:27:01+00:00" }, + { + "name": "grasmash/yaml-expander", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://github.com/grasmash/yaml-expander.git", + "reference": "95f9c876ca31f31bf5bfd9c8e89cc1f065c45528" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/grasmash/yaml-expander/zipball/95f9c876ca31f31bf5bfd9c8e89cc1f065c45528", + "reference": "95f9c876ca31f31bf5bfd9c8e89cc1f065c45528", + "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": { + "phpunit/phpunit": "^4.8|^5.5.4", + "satooshi/php-coveralls": "^1.0", + "squizlabs/php_codesniffer": "^2.7" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Grasmash\\YamlExpander\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Matthew Grasmick" + } + ], + "description": "Expands internal property references in a yaml file.", + "time": "2017-03-24T20:31:04+00:00" + }, { "name": "guzzlehttp/guzzle", "version": "6.2.3", @@ -472,16 +581,16 @@ }, { "name": "guzzlehttp/psr7", - "version": "1.4.1", + "version": "1.4.2", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "0d6c7ca039329247e4f0f8f8f6506810e8248855" + "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/0d6c7ca039329247e4f0f8f8f6506810e8248855", - "reference": "0d6c7ca039329247e4f0f8f8f6506810e8248855", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/f5b8a8512e2b58b0071a7280e39f14f72e05d87c", + "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c", "shasum": "" }, "require": { @@ -533,7 +642,7 @@ "uri", "url" ], - "time": "2017-02-27T10:51:17+00:00" + "time": "2017-03-20T17:10:46+00:00" }, { "name": "jakub-onderka/php-console-color", @@ -1032,16 +1141,16 @@ }, { "name": "psy/psysh", - "version": "v0.8.2", + "version": "v0.8.3", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "97113db4107a4126bef933b60fea6dbc9f615d41" + "reference": "1dd4bbbc64d71e7ec075ffe82b42d9e096dc8d5e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/97113db4107a4126bef933b60fea6dbc9f615d41", - "reference": "97113db4107a4126bef933b60fea6dbc9f615d41", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/1dd4bbbc64d71e7ec075ffe82b42d9e096dc8d5e", + "reference": "1dd4bbbc64d71e7ec075ffe82b42d9e096dc8d5e", "shasum": "" }, "require": { @@ -1101,11 +1210,89 @@ "interactive", "shell" ], - "time": "2017-03-01T00:13:29+00:00" + "time": "2017-03-19T21:40:44+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://api.github.com/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.5", + "version": "v3.2.6", "source": { "type": "git", "url": "https://github.com/symfony/console.git", @@ -1168,7 +1355,7 @@ }, { "name": "symfony/debug", - "version": "v3.2.5", + "version": "v3.2.6", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", @@ -1225,7 +1412,7 @@ }, { "name": "symfony/event-dispatcher", - "version": "v3.2.5", + "version": "v3.2.6", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", @@ -1285,7 +1472,7 @@ }, { "name": "symfony/filesystem", - "version": "v3.2.5", + "version": "v3.2.6", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", @@ -1334,7 +1521,7 @@ }, { "name": "symfony/finder", - "version": "v3.2.5", + "version": "v3.2.6", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", @@ -1442,7 +1629,7 @@ }, { "name": "symfony/process", - "version": "v3.2.5", + "version": "v3.2.6", "source": { "type": "git", "url": "https://github.com/symfony/process.git", @@ -1491,7 +1678,7 @@ }, { "name": "symfony/var-dumper", - "version": "v3.2.5", + "version": "v3.2.6", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", @@ -1557,7 +1744,7 @@ }, { "name": "symfony/yaml", - "version": "v3.2.5", + "version": "v3.2.6", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", @@ -1664,16 +1851,16 @@ "packages-dev": [ { "name": "beberlei/assert", - "version": "v2.7.3", + "version": "v2.7.4", "source": { "type": "git", "url": "https://github.com/beberlei/assert.git", - "reference": "5972776d6a9eedfd3c55216341434e19cb50418f" + "reference": "3ee3bc468a3ce4bbfc3d74f53c6cdb5242d39d1a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/beberlei/assert/zipball/5972776d6a9eedfd3c55216341434e19cb50418f", - "reference": "5972776d6a9eedfd3c55216341434e19cb50418f", + "url": "https://api.github.com/repos/beberlei/assert/zipball/3ee3bc468a3ce4bbfc3d74f53c6cdb5242d39d1a", + "reference": "3ee3bc468a3ce4bbfc3d74f53c6cdb5242d39d1a", "shasum": "" }, "require": { @@ -1681,8 +1868,8 @@ "php": ">=5.3" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^2.0", - "phpunit/phpunit": "@stable" + "friendsofphp/php-cs-fixer": "^2.1.1", + "phpunit/phpunit": "^4|^5" }, "type": "library", "autoload": { @@ -1715,7 +1902,7 @@ "assertion", "validation" ], - "time": "2017-01-24T15:14:39+00:00" + "time": "2017-03-14T18:06:52+00:00" }, { "name": "behat/behat", @@ -3054,87 +3241,9 @@ "homepage": "https://github.com/sebastianbergmann/version", "time": "2015-06-21T13:59:46+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://api.github.com/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/class-loader", - "version": "v3.2.5", + "version": "v3.2.6", "source": { "type": "git", "url": "https://github.com/symfony/class-loader.git", @@ -3190,7 +3299,7 @@ }, { "name": "symfony/config", - "version": "v3.2.5", + "version": "v3.2.6", "source": { "type": "git", "url": "https://github.com/symfony/config.git", @@ -3246,7 +3355,7 @@ }, { "name": "symfony/dependency-injection", - "version": "v3.2.5", + "version": "v3.2.6", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", @@ -3309,7 +3418,7 @@ }, { "name": "symfony/stopwatch", - "version": "v3.2.5", + "version": "v3.2.6", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", @@ -3358,7 +3467,7 @@ }, { "name": "symfony/translation", - "version": "v3.2.5", + "version": "v3.2.6", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", diff --git a/src/Config/DefaultsConfig.php b/src/Config/DefaultsConfig.php index 5172d0c60..44d6b92d2 100644 --- a/src/Config/DefaultsConfig.php +++ b/src/Config/DefaultsConfig.php @@ -15,6 +15,8 @@ class DefaultsConfig extends TerminusConfig */ public function __construct() { + parent::__construct(); + $this->set('root', $this->getTerminusRoot()); $this->set('php', $this->getPhpBinary()); $this->set('php_version', PHP_VERSION); diff --git a/src/Config/DotEnvConfig.php b/src/Config/DotEnvConfig.php index 7a774edd5..81773d664 100644 --- a/src/Config/DotEnvConfig.php +++ b/src/Config/DotEnvConfig.php @@ -18,6 +18,8 @@ class DotEnvConfig extends TerminusConfig */ public function __construct($dir) { + parent::__construct(); + $file = $dir . '/.env'; $this->setSourceName($file); diff --git a/src/Config/EnvConfig.php b/src/Config/EnvConfig.php index 8b1eaff07..d3ed64ca2 100644 --- a/src/Config/EnvConfig.php +++ b/src/Config/EnvConfig.php @@ -15,6 +15,8 @@ class EnvConfig extends TerminusConfig */ public function __construct() { + parent::__construct(); + // Add all of the environment vars that match our constant. foreach ([$_SERVER, $_ENV] as $super) { foreach ($super as $key => $val) { diff --git a/src/Config/TerminusConfig.php b/src/Config/TerminusConfig.php index cab10425b..ab4133722 100644 --- a/src/Config/TerminusConfig.php +++ b/src/Config/TerminusConfig.php @@ -90,7 +90,7 @@ public function get($key, $defaultOverride = null) */ public function keys() { - return array_keys($this->config); + return array_keys($this->export()); } /** diff --git a/src/Config/YamlConfig.php b/src/Config/YamlConfig.php index a7eb2ed0d..e6afadfd0 100644 --- a/src/Config/YamlConfig.php +++ b/src/Config/YamlConfig.php @@ -16,6 +16,8 @@ class YamlConfig extends TerminusConfig */ public function __construct($yml_path) { + parent::__construct(); + $this->setSourceName($yml_path); $file_config = file_exists($yml_path) ? Yaml::parse(file_get_contents($yml_path)) : []; if (!is_null($file_config)) {