+1

src/applications/config/phid/PhabricatorConfigPHIDTypeConfig.php

reviewed

··· 22 22 23 23 return id(new PhabricatorConfigEntryQuery()) 24 24 ->setViewer($query->getViewer()) 25 25 + ->setParentQuery($query) 25 26 ->withPHIDs($phids) 26 27 ->execute(); 27 28 }

+2 -1

src/applications/conpherence/phid/PhabricatorConpherencePHIDTypeThread.php

reviewed

··· 24 24 array $phids) { 25 25 26 26 return id(new ConpherenceThreadQuery()) 27 27 + ->setViewer($query->getViewer()) 28 28 + ->setParentQuery($query) 27 29 ->withPHIDs($phids) 28 28 - ->setViewer($query->getViewer()) 29 30 ->execute(); 30 31 } 31 32

+1

src/applications/countdown/phid/PhabricatorCountdownPHIDTypeCountdown.php

reviewed

··· 22 22 23 23 return id(new PhabricatorCountdownQuery()) 24 24 ->setViewer($query->getViewer()) 25 25 + ->setParentQuery($query) 25 26 ->withPHIDs($phids) 26 27 ->execute(); 27 28 }

+1

src/applications/differential/phid/DifferentialPHIDTypeRevision.php

reviewed

··· 22 22 23 23 return id(new DifferentialRevisionQuery()) 24 24 ->setViewer($query->getViewer()) 25 25 + ->setParentQuery($query) 25 26 ->withPHIDs($phids) 26 27 ->execute(); 27 28 }

+1

src/applications/diviner/phid/DivinerPHIDTypeAtom.php

reviewed

··· 22 22 23 23 return id(new DivinerAtomQuery()) 24 24 ->setViewer($query->getViewer()) 25 25 + ->setParentQuery($query) 25 26 ->withPHIDs($phids) 26 27 ->execute(); 27 28 }

+1

src/applications/diviner/phid/DivinerPHIDTypeBook.php

reviewed

··· 22 22 23 23 return id(new DivinerBookQuery()) 24 24 ->setViewer($query->getViewer()) 25 25 + ->setParentQuery($query) 25 26 ->withPHIDs($phids) 26 27 ->execute(); 27 28 }

+1

src/applications/files/phid/PhabricatorFilePHIDTypeFile.php

reviewed

··· 22 22 23 23 return id(new PhabricatorFileQuery()) 24 24 ->setViewer($query->getViewer()) 25 25 + ->setParentQuery($query) 25 26 ->withPHIDs($phids) 26 27 ->execute(); 27 28 }

+1

src/applications/herald/phid/HeraldPHIDTypeRule.php

reviewed

··· 22 22 23 23 return id(new HeraldRuleQuery()) 24 24 ->setViewer($query->getViewer()) 25 25 + ->setParentQuery($query) 25 26 ->withPHIDs($phids) 26 27 ->execute(); 27 28 }

+3 -2

src/applications/legalpad/phid/PhabricatorLegalpadPHIDTypeDocument.php

reviewed

··· 24 24 array $phids) { 25 25 26 26 return id(new LegalpadDocumentQuery()) 27 27 + ->setViewer($query->getViewer()) 28 28 + ->setParentQuery($query) 29 29 + ->withPHIDs($phids) 27 30 ->needDocumentBodies(true) 28 28 - ->withPHIDs($phids) 29 29 - ->setViewer($query->getViewer()) 30 31 ->execute(); 31 32 } 32 33

+1

src/applications/macro/phid/PhabricatorMacroPHIDTypeMacro.php

reviewed

··· 22 22 23 23 return id(new PhabricatorMacroQuery()) 24 24 ->setViewer($query->getViewer()) 25 25 + ->setParentQuery($query) 25 26 ->withPHIDs($phids) 26 27 ->execute(); 27 28 }

+1

src/applications/mailinglists/phid/PhabricatorMailingListPHIDTypeList.php

reviewed

··· 22 22 23 23 return id(new PhabricatorMailingListQuery()) 24 24 ->setViewer($query->getViewer()) 25 25 + ->setParentQuery($query) 25 26 ->withPHIDs($phids) 26 27 ->execute(); 27 28 }

+1

src/applications/maniphest/phid/ManiphestPHIDTypeTask.php

reviewed

··· 22 22 23 23 return id(new ManiphestTaskQuery()) 24 24 ->setViewer($query->getViewer()) 25 25 + ->setParentQuery($query) 25 26 ->withPHIDs($phids) 26 27 ->execute(); 27 28 }

+1

src/applications/owners/phid/PhabricatorOwnersPHIDTypePackage.php

reviewed

··· 22 22 23 23 return id(new PhabricatorOwnersPackageQuery()) 24 24 ->setViewer($query->getViewer()) 25 25 + ->setParentQuery($query) 25 26 ->withPHIDs($phids) 26 27 ->execute(); 27 28 }

+1

src/applications/paste/phid/PhabricatorPastePHIDTypePaste.php

reviewed

··· 22 22 23 23 return id(new PhabricatorPasteQuery()) 24 24 ->setViewer($query->getViewer()) 25 25 + ->setParentQuery($query) 25 26 ->withPHIDs($phids) 26 27 ->execute(); 27 28 }

+1

src/applications/people/phid/PhabricatorPeoplePHIDTypeExternal.php

reviewed

··· 22 22 23 23 return id(new PhabricatorExternalAccountQuery()) 24 24 ->setViewer($query->getViewer()) 25 25 + ->setParentQuery($query) 25 26 ->withPHIDs($phids) 26 27 ->execute(); 27 28 }

+3 -2

src/applications/people/phid/PhabricatorPeoplePHIDTypeUser.php

reviewed

··· 21 21 array $phids) { 22 22 23 23 return id(new PhabricatorPeopleQuery()) 24 24 + ->setViewer($query->getViewer()) 25 25 + ->setParentQuery($query) 26 26 + ->withPHIDs($phids) 24 27 ->needProfileImage(true) 25 28 ->needStatus(true) 26 26 - ->setViewer($query->getViewer()) 27 27 - ->withPHIDs($phids) 28 29 ->execute(); 29 30 } 30 31

+1

src/applications/phame/phid/PhabricatorPhamePHIDTypeBlog.php

reviewed

··· 25 25 26 26 return id(new PhameBlogQuery()) 27 27 ->setViewer($query->getViewer()) 28 28 + ->setParentQuery($query) 28 29 ->withPHIDs($phids) 29 30 ->execute(); 30 31 }

+1

src/applications/phame/phid/PhabricatorPhamePHIDTypePost.php

reviewed

··· 25 25 26 26 return id(new PhamePostQuery()) 27 27 ->setViewer($query->getViewer()) 28 28 + ->setParentQuery($query) 28 29 ->withPHIDs($phids) 29 30 ->execute(); 30 31 }

+1

src/applications/phlux/phid/PhluxPHIDTypeVariable.php

reviewed

··· 22 22 23 23 return id(new PhluxVariableQuery()) 24 24 ->setViewer($query->getViewer()) 25 25 + ->setParentQuery($query) 25 26 ->withPHIDs($phids) 26 27 ->execute(); 27 28 }

+1

src/applications/pholio/phid/PholioPHIDTypeImage.php

reviewed

··· 22 22 23 23 return id(new PholioImageQuery()) 24 24 ->setViewer($query->getViewer()) 25 25 + ->setParentQuery($query) 25 26 ->withPHIDs($phids) 26 27 ->execute(); 27 28 }

+1

src/applications/pholio/phid/PholioPHIDTypeMock.php

reviewed

··· 22 22 23 23 return id(new PholioMockQuery()) 24 24 ->setViewer($query->getViewer()) 25 25 + ->setParentQuery($query) 25 26 ->withPHIDs($phids) 26 27 ->execute(); 27 28 }

+1

src/applications/phriction/phid/PhrictionPHIDTypeDocument.php

reviewed

··· 22 22 23 23 return id(new PhrictionDocumentQuery()) 24 24 ->setViewer($query->getViewer()) 25 25 + ->setParentQuery($query) 25 26 ->withPHIDs($phids) 26 27 ->execute(); 27 28 }

+1

src/applications/ponder/phid/PonderPHIDTypeAnswer.php

reviewed

··· 22 22 23 23 return id(new PonderAnswerQuery()) 24 24 ->setViewer($query->getViewer()) 25 25 + ->setParentQuery($query) 25 26 ->withPHIDs($phids) 26 27 ->execute(); 27 28 }

+1

src/applications/ponder/phid/PonderPHIDTypeQuestion.php

reviewed

··· 22 22 23 23 return id(new PonderQuestionQuery()) 24 24 ->setViewer($query->getViewer()) 25 25 + ->setParentQuery($query) 25 26 ->withPHIDs($phids) 26 27 ->execute(); 27 28 }

+1

src/applications/project/phid/PhabricatorProjectPHIDTypeProject.php

reviewed

··· 22 22 23 23 return id(new PhabricatorProjectQuery()) 24 24 ->setViewer($query->getViewer()) 25 25 + ->setParentQuery($query) 25 26 ->withPHIDs($phids) 26 27 ->execute(); 27 28 }

+1

src/applications/releeph/phid/ReleephPHIDTypeBranch.php

reviewed

··· 22 22 23 23 return id(new ReleephBranchQuery()) 24 24 ->setViewer($query->getViewer()) 25 25 + ->setParentQuery($query) 25 26 ->withPHIDs($phids) 26 27 ->execute(); 27 28 }

+1

src/applications/releeph/phid/ReleephPHIDTypeProject.php

reviewed

··· 22 22 23 23 return id(new ReleephProjectQuery()) 24 24 ->setViewer($query->getViewer()) 25 25 + ->setParentQuery($query) 25 26 ->withPHIDs($phids) 26 27 ->execute(); 27 28 }

+1

src/applications/releeph/phid/ReleephPHIDTypeRequest.php

reviewed

··· 22 22 23 23 return id(new ReleephRequestQuery()) 24 24 ->setViewer($query->getViewer()) 25 25 + ->setParentQuery($query) 25 26 ->withPHIDs($phids) 26 27 ->execute(); 27 28 }

+2

src/applications/repository/phid/PhabricatorRepositoryPHIDTypeArcanistProject.php

reviewed

··· 23 23 public function loadObjects( 24 24 PhabricatorObjectQuery $query, 25 25 array $phids) { 26 26 + 26 27 return id(new PhabricatorRepositoryArcanistProjectQuery()) 27 28 ->setViewer($query->getViewer()) 29 29 + ->setParentQuery($query) 28 30 ->withPHIDs($phids) 29 31 ->execute(); 30 32 }

+1

src/applications/repository/phid/PhabricatorRepositoryPHIDTypeCommit.php

reviewed

··· 22 22 23 23 return id(new DiffusionCommitQuery()) 24 24 ->setViewer($query->getViewer()) 25 25 + ->setParentQuery($query) 25 26 ->withPHIDs($phids) 26 27 ->execute(); 27 28 }

+1

src/applications/repository/phid/PhabricatorRepositoryPHIDTypeRepository.php

reviewed

··· 23 23 24 24 return id(new PhabricatorRepositoryQuery()) 25 25 ->setViewer($query->getViewer()) 26 26 + ->setParentQuery($query) 26 27 ->withPHIDs($phids) 27 28 ->execute(); 28 29 }

+1

src/applications/slowvote/phid/PhabricatorSlowvotePHIDTypePoll.php

reviewed

··· 22 22 23 23 return id(new PhabricatorSlowvoteQuery()) 24 24 ->setViewer($query->getViewer()) 25 25 + ->setParentQuery($query) 25 26 ->withPHIDs($phids) 26 27 ->execute(); 27 28 }

+1

src/applications/transactions/phid/PhabricatorApplicationTransactionPHIDTypeTransaction.php

reviewed

··· 57 57 58 58 $xactions = id(clone $query) 59 59 ->setViewer($object_query->getViewer()) 60 60 + ->setParentQuery($object_query) 60 61 ->withPHIDs($subtype_phids) 61 62 ->execute(); 62 63

+56 -4

src/infrastructure/query/policy/PhabricatorPolicyAwareQuery.php

reviewed

··· 30 30 31 31 private $viewer; 32 32 private $raisePolicyExceptions; 33 33 + private $parentQuery; 33 34 private $rawResultLimit; 34 35 private $capabilities; 35 36 ··· 64 65 65 66 66 67 /** 68 68 + * Set the parent query of this query. This is useful for nested queries so 69 69 + * that configuration like whether or not to raise policy exceptions is 70 70 + * seamlessly passed along to child queries. 71 71 + * 72 72 + * @return this 73 73 + * @task config 74 74 + */ 75 75 + final public function setParentQuery(PhabricatorPolicyAwareQuery $query) { 76 76 + $this->parentQuery = $query; 77 77 + return $this; 78 78 + } 79 79 + 80 80 + 81 81 + /** 82 82 + * Get the parent query. See @{method:setParentQuery} for discussion. 83 83 + * 84 84 + * @return PhabricatorPolicyAwareQuery The parent query. 85 85 + * @task config 86 86 + */ 87 87 + final public function getParentQuery() { 88 88 + return $this->parentQuery; 89 89 + } 90 90 + 91 91 + 92 92 + /** 93 93 + * Hook to configure whether this query should raise policy exceptions. 94 94 + * 95 95 + * @return this 96 96 + * @task config 97 97 + */ 98 98 + final public function setRaisePolicyExceptions($bool) { 99 99 + $this->raisePolicyExceptions = $bool; 100 100 + return $this; 101 101 + } 102 102 + 103 103 + 104 104 + /** 105 105 + * @return bool 106 106 + * @task config 107 107 + */ 108 108 + final public function shouldRaisePolicyExceptions() { 109 109 + return (bool) $this->raisePolicyExceptions; 110 110 + } 111 111 + 112 112 + 113 113 + /** 67 114 * @task config 68 115 */ 69 116 final public function requireCapabilities(array $capabilities) { ··· 89 136 * } 90 137 * 91 138 * If zero results match the query, this method returns `null`. 92 92 - * 93 139 * If one result matches the query, this method returns that result. 94 140 * 95 141 * If two or more results match the query, this method throws an exception. ··· 105 151 */ 106 152 final public function executeOne() { 107 153 108 108 - $this->raisePolicyExceptions = true; 154 154 + $this->setRaisePolicyExceptions(true); 109 155 try { 110 156 $results = $this->execute(); 111 157 } catch (Exception $ex) { 112 112 - $this->raisePolicyExceptions = false; 158 158 + $this->setRaisePolicyExceptions(false); 113 159 throw $ex; 114 160 } 115 161 ··· 136 182 throw new Exception("Call setViewer() before execute()!"); 137 183 } 138 184 185 185 + $parent_query = $this->getParentQuery(); 186 186 + if ($parent_query) { 187 187 + $this->setRaisePolicyExceptions( 188 188 + $parent_query->shouldRaisePolicyExceptions()); 189 189 + } 190 190 + 139 191 $results = array(); 140 192 141 193 $filter = new PhabricatorPolicyFilter(); ··· 149 201 $capabilities = $this->capabilities; 150 202 } 151 203 $filter->requireCapabilities($capabilities); 152 152 - $filter->raisePolicyExceptions($this->raisePolicyExceptions); 204 204 + $filter->raisePolicyExceptions($this->shouldRaisePolicyExceptions()); 153 205 154 206 $offset = (int)$this->getOffset(); 155 207 $limit = (int)$this->getLimit();