Permalink
Browse files

Rename AssociativeList to PropertyList.

  • Loading branch information...
1 parent 063c554 commit 8f0127a15e1ba87aee7223ce49d437f8aaa1bd40 @greg-1-anderson greg-1-anderson committed Nov 15, 2016
Showing with 28 additions and 108 deletions.
  1. +1 −1 composer.json
  2. +20 −100 composer.lock
  3. +4 −4 lib/Drush/Commands/core/ShellAliasCommands.php
  4. +3 −3 lib/Drush/Commands/core/StateCommands.php
View
@@ -32,7 +32,7 @@
"psr/log": "~1.0",
"psy/psysh": "~0.6",
"league/container": "~2",
- "consolidation/robo": "dev-master",
+ "consolidation/robo": "~1",
"symfony/config": "~2.2",
"consolidation/annotated-command": "~2",
"consolidation/output-formatters": "~3",
View
@@ -4,36 +4,36 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "15eb1a4f8325e027c911be3ec7880ffa",
- "content-hash": "948ac5ed3e37f2cf0599372d9e80f114",
+ "hash": "97d165830b6367c305524af26b1f4a96",
+ "content-hash": "38e97bdb15a6e2e65727b299f74e528c",
"packages": [
{
"name": "consolidation/annotated-command",
- "version": "2.0.2",
+ "version": "2.0.3",
"source": {
"type": "git",
"url": "https://github.com/consolidation/annotated-command.git",
- "reference": "44a17ce3e707f5df1cb0dea6bdddd1ba0291aab4"
+ "reference": "0bcb15e86b8bfbb1972fc6bc31b7d9c3fa40285d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/44a17ce3e707f5df1cb0dea6bdddd1ba0291aab4",
- "reference": "44a17ce3e707f5df1cb0dea6bdddd1ba0291aab4",
+ "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/0bcb15e86b8bfbb1972fc6bc31b7d9c3fa40285d",
+ "reference": "0bcb15e86b8bfbb1972fc6bc31b7d9c3fa40285d",
"shasum": ""
},
"require": {
"consolidation/output-formatters": "~2|~3",
"php": ">=5.4.0",
"phpdocumentor/reflection-docblock": "^2.0|^3.0.2",
"psr/log": "~1",
- "squizlabs/php_codesniffer": "^2.7",
"symfony/console": "^2.8|~3",
"symfony/event-dispatcher": "^2.5|~3",
"symfony/finder": "^2.5|~3"
},
"require-dev": {
"phpunit/phpunit": "4.*",
- "satooshi/php-coveralls": "^1.0"
+ "satooshi/php-coveralls": "^1.0",
+ "squizlabs/php_codesniffer": "^2.7"
},
"type": "library",
"extra": {
@@ -57,7 +57,7 @@
}
],
"description": "Initialize Symfony Console commands from annotated command class methods.",
- "time": "2016-11-14 18:47:37"
+ "time": "2016-11-14 23:51:12"
},
{
"name": "consolidation/log",
@@ -157,16 +157,16 @@
},
{
"name": "consolidation/robo",
- "version": "dev-master",
+ "version": "1.0.3",
"source": {
"type": "git",
"url": "https://github.com/consolidation/Robo.git",
- "reference": "f8421b227a081328f3747157f6694a0e50668c70"
+ "reference": "ee99e2645300be91f25faa21add492d8d4d38eef"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/consolidation/Robo/zipball/f8421b227a081328f3747157f6694a0e50668c70",
- "reference": "f8421b227a081328f3747157f6694a0e50668c70",
+ "url": "https://api.github.com/repos/consolidation/Robo/zipball/ee99e2645300be91f25faa21add492d8d4d38eef",
+ "reference": "ee99e2645300be91f25faa21add492d8d4d38eef",
"shasum": ""
},
"require": {
@@ -230,7 +230,7 @@
}
],
"description": "Modern task runner",
- "time": "2016-11-14 20:26:35"
+ "time": "2016-11-15 00:32:59"
},
{
"name": "container-interop/container-interop",
@@ -753,84 +753,6 @@
"time": "2015-06-21 13:59:46"
},
{
- "name": "squizlabs/php_codesniffer",
- "version": "2.7.0",
- "source": {
- "type": "git",
- "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
- "reference": "571e27b6348e5b3a637b2abc82ac0d01e6d7bbed"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/571e27b6348e5b3a637b2abc82ac0d01e6d7bbed",
- "reference": "571e27b6348e5b3a637b2abc82ac0d01e6d7bbed",
- "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": "2016-09-01 23:53:02"
- },
- {
"name": "symfony/config",
"version": "v2.8.13",
"source": {
@@ -2294,16 +2216,16 @@
},
{
"name": "sebastian/recursion-context",
- "version": "1.0.3",
+ "version": "1.0.4",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/recursion-context.git",
- "reference": "79860854756415e1cec8d186c9cf261cafd87dfc"
+ "reference": "938df7a6478e72795e5f8266cff24d06e3136f2e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/79860854756415e1cec8d186c9cf261cafd87dfc",
- "reference": "79860854756415e1cec8d186c9cf261cafd87dfc",
+ "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/938df7a6478e72795e5f8266cff24d06e3136f2e",
+ "reference": "938df7a6478e72795e5f8266cff24d06e3136f2e",
"shasum": ""
},
"require": {
@@ -2343,14 +2265,12 @@
],
"description": "Provides functionality to recursively process PHP variables",
"homepage": "http://www.github.com/sebastianbergmann/recursion-context",
- "time": "2016-11-14 15:54:23"
+ "time": "2016-11-15 06:55:36"
}
],
"aliases": [],
"minimum-stability": "stable",
- "stability-flags": {
- "consolidation/robo": 20
- },
+ "stability-flags": [],
"prefer-stable": true,
"prefer-lowest": false,
"platform": {
@@ -1,7 +1,7 @@
<?php
namespace Drush\Commands\core;
-use Consolidation\OutputFormatters\StructuredData\AssociativeList;
+use Consolidation\OutputFormatters\StructuredData\PropertyList;
class ShellAliasCommands {
@@ -23,15 +23,15 @@ class ShellAliasCommands {
* @todo completion not yet working for Annotated commands.
* @complete \Drush\Commands\core\ShellAliasCommands::complete
*
- * @return \Consolidation\OutputFormatters\StructuredData\AssociativeList
+ * @return \Consolidation\OutputFormatters\StructuredData\PropertyList
*/
public function shellalias($alias = NULL, $options = ['format' => 'table']) {
$shell_aliases = drush_get_context('shell-aliases', array());
if (!$alias) {
- return new AssociativeList($shell_aliases);
+ return new PropertyList($shell_aliases);
}
elseif (isset($shell_aliases[$alias])) {
- return new AssociativeList(array($alias => $shell_aliases[$alias]));
+ return new PropertyList(array($alias => $shell_aliases[$alias]));
}
else {
throw new \Exception(dt('Shell alias not found.'));
@@ -2,7 +2,7 @@
namespace Drush\Commands\core;
-use Consolidation\OutputFormatters\StructuredData\AssociativeList;
+use Consolidation\OutputFormatters\StructuredData\PropertyList;
class StateCommands {
@@ -17,11 +17,11 @@ class StateCommands {
* Displays last cron run timestamp
* @aliases sget
*
- * @return \Consolidation\OutputFormatters\StructuredData\AssociativeList
+ * @return \Consolidation\OutputFormatters\StructuredData\PropertyList
*/
public function get($key, $options = ['format' => 'string', 'fields' => '']) {
$value = \Drupal::state()->get($key);
- return new AssociativeList([$key => $value]);
+ return new PropertyList([$key => $value]);
}
/**

0 comments on commit 8f0127a

Please sign in to comment.