Merge branch 'master' into addition/confirm-yes

pantheon-systems · Sep 14, 2016 · 496c398 · 496c398
2 parents 8c511fd + 41dcd1d
commit 496c398
Show file tree

Hide file tree

Showing 8 changed files with 959 additions and 904 deletions.
diff --git a/composer.json b/composer.json
@@ -30,7 +30,7 @@
   "autoload-dev": {
     "psr-4": {
       "Pantheon\\Terminus\\UnitTests\\": "tests/new_unit_tests/",
-      "Pantheon\\Terminus\\Tests\\": "tests/"
+      "Pantheon\\Terminus\\FeatureTests\\": "tests/active_features/bootstrap/"
     }
   },
   "require-dev": {

diff --git a/composer.lock b/composer.lock
diff --git a/scripts/lint.sh b/scripts/lint.sh
@@ -18,14 +18,17 @@ eval $cmd
 
 #Run PHP Code Sniffer on command files using a standards subset excepting long lines
 phpcs="vendor/bin/phpcs --standard=tests/config/context_standards.xml --extensions=php --warning-severity=6 --error-severity=1"
-cmd=$phpcs+" tests/features/bootstrap/FeatureContext.php tests/active_features/bootstrap/FeatureContext.php"
+cmd=$phpcs+" tests/features/bootstrap/FeatureContext.php"
 eval $cmd
 
 #Enforce PSR2 on 1.x
 phpcs="vendor/bin/phpcs --standard=PSR2 --extensions=php"
 cmd=$phpcs+" tests/new_unit_tests/*"
 eval $cmd
 
+cmd=$phpcs+" tests/active_features/bootstrap/*"
+eval $cmd
+
 cmd=$phpcs+" bin/terminus.php"
 eval $cmd
 

diff --git a/src/Commands/ArtCommand.php b/src/Commands/ArtCommand.php
@@ -2,15 +2,12 @@
 
 namespace Pantheon\Terminus\Commands;
 
-use Symfony\Component\Console\Output\OutputInterface;
-
 class ArtCommand extends TerminusCommand
 {
     /**
      * Displays Pantheon ASCII artwork
      *
      * @name art
-     * @authorize
      *
      * @param string $name Name of the artwork to select
      * @usage terminus art rocket