Merge pull request #1475 from pantheon-systems/fix/sites_mass-update

Fixed sites mass-update's tags filter

CHANGELOG.md

@@ -1,6 +1,10 @@
 #Change Log
 All notable changes to this project starting with the 0.6.0 release will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org)
 
+## MASTER
+### Fixed
+- Fixed `sites mass-update`'s `--tag` filter. (#1475)
+
 ## 0.13.6 - 2016-12-13
 ### Changed
 - Users are notified of impending Terminus release via update notification with the following message:

php/Terminus/Collections/OrganizationSiteMemberships.php

@@ -3,6 +3,7 @@
 namespace Terminus\Collections;
 
 use Terminus\Exceptions\TerminusException;
+use Terminus\Exceptions\TerminusNotFoundException;
 
 class OrganizationSiteMemberships extends TerminusCollection
 {
@@ -65,7 +66,7 @@ public function get($id)
                 }
             }
         }
-        return null;
+        throw new TerminusNotFoundException('No such site membership was found in this organization.');
     }
 
   /**

php/Terminus/Models/Site.php

@@ -10,6 +10,7 @@
 use Terminus\Collections\SiteOrganizationMemberships;
 use Terminus\Collections\SiteUserMemberships;
 use Terminus\Collections\Workflows;
+use Terminus\Exceptions\TerminusNotFoundException;
 
 class Site extends TerminusModel
 {
@@ -357,21 +358,21 @@ function ($membership) {
      * Returns tags from the site/org join
      * TODO: Move these into tags model/collection
      *
-     * @param Organization $org UUID of organization site belongs to
+     * @param Organization $org An object representing the organization with tags on this site
      * @return string[]
      */
     public function getTags($org)
     {
         if (isset($this->tags)) {
             return $this->tags;
         }
-        $org_site_member = new OrganizationSiteMemberships(
-            ['organization' => $org,]
-        );
-        $org_site_member->fetch();
-        $org  = $org_site_member->get($this->id);
-        $tags = $org->get('tags');
-        return $tags;
+        $org_site_memberships = new OrganizationSiteMemberships(['organization' => $org,]);
+        try {
+            $org_site_membership = $org_site_memberships->get($this->id);
+        } catch (TerminusNotFoundException $e) {
+            return [];
+        }
+        return $org_site_membership->get('tags');
     }
 
     /**