From a3393c3ecb92753277cd7bf447631ebb510f59ce Mon Sep 17 00:00:00 2001 From: epriestley Date: Sun, 16 Aug 2015 17:59:14 -0700 Subject: [PATCH] Fix Owners lookups for the repository root Summary: Ref T9201. At the root of a repository the current path is `null`, but the OwnersQuery wants strings. This could be resolved a couple different ways, but just cast the arguments to strings since that seems reasonable enough. Test Plan: Browsed root of a repository. Reviewers: chad Reviewed By: chad Maniphest Tasks: T9201 Differential Revision: https://secure.phabricator.com/D13919 --- .../diffusion/controller/DiffusionBrowseController.php | 2 -- .../owners/query/PhabricatorOwnersPackageQuery.php | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/applications/diffusion/controller/DiffusionBrowseController.php b/src/applications/diffusion/controller/DiffusionBrowseController.php index 6fd164f2a7..7450c3921a 100644 --- a/src/applications/diffusion/controller/DiffusionBrowseController.php +++ b/src/applications/diffusion/controller/DiffusionBrowseController.php @@ -183,8 +183,6 @@ abstract class DiffusionBrowseController extends DiffusionController { $ownership = id(new PHUIStatusListView()) ->setUser($viewer); - - foreach ($packages as $package) { $icon = 'fa-list-alt'; $color = 'grey'; diff --git a/src/applications/owners/query/PhabricatorOwnersPackageQuery.php b/src/applications/owners/query/PhabricatorOwnersPackageQuery.php index 8dbb74e528..f2691ea3be 100644 --- a/src/applications/owners/query/PhabricatorOwnersPackageQuery.php +++ b/src/applications/owners/query/PhabricatorOwnersPackageQuery.php @@ -42,6 +42,7 @@ final class PhabricatorOwnersPackageQuery } foreach ($paths as $path) { + $path = (string)$path; $this->controlMap[$repository_phid][$path] = $path; } @@ -277,6 +278,8 @@ final class PhabricatorOwnersPackageQuery * @return list List of controlling packages. */ public function getControllingPackagesForPath($repository_phid, $path) { + $path = (string)$path; + if (!isset($this->controlMap[$repository_phid][$path])) { throw new PhutilInvalidStateException('withControl'); }