From af5a9b21d8954aaced65794078f2b23eb4806084 Mon Sep 17 00:00:00 2001 From: Oubah Awaleh Date: Mon, 15 Jul 2019 15:20:33 -0700 Subject: [PATCH 01/29] Added filter by filter-via-dot-access-data to reduce number of code line --- composer.json | 1 + composer.lock | 210 ++++++++++++++++++++----------- src/Commands/Org/ListCommand.php | 1 + src/Terminus.php | 1 + 4 files changed, 141 insertions(+), 72 deletions(-) diff --git a/composer.json b/composer.json index 6c8ded6cc..6d101aaa6 100644 --- a/composer.json +++ b/composer.json @@ -9,6 +9,7 @@ "require": { "php": ">=5.5.38", "composer/semver": "^1.4", + "consolidation/filter-via-dot-access-data": "^1.0", "consolidation/output-formatters": "^3.5", "consolidation/robo": "^1.4.4", "guzzlehttp/guzzle": "^6.2", diff --git a/composer.lock b/composer.lock index abb0336ff..db058e024 100644 --- a/composer.lock +++ b/composer.lock @@ -1,11 +1,10 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "hash": "574028d0f2f822f33828c5bf3f14c3a3", - "content-hash": "8c8ad7e5d0b008081ba92746a501b2a2", + "content-hash": "a7879bed338f7d6b82f405ad3e53d15c", "packages": [ { "name": "composer/semver", @@ -67,7 +66,7 @@ "validation", "versioning" ], - "time": "2019-03-19 17:25:45" + "time": "2019-03-19T17:25:45+00:00" }, { "name": "consolidation/annotated-command", @@ -163,7 +162,7 @@ } ], "description": "Initialize Symfony Console commands from annotated command class methods.", - "time": "2019-03-08 16:55:03" + "time": "2019-03-08T16:55:03+00:00" }, { "name": "consolidation/config", @@ -244,7 +243,74 @@ } ], "description": "Provide configuration services for a commandline tool.", - "time": "2019-03-03 19:37:04" + "time": "2019-03-03T19:37:04+00:00" + }, + { + "name": "consolidation/filter-via-dot-access-data", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/consolidation/filter-via-dot-access-data.git", + "reference": "a53e96c6b9f7f042f5e085bf911f3493cea823c6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/consolidation/filter-via-dot-access-data/zipball/a53e96c6b9f7f042f5e085bf911f3493cea823c6", + "reference": "a53e96c6b9f7f042f5e085bf911f3493cea823c6", + "shasum": "" + }, + "require": { + "dflydev/dot-access-data": "^1.1.0", + "php": ">=5.5.0" + }, + "require-dev": { + "consolidation/robo": "^1.2.3", + "g1a/composer-test-scenarios": "^3", + "knplabs/github-api": "^2.7", + "php-coveralls/php-coveralls": "^1", + "php-http/guzzle6-adapter": "^1.1", + "phpunit/phpunit": "^5", + "squizlabs/php_codesniffer": "^2.8", + "symfony/console": "^2.8|^3|^4" + }, + "type": "library", + "extra": { + "scenarios": { + "phpunit5": { + "require-dev": { + "phpunit/phpunit": "^5.7.27" + }, + "remove": [ + "php-coveralls/php-coveralls" + ], + "config": { + "platform": { + "php": "5.6.33" + } + } + } + }, + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Consolidation\\Filter\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Greg Anderson", + "email": "greg.1.anderson@greenknowe.org" + } + ], + "description": "This project uses dflydev/dot-access-data to provide simple output filtering for applications built with annotated-command / Robo.", + "time": "2019-01-18T06:05:07+00:00" }, { "name": "consolidation/log", @@ -334,7 +400,7 @@ } ], "description": "Improved Psr-3 / Psr\\Log logger based on Symfony Console components.", - "time": "2019-01-01 17:30:51" + "time": "2019-01-01T17:30:51+00:00" }, { "name": "consolidation/output-formatters", @@ -435,7 +501,7 @@ } ], "description": "Format text by applying transformations provided by plug-in formatters.", - "time": "2019-05-30 23:16:01" + "time": "2019-05-30T23:16:01+00:00" }, { "name": "consolidation/robo", @@ -543,7 +609,7 @@ } ], "description": "Modern task runner", - "time": "2019-03-19 18:07:19" + "time": "2019-03-19T18:07:19+00:00" }, { "name": "consolidation/self-update", @@ -593,7 +659,7 @@ } ], "description": "Provides a self:update command for Symfony Console applications.", - "time": "2018-10-28 01:52:03" + "time": "2018-10-28T01:52:03+00:00" }, { "name": "container-interop/container-interop", @@ -624,7 +690,7 @@ ], "description": "Promoting the interoperability of container objects (DIC, SL, etc.)", "homepage": "https://github.com/container-interop/container-interop", - "time": "2017-02-14 19:40:03" + "time": "2017-02-14T19:40:03+00:00" }, { "name": "dflydev/dot-access-data", @@ -683,7 +749,7 @@ "dot", "notation" ], - "time": "2017-01-20 21:14:22" + "time": "2017-01-20T21:14:22+00:00" }, { "name": "dnoegel/php-xdg-base-dir", @@ -716,7 +782,7 @@ "MIT" ], "description": "implementation of xdg base directory specification for php", - "time": "2014-10-24 07:27:01" + "time": "2014-10-24T07:27:01+00:00" }, { "name": "grasmash/expander", @@ -763,7 +829,7 @@ } ], "description": "Expands internal property references in PHP arrays file.", - "time": "2017-12-21 22:14:55" + "time": "2017-12-21T22:14:55+00:00" }, { "name": "grasmash/yaml-expander", @@ -811,7 +877,7 @@ } ], "description": "Expands internal property references in a yaml file.", - "time": "2017-12-16 16:06:03" + "time": "2017-12-16T16:06:03+00:00" }, { "name": "guzzlehttp/guzzle", @@ -876,7 +942,7 @@ "rest", "web service" ], - "time": "2018-04-22 15:46:56" + "time": "2018-04-22T15:46:56+00:00" }, { "name": "guzzlehttp/promises", @@ -927,7 +993,7 @@ "keywords": [ "promise" ], - "time": "2016-12-20 10:07:11" + "time": "2016-12-20T10:07:11+00:00" }, { "name": "guzzlehttp/psr7", @@ -994,7 +1060,7 @@ "uri", "url" ], - "time": "2018-12-04 20:46:45" + "time": "2018-12-04T20:46:45+00:00" }, { "name": "jakub-onderka/php-console-color", @@ -1036,7 +1102,7 @@ "email": "jakub.onderka@gmail.com" } ], - "time": "2018-09-29 17:23:10" + "time": "2018-09-29T17:23:10+00:00" }, { "name": "jakub-onderka/php-console-highlighter", @@ -1080,7 +1146,7 @@ "homepage": "http://www.acci.cz/" } ], - "time": "2015-04-20 18:58:01" + "time": "2015-04-20T18:58:01+00:00" }, { "name": "league/container", @@ -1145,7 +1211,7 @@ "provider", "service" ], - "time": "2017-05-10 09:20:27" + "time": "2017-05-10T09:20:27+00:00" }, { "name": "nikic/php-parser", @@ -1196,7 +1262,7 @@ "parser", "php" ], - "time": "2018-02-28 20:30:58" + "time": "2018-02-28T20:30:58+00:00" }, { "name": "psr/container", @@ -1245,7 +1311,7 @@ "container-interop", "psr" ], - "time": "2017-02-14 16:28:37" + "time": "2017-02-14T16:28:37+00:00" }, { "name": "psr/http-message", @@ -1295,7 +1361,7 @@ "request", "response" ], - "time": "2016-08-06 14:39:51" + "time": "2016-08-06T14:39:51+00:00" }, { "name": "psr/log", @@ -1342,7 +1408,7 @@ "psr", "psr-3" ], - "time": "2018-11-20 15:27:04" + "time": "2018-11-20T15:27:04+00:00" }, { "name": "psy/psysh", @@ -1414,7 +1480,7 @@ "interactive", "shell" ], - "time": "2018-04-02 05:41:44" + "time": "2018-04-02T05:41:44+00:00" }, { "name": "ralouphie/getallheaders", @@ -1454,7 +1520,7 @@ } ], "description": "A polyfill for getallheaders.", - "time": "2016-02-11 07:05:27" + "time": "2016-02-11T07:05:27+00:00" }, { "name": "symfony/console", @@ -1526,7 +1592,7 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2019-05-09 08:42:51" + "time": "2019-05-09T08:42:51+00:00" }, { "name": "symfony/debug", @@ -1582,7 +1648,7 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2019-05-18 13:32:47" + "time": "2019-05-18T13:32:47+00:00" }, { "name": "symfony/event-dispatcher", @@ -1645,7 +1711,7 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2019-04-02 08:51:52" + "time": "2019-04-02T08:51:52+00:00" }, { "name": "symfony/filesystem", @@ -1695,7 +1761,7 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2019-02-04 21:34:32" + "time": "2019-02-04T21:34:32+00:00" }, { "name": "symfony/finder", @@ -1744,7 +1810,7 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2019-05-24 12:25:55" + "time": "2019-05-24T12:25:55+00:00" }, { "name": "symfony/polyfill-ctype", @@ -1802,7 +1868,7 @@ "polyfill", "portable" ], - "time": "2019-02-06 07:57:58" + "time": "2019-02-06T07:57:58+00:00" }, { "name": "symfony/polyfill-mbstring", @@ -1861,7 +1927,7 @@ "portable", "shim" ], - "time": "2019-02-06 07:57:58" + "time": "2019-02-06T07:57:58+00:00" }, { "name": "symfony/process", @@ -1910,7 +1976,7 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2019-05-22 12:54:11" + "time": "2019-05-22T12:54:11+00:00" }, { "name": "symfony/var-dumper", @@ -1979,7 +2045,7 @@ "debug", "dump" ], - "time": "2019-05-01 09:52:10" + "time": "2019-05-01T09:52:10+00:00" }, { "name": "symfony/yaml", @@ -2038,7 +2104,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2019-03-25 07:48:46" + "time": "2019-03-25T07:48:46+00:00" } ], "packages-dev": [ @@ -2095,7 +2161,7 @@ "assertion", "validation" ], - "time": "2019-05-28 15:27:37" + "time": "2019-05-28T15:27:37+00:00" }, { "name": "behat/behat", @@ -2173,7 +2239,7 @@ "symfony", "testing" ], - "time": "2018-08-10 18:56:51" + "time": "2018-08-10T18:56:51+00:00" }, { "name": "behat/gherkin", @@ -2232,7 +2298,7 @@ "gherkin", "parser" ], - "time": "2019-01-16 14:22:17" + "time": "2019-01-16T14:22:17+00:00" }, { "name": "behat/transliterator", @@ -2276,7 +2342,7 @@ "slug", "transliterator" ], - "time": "2017-04-04 11:38:05" + "time": "2017-04-04T11:38:05+00:00" }, { "name": "doctrine/instantiator", @@ -2330,7 +2396,7 @@ "constructor", "instantiate" ], - "time": "2015-06-14 21:17:01" + "time": "2015-06-14T21:17:01+00:00" }, { "name": "php-coveralls/php-coveralls", @@ -2413,7 +2479,7 @@ "github", "test" ], - "time": "2018-05-22 23:11:08" + "time": "2018-05-22T23:11:08+00:00" }, { "name": "php-vcr/php-vcr", @@ -2463,7 +2529,7 @@ } ], "description": "Record your test suite's HTTP interactions and replay them during future test runs for fast, deterministic, accurate tests.", - "time": "2018-05-30 15:10:47" + "time": "2018-05-30T15:10:47+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -2517,7 +2583,7 @@ "reflection", "static analysis" ], - "time": "2017-09-11 18:02:19" + "time": "2017-09-11T18:02:19+00:00" }, { "name": "phpdocumentor/reflection-docblock", @@ -2562,7 +2628,7 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2017-08-08 06:39:58" + "time": "2017-08-08T06:39:58+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -2609,7 +2675,7 @@ "email": "me@mikevanriel.com" } ], - "time": "2017-06-03 08:32:36" + "time": "2017-06-03T08:32:36+00:00" }, { "name": "phpspec/prophecy", @@ -2672,7 +2738,7 @@ "spy", "stub" ], - "time": "2018-08-05 17:53:17" + "time": "2018-08-05T17:53:17+00:00" }, { "name": "phpunit/php-code-coverage", @@ -2734,7 +2800,7 @@ "testing", "xunit" ], - "time": "2015-10-06 15:47:00" + "time": "2015-10-06T15:47:00+00:00" }, { "name": "phpunit/php-file-iterator", @@ -2781,7 +2847,7 @@ "filesystem", "iterator" ], - "time": "2017-11-27 13:52:08" + "time": "2017-11-27T13:52:08+00:00" }, { "name": "phpunit/php-text-template", @@ -2822,7 +2888,7 @@ "keywords": [ "template" ], - "time": "2015-06-21 13:50:34" + "time": "2015-06-21T13:50:34+00:00" }, { "name": "phpunit/php-timer", @@ -2871,7 +2937,7 @@ "keywords": [ "timer" ], - "time": "2017-02-26 11:10:40" + "time": "2017-02-26T11:10:40+00:00" }, { "name": "phpunit/php-token-stream", @@ -2920,7 +2986,7 @@ "keywords": [ "tokenizer" ], - "time": "2017-12-04 08:55:13" + "time": "2017-12-04T08:55:13+00:00" }, { "name": "phpunit/phpunit", @@ -2992,7 +3058,7 @@ "testing", "xunit" ], - "time": "2017-06-21 08:07:12" + "time": "2017-06-21T08:07:12+00:00" }, { "name": "phpunit/phpunit-mock-objects", @@ -3048,7 +3114,7 @@ "mock", "xunit" ], - "time": "2015-10-02 06:51:40" + "time": "2015-10-02T06:51:40+00:00" }, { "name": "sebastian/comparator", @@ -3112,7 +3178,7 @@ "compare", "equality" ], - "time": "2017-01-29 09:50:25" + "time": "2017-01-29T09:50:25+00:00" }, { "name": "sebastian/diff", @@ -3164,7 +3230,7 @@ "keywords": [ "diff" ], - "time": "2017-05-22 07:24:03" + "time": "2017-05-22T07:24:03+00:00" }, { "name": "sebastian/environment", @@ -3214,7 +3280,7 @@ "environment", "hhvm" ], - "time": "2016-08-18 05:49:44" + "time": "2016-08-18T05:49:44+00:00" }, { "name": "sebastian/exporter", @@ -3281,7 +3347,7 @@ "export", "exporter" ], - "time": "2016-06-17 09:04:28" + "time": "2016-06-17T09:04:28+00:00" }, { "name": "sebastian/finder-facade", @@ -3320,7 +3386,7 @@ ], "description": "FinderFacade is a convenience wrapper for Symfony's Finder component.", "homepage": "https://github.com/sebastianbergmann/finder-facade", - "time": "2017-11-18 17:31:49" + "time": "2017-11-18T17:31:49+00:00" }, { "name": "sebastian/global-state", @@ -3371,7 +3437,7 @@ "keywords": [ "global state" ], - "time": "2015-10-12 03:26:01" + "time": "2015-10-12T03:26:01+00:00" }, { "name": "sebastian/phpcpd", @@ -3422,7 +3488,7 @@ ], "description": "Copy/Paste Detector (CPD) for PHP code.", "homepage": "https://github.com/sebastianbergmann/phpcpd", - "time": "2016-04-17 19:32:49" + "time": "2016-04-17T19:32:49+00:00" }, { "name": "sebastian/recursion-context", @@ -3475,7 +3541,7 @@ ], "description": "Provides functionality to recursively process PHP variables", "homepage": "http://www.github.com/sebastianbergmann/recursion-context", - "time": "2016-10-03 07:41:43" + "time": "2016-10-03T07:41:43+00:00" }, { "name": "sebastian/version", @@ -3510,7 +3576,7 @@ ], "description": "Library that helps with managing the version number of Git-hosted PHP projects", "homepage": "https://github.com/sebastianbergmann/version", - "time": "2015-06-21 13:59:46" + "time": "2015-06-21T13:59:46+00:00" }, { "name": "squizlabs/php_codesniffer", @@ -3588,7 +3654,7 @@ "phpcs", "standards" ], - "time": "2018-11-07 22:31:41" + "time": "2018-11-07T22:31:41+00:00" }, { "name": "symfony/class-loader", @@ -3644,7 +3710,7 @@ ], "description": "Symfony ClassLoader Component", "homepage": "https://symfony.com", - "time": "2019-01-16 09:39:14" + "time": "2019-01-16T09:39:14+00:00" }, { "name": "symfony/config", @@ -3708,7 +3774,7 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "time": "2019-02-23 15:06:07" + "time": "2019-02-23T15:06:07+00:00" }, { "name": "symfony/dependency-injection", @@ -3779,7 +3845,7 @@ ], "description": "Symfony DependencyInjection Component", "homepage": "https://symfony.com", - "time": "2019-05-19 14:11:39" + "time": "2019-05-19T14:11:39+00:00" }, { "name": "symfony/stopwatch", @@ -3828,7 +3894,7 @@ ], "description": "Symfony Stopwatch Component", "homepage": "https://symfony.com", - "time": "2019-01-16 09:39:14" + "time": "2019-01-16T09:39:14+00:00" }, { "name": "symfony/translation", @@ -3898,7 +3964,7 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2019-05-01 11:10:09" + "time": "2019-05-01T11:10:09+00:00" }, { "name": "theseer/fdomdocument", @@ -3938,7 +4004,7 @@ ], "description": "The classes contained within this repository extend the standard DOM to use exceptions at all occasions of errors instead of PHP warnings or notices. They also add various custom methods and shortcuts for convenience and to simplify the usage of DOM.", "homepage": "https://github.com/theseer/fDOMDocument", - "time": "2017-06-30 11:53:12" + "time": "2017-06-30T11:53:12+00:00" }, { "name": "webmozart/assert", @@ -3989,7 +4055,7 @@ "check", "validate" ], - "time": "2018-12-25 11:19:39" + "time": "2018-12-25T11:19:39+00:00" } ], "aliases": [], diff --git a/src/Commands/Org/ListCommand.php b/src/Commands/Org/ListCommand.php index a63c8167d..d38f6e631 100644 --- a/src/Commands/Org/ListCommand.php +++ b/src/Commands/Org/ListCommand.php @@ -18,6 +18,7 @@ class ListCommand extends TerminusCommand * Displays the list of organizations. * * @authorize + * @filter-output * * @command org:list * @aliases orgs diff --git a/src/Terminus.php b/src/Terminus.php index bb2b2f422..c5952b1b6 100644 --- a/src/Terminus.php +++ b/src/Terminus.php @@ -121,6 +121,7 @@ private function addBuiltInCommandsAndHooks() { // List of all hooks and commands. Update via 'composer update-class-lists' $this->commands = [ + 'Consolidation\\Filter\\Hooks\\FilterHooks', 'Pantheon\\Terminus\\Hooks\\Authorizer', 'Pantheon\\Terminus\\Hooks\\SiteEnvLookup', 'Pantheon\\Terminus\\Commands\\AliasesCommand', From c7a3c8e30df8c4139cdd87524589a32a338e3684 Mon Sep 17 00:00:00 2001 From: Oubah Awaleh Date: Mon, 15 Jul 2019 15:48:25 -0700 Subject: [PATCH 02/29] Added filter by filter-via-dot-access-data to easy maintain code --- src/Commands/Backup/ListCommand.php | 3 ++- src/Models/Backup.php | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Commands/Backup/ListCommand.php b/src/Commands/Backup/ListCommand.php index 845656a0d..2b36fcb39 100644 --- a/src/Commands/Backup/ListCommand.php +++ b/src/Commands/Backup/ListCommand.php @@ -17,6 +17,7 @@ class ListCommand extends BackupCommand * Lists backups for a specific site and environment. * * @authorize + * @filter-output * * @command backup:list * @aliases backups @@ -30,7 +31,7 @@ class ListCommand extends BackupCommand * @return RowsOfFields * * @param string $site_env Site & environment in the format `site-name.env` - * @option string $element [all|code|files|database|db] Backup element filter + * @option string $element [all|code|files|database|db] DEPRECATED Backup element filter * * @usage . Lists all backups made of 's environment. * @usage . --element= Lists all backups made of 's environment. diff --git a/src/Models/Backup.php b/src/Models/Backup.php index becb1f63f..6bb53218f 100755 --- a/src/Models/Backup.php +++ b/src/Models/Backup.php @@ -187,6 +187,7 @@ public function serialize() 'expiry' => $this->getExpiry(), 'initiator' => $this->getInitiator(), 'url' => $this->get('archive_url'), + 'type' => $this->get('type'), ]; } From f04772179decfe4ee3e9050b19f871139272b70f Mon Sep 17 00:00:00 2001 From: Oubah Awaleh Date: Mon, 15 Jul 2019 16:33:57 -0700 Subject: [PATCH 03/29] Added new filter option to branch list command --- src/Commands/Branch/ListCommand.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Commands/Branch/ListCommand.php b/src/Commands/Branch/ListCommand.php index 8f1e36512..5dad3e0fe 100644 --- a/src/Commands/Branch/ListCommand.php +++ b/src/Commands/Branch/ListCommand.php @@ -18,9 +18,11 @@ class ListCommand extends TerminusCommand implements SiteAwareInterface use SiteAwareTrait; /** + * * Displays list of git branches for a site. * * @authorize + * @filter-output * * @command branch:list * @aliases branches From d832a6d58c620fa33c6a125c1e037629b0b0630d Mon Sep 17 00:00:00 2001 From: Oubah Awaleh Date: Mon, 15 Jul 2019 16:55:11 -0700 Subject: [PATCH 04/29] Added new filter option to domain list command --- src/Commands/Domain/AddCommand.php | 1 + src/Commands/Domain/ListCommand.php | 1 + src/Commands/Domain/LookupCommand.php | 1 + 3 files changed, 3 insertions(+) diff --git a/src/Commands/Domain/AddCommand.php b/src/Commands/Domain/AddCommand.php index 676710efd..ab69f2db6 100644 --- a/src/Commands/Domain/AddCommand.php +++ b/src/Commands/Domain/AddCommand.php @@ -18,6 +18,7 @@ class AddCommand extends TerminusCommand implements SiteAwareInterface * Associates a domain with the environment. * * @authorize + * * * @command domain:add * diff --git a/src/Commands/Domain/ListCommand.php b/src/Commands/Domain/ListCommand.php index 94b9f9850..250f2c616 100644 --- a/src/Commands/Domain/ListCommand.php +++ b/src/Commands/Domain/ListCommand.php @@ -21,6 +21,7 @@ class ListCommand extends TerminusCommand implements SiteAwareInterface * Displays domains associated with the environment. * * @authorize + * @filter-output * * @command domain:list * @aliases domains diff --git a/src/Commands/Domain/LookupCommand.php b/src/Commands/Domain/LookupCommand.php index 33bbfe43d..d9c952707 100644 --- a/src/Commands/Domain/LookupCommand.php +++ b/src/Commands/Domain/LookupCommand.php @@ -22,6 +22,7 @@ class LookupCommand extends TerminusCommand implements SiteAwareInterface * * @authorize * + * * @command domain:lookup * * @field-labels From bd40021815d77ba5d8c94291e5a2d04ad057b7f0 Mon Sep 17 00:00:00 2001 From: Oubah Awaleh Date: Tue, 16 Jul 2019 10:57:44 -0700 Subject: [PATCH 05/29] Added filter option to env list command --- src/Commands/Env/ListCommand.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Commands/Env/ListCommand.php b/src/Commands/Env/ListCommand.php index a4c41f84d..6a7b06b28 100644 --- a/src/Commands/Env/ListCommand.php +++ b/src/Commands/Env/ListCommand.php @@ -21,6 +21,7 @@ class ListCommand extends TerminusCommand implements SiteAwareInterface * Displays a list of the site's environments. * * @authorize + * @filter-output * * @command env:list * @aliases envs From 3053d15dfb8e839c17a9005ffb57203cd3e78490 Mon Sep 17 00:00:00 2001 From: Oubah Awaleh Date: Tue, 16 Jul 2019 10:58:21 -0700 Subject: [PATCH 06/29] Added filter option to the machine-token command --- src/Commands/MachineToken/ListCommand.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Commands/MachineToken/ListCommand.php b/src/Commands/MachineToken/ListCommand.php index aed5ed7e9..be49a5a39 100644 --- a/src/Commands/MachineToken/ListCommand.php +++ b/src/Commands/MachineToken/ListCommand.php @@ -18,6 +18,7 @@ class ListCommand extends TerminusCommand * Lists the currently logged-in user's machine tokens. * * @authorize + * @filter-output * * @command machine-token:list * @aliases machine-tokens mt:list mts From aaa5f446698a411e6f5cc65401838d1a14cd96a1 Mon Sep 17 00:00:00 2001 From: Oubah Awaleh Date: Tue, 16 Jul 2019 11:10:21 -0700 Subject: [PATCH 07/29] Added filter option to the multidev command --- src/Commands/Multidev/ListCommand.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Commands/Multidev/ListCommand.php b/src/Commands/Multidev/ListCommand.php index f931846f5..97a7e0db9 100644 --- a/src/Commands/Multidev/ListCommand.php +++ b/src/Commands/Multidev/ListCommand.php @@ -17,6 +17,7 @@ class ListCommand extends TerminusCommand implements SiteAwareInterface * Lists a site's Multidev environments. * * @authorize + * @filter-output * * @command multidev:list * @aliases multidevs From d9a141e0a088ed3c5a8c125c0bf5407bbb5171f4 Mon Sep 17 00:00:00 2001 From: Oubah Awaleh Date: Tue, 16 Jul 2019 11:24:31 -0700 Subject: [PATCH 08/29] Added filter option to org people list command --- src/Commands/Org/People/ListCommand.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Commands/Org/People/ListCommand.php b/src/Commands/Org/People/ListCommand.php index 5f671f614..4e5d8f5be 100644 --- a/src/Commands/Org/People/ListCommand.php +++ b/src/Commands/Org/People/ListCommand.php @@ -18,6 +18,7 @@ class ListCommand extends TerminusCommand * Displays the list of users associated with an organization. * * @authorize + * @filter-output * * @command org:people:list * @aliases org:ppl:list From 330d3cb197408415ee9a6a46222f5f66091fc821 Mon Sep 17 00:00:00 2001 From: Oubah Awaleh Date: Tue, 16 Jul 2019 11:32:32 -0700 Subject: [PATCH 09/29] Added filter option to org site list --- src/Commands/Org/Site/ListCommand.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Commands/Org/Site/ListCommand.php b/src/Commands/Org/Site/ListCommand.php index 7695d265d..917ea3095 100644 --- a/src/Commands/Org/Site/ListCommand.php +++ b/src/Commands/Org/Site/ListCommand.php @@ -21,6 +21,7 @@ class ListCommand extends TerminusCommand implements SiteAwareInterface * Displays the list of sites associated with an organization. * * @authorize + * @filter-output * * @command org:site:list * @aliases org:sites From db7f536b934a5ac16b768b20d6d0d9a10f6573b7 Mon Sep 17 00:00:00 2001 From: Oubah Awaleh Date: Tue, 16 Jul 2019 12:26:04 -0700 Subject: [PATCH 10/29] Added filter option to org upstream list command --- src/Commands/Org/Upstream/ListCommand.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Commands/Org/Upstream/ListCommand.php b/src/Commands/Org/Upstream/ListCommand.php index ae507069f..661703b9a 100644 --- a/src/Commands/Org/Upstream/ListCommand.php +++ b/src/Commands/Org/Upstream/ListCommand.php @@ -13,7 +13,7 @@ class ListCommand extends UserListCommand { /** * Displays the list of upstreams belonging to an organization. - * + * @filter-output * @command org:upstream:list * @aliases org:upstreams * From 2368ab1a0cd1f680158dece8d7e0b5e60996ba23 Mon Sep 17 00:00:00 2001 From: Oubah Awaleh Date: Tue, 16 Jul 2019 13:33:38 -0700 Subject: [PATCH 11/29] Added filter option to plan list command --- src/Commands/Plan/ListCommand.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Commands/Plan/ListCommand.php b/src/Commands/Plan/ListCommand.php index bcaba7a9d..ab91d07cd 100644 --- a/src/Commands/Plan/ListCommand.php +++ b/src/Commands/Plan/ListCommand.php @@ -18,6 +18,7 @@ class ListCommand extends SiteCommand * Displays the list of available site plans. * * @authorize + * @filter-output * * @command plan:list * @aliases plans From 7461d954e60012b059f0c95835639c30907c58ca Mon Sep 17 00:00:00 2001 From: Oubah Awaleh Date: Tue, 16 Jul 2019 13:50:38 -0700 Subject: [PATCH 12/29] Added filter option to site list command --- src/Commands/Site/ListCommand.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Commands/Site/ListCommand.php b/src/Commands/Site/ListCommand.php index b1f2853b6..6f78b76b1 100644 --- a/src/Commands/Site/ListCommand.php +++ b/src/Commands/Site/ListCommand.php @@ -13,6 +13,7 @@ class ListCommand extends SiteCommand * Displays the list of sites accessible to the currently logged-in user. * * @authorize + * @filter-output * * @command site:list * @aliases sites From d5c33fa88ef7a130069abc60a6ff08baef0715d6 Mon Sep 17 00:00:00 2001 From: Oubah Awaleh Date: Wed, 17 Jul 2019 11:44:38 -0700 Subject: [PATCH 13/29] added filter option to payment method command --- src/Commands/PaymentMethod/ListCommand.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Commands/PaymentMethod/ListCommand.php b/src/Commands/PaymentMethod/ListCommand.php index 2e16a5e23..a6ea1729a 100644 --- a/src/Commands/PaymentMethod/ListCommand.php +++ b/src/Commands/PaymentMethod/ListCommand.php @@ -18,6 +18,7 @@ class ListCommand extends TerminusCommand * Displays the list of payment methods for the currently logged-in user. * * @authorize + * @filter-output * * @command payment-method:list * @aliases payment-methods pm:list pms From 026213ad6892e3d153cb16d776c25702b8581e3e Mon Sep 17 00:00:00 2001 From: Oubah Awaleh Date: Thu, 18 Jul 2019 09:31:14 -0700 Subject: [PATCH 14/29] Added filter option to reduce maintainability --- src/Commands/SSHKey/ListCommand.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Commands/SSHKey/ListCommand.php b/src/Commands/SSHKey/ListCommand.php index d32e96310..cd469acf1 100644 --- a/src/Commands/SSHKey/ListCommand.php +++ b/src/Commands/SSHKey/ListCommand.php @@ -18,6 +18,7 @@ class ListCommand extends TerminusCommand * Displays the list of SSH public keys associated with the currently logged-in user. * * @authorize + * @filter-output * * @command ssh-key:list * @aliases ssh-keys From 0d1e01ee0df38f1284a5ef4746f796f06358942d Mon Sep 17 00:00:00 2001 From: Oubah Awaleh Date: Thu, 18 Jul 2019 09:31:43 -0700 Subject: [PATCH 15/29] Added filter option to reduce maintainability --- src/Commands/Site/Org/ListCommand.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Commands/Site/Org/ListCommand.php b/src/Commands/Site/Org/ListCommand.php index 722af1284..9d10fcb43 100644 --- a/src/Commands/Site/Org/ListCommand.php +++ b/src/Commands/Site/Org/ListCommand.php @@ -21,6 +21,7 @@ class ListCommand extends TerminusCommand implements SiteAwareInterface * Displays the list of supporting organizations associated with a site. * * @authorize + * @filter-output * * @command site:org:list * @aliases site:orgs From 82977c10b08914c3ec1a90329a3a079d023a7f35 Mon Sep 17 00:00:00 2001 From: Oubah Awaleh Date: Thu, 18 Jul 2019 09:43:28 -0700 Subject: [PATCH 16/29] Added filter option to reduce code maintainability --- src/Commands/Site/Team/ListCommand.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Commands/Site/Team/ListCommand.php b/src/Commands/Site/Team/ListCommand.php index a2303a2b3..49c1eb631 100644 --- a/src/Commands/Site/Team/ListCommand.php +++ b/src/Commands/Site/Team/ListCommand.php @@ -21,6 +21,7 @@ class ListCommand extends TerminusCommand implements SiteAwareInterface * Displays the list of team members for a site. * * @authorize + * @filter-output * * @command site:team:list * From 8e92bffcc79065f34b4bd6ab9373e36be980531f Mon Sep 17 00:00:00 2001 From: Oubah Awaleh Date: Thu, 18 Jul 2019 09:47:13 -0700 Subject: [PATCH 17/29] Filter option is not needed for tag:list command --- src/Commands/Tag/ListCommand.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Commands/Tag/ListCommand.php b/src/Commands/Tag/ListCommand.php index c7f1d44e4..5ce6858fb 100644 --- a/src/Commands/Tag/ListCommand.php +++ b/src/Commands/Tag/ListCommand.php @@ -14,6 +14,7 @@ class ListCommand extends TagCommand * Displays the list of tags for a site within an organization. * * @authorize + * * * @command tag:list * @aliases tags From dd3e0460005f96c97287c91f9a8a6f318793a288 Mon Sep 17 00:00:00 2001 From: Oubah Awaleh Date: Thu, 18 Jul 2019 09:47:56 -0700 Subject: [PATCH 18/29] Added filter option to reduce code maintainability --- src/Commands/Upstream/ListCommand.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Commands/Upstream/ListCommand.php b/src/Commands/Upstream/ListCommand.php index 980457594..5cc5f2900 100644 --- a/src/Commands/Upstream/ListCommand.php +++ b/src/Commands/Upstream/ListCommand.php @@ -18,6 +18,7 @@ class ListCommand extends TerminusCommand * Displays the list of upstreams accessible to the currently logged-in user. * * @authorize + * @filter-output * * @command upstream:list * @aliases upstreams From 7d36589be17fb10ea6557349665411925fe44594 Mon Sep 17 00:00:00 2001 From: Oubah Awaleh Date: Thu, 18 Jul 2019 09:59:17 -0700 Subject: [PATCH 19/29] Added filter option to update:list cmd to reduce code maintainability --- src/Commands/Org/Upstream/ListCommand.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Commands/Org/Upstream/ListCommand.php b/src/Commands/Org/Upstream/ListCommand.php index 661703b9a..6e27ea554 100644 --- a/src/Commands/Org/Upstream/ListCommand.php +++ b/src/Commands/Org/Upstream/ListCommand.php @@ -26,8 +26,8 @@ class ListCommand extends UserListCommand * framework: Framework * @param string $organization Organization name, label, or ID * @option all Show all upstreams - * @option framework Framework filter - * @option name Name filter + * @option framework DEPRECATED Framework filter + * @option name DEPRECATED Name filter * @return RowsOfFields * * @usage Displays the list of upstreams accessible to the currently logged-in user. From efa413f51a6d47814570bf80a1f6ec3799bf5806 Mon Sep 17 00:00:00 2001 From: Oubah Awaleh Date: Thu, 18 Jul 2019 13:45:51 -0700 Subject: [PATCH 20/29] Added a test payment method test --- tests/features/payment-methods.feature | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/tests/features/payment-methods.feature b/tests/features/payment-methods.feature index 39cef7b12..960b9b6fa 100644 --- a/tests/features/payment-methods.feature +++ b/tests/features/payment-methods.feature @@ -6,6 +6,18 @@ Feature: Payment method command Background: I am logged in Given I am authenticated + @vcr payment-method-list.yml + Scenario: Listing a user's payment methods and filtering + When I run: + """ + terminus payment-method:list --filter="label=[[payment_method_label]]" + """ + Then I should get: "------------- --------------------------------------" + And I should get: "Label ID" + And I should get: "------------- --------------------------------------" + And I should get: "[[payment_method_label]] 8558e04f-3674-481e-b448-bccff73cb430" + And I should get: "------------- --------------------------------------" + @vcr payment-method-list.yml Scenario: Listing a user's payment methods When I run "terminus payment-method:list" @@ -15,6 +27,16 @@ Feature: Payment method command And I should get: "[[payment_method_label]] 8558e04f-3674-481e-b448-bccff73cb430" And I should get: "------------- --------------------------------------" + @vcr payment-method-list.yml + Scenario: Listing a user's payment methods and filtering when they don't have any matches + When I run: + """ + terminus payment-method:list --filter="label=invalid" + """ + Then I should get: "------- ----" + And I should get: "Label ID" + And I should get: "------- ----" + @vcr payment-method-site-list-empty.yml Scenario: Listing a user's payment methods when they don't have any When I run "terminus payment-method:list" From dd8f7c543426257bf30951ba7d9e69d7d2c5b70b Mon Sep 17 00:00:00 2001 From: Oubah Awaleh Date: Thu, 18 Jul 2019 13:47:22 -0700 Subject: [PATCH 21/29] Added filter option to list site command --- src/Commands/Upstream/Updates/ListCommand.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Commands/Upstream/Updates/ListCommand.php b/src/Commands/Upstream/Updates/ListCommand.php index fdad7b96c..808a9881b 100644 --- a/src/Commands/Upstream/Updates/ListCommand.php +++ b/src/Commands/Upstream/Updates/ListCommand.php @@ -15,6 +15,7 @@ class ListCommand extends UpdatesCommand * Note: To refresh the cache you will need to run site:upstream:clear-cache before running this command. * * @authorize + * @filter-output * * @command upstream:updates:list * From 42d34f682824a8b63ec3b219d0da517810c573b6 Mon Sep 17 00:00:00 2001 From: Oubah Awaleh Date: Thu, 18 Jul 2019 15:09:28 -0700 Subject: [PATCH 22/29] Added a test payment method test --- tests/features/bootstrap/FeatureContext.php | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/features/bootstrap/FeatureContext.php b/tests/features/bootstrap/FeatureContext.php index 432addaeb..a8bb90d08 100644 --- a/tests/features/bootstrap/FeatureContext.php +++ b/tests/features/bootstrap/FeatureContext.php @@ -605,6 +605,7 @@ public function iSetTheEnvironmentVariableTo($var, $value) /** * @When /^I run "([^"]*)"$/ * @When /^I run: (.*)$/ + * @When /^I run:$/ * Runs command and saves output * * @param [string] $command To be entered as CL stdin From 7244e4b5a265d059f132694f986bce68af2c3d48 Mon Sep 17 00:00:00 2001 From: Oubah Awaleh Date: Thu, 18 Jul 2019 15:11:09 -0700 Subject: [PATCH 23/29] Added filter option --- src/Commands/Site/ListCommand.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Commands/Site/ListCommand.php b/src/Commands/Site/ListCommand.php index 6f78b76b1..500e4680e 100644 --- a/src/Commands/Site/ListCommand.php +++ b/src/Commands/Site/ListCommand.php @@ -32,10 +32,10 @@ class ListCommand extends SiteCommand * @default-fields name,id,plan_name,framework,region,owner,created,memberships,frozen * @return RowsOfFields * - * @option name Name filter - * @option org Organization filter; "all" or an organization's name, label, or ID + * @option name DEPRECATED Name filter + * @option org DEPRECATED Organization filter; "all" or an organization's name, label, or ID * @option owner Owner filter; "me" or user UUID - * @option plan Plan filter; filter by the plan's label + * @option plan DEPRECATED Plan filter; filter by the plan's label * @option team Team-only filter * @option string $upstream Upstream name to filter * From c797ea4aa3d2213ed68d5271cb24d35f4d25f889 Mon Sep 17 00:00:00 2001 From: Oubah Awaleh Date: Fri, 19 Jul 2019 10:40:06 -0700 Subject: [PATCH 24/29] added filter option to en codelog command --- src/Commands/Env/CodeLogCommand.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Commands/Env/CodeLogCommand.php b/src/Commands/Env/CodeLogCommand.php index 87c970414..246616ec9 100644 --- a/src/Commands/Env/CodeLogCommand.php +++ b/src/Commands/Env/CodeLogCommand.php @@ -19,6 +19,7 @@ class CodeLogCommand extends TerminusCommand implements SiteAwareInterface * Displays the code log for the environment. * * @authorize + * @filter-output * * @command env:code-log * From e1d50d57575874a6649692d2c9b7c2b7a0b9eb17 Mon Sep 17 00:00:00 2001 From: Oubah Awaleh Date: Fri, 19 Jul 2019 10:56:43 -0700 Subject: [PATCH 25/29] Updated added options and deprecated options --- CHANGELOG.md | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a943f168..545b866f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -91,7 +91,24 @@ All notable changes to this project will be documented in this file. This projec - Added `is_owner` field to the output of `site:team:list` in order to indicate which user is the site owner. (#1949) - Added boolean `is_owner` field to the output of `SiteUserMemberships::serialize()` in order to indicate which user is the site owner. (#1949) - Added `SiteUserMemberships::isOwner()` function in order to ascertain whether the user is the site's owner. (#1949) -- A `--progress` option has been added to `remote:drush` and `remote:wp` to enable progress for remote commands. (#1947) +- A `--progress` option has been added to `remote:drush` and `remote:wp` to enable progress for remote commands. (#1947)\- Added --filter option to `backup:list` command (#1992) +- Added --filter option to `org:list` command (#1992) +- Added --filter option to `branch:list` command (#1992) +- Added --filter option to `domain:list` command (#1992) +- Added --filter option to `env:list` command (#1992) +- Added --filter option to `multidev:list` command (#1992) +- Added --filter option to `org:people:list` command (#1992) +- Added --filter option to `org:site:list` command (#1992) +- Added --filter option to `org:upstream:list` command (#1992) +- Added --filter option to `payment-method:list` command (#1992) +- Added --filter option to `plan:list` command (#1992) +- Added --filter option to `site:list` command (#1992) +- Added --filter option to `site:org:list` command (#1992) +- Added --filter option to `site:team:list` command (#1992) +- Added --filter option to `ssh-key:list` command (#1992) +- Added --filter option to `upstream:list` command (#1992) +- Added --filter option to `upstream:updates:list` command (#1992) + ### Changed - `org:site:list` now displays a `Plan`/`plan_name` field to replace `Service Level`/`service_level`. (#1901) @@ -138,6 +155,12 @@ All notable changes to this project will be documented in this file. This projec ### Deprecated - `service-level:set` is now deprecated. Please use `plan:set`. (#1901) - `Site::updateServiceLevel()` is now deprecated. Please use `Plans::set()`. (#1901) +- `backup:list` `--element=VALUE` option is deprecated. Use `--filter="type=VALUE"` instead. (#1992) +- `org:upstream:list` `--framework=VALUE` options is deprecated. Use `--filter="id=VALUE" instead. (#1992) +- `org:upstream:list` `--name=VALUE` option is deprecated. Use `--filter="id=VALUE" instead. (#1992) +- `site:list` `--name=VALUE` option is deprecated. Use `--filter="id=VALUE" instead.(#1992) +- `site:list` `--plan=VALUE` option is deprecated. Use `--filter="plan_name=VALUE" instead.(#1992) +- `site:list` `--framework=VALUE` option is deprecated. Use `--filter="framework=VALUE" instead. (#1992 ### Fixed - Fixed `Environment::importDatabase()` by switching from using the `import_database` workflow to `do_import`. (#1909) From 2062dd37da11c8e33c39d07b542fded36ecf0f32 Mon Sep 17 00:00:00 2001 From: Oubah Awaleh Date: Fri, 19 Jul 2019 11:01:19 -0700 Subject: [PATCH 26/29] Removed the filter option, was not requirement to add an option --- src/Commands/Env/CodeLogCommand.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Commands/Env/CodeLogCommand.php b/src/Commands/Env/CodeLogCommand.php index 246616ec9..0a2935270 100644 --- a/src/Commands/Env/CodeLogCommand.php +++ b/src/Commands/Env/CodeLogCommand.php @@ -19,7 +19,7 @@ class CodeLogCommand extends TerminusCommand implements SiteAwareInterface * Displays the code log for the environment. * * @authorize - * @filter-output + * * * @command env:code-log * From 373f04a6f51d17d42d4a0f4a555b323fba161a6e Mon Sep 17 00:00:00 2001 From: Oubah Awaleh Date: Fri, 19 Jul 2019 15:46:07 -0700 Subject: [PATCH 27/29] Updated heading/subheading to match with the rest of doc --- CHANGELOG.md | 60 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 545b866f2..7f98a92c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,38 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org) ## MASTER -### Changed +### Added +- Added `--filter` option to `backup:list` command (#1992) +- Added `--filter` option to `branch:list` command (#1992) +- Added `--filter` option to `domain:list` command (#1992) +- Added `--filter` option to `env:list` command (#1992) +- Added `--filter` option to `multidev:list` command (#1992) +- Added `--filter` option to `org:list` command (#1992) +- Added `--filter` option to `org:people:list` command (#1992) +- Added `--filter` option to `org:site:list` command (#1992) +- Added `--filter` option to `org:upstream:list` command (#1992) +- Added `--filter` option to `payment-method:list` command (#1992) +- Added `--filter` option to `plan:list` command (#1992) +- Added `--filter` option to `site:list` command (#1992) +- Added `--filter` option to `site:org:list` command (#1992) +- Added `--filter` option to `site:team:list` command (#1992) +- Added `--filter` option to `ssh-key:list` command (#1992) +- Added `--filter` option to `upstream:list` command (#1992) +- Added `--filter` option to `upstream:updates:list` command (#1992) + +### Deprecated +- `backup:list` `--element=VALUE` option is deprecated. Use `--filter="type=VALUE"` instead. (#1992) +- `site:list` `--framework=VALUE` option is deprecated. Use `--filter="framework=VALUE"` instead. (#1992) +- `site:list` `--name=VALUE` option is deprecated. Use `--filter="name=VALUE"` instead. (#1992) +- `site:list` `--plan=VALUE` option is deprecated. Use `--filter="plan_name=VALUE"` instead. (#1992) +- `org:site:list` `--plan=VALUE` option is deprecated. Use `--filter="plan_name=VALUE"` instead. (#1992) +- `org:site:list` `--tags=VALUE` option is deprecated. Use `--filter="tags=VALUE"` instead. (#1992) +- `org:upstream:list` `--framework=VALUE` option is deprecated. Use `--filter="framework=VALUE"` instead. (#1992) +- `org:upstream:list` `--name=VALUE` option is deprecated. Use `--filter="label=VALUE"` instead. (#1992) +- `upstream:list` `--framework=VALUE` option is deprecated. Use `--filter="framework=VALUE"` instead. (#1992) +- `upstream:list` `--name=VALUE` option is deprecated. Use `--filter="label=VALUE"` instead. (#1992) + +### Changed - `site:info`'s value of the `region` field has been changed to use human-readable region names. (#1985) - `site:list`'s value of the `region` field has been changed to use human-readable region names. (#1985) @@ -91,23 +122,9 @@ All notable changes to this project will be documented in this file. This projec - Added `is_owner` field to the output of `site:team:list` in order to indicate which user is the site owner. (#1949) - Added boolean `is_owner` field to the output of `SiteUserMemberships::serialize()` in order to indicate which user is the site owner. (#1949) - Added `SiteUserMemberships::isOwner()` function in order to ascertain whether the user is the site's owner. (#1949) -- A `--progress` option has been added to `remote:drush` and `remote:wp` to enable progress for remote commands. (#1947)\- Added --filter option to `backup:list` command (#1992) -- Added --filter option to `org:list` command (#1992) -- Added --filter option to `branch:list` command (#1992) -- Added --filter option to `domain:list` command (#1992) -- Added --filter option to `env:list` command (#1992) -- Added --filter option to `multidev:list` command (#1992) -- Added --filter option to `org:people:list` command (#1992) -- Added --filter option to `org:site:list` command (#1992) -- Added --filter option to `org:upstream:list` command (#1992) -- Added --filter option to `payment-method:list` command (#1992) -- Added --filter option to `plan:list` command (#1992) -- Added --filter option to `site:list` command (#1992) -- Added --filter option to `site:org:list` command (#1992) -- Added --filter option to `site:team:list` command (#1992) -- Added --filter option to `ssh-key:list` command (#1992) -- Added --filter option to `upstream:list` command (#1992) -- Added --filter option to `upstream:updates:list` command (#1992) +- A `--progress` option has been added to `remote:drush` and `remote:wp` to enable progress for remote commands. (#1947) + + ### Changed @@ -155,12 +172,7 @@ All notable changes to this project will be documented in this file. This projec ### Deprecated - `service-level:set` is now deprecated. Please use `plan:set`. (#1901) - `Site::updateServiceLevel()` is now deprecated. Please use `Plans::set()`. (#1901) -- `backup:list` `--element=VALUE` option is deprecated. Use `--filter="type=VALUE"` instead. (#1992) -- `org:upstream:list` `--framework=VALUE` options is deprecated. Use `--filter="id=VALUE" instead. (#1992) -- `org:upstream:list` `--name=VALUE` option is deprecated. Use `--filter="id=VALUE" instead. (#1992) -- `site:list` `--name=VALUE` option is deprecated. Use `--filter="id=VALUE" instead.(#1992) -- `site:list` `--plan=VALUE` option is deprecated. Use `--filter="plan_name=VALUE" instead.(#1992) -- `site:list` `--framework=VALUE` option is deprecated. Use `--filter="framework=VALUE" instead. (#1992 + ### Fixed - Fixed `Environment::importDatabase()` by switching from using the `import_database` workflow to `do_import`. (#1909) From cca9cee89f5c2c9e82dfc6f169818c9bff211a97 Mon Sep 17 00:00:00 2001 From: Oubah Awaleh Date: Fri, 19 Jul 2019 15:46:44 -0700 Subject: [PATCH 28/29] lint clean up --- src/Commands/Branch/ListCommand.php | 1 - src/Commands/Domain/AddCommand.php | 1 - src/Commands/Env/CodeLogCommand.php | 1 - src/Commands/Org/Site/ListCommand.php | 4 ++-- src/Commands/Tag/ListCommand.php | 1 - src/Commands/Upstream/ListCommand.php | 4 ++-- tests/unit_tests/Models/BackupTest.php | 1 + 7 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/Commands/Branch/ListCommand.php b/src/Commands/Branch/ListCommand.php index 5dad3e0fe..adec8f938 100644 --- a/src/Commands/Branch/ListCommand.php +++ b/src/Commands/Branch/ListCommand.php @@ -18,7 +18,6 @@ class ListCommand extends TerminusCommand implements SiteAwareInterface use SiteAwareTrait; /** - * * Displays list of git branches for a site. * * @authorize diff --git a/src/Commands/Domain/AddCommand.php b/src/Commands/Domain/AddCommand.php index ab69f2db6..676710efd 100644 --- a/src/Commands/Domain/AddCommand.php +++ b/src/Commands/Domain/AddCommand.php @@ -18,7 +18,6 @@ class AddCommand extends TerminusCommand implements SiteAwareInterface * Associates a domain with the environment. * * @authorize - * * * @command domain:add * diff --git a/src/Commands/Env/CodeLogCommand.php b/src/Commands/Env/CodeLogCommand.php index 0a2935270..87c970414 100644 --- a/src/Commands/Env/CodeLogCommand.php +++ b/src/Commands/Env/CodeLogCommand.php @@ -19,7 +19,6 @@ class CodeLogCommand extends TerminusCommand implements SiteAwareInterface * Displays the code log for the environment. * * @authorize - * * * @command env:code-log * diff --git a/src/Commands/Org/Site/ListCommand.php b/src/Commands/Org/Site/ListCommand.php index 917ea3095..6b828e6f5 100644 --- a/src/Commands/Org/Site/ListCommand.php +++ b/src/Commands/Org/Site/ListCommand.php @@ -38,8 +38,8 @@ class ListCommand extends TerminusCommand implements SiteAwareInterface * @return RowsOfFields * * @param string $organization Organization name, label, or ID - * @option plan Plan filter; filter by the plan's label - * @option string $tag Tag name to filter + * @option plan DEPRECATED Plan filter; filter by the plan's label + * @option string $tag DEPRECATED Tag name to filter * @option string $upstream Upstream name to filter * * @usage Displays the list of sites associated with . diff --git a/src/Commands/Tag/ListCommand.php b/src/Commands/Tag/ListCommand.php index 5ce6858fb..c7f1d44e4 100644 --- a/src/Commands/Tag/ListCommand.php +++ b/src/Commands/Tag/ListCommand.php @@ -14,7 +14,6 @@ class ListCommand extends TagCommand * Displays the list of tags for a site within an organization. * * @authorize - * * * @command tag:list * @aliases tags diff --git a/src/Commands/Upstream/ListCommand.php b/src/Commands/Upstream/ListCommand.php index 5cc5f2900..1614e8354 100644 --- a/src/Commands/Upstream/ListCommand.php +++ b/src/Commands/Upstream/ListCommand.php @@ -32,8 +32,8 @@ class ListCommand extends TerminusCommand * framework: Framework * organization: Organization * @option all Show all upstreams - * @option framework Framework filter - * @option name Name filter + * @option framework DEPRECATED Framework filter + * @option name DEPRECATED Name filter * @option org Organization filter; "all" or an organization's name, label, or ID * @return RowsOfFields * diff --git a/tests/unit_tests/Models/BackupTest.php b/tests/unit_tests/Models/BackupTest.php index cc3e19c11..ef427a8eb 100644 --- a/tests/unit_tests/Models/BackupTest.php +++ b/tests/unit_tests/Models/BackupTest.php @@ -204,6 +204,7 @@ public function testSerialize() 'date' => 1479742685, 'expiry' => 1479742685, 'initiator' => 'automated', + 'type' => 'type', 'url' => null, ]; From 6de9c1caa017812bece38a10365a6616b582a67a Mon Sep 17 00:00:00 2001 From: Oubah Awaleh Date: Fri, 19 Jul 2019 15:51:25 -0700 Subject: [PATCH 29/29] lint clean up --- CHANGELOG.md | 4 ---- src/Commands/Domain/LookupCommand.php | 1 - src/Commands/Org/Upstream/ListCommand.php | 1 + 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7f98a92c8..7190084be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -124,9 +124,6 @@ All notable changes to this project will be documented in this file. This projec - Added `SiteUserMemberships::isOwner()` function in order to ascertain whether the user is the site's owner. (#1949) - A `--progress` option has been added to `remote:drush` and `remote:wp` to enable progress for remote commands. (#1947) - - - ### Changed - `org:site:list` now displays a `Plan`/`plan_name` field to replace `Service Level`/`service_level`. (#1901) - `site:info` now displays a `Plan`/`plan_name` field to replace `Service Level`/`service_level`. (#1901) @@ -173,7 +170,6 @@ All notable changes to this project will be documented in this file. This projec - `service-level:set` is now deprecated. Please use `plan:set`. (#1901) - `Site::updateServiceLevel()` is now deprecated. Please use `Plans::set()`. (#1901) - ### Fixed - Fixed `Environment::importDatabase()` by switching from using the `import_database` workflow to `do_import`. (#1909) - Fixed `Environment::importFiles()` by switching from using the `import_files` workflow to `do_import`. (#1909) diff --git a/src/Commands/Domain/LookupCommand.php b/src/Commands/Domain/LookupCommand.php index d9c952707..33bbfe43d 100644 --- a/src/Commands/Domain/LookupCommand.php +++ b/src/Commands/Domain/LookupCommand.php @@ -22,7 +22,6 @@ class LookupCommand extends TerminusCommand implements SiteAwareInterface * * @authorize * - * * @command domain:lookup * * @field-labels diff --git a/src/Commands/Org/Upstream/ListCommand.php b/src/Commands/Org/Upstream/ListCommand.php index 6e27ea554..8920922ce 100644 --- a/src/Commands/Org/Upstream/ListCommand.php +++ b/src/Commands/Org/Upstream/ListCommand.php @@ -13,6 +13,7 @@ class ListCommand extends UserListCommand { /** * Displays the list of upstreams belonging to an organization. + * * @filter-output * @command org:upstream:list * @aliases org:upstreams