From f13b7d73d042471379385d52d6b4f3f9727c36e2 Mon Sep 17 00:00:00 2001 From: Joshua Spence Date: Tue, 10 Feb 2015 06:55:27 +1100 Subject: [PATCH] Remove deprecated support for specifying flags as a string Summary: It should be safe to remove this now. Test Plan: `arc unit` Reviewers: #blessed_reviewers, epriestley Reviewed By: #blessed_reviewers, epriestley Subscribers: Korvin, epriestley Differential Revision: https://secure.phabricator.com/D11714 --- src/lint/linter/ArcanistExternalLinter.php | 28 ++++------------------ 1 file changed, 5 insertions(+), 23 deletions(-) diff --git a/src/lint/linter/ArcanistExternalLinter.php b/src/lint/linter/ArcanistExternalLinter.php index b6790d4f..08f3e5cb 100644 --- a/src/lint/linter/ArcanistExternalLinter.php +++ b/src/lint/linter/ArcanistExternalLinter.php @@ -141,8 +141,8 @@ abstract class ArcanistExternalLinter extends ArcanistFutureLinter { * @return this * @task bin */ - final public function setFlags($flags) { - $this->flags = (array)$flags; + final public function setFlags(array $flags) { + $this->flags = $flags; return $this; } @@ -337,21 +337,9 @@ abstract class ArcanistExternalLinter extends ArcanistFutureLinter { * @task exec */ final protected function getCommandFlags() { - $mandatory_flags = $this->getMandatoryFlags(); - if (!is_array($mandatory_flags)) { - phutil_deprecated( - 'String support for flags.', 'You should use list instead.'); - $mandatory_flags = (array) $mandatory_flags; - } - - $flags = nonempty($this->flags, $this->getDefaultFlags()); - if (!is_array($flags)) { - phutil_deprecated( - 'String support for flags.', 'You should use list instead.'); - $flags = (array) $flags; - } - - return array_merge($mandatory_flags, $flags); + return array_merge( + $this->getMandatoryFlags(), + nonempty($this->flags, $this->getDefaultFlags())); } public function getCacheVersion() { @@ -508,12 +496,6 @@ abstract class ArcanistExternalLinter extends ArcanistFutureLinter { throw new Exception( pht('None of the configured binaries can be located.')); case 'flags': - if (!is_array($value)) { - phutil_deprecated( - 'String support for flags.', - 'You should use list instead.'); - $value = (array) $value; - } $this->setFlags($value); return; }