Fixed branch selection in site delete-branch, removed live and test f…

…rom the list

CHANGELOG.md

@@ -12,6 +12,7 @@ All notable changes to this project starting with the 0.6.0 release will be docu
 
 ### Fixed
 - Fixed type error in `site hostnames lookup` which appears when there are no results. (#1139)
+- Fixed branch selection in `site delete-branch`. (#1143)
 
 ### Removed
 - Removed `sites import` command. Please create new sites with `sites create` and then import via `site import` instead. (#1132)

php/Terminus/Commands/SiteCommand.php

@@ -557,13 +557,16 @@ public function delete($args, $assoc_args) {
    */
   public function deleteBranch($args, $assoc_args) {
     $site     = $this->sites->get(
-      $this->input()->siteName(['args' => $assoc_args])
+      $this->input()->siteName(['args' => $assoc_args,])
+    );
+    $branches = array_diff(
+      (array)$site->getTips(),
+      ['master', 'live', 'test',]
     );
-    $branches = array_diff((array)$site->getTips(), ['master']);
     if (empty($branches)) {
       $this->failure(
         'The site {site} has no branches which may be deleted.',
-        ['site' => $site->get('name')]
+        ['site' => $site->get('name'),]
       );
     }
     $branch   = $this->input()->menu(
@@ -573,14 +576,15 @@ public function deleteBranch($args, $assoc_args) {
         'key'             => 'branch',
         'label'           => 'Select the branch to delete',
         'choices'         => $branches,
+        'return_value'    => true,
       ]
     );
 
     $message = 'Are you sure you want to delete the "%s" branch from %s?';
     $this->input()->confirm(
       [
         'message' => $message,
-        'context' => [$branch, $site->get('name')],
+        'context' => [$branch, $site->get('name'),],
       ]
     );