recaptime.dev / phorge
@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.) hq.recaptime.dev/wiki/Phorge
phorge phabricator
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Apply lint rules to Phabricator

Summary: Mostly applies a new call spacing rule; also a few things that have slipped through via pull requests and such

Test Plan: `find src/ -type f -name '*.php' | xargs -n16 arc lint --output summary --apply-patches`

Reviewers: chad

Reviewed By: chad

CC: aran

Differential Revision: https://secure.phabricator.com/D5002

epriestley a22bea2a 63f35ee9

+341 -662
+1 -2
src/applications/audit/events/AuditPeopleMenuEventListener.php
··· 28 28 ->setIsExternal(true) 29 29 ->setName($name) 30 30 ->setHref($href) 31 - ->setKey($name) 32 - ); 31 + ->setKey($name)); 33 32 34 33 $event->setValue('menu', $menu); 35 34 }
+2 -2
src/applications/auth/ldap/PhabricatorLDAPProvider.php
··· 269 269 270 270 $rows = array(); 271 271 272 - for($i = 0; $i < $entries['count']; $i++) { 272 + for ($i = 0; $i < $entries['count']; $i++) { 273 273 $row = array(); 274 274 $entry = $entries[$i]; 275 275 276 276 // Get username, email and realname 277 277 $username = $entry[$this->getSearchAttribute()][0]; 278 - if(empty($username)) { 278 + if (empty($username)) { 279 279 continue; 280 280 } 281 281 $row[] = $username;
+1 -2
src/applications/calendar/controller/PhabricatorCalendarBrowseController.php
··· 44 44 $details = "\n\n".rtrim($status->getDescription()); 45 45 } 46 46 $event->setDescription( 47 - $status->getTerseSummary($user).$details 48 - ); 47 + $status->getTerseSummary($user).$details); 49 48 $event->setEventID($status->getID()); 50 49 $month_view->addEvent($event); 51 50 }
+3 -6
src/applications/calendar/controller/PhabricatorCalendarDeleteStatusController.php
··· 28 28 $uri->setQueryParams( 29 29 array( 30 30 'deleted' => true, 31 - ) 32 - ); 31 + )); 33 32 return id(new AphrontRedirectResponse()) 34 33 ->setURI($uri); 35 34 } ··· 40 39 $dialog->appendChild(phutil_tag( 41 40 'p', 42 41 array(), 43 - pht('Permanently delete this status? This action can not be undone.') 44 - )); 42 + pht('Permanently delete this status? This action can not be undone.'))); 45 43 $dialog->addSubmitButton(pht('Delete')); 46 44 $dialog->addCancelButton( 47 - $this->getApplicationURI('status/edit/'.$status->getID().'/') 48 - ); 45 + $this->getApplicationURI('status/edit/'.$status->getID().'/')); 49 46 50 47 return id(new AphrontDialogResponse())->setDialog($dialog); 51 48
+4 -8
src/applications/calendar/controller/PhabricatorCalendarEditStatusController.php
··· 85 85 $user, 86 86 'Y'), 87 87 $redirect => true, 88 - ) 89 - ); 88 + )); 90 89 return id(new AphrontRedirectResponse()) 91 90 ->setURI($uri); 92 91 } ··· 125 124 } else { 126 125 $submit->addCancelButton( 127 126 $this->getApplicationURI('status/delete/'.$status->getID().'/'), 128 - pht('Delete Status') 129 - ); 127 + pht('Delete Status')); 130 128 } 131 129 $form->appendChild($submit); 132 130 ··· 138 136 id(new PhabricatorHeaderView())->setHeader($page_title), 139 137 $error_view, 140 138 $form, 141 - ) 142 - ); 139 + )); 143 140 144 141 return $this->buildApplicationPage( 145 142 $nav, 146 143 array( 147 144 'title' => $page_title, 148 145 'device' => true 149 - ) 150 - ); 146 + )); 151 147 } 152 148 153 149 }
+4 -8
src/applications/calendar/controller/PhabricatorCalendarViewStatusController.php
··· 32 32 array( 33 33 id(new PhabricatorHeaderView())->setHeader($page_title), 34 34 $status_list, 35 - ) 36 - ); 35 + )); 37 36 38 37 return $this->buildApplicationPage( 39 38 $nav, 40 39 array( 41 40 'title' => $page_title, 42 41 'device' => true 43 - ) 44 - ); 42 + )); 45 43 } 46 44 47 45 private function buildStatusList(array $statuses) { ··· 62 60 array( 63 61 'month' => $month, 64 62 'year' => $year, 65 - ) 66 - ); 63 + )); 67 64 $href = (string) $uri; 68 65 } 69 66 $from = phabricator_datetime($status->getDateFrom(), $user); ··· 115 112 } else { 116 113 $page_title = pht( 117 114 'Upcoming Statuses for %s', 118 - $this->getHandle($this->phid)->getName() 119 - ); 115 + $this->getHandle($this->phid)->getName()); 120 116 } 121 117 return $page_title; 122 118 }
+2 -4
src/applications/calendar/view/AphrontCalendarMonthView.php
··· 170 170 $prev_link = phutil_tag( 171 171 'a', 172 172 array('href' => (string) $uri->setQueryParams($query)), 173 - "\xE2\x86\x90" 174 - ); 173 + "\xE2\x86\x90"); 175 174 176 175 list($next_year, $next_month) = $this->getNextYearAndMonth(); 177 176 $query = array('year' => $next_year, 'month' => $next_month); 178 177 $next_link = phutil_tag( 179 178 'a', 180 179 array('href' => (string) $uri->setQueryParams($query)), 181 - "\xE2\x86\x92" 182 - ); 180 + "\xE2\x86\x92"); 183 181 184 182 $left_th = phutil_tag('th', array(), $prev_link); 185 183 $right_th = phutil_tag('th', array(), $next_link);
+1 -2
src/applications/config/controller/PhabricatorConfigAllController.php
··· 91 91 array( 92 92 'title' => $title, 93 93 'device' => true, 94 - ) 95 - ); 94 + )); 96 95 } 97 96 98 97 }
+1 -2
src/applications/config/controller/PhabricatorConfigGroupController.php
··· 46 46 array( 47 47 'title' => $title, 48 48 'device' => true, 49 - ) 50 - ); 49 + )); 51 50 } 52 51 53 52 private function buildOptionList(array $options) {
+1 -2
src/applications/config/controller/PhabricatorConfigIssueListController.php
··· 41 41 array( 42 42 'title' => $title, 43 43 'device' => true, 44 - ) 45 - ); 44 + )); 46 45 } 47 46 48 47 private function buildIssueList(array $issues) {
+1 -2
src/applications/config/controller/PhabricatorConfigIssueViewController.php
··· 54 54 array( 55 55 'title' => $title, 56 56 'device' => true, 57 - ) 58 - ); 57 + )); 59 58 } 60 59 61 60 private function renderIssue(PhabricatorSetupIssue $issue) {
+1 -2
src/applications/config/controller/PhabricatorConfigListController.php
··· 38 38 array( 39 39 'title' => $title, 40 40 'device' => true, 41 - ) 42 - ); 41 + )); 43 42 } 44 43 45 44 private function buildConfigOptionsList(array $groups) {
+1 -2
src/applications/config/option/PhabricatorCoreConfigOptions.php
··· 131 131 $this->newOption('phabricator.uninstalled-applications', 'set', array()) 132 132 ->setLocked(true) 133 133 ->setDescription( 134 - pht('Array containing list of Uninstalled applications.') 135 - ), 134 + pht('Array containing list of Uninstalled applications.')), 136 135 ); 137 136 } 138 137
+4 -3
src/applications/config/view/PhabricatorSetupIssueView.php
··· 64 64 // TODO: We should do a better job of detecting how to install extensions 65 65 // on the current system. 66 66 $install_commands = hsprintf( 67 - "\$ sudo apt-get install php5-<em>extname</em> # Debian / Ubuntu\n". 68 - "\$ sudo yum install php-<em>extname</em> # Red Hat / Derivatives" 69 - ); 67 + "\$ sudo apt-get install php5-<em>extname</em> ". 68 + "# Debian / Ubuntu\n". 69 + "\$ sudo yum install php-<em>extname</em> ". 70 + "# Red Hat / Derivatives"); 70 71 71 72 $fallback_info = pht( 72 73 "If those commands don't work, try Google. The process of installing ".
+9 -18
src/applications/conpherence/controller/ConpherenceController.php
··· 78 78 ->execute(); 79 79 $unread_conpherences = array_select_keys( 80 80 $all_conpherences, 81 - array_keys($unread) 82 - ); 81 + array_keys($unread)); 83 82 $this->setUnreadConpherences($unread_conpherences); 84 83 85 84 $read_conpherences = array_select_keys( 86 85 $all_conpherences, 87 - array_keys($read) 88 - ); 86 + array_keys($read)); 89 87 $this->setReadConpherences($read_conpherences); 90 88 91 89 if (!$this->getSelectedConpherencePHID()) { ··· 109 107 $nav->addButton( 110 108 'new', 111 109 pht('New Conversation'), 112 - $this->getApplicationURI('new/') 113 - ); 110 + $this->getApplicationURI('new/')); 114 111 $nav->addLabel(pht('Unread')); 115 112 $nav = $this->addConpherencesToNav($unread_conpherences, $nav); 116 113 $nav->addLabel(pht('Read')); ··· 129 126 $uri = $this->getApplicationURI('view/'.$conpherence->getID().'/'); 130 127 $data = $conpherence->getDisplayData( 131 128 $user, 132 - null 133 - ); 129 + null); 134 130 $title = $data['title']; 135 131 $subtitle = $data['subtitle']; 136 132 $unread_count = $data['unread_count']; ··· 185 181 id(new PhabricatorMenuItemView()) 186 182 ->setName(pht('New Conversation')) 187 183 ->setHref($this->getApplicationURI('new/')) 188 - ->setIcon('create') 189 - ) 184 + ->setIcon('create')) 190 185 ->addCrumb( 191 186 id(new PhabricatorCrumbView()) 192 - ->setName(pht('Conpherence')) 193 - ); 187 + ->setName(pht('Conpherence'))); 194 188 195 189 return $crumbs; 196 190 } ··· 206 200 'form_pane' => 'conpherence-form', 207 201 'menu_pane' => 'conpherence-menu', 208 202 'fancy_ajax' => (bool) $this->getSelectedConpherencePHID() 209 - ) 210 - ); 203 + )); 211 204 Javelin::initBehavior('conpherence-init', 212 205 array( 213 206 'selected_conpherence_id' => $this->getSelectedConpherencePHID(), ··· 216 209 'messages' => 'conpherence-messages', 217 210 'widgets_pane' => 'conpherence-widget-pane', 218 211 'form_pane' => 'conpherence-form' 219 - ) 220 - ); 212 + )); 221 213 Javelin::initBehavior('conpherence-drag-and-drop-photo', 222 214 array( 223 215 'target' => 'conpherence-header-pane', 224 216 'form_pane' => 'conpherence-form', 225 217 'upload_uri' => '/file/dropupload/', 226 218 'activated_class' => 'conpherence-header-upload-photo', 227 - ) 228 - ); 219 + )); 229 220 } 230 221 231 222 }
+7 -14
src/applications/conpherence/controller/ConpherenceListController.php
··· 59 59 array( 60 60 'title' => $title, 61 61 'device' => true, 62 - ) 63 - ); 62 + )); 64 63 } 65 64 66 65 private function renderEmptyMainPane() { ··· 77 76 'class' => 'conpherence-header-pane', 78 77 'id' => 'conpherence-header-pane', 79 78 ), 80 - '' 81 - ), 79 + ''), 82 80 phutil_tag( 83 81 'div', 84 82 array( 85 83 'class' => 'conpherence-widget-pane', 86 84 'id' => 'conpherence-widget-pane' 87 85 ), 88 - '' 89 - ), 86 + ''), 90 87 javelin_tag( 91 88 'div', 92 89 array( ··· 100 97 'class' => 'conpherence-messages', 101 98 'id' => 'conpherence-messages' 102 99 ), 103 - '' 104 - ), 100 + ''), 105 101 phutil_tag( 106 102 'div', 107 103 array( 108 104 'id' => 'conpherence-form' 109 105 ), 110 - '' 111 - ) 112 - ) 113 - ) 114 - ) 115 - ); 106 + '') 107 + )) 108 + )); 116 109 } 117 110 118 111
+7 -14
src/applications/conpherence/controller/ConpherenceNewController.php
··· 44 44 45 45 $file_phids = 46 46 PhabricatorMarkupEngine::extractFilePHIDsFromEmbeddedFiles( 47 - array($message) 48 - ); 47 + array($message)); 49 48 if ($file_phids) { 50 49 $files = id(new PhabricatorFileQuery()) 51 50 ->setViewer($user) ··· 70 69 ->attachComment( 71 70 id(new ConpherenceTransactionComment()) 72 71 ->setContent($message) 73 - ->setConpherencePHID($conpherence->getPHID()) 74 - ); 72 + ->setConpherencePHID($conpherence->getPHID())); 75 73 $content_source = PhabricatorContentSource::newForSource( 76 74 PhabricatorContentSource::SOURCE_WEB, 77 75 array( 78 76 'ip' => $request->getRemoteAddr() 79 - ) 80 - ); 77 + )); 81 78 id(new ConpherenceEditor()) 82 79 ->setContentSource($content_source) 83 80 ->setContinueOnNoEffect(true) ··· 151 148 ->setUser($user) 152 149 ->setDatasource('/typeahead/common/users/') 153 150 ->setLabel(pht('To')) 154 - ->setError($e_participants) 155 - ) 151 + ->setError($e_participants)) 156 152 ->appendChild( 157 153 id(new PhabricatorRemarkupControl()) 158 154 ->setName('message') 159 155 ->setValue($message) 160 156 ->setLabel(pht('Message')) 161 157 ->setPlaceHolder(pht('Drag and drop to include files...')) 162 - ->setError($e_message) 163 - ); 158 + ->setError($e_message)); 164 159 165 160 if ($request->isAjax()) { 166 161 $form->setTitle($title); ··· 172 167 ->appendChild( 173 168 id(new AphrontFormSubmitControl()) 174 169 ->setValue(pht('Submit')) 175 - ->addCancelButton($cancel_uri) 176 - ); 170 + ->addCancelButton($cancel_uri)); 177 171 178 172 $this->loadStartingConpherences(); 179 173 $this->setSelectedConpherencePHID(null); ··· 194 188 array( 195 189 'title' => $title, 196 190 'device' => true, 197 - ) 198 - ); 191 + )); 199 192 } 200 193 }
+14 -29
src/applications/conpherence/controller/ConpherenceUpdateController.php
··· 56 56 $message = $request->getStr('text'); 57 57 $xactions = $editor->generateTransactionsFromText( 58 58 $conpherence, 59 - $message 60 - ); 59 + $message); 61 60 break; 62 61 case 'metadata': 63 62 $xactions = array(); ··· 82 81 0, 83 82 0, 84 83 ConpherenceImageData::HEAD_WIDTH, 85 - ConpherenceImageData::HEAD_HEIGHT 86 - ); 84 + ConpherenceImageData::HEAD_HEIGHT); 87 85 // this is handled outside the editor for now. no particularly 88 86 // good reason to move it inside 89 87 $conpherence->setImagePHIDs( 90 88 array( 91 89 ConpherenceImageData::SIZE_HEAD => $header_file->getPHID(), 92 - ) 93 - ); 90 + )); 94 91 $conpherence->setImages( 95 92 array( 96 93 ConpherenceImageData::SIZE_HEAD => $header_file, 97 - ) 98 - ); 94 + )); 99 95 } else { 100 96 $e_file[] = $orig_file; 101 97 $errors[] = ··· 112 108 $top, 113 109 $left, 114 110 ConpherenceImageData::HEAD_WIDTH, 115 - ConpherenceImageData::HEAD_HEIGHT 116 - ); 111 + ConpherenceImageData::HEAD_HEIGHT); 117 112 $image_phid = $xformed->getPHID(); 118 113 119 114 $xactions[] = id(new ConpherenceTransaction()) 120 115 ->setTransactionType( 121 - ConpherenceTransactionType::TYPE_PICTURE_CROP 122 - ) 116 + ConpherenceTransactionType::TYPE_PICTURE_CROP) 123 117 ->setNewValue($image_phid); 124 118 } 125 119 if ($title != $conpherence->getTitle()) { ··· 143 137 } 144 138 } else if (empty($errors)) { 145 139 $errors[] = pht( 146 - 'That was a non-update. Try cancel.' 147 - ); 140 + 'That was a non-update. Try cancel.'); 148 141 } 149 142 } 150 143 151 144 if ($updated) { 152 145 return id(new AphrontRedirectResponse())->setURI( 153 - $this->getApplicationURI($conpherence_id.'/') 154 - ); 146 + $this->getApplicationURI($conpherence_id.'/')); 155 147 } 156 148 157 149 if ($errors) { ··· 166 158 id(new AphrontFormTextControl()) 167 159 ->setLabel(pht('Title')) 168 160 ->setName('title') 169 - ->setValue($conpherence->getTitle()) 170 - ); 161 + ->setValue($conpherence->getTitle())); 171 162 172 163 $image = $conpherence->getImage(ConpherenceImageData::SIZE_ORIG); 173 164 if ($image) { ··· 180 171 array( 181 172 'src' => 182 173 $conpherence->loadImageURI(ConpherenceImageData::SIZE_HEAD), 183 - )) 184 - ) 185 - ) 174 + )))) 186 175 ->appendChild( 187 176 id(new AphrontFormCropControl()) 188 177 ->setLabel(pht('Crop Image')) 189 178 ->setValue($image) 190 179 ->setWidth(ConpherenceImageData::HEAD_WIDTH) 191 - ->setHeight(ConpherenceImageData::HEAD_HEIGHT) 192 - ) 180 + ->setHeight(ConpherenceImageData::HEAD_HEIGHT)) 193 181 ->appendChild( 194 182 id(new ConpherenceFormDragAndDropUploadControl()) 195 - ->setLabel(pht('Change Image')) 196 - ); 183 + ->setLabel(pht('Change Image'))); 197 184 198 185 } else { 199 186 200 187 $form 201 188 ->appendChild( 202 189 id(new ConpherenceFormDragAndDropUploadControl()) 203 - ->setLabel(pht('Image')) 204 - ); 190 + ->setLabel(pht('Image'))); 205 191 } 206 192 207 193 require_celerity_resource('conpherence-update-css'); ··· 216 202 ->appendChild($error_view) 217 203 ->appendChild($form) 218 204 ->addSubmitButton() 219 - ->addCancelButton($this->getApplicationURI($conpherence->getID().'/')) 220 - ); 205 + ->addCancelButton($this->getApplicationURI($conpherence->getID().'/'))); 221 206 } 222 207 }
+8 -16
src/applications/conpherence/controller/ConpherenceViewController.php
··· 63 63 $conpherence = $this->getConpherence(); 64 64 $display_data = $conpherence->getDisplayData( 65 65 $user, 66 - ConpherenceImageData::SIZE_HEAD 67 - ); 66 + ConpherenceImageData::SIZE_HEAD); 68 67 $edit_href = $this->getApplicationURI('update/'.$conpherence->getID().'/'); 69 68 $class_mod = $display_data['image_class']; 70 69 ··· 74 73 array( 75 74 'class' => 'upload-photo' 76 75 ), 77 - pht('Drop photo here to change this Conpherence photo.') 78 - ). 76 + pht('Drop photo here to change this Conpherence photo.')). 79 77 javelin_tag( 80 78 'a', 81 79 array( ··· 83 81 'href' => $edit_href, 84 82 'sigil' => 'workflow edit-action', 85 83 ), 86 - '' 87 - ). 84 + ''). 88 85 phutil_tag( 89 86 'div', 90 87 array( 91 88 'class' => $class_mod.'header-image', 92 89 'style' => 'background-image: url('.$display_data['image'].');' 93 90 ), 94 - '' 95 - ). 91 + ''). 96 92 phutil_tag( 97 93 'div', 98 94 array( 99 95 'class' => $class_mod.'title', 100 96 ), 101 - $display_data['title'] 102 - ). 97 + $display_data['title']). 103 98 phutil_tag( 104 99 'div', 105 100 array( 106 101 'class' => $class_mod.'subtitle', 107 102 ), 108 - $display_data['subtitle'] 109 - ); 103 + $display_data['subtitle']); 110 104 111 105 return array('header' => $header); 112 106 } ··· 154 148 ->appendChild( 155 149 id(new PhabricatorRemarkupControl()) 156 150 ->setUser($user) 157 - ->setName('text') 158 - ) 151 + ->setName('text')) 159 152 ->appendChild( 160 153 id(new AphrontFormSubmitControl()) 161 - ->setValue(pht('Pontificate')) 162 - )->render(); 154 + ->setValue(pht('Pontificate')))->render(); 163 155 164 156 $scrollbutton = javelin_tag( 165 157 'a',
+17 -34
src/applications/conpherence/controller/ConpherenceWidgetController.php
··· 60 60 'widgets-tasks' => 1, 61 61 'widgets-calendar' => 1, 62 62 ) 63 - ) 64 - ); 63 + )); 65 64 66 65 $conpherence = $this->getConpherence(); 67 66 ··· 82 81 'id' => 'widgets-files-toggle', 83 82 'class' => 'sprite-conpher conpher_files_off first-icon' 84 83 ), 85 - '' 86 - ), 84 + ''), 87 85 javelin_tag( 88 86 'a', 89 87 array( ··· 95 93 'id' => 'widgets-tasks-toggle', 96 94 'class' => 'sprite-conpher conpher_list_off conpher_list_on', 97 95 ), 98 - '' 99 - ), 96 + ''), 100 97 javelin_tag( 101 98 'a', 102 99 array( ··· 108 105 'id' => 'widgets-calendar-toggle', 109 106 'class' => 'sprite-conpher conpher_calendar_off', 110 107 ), 111 - '' 112 - ) 113 - ) 114 - ). 108 + '') 109 + )). 115 110 phutil_tag( 116 111 'div', 117 112 array( ··· 119 114 'id' => 'widgets-files', 120 115 'style' => 'display: none;' 121 116 ), 122 - $this->renderFilesWidgetPaneContent() 123 - ). 117 + $this->renderFilesWidgetPaneContent()). 124 118 phutil_tag( 125 119 'div', 126 120 array( 127 121 'class' => 'widgets-body', 128 122 'id' => 'widgets-tasks', 129 123 ), 130 - $this->renderTaskWidgetPaneContent() 131 - ). 124 + $this->renderTaskWidgetPaneContent()). 132 125 phutil_tag( 133 126 'div', 134 127 array( ··· 136 129 'id' => 'widgets-calendar', 137 130 'style' => 'display: none;' 138 131 ), 139 - $this->renderCalendarWidgetPaneContent() 140 - ); 132 + $this->renderCalendarWidgetPaneContent()); 141 133 142 134 return array('widgets' => $widgets); 143 135 } ··· 156 148 array( 157 149 'src' => $thumb 158 150 ), 159 - '' 160 - ), 151 + ''), 161 152 $file->getName() 162 153 ); 163 154 } ··· 193 184 array( 194 185 'href' => '/T'.$task->getID() 195 186 ), 196 - $task->getTitle() 197 - ) 187 + $task->getTitle()) 198 188 ); 199 189 } 200 190 $table = id(new AphrontTableView($data)) ··· 244 234 $epoch_range = phabricator_format_local_time( 245 235 $status->getDateFrom(), 246 236 $user, 247 - $time_str 248 - ) . ' - ' . phabricator_format_local_time( 237 + $time_str) . ' - ' . phabricator_format_local_time( 249 238 $status->getDateTo(), 250 239 $user, 251 - $time_str 252 - ); 240 + $time_str); 253 241 254 242 $content[] = phutil_tag( 255 243 'div', ··· 262 250 array( 263 251 'class' => 'epoch-range' 264 252 ), 265 - $epoch_range 266 - ), 253 + $epoch_range), 267 254 phutil_tag( 268 255 'div', 269 256 array( 270 257 'class' => 'icon', 271 258 ), 272 - '' 273 - ), 259 + ''), 274 260 phutil_tag( 275 261 'div', 276 262 array( 277 263 'class' => 'description' 278 264 ), 279 - $status->getTerseSummary($user) 280 - ), 265 + $status->getTerseSummary($user)), 281 266 phutil_tag( 282 267 'div', 283 268 array( 284 269 'class' => 'participant' 285 270 ), 286 - $handles[$status->getUserPHID()]->getName() 287 - ) 288 - ) 289 - ); 271 + $handles[$status->getUserPHID()]->getName()) 272 + )); 290 273 } 291 274 } 292 275 }
+6 -12
src/applications/conpherence/editor/ConpherenceEditor.php
··· 12 12 $files = array(); 13 13 $file_phids = 14 14 PhabricatorMarkupEngine::extractFilePHIDsFromEmbeddedFiles( 15 - array($text) 16 - ); 15 + array($text)); 17 16 // Since these are extracted from text, we might be re-including the 18 17 // same file -- e.g. a mock under discussion. Filter files we 19 18 // already have. ··· 36 35 ->attachComment( 37 36 id(new ConpherenceTransactionComment()) 38 37 ->setContent($text) 39 - ->setConpherencePHID($conpherence->getPHID()) 40 - ); 38 + ->setConpherencePHID($conpherence->getPHID())); 41 39 return $xactions; 42 40 } 43 41 ··· 99 97 case ConpherenceTransactionType::TYPE_PICTURE: 100 98 $object->setImagePHID( 101 99 $xaction->getNewValue(), 102 - ConpherenceImageData::SIZE_ORIG 103 - ); 100 + ConpherenceImageData::SIZE_ORIG); 104 101 break; 105 102 case ConpherenceTransactionType::TYPE_PICTURE_CROP: 106 103 $object->setImagePHID( 107 104 $xaction->getNewValue(), 108 - ConpherenceImageData::SIZE_HEAD 109 - ); 105 + ConpherenceImageData::SIZE_HEAD); 110 106 break; 111 107 } 112 108 } ··· 127 123 $editor->addEdge( 128 124 $object->getPHID(), 129 125 $edge_type, 130 - $file_phid 131 - ); 126 + $file_phid); 132 127 } 133 128 $editor->save(); 134 129 // fallthrough ··· 205 200 if (!$title) { 206 201 $title = pht( 207 202 '%s sent you a message.', 208 - $this->getActor()->getUserName() 209 - ); 203 + $this->getActor()->getUserName()); 210 204 } 211 205 $phid = $object->getPHID(); 212 206
+1 -2
src/applications/conpherence/events/ConpherencePeopleMenuEventListener.php
··· 28 28 ->setIsExternal(true) 29 29 ->setName($name) 30 30 ->setHref($conpherence_uri) 31 - ->setKey($name) 32 - ); 31 + ->setKey($name)); 33 32 34 33 $event->setValue('menu', $menu); 35 34 }
+3 -7
src/applications/conpherence/mail/ConpherenceReplyHandler.php
··· 49 49 $edge_type = PhabricatorEdgeConfig::TYPE_OBJECT_HAS_FILE; 50 50 $file_phids = PhabricatorEdgeQuery::loadDestinationPHIDs( 51 51 $conpherence->getPHID(), 52 - $edge_type 53 - ); 52 + $edge_type); 54 53 $conpherence->attachFilePHIDs($file_phids); 55 54 $participants = id(new ConpherenceParticipant()) 56 55 ->loadAllWhere('conpherencePHID = %s', $conpherence->getPHID()); ··· 75 74 $body = $this->enhanceBodyWithAttachments( 76 75 $body, 77 76 $file_phids, 78 - '{F%d}' 79 - ); 77 + '{F%d}'); 80 78 81 79 $xactions = array(); 82 80 if ($this->getMailAddedParticipantPHIDs()) { ··· 89 87 $xactions, 90 88 $editor->generateTransactionsFromText( 91 89 $conpherence, 92 - $body 93 - ) 94 - ); 90 + $body)); 95 91 96 92 $editor->applyTransactions($conpherence, $xactions); 97 93
+2 -4
src/applications/conpherence/query/ConpherenceParticipantQuery.php
··· 73 73 $where[] = qsprintf( 74 74 $conn_r, 75 75 'participationStatus = %d', 76 - $this->participationStatus 77 - ); 76 + $this->participationStatus); 78 77 } 79 78 80 79 if ($this->dateTouched) { ··· 83 82 $conn_r, 84 83 'dateTouched %Q %d', 85 84 $this->dateTouchedSort, 86 - $this->dateTouched 87 - ); 85 + $this->dateTouched); 88 86 } 89 87 } 90 88
+6 -12
src/applications/conpherence/query/ConpherenceThreadQuery.php
··· 101 101 $conpherence_participants = mpull( 102 102 $conpherence_participants, 103 103 null, 104 - 'getParticipantPHID' 105 - ); 104 + 'getParticipantPHID'); 106 105 $current_conpherence->attachParticipants($conpherence_participants); 107 106 } 108 107 ··· 163 162 $start_of_week = phabricator_format_local_time( 164 163 strtotime('today'), 165 164 $this->getViewer(), 166 - 'U' 167 - ); 165 + 'U'); 168 166 $end_of_week = phabricator_format_local_time( 169 167 strtotime('midnight +1 week'), 170 168 $this->getViewer(), 171 - 'U' 172 - ); 169 + 'U'); 173 170 $statuses = id(new PhabricatorUserStatus()) 174 171 ->loadAllWhere( 175 172 'userPHID in (%Ls) AND dateTo >= %d AND dateFrom <= %d', 176 173 $participant_phids, 177 174 $start_of_week, 178 - $end_of_week 179 - ); 175 + $end_of_week); 180 176 $statuses = mgroup($statuses, 'getUserPHID'); 181 177 182 178 // attached files ··· 208 204 private function loadOrigPics(array $conpherences) { 209 205 return $this->loadPics( 210 206 $conpherences, 211 - ConpherenceImageData::SIZE_ORIG 212 - ); 207 + ConpherenceImageData::SIZE_ORIG); 213 208 } 214 209 215 210 private function loadHeaderPics(array $conpherences) { 216 211 return $this->loadPics( 217 212 $conpherences, 218 - ConpherenceImageData::SIZE_HEAD 219 - ); 213 + ConpherenceImageData::SIZE_HEAD); 220 214 } 221 215 222 216 private function loadPics(array $conpherences, $size) {
+2 -4
src/applications/conpherence/storage/ConpherenceThread.php
··· 130 130 return array_slice( 131 131 $this->transactions, 132 132 $length - $begin - $amount, 133 - $amount 134 - ); 133 + $amount); 135 134 } 136 135 137 136 public function attachFilePHIDs(array $file_phids) { ··· 209 208 if ($snippet === null) { 210 209 $snippet = phutil_utf8_shorten( 211 210 $transaction->getComment()->getContent(), 212 - 48 213 - ); 211 + 48); 214 212 if ($transaction->getAuthorPHID() == $user->getPHID()) { 215 213 $snippet = "\xE2\x86\xB0 " . $snippet; 216 214 }
+2 -4
src/applications/conpherence/view/ConpherenceFormDragAndDropUploadControl.php
··· 25 25 'form_pane' => 'conpherence-form', 26 26 'upload_uri' => '/file/dropupload/', 27 27 'activated_class' => 'conpherence-dialogue-upload-photo', 28 - ) 29 - ); 28 + )); 30 29 require_celerity_resource('conpherence-update-css'); 31 30 32 31 return phutil_tag( ··· 35 34 'id' => $drop_id, 36 35 'class' => 'conpherence-dialogue-drag-photo', 37 36 ), 38 - pht('Drag and drop an image here to upload it.') 39 - ); 37 + pht('Drag and drop an image here to upload it.')); 40 38 } 41 39 42 40 }
+1 -2
src/applications/conpherence/view/ConpherenceTransactionView.php
··· 87 87 array( 88 88 'class' => $content_class 89 89 ), 90 - $this->renderSingleView($content)) 91 - ); 90 + $this->renderSingleView($content))); 92 91 93 92 return $transaction_view->render(); 94 93 }
+1 -2
src/applications/differential/conduit/ConduitAPI_differential_finishpostponedlinters_Method.php
··· 76 76 $messages_property = id(new DifferentialDiffProperty())->loadOneWhere( 77 77 'diffID = %d AND name = %s', 78 78 $diff_id, 79 - 'arc:lint' 80 - ); 79 + 'arc:lint'); 81 80 if ($messages_property) { 82 81 $messages = $messages_property->getData(); 83 82 } else {
+1 -2
src/applications/differential/conduit/ConduitAPI_differential_setdiffproperty_Method.php
··· 51 51 $messages_property = id(new DifferentialDiffProperty())->loadOneWhere( 52 52 'diffID = %d AND name = %s', 53 53 $diff_id, 54 - 'arc:lint' 55 - ); 54 + 'arc:lint'); 56 55 if ($messages_property) { 57 56 $results = $messages_property->getData(); 58 57 } else {
+1 -2
src/applications/differential/conduit/ConduitAPI_differential_updateunitresults_Method.php
··· 50 50 $diff_property = id(new DifferentialDiffProperty())->loadOneWhere( 51 51 'diffID = %d AND name = %s', 52 52 $diff_id, 53 - 'arc:unit' 54 - ); 53 + 'arc:unit'); 55 54 56 55 if (!$diff_property) { 57 56 throw new ConduitException('ERR_NO_RESULTS');
+3 -6
src/applications/differential/controller/DifferentialRevisionStatsController.php
··· 23 23 $phid, 24 24 $phid, 25 25 $this->filter, 26 - $phid 27 - ); 26 + $phid); 28 27 return $table->loadAllFromArray($rows); 29 28 } 30 29 ··· 46 45 $phid, 47 46 $phid, 48 47 $this->filter, 49 - $phid 50 - ); 48 + $phid); 51 49 52 50 return $table->loadAllFromArray($rows); 53 51 } ··· 60 58 $diff_teml = new DifferentialDiff(); 61 59 $diffs = $diff_teml->loadAllWhere( 62 60 'revisionID in (%Ld)', 63 - array_keys($revisions) 64 - ); 61 + array_keys($revisions)); 65 62 return $diffs; 66 63 } 67 64
+2 -4
src/applications/differential/controller/DifferentialRevisionViewController.php
··· 157 157 'p', 158 158 array(), 159 159 pht('All specified reviewers are disabled and this revision '. 160 - 'needs review. You may want to add some new reviewers.') 161 - )); 160 + 'needs review. You may want to add some new reviewers.'))); 162 161 } else { 163 162 $reviewer_warning->appendChild( 164 163 phutil_tag( 165 164 'p', 166 165 array(), 167 166 pht('This revision has no specified reviewers and needs '. 168 - 'review. You may want to add some reviewers.') 169 - )); 167 + 'review. You may want to add some reviewers.'))); 170 168 } 171 169 } 172 170 }
+1 -2
src/applications/differential/events/DifferentialPeopleMenuEventListener.php
··· 28 28 ->setIsExternal(true) 29 29 ->setHref($href) 30 30 ->setName($name) 31 - ->setKey($name) 32 - ); 31 + ->setKey($name)); 33 32 34 33 $event->setValue('menu', $menu); 35 34 }
+3 -6
src/applications/differential/parser/DifferentialChangesetParser.php
··· 159 159 return $parser->parseHunksForHighlightMasks( 160 160 $changeset->getHunks(), 161 161 $this->originalLeft->getHunks(), 162 - $this->originalRight->getHunks() 163 - ); 162 + $this->originalRight->getHunks()); 164 163 } 165 164 166 165 /** ··· 890 889 $mask_force, 891 890 $feedback_mask, 892 891 $range_start, 893 - $range_len 894 - ); 892 + $range_len); 895 893 896 894 $renderer 897 895 ->setGaps($gaps) ··· 901 899 $html = $renderer->renderTextChange( 902 900 $range_start, 903 901 $range_len, 904 - $rows 905 - ); 902 + $rows); 906 903 907 904 return $renderer->renderChangesetTable($html); 908 905 }
+3 -9
src/applications/differential/render/DifferentialChangesetTwoUpRenderer.php
··· 27 27 'colspan' => 6, 28 28 'class' => 'show-more' 29 29 ), 30 - pht('Context not available.') 31 - ) 32 - ); 30 + pht('Context not available.'))); 33 31 } 34 32 35 33 $html = array(); ··· 375 373 'img', 376 374 array( 377 375 'src' => $old_file->getBestURI(), 378 - ) 379 - ) 380 - ); 376 + ))); 381 377 } 382 378 383 379 $new = null; ··· 391 387 'img', 392 388 array( 393 389 'src' => $new_file->getBestURI(), 394 - ) 395 - ) 396 - ); 390 + ))); 397 391 } 398 392 399 393 $html_old = array();
+1 -2
src/applications/differential/search/DifferentialSearchIndexer.php
··· 34 34 foreach ($aux_fields as $aux_field) { 35 35 $doc->addField( 36 36 $aux_field->getKeyForSearchIndex(), 37 - $aux_field->getValueForSearchIndex() 38 - ); 37 + $aux_field->getValueForSearchIndex()); 39 38 } 40 39 41 40 $doc->addRelationship(
+1 -2
src/applications/differential/view/DifferentialRevisionDetailView.php
··· 123 123 id(new PhabricatorTagView()) 124 124 ->setType(PhabricatorTagView::TYPE_STATE) 125 125 ->setName($status_name) 126 - ->setBackgroundColor($status_color) 127 - ); 126 + ->setBackgroundColor($status_color)); 128 127 129 128 return $view; 130 129 }
+1 -2
src/applications/diffusion/conduit/ConduitAPI_diffusion_getrecentcommitsbypath_Method.php
··· 38 38 39 39 $limit = nonempty( 40 40 $request->getValue('limit'), 41 - self::DEFAULT_LIMIT 42 - ); 41 + self::DEFAULT_LIMIT); 43 42 44 43 $history = DiffusionHistoryQuery::newFromDiffusionRequest($drequest) 45 44 ->setLimit($limit)
+1 -1
src/applications/diffusion/controller/DiffusionChangeController.php
··· 14 14 // TODO: Refine this. 15 15 return new Aphront404Response(); 16 16 } 17 - 17 + 18 18 $repository = $drequest->getRepository(); 19 19 $callsign = $repository->getCallsign(); 20 20 $commit = $drequest->getRawCommit();
+7 -14
src/applications/diffusion/controller/DiffusionCommitController.php
··· 40 40 ->setTitle('Error displaying commit.') 41 41 ->appendChild('Failed to load the commit because the commit has not '. 42 42 'been parsed yet.'), 43 - array('title' => 'Commit Still Parsing') 44 - ); 43 + array('title' => 'Commit Still Parsing')); 45 44 } 46 45 47 46 $commit_data = $drequest->loadCommitData(); ··· 83 82 $commit_properties = $this->loadCommitProperties( 84 83 $commit, 85 84 $commit_data, 86 - $parent_query->loadParents() 87 - ); 85 + $parent_query->loadParents()); 88 86 $property_list = id(new PhabricatorPropertyListView()) 89 87 ->setHasKeyboardShortcuts(true); 90 88 foreach ($commit_properties as $key => $value) { ··· 280 278 281 279 $change_list_title = DiffusionView::nameCommit( 282 280 $repository, 283 - $commit->getCommitIdentifier() 284 - ); 281 + $commit->getCommitIdentifier()); 285 282 $change_list = new DifferentialChangesetListView(); 286 283 $change_list->setTitle($change_list_title); 287 284 $change_list->setChangesets($changesets); ··· 320 317 $commit_id = 'r'.$callsign.$commit->getCommitIdentifier(); 321 318 $short_name = DiffusionView::nameCommit( 322 319 $repository, 323 - $commit->getCommitIdentifier() 324 - ); 320 + $commit->getCommitIdentifier()); 325 321 326 322 $crumbs = $this->buildCrumbs(array( 327 323 'commit' => true, ··· 351 347 $content, 352 348 array( 353 349 'title' => $commit_id 354 - ) 355 - ); 350 + )); 356 351 } 357 352 358 353 private function loadCommitProperties( ··· 373 368 ->execute(); 374 369 375 370 $task_phids = array_keys( 376 - $edges[$commit_phid][PhabricatorEdgeConfig::TYPE_COMMIT_HAS_TASK] 377 - ); 371 + $edges[$commit_phid][PhabricatorEdgeConfig::TYPE_COMMIT_HAS_TASK]); 378 372 $proj_phids = array_keys( 379 - $edges[$commit_phid][PhabricatorEdgeConfig::TYPE_COMMIT_HAS_PROJECT] 380 - ); 373 + $edges[$commit_phid][PhabricatorEdgeConfig::TYPE_COMMIT_HAS_PROJECT]); 381 374 382 375 $phids = array_merge($task_phids, $proj_phids); 383 376 if ($data->getCommitDetail('authorPHID')) {
+1 -2
src/applications/diffusion/controller/DiffusionCommitEditController.php
··· 24 24 $edge_type = PhabricatorEdgeConfig::TYPE_COMMIT_HAS_PROJECT; 25 25 $current_proj_phids = PhabricatorEdgeQuery::loadDestinationPHIDs( 26 26 $commit_phid, 27 - $edge_type 28 - ); 27 + $edge_type); 29 28 $handles = $this->loadViewerHandles($current_proj_phids); 30 29 $proj_t_values = mpull($handles, 'getFullName', 'getPHID'); 31 30
+3 -6
src/applications/diffusion/controller/DiffusionController.php
··· 188 188 $crumb = new PhabricatorCrumbView(); 189 189 if ($spec['commit']) { 190 190 $crumb->setName( 191 - "Tags for r{$callsign}{$raw_commit}" 192 - ); 191 + "Tags for r{$callsign}{$raw_commit}"); 193 192 $crumb->setHref($drequest->generateURI( 194 193 array( 195 194 'action' => 'commit', 196 195 'commit' => $raw_commit, 197 - )) 198 - ); 196 + ))); 199 197 } else { 200 198 $crumb->setName('Tags'); 201 199 } ··· 264 262 $crumb->setHref($drequest->generateURI( 265 263 array( 266 264 'path' => '', 267 - ) + $uri_params) 268 - ); 265 + ) + $uri_params)); 269 266 $crumb_list[] = $crumb; 270 267 271 268 $path_parts = explode('/', $path);
+1 -2
src/applications/diffusion/events/DiffusionPeopleMenuEventListener.php
··· 27 27 ->setIsExternal(true) 28 28 ->setHref($href) 29 29 ->setName($name) 30 - ->setKey($name) 31 - ); 30 + ->setKey($name)); 32 31 33 32 $event->setValue('menu', $menu); 34 33 }
+1 -2
src/applications/diffusion/query/branch/DiffusionGitBranchQuery.php
··· 13 13 list($stdout) = $repository->execxLocalCommand( 14 14 'for-each-ref %C --sort=-creatordate --format=%s refs/remotes', 15 15 $count ? '--count='.(int)$count : null, 16 - '%(refname:short) %(objectname)' 17 - ); 16 + '%(refname:short) %(objectname)'); 18 17 19 18 $branch_list = self::parseGitRemoteBranchOutput( 20 19 $stdout,
+1 -2
src/applications/diffusion/query/exists/DiffusionGitExistsQuery.php
··· 8 8 9 9 list($err, $merge_base) = $repository->execLocalCommand( 10 10 'cat-file -t %s', 11 - $request->getCommit() 12 - ); 11 + $request->getCommit()); 13 12 14 13 return !$err; 15 14 }
+1 -2
src/applications/diffusion/query/exists/DiffusionMercurialExistsQuery.php
··· 8 8 9 9 list($err, $stdout) = $repository->execLocalCommand( 10 10 'id --rev %s', 11 - $request->getCommit() 12 - ); 11 + $request->getCommit()); 13 12 14 13 return !$err; 15 14
+1 -2
src/applications/diffusion/query/exists/DiffusionSvnExistsQuery.php
··· 8 8 9 9 list($info) = $repository->execxRemoteCommand( 10 10 'info %s', 11 - $repository->getRemoteURI() 12 - ); 11 + $repository->getRemoteURI()); 13 12 14 13 $matches = null; 15 14 $exists = false;
+1 -2
src/applications/diffusion/query/taglist/DiffusionGitTagListQuery.php
··· 12 12 'for-each-ref %C --sort=-creatordate --format=%s refs/tags', 13 13 $count ? '--count='.(int)$count : null, 14 14 '%(objectname) %(objecttype) %(refname) %(*objectname) %(*objecttype) '. 15 - '%(subject)%01%(creator)' 16 - ); 15 + '%(subject)%01%(creator)'); 17 16 18 17 $stdout = trim($stdout); 19 18 if (!strlen($stdout)) {
+1 -2
src/applications/diffusion/view/DiffusionBranchTableView.php
··· 45 45 'branch' => $branch->getName(), 46 46 )) 47 47 ), 48 - 'History' 49 - ), 48 + 'History'), 50 49 phutil_tag( 51 50 'a', 52 51 array(
+1 -2
src/applications/diffusion/view/DiffusionEmptyResultView.php
··· 49 49 'text' => 'existed', 50 50 'commit' => $existed, 51 51 'params' => array('view' => $this->view), 52 - ) 53 - ); 52 + )); 54 53 55 54 $title = 'Path Was Deleted'; 56 55 $body = hsprintf(
+1 -2
src/applications/feed/PhabricatorFeedStoryPublisher.php
··· 108 108 foreach ($uris as $uri) { 109 109 $task = PhabricatorWorker::scheduleTask( 110 110 'FeedPublisherWorker', 111 - array('chrono_key' => $chrono_key, 'uri' => $uri) 112 - ); 111 + array('chrono_key' => $chrono_key, 'uri' => $uri)); 113 112 } 114 113 115 114 return $story;
+1 -1
src/applications/feed/storage/PhabricatorFeedStoryData.php
··· 28 28 // We're on a 32-bit machine. 29 29 if (function_exists('bcadd')) { 30 30 // Try to use the 'bc' extension. 31 - return bcdiv($this->chronologicalKey, bcpow(2,32)); 31 + return bcdiv($this->chronologicalKey, bcpow(2, 32)); 32 32 } else { 33 33 // Do the math in MySQL. TODO: If we formalize a bc dependency, get 34 34 // rid of this.
+4 -3
src/applications/feed/story/PhabricatorFeedStoryProject.php
··· 34 34 } 35 35 break; 36 36 case PhabricatorProjectTransactionType::TYPE_STATUS: 37 + $old_name = PhabricatorProjectStatus::getNameForStatus($old); 38 + $new_name = PhabricatorProjectStatus::getNameForStatus($new); 37 39 $action = hsprintf( 38 40 'changed project %s status from %s to %s.', 39 41 $this->linkTo($proj_phid), 40 - $this->renderString(PhabricatorProjectStatus::getNameForStatus($old)), 41 - $this->renderString(PhabricatorProjectStatus::getNameForStatus($new)) 42 - ); 42 + $this->renderString($old_name), 43 + $this->renderString($new_name)); 43 44 break; 44 45 case PhabricatorProjectTransactionType::TYPE_MEMBERS: 45 46 $add = array_diff($new, $old);
+4 -8
src/applications/files/PhabricatorImageTransformer.php
··· 69 69 $top, 70 70 $left, 71 71 $width, 72 - $height 73 - ); 72 + $height); 74 73 75 74 return PhabricatorFile::newFromFileData( 76 75 $image, 77 76 array( 78 77 'name' => 'conpherence-'.$file->getName(), 79 - ) 80 - ); 78 + )); 81 79 } 82 80 83 81 private function crudelyCropTo(PhabricatorFile $file, $x, $min_y, $max_y) { ··· 126 124 0, 0, 127 125 $orig_x, $orig_y, 128 126 $w, $h, 129 - $orig_w, $orig_h 130 - ); 127 + $orig_w, $orig_h); 131 128 132 129 return $this->saveImageDataInAnyFormat($dst, $file->getMimeType()); 133 130 } ··· 409 406 410 407 list($err) = exec_manual( 411 408 'convert %s -coalesce -resize %sX%s\! %s' 412 - , $input, $sdx, $sdy, $resized 413 - ); 409 + , $input, $sdx, $sdy, $resized); 414 410 415 411 if (!$err) { 416 412 $new_data = Filesystem::readFile($resized);
+1 -2
src/applications/files/management/PhabricatorFilesManagementMetadataWorkflow.php
··· 22 22 'name' => 'dry-run', 23 23 'help' => 'Show what would be updated.', 24 24 ), 25 - ) 26 - ); 25 + )); 27 26 } 28 27 29 28 public function execute(PhutilArgumentParser $args) {
+1 -2
src/applications/flag/conduit/ConduitAPI_flag_Method.php
··· 7 7 8 8 protected function attachHandleToFlag($flag) { 9 9 $flag->attachHandle( 10 - PhabricatorObjectHandleData::loadOneHandle($flag->getObjectPHID()) 11 - ); 10 + PhabricatorObjectHandleData::loadOneHandle($flag->getObjectPHID())); 12 11 } 13 12 14 13 protected function buildFlagInfoDictionary($flag) {
+1 -2
src/applications/herald/controller/HeraldRuleController.php
··· 208 208 209 209 $repetition_policy_param = $request->getStr('repetition_policy'); 210 210 $rule->setRepetitionPolicy( 211 - HeraldRepetitionPolicyConfig::toInt($repetition_policy_param) 212 - ); 211 + HeraldRepetitionPolicyConfig::toInt($repetition_policy_param)); 213 212 214 213 $e_name = true; 215 214 $errors = array();
+1 -2
src/applications/herald/engine/HeraldEngine.php
··· 52 52 ->setRuleOwner($rule->getAuthorPHID()) 53 53 ->setReason( 54 54 "This rule is only supposed to be repeated a single time, ". 55 - "and it has already been applied." 56 - ); 55 + "and it has already been applied."); 57 56 $this->transcript->addRuleTranscript($xscript); 58 57 $rule_matches = false; 59 58 } else {
+2 -4
src/applications/mailinglists/controller/PhabricatorMailingListsEditController.php
··· 120 120 $crumbs->addCrumb( 121 121 id(new PhabricatorCrumbView()) 122 122 ->setName(pht('Edit Mailing List')) 123 - ->setHref($this->getApplicationURI('/edit/'.$list->getID().'/')) 124 - ); 123 + ->setHref($this->getApplicationURI('/edit/'.$list->getID().'/'))); 125 124 } else { 126 125 $panel->setHeader(pht('Create Mailing List')); 127 126 $crumbs->addCrumb( 128 127 id(new PhabricatorCrumbView()) 129 128 ->setName(pht('Create Mailing List')) 130 - ->setHref($this->getApplicationURI('/edit/')) 131 - ); 129 + ->setHref($this->getApplicationURI('/edit/'))); 132 130 } 133 131 134 132 $panel->appendChild($form);
+1 -2
src/applications/mailinglists/controller/PhabricatorMailingListsListController.php
··· 61 61 $crumbs->addCrumb( 62 62 id(new PhabricatorCrumbView()) 63 63 ->setName(pht('All Lists')) 64 - ->setHref($this->getApplicationURI()) 65 - ); 64 + ->setHref($this->getApplicationURI())); 66 65 $nav->setCrumbs($crumbs); 67 66 68 67 $panel = new AphrontPanelView();
+1 -2
src/applications/maniphest/conduit/ConduitAPI_maniphest_Method.php
··· 249 249 if (!empty($phid_groups)) { 250 250 throw id(new ConduitException('ERR-INVALID-PARAMETER')) 251 251 ->setErrorDescription( 252 - 'One or more PHIDs were invalid for '.$field.'.' 253 - ); 252 + 'One or more PHIDs were invalid for '.$field.'.'); 254 253 } 255 254 256 255 return true;
+1 -1
src/applications/maniphest/controller/ManiphestController.php
··· 59 59 $nav->addFilter('subscribed', 'Subscribed'); 60 60 $nav->addFilter('triage', 'Need Triage'); 61 61 $nav->addLabel('User Projects'); 62 - $nav->addFilter('projecttriage','Need Triage'); 62 + $nav->addFilter('projecttriage', 'Need Triage'); 63 63 $nav->addFilter('projectall', 'All Tasks'); 64 64 $nav->addLabel('All Tasks'); 65 65 $nav->addFilter('alltriage', 'Need Triage');
+2 -4
src/applications/maniphest/controller/ManiphestTaskListController.php
··· 149 149 id(new AphrontFormTextControl()) 150 150 ->setName('set_search') 151 151 ->setLabel('Search') 152 - ->setValue($search_text) 153 - ); 152 + ->setValue($search_text)); 154 153 $form->appendChild( 155 154 id(new AphrontFormTextControl()) 156 155 ->setName('set_tasks') 157 156 ->setLabel('Task IDs') 158 - ->setValue(join(',', $task_ids)) 159 - ); 157 + ->setValue(join(',', $task_ids))); 160 158 161 159 $tokens = array(); 162 160 foreach ($owner_phids as $phid) {
+1 -2
src/applications/maniphest/event/ManiphestPeopleMenuEventListener.php
··· 27 27 ->setIsExternal(true) 28 28 ->setHref($href) 29 29 ->setName($name) 30 - ->setKey($name) 31 - ); 30 + ->setKey($name)); 32 31 33 32 $event->setValue('menu', $menu); 34 33 }
+4 -8
src/applications/meta/controller/PhabricatorApplicationDetailViewController.php
··· 72 72 private function buildPropertyView(PhabricatorApplication $selected) { 73 73 $properties = id(new PhabricatorPropertyListView()) 74 74 ->addProperty( 75 - pht('Description'), $selected->getShortDescription() 76 - ); 75 + pht('Description'), $selected->getShortDescription()); 77 76 78 77 return $properties; 79 78 } ··· 92 91 ->setIcon('delete') 93 92 ->setWorkflow(true) 94 93 ->setHref( 95 - $this->getApplicationURI(get_class($selected).'/uninstall/')) 96 - ); 94 + $this->getApplicationURI(get_class($selected).'/uninstall/'))); 97 95 } else { 98 96 $view->addAction( 99 97 id(new PhabricatorActionView()) ··· 101 99 ->setIcon('new') 102 100 ->setWorkflow(true) 103 101 ->setHref( 104 - $this->getApplicationURI(get_class($selected).'/install/')) 105 - ); 102 + $this->getApplicationURI(get_class($selected).'/install/'))); 106 103 } 107 104 } else { 108 105 $view->addAction( ··· 112 109 ->setWorkflow(true) 113 110 ->setDisabled(true) 114 111 ->setHref( 115 - $this->getApplicationURI(get_class($selected).'/uninstall/')) 116 - ); 112 + $this->getApplicationURI(get_class($selected).'/uninstall/'))); 117 113 } 118 114 return $view; 119 115 }
+3 -6
src/applications/meta/controller/PhabricatorApplicationUninstallController.php
··· 36 36 if ($selected->canUninstall()) { 37 37 $dialog->setTitle('Confirmation') 38 38 ->appendChild( 39 - 'Install '. $selected->getName(). ' application ?' 40 - ) 39 + 'Install '. $selected->getName(). ' application ?') 41 40 ->addSubmitButton('Install'); 42 41 43 42 } else { ··· 48 47 if ($selected->canUninstall()) { 49 48 $dialog->setTitle('Confirmation') 50 49 ->appendChild( 51 - 'Really Uninstall '. $selected->getName(). ' application ?' 52 - ) 50 + 'Really Uninstall '. $selected->getName(). ' application ?') 53 51 ->addSubmitButton('Uninstall'); 54 52 } else { 55 53 $dialog->setTitle('Information') 56 54 ->appendChild( 57 55 'This application cannot be uninstalled, 58 - because it is required for Phabricator to work.' 59 - ); 56 + because it is required for Phabricator to work.'); 60 57 } 61 58 } 62 59 return id(new AphrontDialogResponse())->setDialog($dialog);
+1 -2
src/applications/meta/controller/PhabricatorApplicationsListController.php
··· 39 39 array( 40 40 'title' => $title, 41 41 'device' => true, 42 - ) 43 - ); 42 + )); 44 43 } 45 44 46 45
+1 -2
src/applications/metamta/adapter/PhabricatorMailImplementationPHPMailerAdapter.php
··· 76 76 $data, 77 77 $filename, 78 78 'base64', 79 - $mimetype 80 - ); 79 + $mimetype); 81 80 return $this; 82 81 } 83 82
+1 -2
src/applications/metamta/adapter/PhabricatorMailImplementationPHPMailerLiteAdapter.php
··· 55 55 $data, 56 56 $filename, 57 57 'base64', 58 - $mimetype 59 - ); 58 + $mimetype); 60 59 return $this; 61 60 } 62 61
+1 -2
src/applications/metamta/controller/PhabricatorMetaMTAReceivedListController.php
··· 20 20 21 21 $phids = array_merge( 22 22 mpull($mails, 'getAuthorPHID'), 23 - mpull($mails, 'getRelatedPHID') 24 - ); 23 + mpull($mails, 'getRelatedPHID')); 25 24 $phids = array_unique(array_filter($phids)); 26 25 27 26 $handles = $this->loadViewerHandles($phids);
+8 -4
src/applications/metamta/controller/PhabricatorMetaMTASendController.php
··· 76 76 'deliver outbound email. This completely disables outbound email! '. 77 77 'All outbound email will be thrown in a deep, dark hole until you '. 78 78 'configure a real adapter.', 79 - phutil_tag('tt', array(), 'PhabricatorMailImplementationTestAdapter')) 80 - )); 79 + phutil_tag( 80 + 'tt', 81 + array(), 82 + 'PhabricatorMailImplementationTestAdapter')))); 81 83 } 82 84 83 85 $phdlink_href = PhabricatorEnv::getDoclink( ··· 123 125 ->setName('mailtags') 124 126 ->setCaption(pht( 125 127 'Example: %s', 126 - phutil_tag('tt', array(), 'differential-cc, differential-comment')) 127 - )) 128 + phutil_tag( 129 + 'tt', 130 + array(), 131 + 'differential-cc, differential-comment')))) 128 132 ->appendChild( 129 133 id(new AphrontFormDragAndDropUploadControl()) 130 134 ->setLabel(pht('Attach Files'))
+1 -2
src/applications/metamta/replyhandler/PhabricatorMailReplyHandler.php
··· 39 39 PhabricatorObjectHandle $handle); 40 40 public function getReplyHandlerDomain() { 41 41 return PhabricatorEnv::getEnvConfig( 42 - 'metamta.reply-handler-domain' 43 - ); 42 + 'metamta.reply-handler-domain'); 44 43 } 45 44 abstract public function getReplyHandlerInstructions(); 46 45 abstract protected function receiveEmail(
+1 -2
src/applications/metamta/storage/PhabricatorMetaMTAMail.php
··· 424 424 $mailer->addAttachment( 425 425 $attachment->getData(), 426 426 $attachment->getFilename(), 427 - $attachment->getMimeType() 428 - ); 427 + $attachment->getMimeType()); 429 428 } 430 429 break; 431 430 case 'body':
+3 -6
src/applications/metamta/storage/PhabricatorMetaMTAReceivedMail.php
··· 50 50 private function loadExcludeMailRecipientPHIDs() { 51 51 $addresses = array_merge( 52 52 $this->getToAddresses(), 53 - $this->getCCAddresses() 54 - ); 53 + $this->getCCAddresses()); 55 54 56 55 return $this->loadPHIDsFromAddresses($addresses); 57 56 } ··· 173 172 if ($message_id_hash) { 174 173 $messages = $this->loadAllWhere( 175 174 'messageIDHash = %s', 176 - $message_id_hash 177 - ); 175 + $message_id_hash); 178 176 $messages_count = count($messages); 179 177 if ($messages_count > 1) { 180 178 $first_message = reset($messages); ··· 183 181 'Ignoring email with message id hash "%s" that has been seen %d '. 184 182 'times, including this message.', 185 183 $message_id_hash, 186 - $messages_count 187 - ); 184 + $messages_count); 188 185 return $this->setMessage($message)->save(); 189 186 } 190 187 }
+1 -2
src/applications/oauthserver/PhabricatorOAuthServer.php
··· 193 193 // check if the scope includes "offline_access", which makes the 194 194 // token valid despite being expired 195 195 if (isset( 196 - $token_scope[PhabricatorOAuthServerScope::SCOPE_OFFLINE_ACCESS] 197 - )) { 196 + $token_scope[PhabricatorOAuthServerScope::SCOPE_OFFLINE_ACCESS])) { 198 197 $valid = true; 199 198 } 200 199 }
+1 -2
src/applications/oauthserver/PhabricatorOAuthServerScope.php
··· 29 29 $name = $scope, 30 30 $value = 1, 31 31 $label = self::getCheckboxLabel($scope), 32 - $checked = isset($current_scopes[$scope]) 33 - ); 32 + $checked = isset($current_scopes[$scope])); 34 33 } 35 34 $checkboxes->setLabel('Scope'); 36 35
+3 -6
src/applications/oauthserver/__tests__/PhabricatorOAuthServerTestCase.php
··· 18 18 $this->assertEqual( 19 19 $expected, 20 20 $result, 21 - "Validation of redirect URI '{$input}'" 22 - ); 21 + "Validation of redirect URI '{$input}'"); 23 22 } 24 23 } 25 24 ··· 41 40 $expected, 42 41 $server->validateSecondaryRedirectURI($uri, $primary_uri), 43 42 "Validation of redirect URI '{$input}' ". 44 - "relative to '{$primary_uri}'" 45 - ); 43 + "relative to '{$primary_uri}'"); 46 44 } 47 45 48 46 $primary_uri = new PhutilURI('http://www.google.com/?auth'); ··· 60 58 $expected, 61 59 $server->validateSecondaryRedirectURI($uri, $primary_uri), 62 60 "Validation of secondary redirect URI '{$input}' ". 63 - "relative to '{$primary_uri}'" 64 - ); 61 + "relative to '{$primary_uri}'"); 65 62 } 66 63 67 64 }
+11 -22
src/applications/oauthserver/controller/PhabricatorOAuthServerAuthController.php
··· 29 29 if (!$client_phid) { 30 30 $response->setError('invalid_request'); 31 31 $response->setErrorDescription( 32 - 'Required parameter client_id not specified.' 33 - ); 32 + 'Required parameter client_id not specified.'); 34 33 return $response; 35 34 } 36 35 $server->setUser($current_user); ··· 43 42 if (!$client) { 44 43 $response->setError('invalid_request'); 45 44 $response->setErrorDescription( 46 - 'Client with id '.$client_phid.' not found.' 47 - ); 45 + 'Client with id '.$client_phid.' not found.'); 48 46 return $response; 49 47 } 50 48 $server->setClient($client); ··· 58 56 'The specified redirect URI is invalid. The redirect URI '. 59 57 'must be a fully-qualified domain with no fragments and '. 60 58 'must have the same domain and at least the same query '. 61 - 'parameters as the redirect URI the client registered.' 62 - ); 59 + 'parameters as the redirect URI the client registered.'); 63 60 return $response; 64 61 } 65 62 $uri = $redirect_uri; ··· 73 70 if (empty($response_type)) { 74 71 $response->setError('invalid_request'); 75 72 $response->setErrorDescription( 76 - 'Required parameter response_type not specified.' 77 - ); 73 + 'Required parameter response_type not specified.'); 78 74 return $response; 79 75 } 80 76 if ($response_type != 'code') { ··· 82 78 $response->setErrorDescription( 83 79 'The authorization server does not support obtaining an '. 84 80 'authorization code using the specified response_type. '. 85 - 'You must specify the response_type as "code".' 86 - ); 81 + 'You must specify the response_type as "code".'); 87 82 return $response; 88 83 } 89 84 if ($scope) { 90 85 if (!PhabricatorOAuthServerScope::validateScopesList($scope)) { 91 86 $response->setError('invalid_scope'); 92 87 $response->setErrorDescription( 93 - 'The requested scope is invalid, unknown, or malformed.' 94 - ); 88 + 'The requested scope is invalid, unknown, or malformed.'); 95 89 return $response; 96 90 } 97 91 $scope = PhabricatorOAuthServerScope::scopesListToDict($scope); ··· 136 130 $response->setError('server_error'); 137 131 $response->setErrorDescription( 138 132 'The authorization server encountered an unexpected condition '. 139 - 'which prevented it from fulfilling the request. ' 140 - ); 133 + 'which prevented it from fulfilling the request. '); 141 134 return $response; 142 135 } 143 136 ··· 162 155 if (!PhabricatorOAuthServerScope::validateScopesDict($desired_scopes)) { 163 156 $response->setError('invalid_scope'); 164 157 $response->setErrorDescription( 165 - 'The requested scope is invalid, unknown, or malformed.' 166 - ); 158 + 'The requested scope is invalid, unknown, or malformed.'); 167 159 return $response; 168 160 } 169 161 } else { ··· 185 177 ->setUser($current_user) 186 178 ->appendChild( 187 179 id(new AphrontFormStaticControl()) 188 - ->setValue($description) 189 - ) 180 + ->setValue($description)) 190 181 ->appendChild( 191 - PhabricatorOAuthServerScope::getCheckboxControl($desired_scopes) 192 - ) 182 + PhabricatorOAuthServerScope::getCheckboxControl($desired_scopes)) 193 183 ->appendChild( 194 184 id(new AphrontFormSubmitControl()) 195 185 ->setValue('Authorize') 196 - ->addCancelButton($cancel_uri) 197 - ); 186 + ->addCancelButton($cancel_uri)); 198 187 199 188 $panel->appendChild($form); 200 189
+11 -22
src/applications/oauthserver/controller/PhabricatorOAuthServerTokenController.php
··· 22 22 if ($grant_type != 'authorization_code') { 23 23 $response->setError('unsupported_grant_type'); 24 24 $response->setErrorDescription( 25 - 'Only grant_type authorization_code is supported.' 26 - ); 25 + 'Only grant_type authorization_code is supported.'); 27 26 return $response; 28 27 } 29 28 if (!$code) { 30 29 $response->setError('invalid_request'); 31 30 $response->setErrorDescription( 32 - 'Required parameter code missing.' 33 - ); 31 + 'Required parameter code missing.'); 34 32 return $response; 35 33 } 36 34 if (!$client_phid) { 37 35 $response->setError('invalid_request'); 38 36 $response->setErrorDescription( 39 - 'Required parameter client_id missing.' 40 - ); 37 + 'Required parameter client_id missing.'); 41 38 return $response; 42 39 } 43 40 if (!$client_secret) { 44 41 $response->setError('invalid_request'); 45 42 $response->setErrorDescription( 46 - 'Required parameter client_secret missing.' 47 - ); 43 + 'Required parameter client_secret missing.'); 48 44 return $response; 49 45 } 50 46 // one giant try / catch around all the exciting database stuff so we ··· 56 52 if (!$auth_code) { 57 53 $response->setError('invalid_grant'); 58 54 $response->setErrorDescription( 59 - 'Authorization code '.$code.' not found.' 60 - ); 55 + 'Authorization code '.$code.' not found.'); 61 56 return $response; 62 57 } 63 58 ··· 72 67 $response->setError('invalid_grant'); 73 68 $response->setErrorDescription( 74 69 'Redirect uri in request must exactly match redirect uri '. 75 - 'from authorization code.' 76 - ); 70 + 'from authorization code.'); 77 71 return $response; 78 72 } 79 73 } else if ($redirect_uri) { 80 74 $response->setError('invalid_grant'); 81 75 $response->setErrorDescription( 82 76 'Redirect uri in request and no redirect uri in authorization '. 83 - 'code. The two must exactly match.' 84 - ); 77 + 'code. The two must exactly match.'); 85 78 return $response; 86 79 } 87 80 ··· 91 84 if (!$client) { 92 85 $response->setError('invalid_client'); 93 86 $response->setErrorDescription( 94 - 'Client with client_id '.$client_phid.' not found.' 95 - ); 87 + 'Client with client_id '.$client_phid.' not found.'); 96 88 return $response; 97 89 } 98 90 $server->setClient($client); ··· 103 95 if (!$user) { 104 96 $response->setError('invalid_grant'); 105 97 $response->setErrorDescription( 106 - 'User with phid '.$user_phid.' not found.' 107 - ); 98 + 'User with phid '.$user_phid.' not found.'); 108 99 return $response; 109 100 } 110 101 $server->setUser($user); ··· 117 108 if (!$is_good_code) { 118 109 $response->setError('invalid_grant'); 119 110 $response->setErrorDescription( 120 - 'Invalid authorization code '.$code.'.' 121 - ); 111 + 'Invalid authorization code '.$code.'.'); 122 112 return $response; 123 113 } 124 114 ··· 136 126 $response->setError('server_error'); 137 127 $response->setErrorDescription( 138 128 'The authorization server encountered an unexpected condition '. 139 - 'which prevented it from fulfilling the request.' 140 - ); 129 + 'which prevented it from fulfilling the request.'); 141 130 return $response; 142 131 } 143 132 }
+9 -18
src/applications/oauthserver/controller/client/PhabricatorOAuthClientEditController.php
··· 88 88 'Redirect URI must be a fully qualified domain name '. 89 89 'with no fragments. See '. 90 90 'http://tools.ietf.org/html/draft-ietf-oauth-v2-23#section-3.1.2 '. 91 - 'for more information on the correct format.' 92 - ); 91 + 'for more information on the correct format.'); 93 92 $bad_redirect = true; 94 93 } else { 95 94 $client->save(); ··· 124 123 id(new AphrontFormTextControl()) 125 124 ->setLabel('Name') 126 125 ->setName('name') 127 - ->setValue($client->getName()) 128 - ); 126 + ->setValue($client->getName())); 129 127 if ($this->isClientEdit()) { 130 128 $form 131 129 ->appendChild( 132 130 id(new AphrontFormTextControl()) 133 131 ->setLabel('ID') 134 - ->setValue($phid) 135 - ) 132 + ->setValue($phid)) 136 133 ->appendChild( 137 134 id(new AphrontFormStaticControl()) 138 135 ->setLabel('Secret') 139 - ->setValue($client->getSecret()) 140 - ); 136 + ->setValue($client->getSecret())); 141 137 } 142 138 $form 143 139 ->appendChild( ··· 145 141 ->setLabel('Redirect URI') 146 142 ->setName('redirect_uri') 147 143 ->setValue($client->getRedirectURI()) 148 - ->setError($bad_redirect) 149 - ); 144 + ->setError($bad_redirect)); 150 145 if ($this->isClientEdit()) { 151 146 $created = phabricator_datetime($client->getDateCreated(), 152 147 $current_user); ··· 156 151 ->appendChild( 157 152 id(new AphrontFormStaticControl()) 158 153 ->setLabel('Created') 159 - ->setValue($created) 160 - ) 154 + ->setValue($created)) 161 155 ->appendChild( 162 156 id(new AphrontFormStaticControl()) 163 157 ->setLabel('Last Updated') 164 - ->setValue($updated) 165 - ); 158 + ->setValue($updated)); 166 159 } 167 160 $form 168 161 ->appendChild( 169 162 id(new AphrontFormSubmitControl()) 170 - ->setValue($submit_button) 171 - ); 163 + ->setValue($submit_button)); 172 164 173 165 $panel->appendChild($form); 174 166 return $this->buildStandardPageResponse( 175 167 array($error, 176 168 $panel 177 169 ), 178 - array('title' => $title) 179 - ); 170 + array('title' => $title)); 180 171 } 181 172 182 173 }
+5 -10
src/applications/oauthserver/controller/client/PhabricatorOAuthClientListController.php
··· 36 36 array( 37 37 'href' => $client->getViewURI(), 38 38 ), 39 - $client->getName() 40 - ), 39 + $client->getName()), 41 40 $client->getPHID(), 42 41 $client->getSecret(), 43 42 phutil_tag( ··· 45 44 array( 46 45 'href' => $client->getRedirectURI(), 47 46 ), 48 - $client->getRedirectURI() 49 - ), 47 + $client->getRedirectURI()), 50 48 phutil_tag( 51 49 'a', 52 50 array( 53 51 'class' => 'small button grey', 54 52 'href' => $client->getEditURI(), 55 53 ), 56 - 'Edit' 57 - ), 54 + 'Edit'), 58 55 ); 59 56 60 57 $rows[] = $row; ··· 72 69 $this->getNoticeView(), 73 70 $panel->appendChild($pager) 74 71 ), 75 - array('title' => $title) 76 - ); 72 + array('title' => $title)); 77 73 } 78 74 79 75 private function buildClientList($rows, $rowc, $title) { ··· 97 93 )); 98 94 if (empty($rows)) { 99 95 $table->setNoDataString( 100 - 'You have not created any clients for this OAuthServer.' 101 - ); 96 + 'You have not created any clients for this OAuthServer.'); 102 97 } 103 98 104 99 $panel = new AphrontPanelView();
+9 -18
src/applications/oauthserver/controller/client/PhabricatorOAuthClientViewController.php
··· 33 33 $message = 'No client found with id '.$phid.'.'; 34 34 return $this->buildStandardPageResponse( 35 35 $this->buildErrorView($message), 36 - array('title' => $title) 37 - ); 36 + array('title' => $title)); 38 37 } 39 38 40 39 $panel = new AphrontPanelView(); ··· 45 44 ->appendChild( 46 45 id(new AphrontFormStaticControl()) 47 46 ->setLabel('Name') 48 - ->setValue($client->getName()) 49 - ) 47 + ->setValue($client->getName())) 50 48 ->appendChild( 51 49 id(new AphrontFormStaticControl()) 52 50 ->setLabel('ID') 53 - ->setValue($phid) 54 - ); 51 + ->setValue($phid)); 55 52 if ($current_user->getPHID() == $client->getCreatorPHID()) { 56 53 $form 57 54 ->appendChild( 58 55 id(new AphrontFormStaticControl()) 59 56 ->setLabel('Secret') 60 - ->setValue($client->getSecret()) 61 - ); 57 + ->setValue($client->getSecret())); 62 58 } 63 59 $form 64 60 ->appendChild( 65 61 id(new AphrontFormStaticControl()) 66 62 ->setLabel('Redirect URI') 67 - ->setValue($client->getRedirectURI()) 68 - ); 63 + ->setValue($client->getRedirectURI())); 69 64 $created = phabricator_datetime($client->getDateCreated(), 70 65 $current_user); 71 66 $updated = phabricator_datetime($client->getDateModified(), ··· 74 69 ->appendChild( 75 70 id(new AphrontFormStaticControl()) 76 71 ->setLabel('Created') 77 - ->setValue($created) 78 - ) 72 + ->setValue($created)) 79 73 ->appendChild( 80 74 id(new AphrontFormStaticControl()) 81 75 ->setLabel('Last Updated') 82 - ->setValue($updated) 83 - ); 76 + ->setValue($updated)); 84 77 $panel->appendChild($form); 85 78 $admin_panel = null; 86 79 if ($client->getCreatorPHID() == $current_user->getPHID()) { ··· 100 93 ->setAction('/oauthserver/test/') 101 94 ->appendChild( 102 95 id(new AphrontFormSubmitControl()) 103 - ->setValue('Create Scopeless Test Authorization') 104 - ); 96 + ->setValue('Create Scopeless Test Authorization')); 105 97 $admin_panel = id(new AphrontPanelView()) 106 98 ->setHeader('Admin Tools') 107 99 ->appendChild($create_authorization_form); ··· 112 104 $panel, 113 105 $admin_panel 114 106 ), 115 - array('title' => $title) 116 - ); 107 + array('title' => $title)); 117 108 } 118 109 }
+6 -13
src/applications/oauthserver/controller/clientauthorization/PhabricatorOAuthClientAuthorizationEditController.php
··· 66 66 array( 67 67 'href' => $client->getViewURI(), 68 68 ), 69 - $client->getName())) 70 - ) 69 + $client->getName()))) 71 70 ->appendChild( 72 71 id(new AphrontFormStaticControl()) 73 72 ->setLabel('Created') 74 - ->setValue($created) 75 - ) 73 + ->setValue($created)) 76 74 ->appendChild( 77 75 id(new AphrontFormStaticControl()) 78 76 ->setLabel('Last Updated') 79 - ->setValue($updated) 80 - ) 77 + ->setValue($updated)) 81 78 ->appendChild( 82 79 PhabricatorOAuthServerScope::getCheckboxControl( 83 - $authorization->getScope() 84 - ) 85 - ) 80 + $authorization->getScope())) 86 81 ->appendChild( 87 82 id(new AphrontFormSubmitControl()) 88 83 ->setValue('Save OAuth Client Authorization') 89 - ->addCancelButton('/oauthserver/clientauthorization/') 90 - ); 84 + ->addCancelButton('/oauthserver/clientauthorization/')); 91 85 92 86 $panel->appendChild($form); 93 87 return $this->buildStandardPageResponse( 94 88 $panel, 95 - array('title' => $title) 96 - ); 89 + array('title' => $title)); 97 90 } 98 91 }
+8 -16
src/applications/oauthserver/controller/clientauthorization/PhabricatorOAuthClientAuthorizationListController.php
··· 47 47 $updated = phabricator_datetime($authorization->getDateModified(), 48 48 $current_user); 49 49 $scope_doc_href = PhabricatorEnv::getDoclink( 50 - 'article/Using_the_Phabricator_OAuth_Server.html#scopes' 51 - ); 50 + 'article/Using_the_Phabricator_OAuth_Server.html#scopes'); 52 51 $row = array( 53 52 phutil_tag( 54 53 'a', 55 54 array( 56 55 'href' => $client->getViewURI(), 57 56 ), 58 - $client->getName() 59 - ), 57 + $client->getName()), 60 58 phutil_tag( 61 59 'a', 62 60 array( 63 61 'href' => $scope_doc_href, 64 62 ), 65 - $authorization->getScopeString() 66 - ), 63 + $authorization->getScopeString()), 67 64 phabricator_datetime( 68 65 $authorization->getDateCreated(), 69 - $current_user 70 - ), 66 + $current_user), 71 67 phabricator_datetime( 72 68 $authorization->getDateModified(), 73 - $current_user 74 - ), 69 + $current_user), 75 70 phutil_tag( 76 71 'a', 77 72 array( 78 73 'class' => 'small button grey', 79 74 'href' => $authorization->getEditURI(), 80 75 ), 81 - 'Edit' 82 - ), 76 + 'Edit'), 83 77 ); 84 78 85 79 $rows[] = $row; ··· 97 91 $this->getNoticeView(), 98 92 $panel->appendChild($pager), 99 93 ), 100 - array('title' => $title) 101 - ); 94 + array('title' => $title)); 102 95 } 103 96 104 97 private function buildClientAuthorizationList($rows, $rowc, $title) { ··· 122 115 )); 123 116 if (empty($rows)) { 124 117 $table->setNoDataString( 125 - 'You have not authorized any clients for this OAuthServer.' 126 - ); 118 + 'You have not authorized any clients for this OAuthServer.'); 127 119 } 128 120 129 121 $panel = new AphrontPanelView();
+1 -2
src/applications/paste/controller/PhabricatorPasteEditController.php
··· 158 158 array( 159 159 'href' => $this->getApplicationURI('?parent='.$paste->getID()) 160 160 ), 161 - pht('Fork') 162 - ); 161 + pht('Fork')); 163 162 $form 164 163 ->appendChild( 165 164 id(new AphrontFormMarkupControl())
+1 -2
src/applications/paste/controller/PhabricatorPasteListController.php
··· 66 66 array( 67 67 'title' => $title, 68 68 'device' => true, 69 - ) 70 - ); 69 + )); 71 70 } 72 71 73 72 private function buildPasteList(array $pastes) {
+2 -2
src/applications/people/controller/PhabricatorPeopleLogsController.php
··· 154 154 $rows = array(); 155 155 foreach ($logs as $log) { 156 156 $rows[] = array( 157 - phabricator_date($log->getDateCreated(),$user), 158 - phabricator_time($log->getDateCreated(),$user), 157 + phabricator_date($log->getDateCreated(), $user), 158 + phabricator_time($log->getDateCreated(), $user), 159 159 $log->getAction(), 160 160 $log->getActorPHID() ? $handles[$log->getActorPHID()]->getName() : null, 161 161 $handles[$log->getUserPHID()]->getName(),
+4 -8
src/applications/people/controller/PhabricatorPeopleProfileController.php
··· 94 94 ->setIsExternal(true) 95 95 ->setName($name) 96 96 ->setHref($href) 97 - ->setType(PhabricatorMenuItemView::TYPE_LINK) 98 - ); 97 + ->setType(PhabricatorMenuItemView::TYPE_LINK)); 99 98 } 100 99 } 101 100 ··· 149 148 $nav->addFilter( 150 149 null, 151 150 pht('Edit Profile...'), 152 - '/settings/panel/profile/' 153 - ); 151 + '/settings/panel/profile/'); 154 152 } 155 153 156 154 if ($viewer->getIsAdmin()) { 157 155 $nav->addFilter( 158 156 null, 159 157 pht('Administrate User...'), 160 - '/people/edit/'.$user->getID().'/' 161 - ); 158 + '/people/edit/'.$user->getID().'/'); 162 159 } 163 160 164 161 return $this->buildApplicationPage( ··· 172 169 173 170 $blurb = nonempty( 174 171 $profile->getBlurb(), 175 - '//'.pht('Nothing is known about this rare specimen.').'//' 176 - ); 172 + '//'.pht('Nothing is known about this rare specimen.').'//'); 177 173 178 174 $engine = PhabricatorMarkupEngine::newProfileMarkupEngine(); 179 175 $blurb = $engine->markupText($blurb);
+4 -8
src/applications/phame/controller/blog/PhameBlogEditController.php
··· 114 114 ->setName('name') 115 115 ->setValue($blog->getName()) 116 116 ->setID('blog-name') 117 - ->setError($e_name) 118 - ) 117 + ->setError($e_name)) 119 118 ->appendChild( 120 119 id(new PhabricatorRemarkupControl()) 121 120 ->setLabel('Description') ··· 151 150 ->setName('custom_domain') 152 151 ->setValue($blog->getDomain()) 153 152 ->setCaption('Must include at least one dot (.), e.g. blog.example.com') 154 - ->setError($e_custom_domain) 155 - ) 153 + ->setError($e_custom_domain)) 156 154 ->appendChild( 157 155 id(new AphrontFormSelectControl()) 158 156 ->setLabel('Skin') 159 157 ->setName('skin') 160 158 ->setValue($blog->getSkin()) 161 - ->setOptions($skins) 162 - ) 159 + ->setOptions($skins)) 163 160 ->appendChild( 164 161 id(new AphrontFormSubmitControl()) 165 162 ->addCancelButton($cancel_uri) 166 - ->setValue($submit_button) 167 - ); 163 + ->setValue($submit_button)); 168 164 169 165 if ($errors) { 170 166 $error_view = id(new AphrontErrorView())
+5 -10
src/applications/phame/controller/post/PhamePostEditController.php
··· 112 112 ->setName('title') 113 113 ->setValue($post->getTitle()) 114 114 ->setID('post-title') 115 - ->setError($e_title) 116 - ) 115 + ->setError($e_title)) 117 116 ->appendChild( 118 117 id(new AphrontFormTextControl()) 119 118 ->setLabel('Phame Title') ··· 123 122 ->setCaption('Up to 64 alphanumeric characters '. 124 123 'with underscores for spaces. '. 125 124 'Formatting is enforced.') 126 - ->setError($e_phame_title) 127 - ) 125 + ->setError($e_phame_title)) 128 126 ->appendChild( 129 127 id(new PhabricatorRemarkupControl()) 130 128 ->setLabel('Body') ··· 133 131 ->setHeight(AphrontFormTextAreaControl::HEIGHT_VERY_TALL) 134 132 ->setID('post-body') 135 133 ->setUser($user) 136 - ->setDisableMacros(true) 137 - ) 134 + ->setDisableMacros(true)) 138 135 ->appendChild( 139 136 id(new AphrontFormSelectControl()) 140 137 ->setLabel('Comments Widget') 141 138 ->setName('comments_widget') 142 139 ->setvalue($post->getCommentsWidget()) 143 - ->setOptions($post->getCommentsWidgetOptionsForSelect()) 144 - ) 140 + ->setOptions($post->getCommentsWidgetOptionsForSelect())) 145 141 ->appendChild( 146 142 id(new AphrontFormSubmitControl()) 147 143 ->addCancelButton($cancel_uri) 148 - ->setValue($submit_button) 149 - ); 144 + ->setValue($submit_button)); 150 145 151 146 $preview_panel = hsprintf( 152 147 '<div class="aphront-panel-preview">
+1 -2
src/applications/phame/skins/PhameBasicTemplateBlogSkin.php
··· 93 93 protected function renderHeader() { 94 94 return $this->renderTemplate( 95 95 'header.php', 96 - array() 97 - ); 96 + array()); 98 97 } 99 98 100 99 protected function renderFooter() {
+1 -2
src/applications/phame/storage/PhameBlog.php
··· 104 104 105 105 $this->bloggerPHIDs = PhabricatorEdgeQuery::loadDestinationPHIDs( 106 106 $this->getPHID(), 107 - PhabricatorEdgeConfig::TYPE_BLOG_HAS_BLOGGER 108 - ); 107 + PhabricatorEdgeConfig::TYPE_BLOG_HAS_BLOGGER); 109 108 110 109 return $this; 111 110 }
+1 -2
src/applications/phame/view/PhamePostView.php
··· 208 208 $disqus_thread = phutil_tag('div', 209 209 array( 210 210 'id' => 'disqus_thread' 211 - ) 212 - ); 211 + )); 213 212 214 213 // protip - try some var disqus_developer = 1; action to test locally 215 214 $disqus_js = hsprintf(
+1 -1
src/applications/phid/conduit/ConduitAPI_phid_lookup_Method.php
··· 33 33 $phids[$name] = $phid; 34 34 } 35 35 } 36 - 36 + 37 37 $handles = id(new PhabricatorObjectHandleData($phids)) 38 38 ->loadHandles(); 39 39 $result = array();
+2 -4
src/applications/pholio/controller/PholioInlineController.php
··· 17 17 18 18 $inline_comments = id(new PholioTransactionComment())->loadAllWhere( 19 19 'imageid = %d AND transactionphid IS NOT NULL', 20 - $this->id 21 - ); 20 + $this->id); 22 21 23 22 $inline_comments = array_merge( 24 23 $inline_comments, ··· 31 30 foreach ($inline_comments as $inline_comment) { 32 31 $author = id(new PhabricatorUser())->loadOneWhere( 33 32 'phid = %s', 34 - $inline_comment->getAuthorPHID() 35 - ); 33 + $inline_comment->getAuthorPHID()); 36 34 $inlines[] = array( 37 35 'phid' => $inline_comment->getPHID(), 38 36 'userphid' => $author->getPHID(),
+1 -2
src/applications/pholio/controller/PholioMockCommentController.php
··· 53 53 $inlineComments = id(new PholioTransactionComment())->loadAllWhere( 54 54 'authorphid = %s AND transactionphid IS NULL AND imageid IN (%Ld)', 55 55 $user->getPHID(), 56 - mpull($mock->getImages(), 'getID') 57 - ); 56 + mpull($mock->getImages(), 'getID')); 58 57 59 58 foreach ($inlineComments as $inlineComment) { 60 59 $xactions[] = id(new PholioTransaction())
+1 -2
src/applications/pholio/controller/PholioMockListController.php
··· 60 60 $crumbs->addCrumb( 61 61 id(new PhabricatorCrumbView()) 62 62 ->setName($title) 63 - ->setHref($this->getApplicationURI()) 64 - ); 63 + ->setHref($this->getApplicationURI())); 65 64 $nav->setCrumbs($crumbs); 66 65 67 66 return $this->buildApplicationPage(
+1 -2
src/applications/pholio/controller/PholioMockViewController.php
··· 78 78 $crumbs->addCrumb( 79 79 id(new PhabricatorCrumbView()) 80 80 ->setName($title) 81 - ->setHref($this->getApplicationURI().'M'.$this->id) 82 - ); 81 + ->setHref($this->getApplicationURI().'M'.$this->id)); 83 82 84 83 $content = array( 85 84 $crumbs,
+1 -2
src/applications/pholio/view/PholioMockImagesView.php
··· 44 44 'sigil' => 'mock-wrapper', 45 45 'class' => 'pholio-mock-wrapper' 46 46 ), 47 - $main_image_tag 48 - ); 47 + $main_image_tag); 49 48 50 49 51 50 $inline_comments_holder = javelin_tag(
+2 -4
src/applications/phortune/stripe/controller/PhortuneStripeTestPaymentFormController.php
··· 69 69 ), 70 70 array( 71 71 'title' => $title, 72 - ) 73 - ); 72 + )); 74 73 } 75 74 76 75 /** ··· 120 119 $error = sprintf( 121 120 'error_type: %s error_message: %s', 122 121 $type, 123 - $msg 124 - ); 122 + $msg); 125 123 $this->logStripeError($error); 126 124 break; 127 125 }
+9 -23
src/applications/phortune/stripe/view/PhortuneStripePaymentFormView.php
··· 61 61 'Discover, JCB, and Diners Club.', 62 62 'size' => 440, 63 63 ) 64 - ) 65 - ) 66 - ) 67 - ) 64 + )))) 68 65 ->appendChild( 69 66 id(new AphrontFormTextControl()) 70 67 ->setLabel('Card Number') 71 68 ->setDisableAutocomplete(true) 72 69 ->setSigil('number-input') 73 - ->setError($this->getCardNumberError()) 74 - ) 70 + ->setError($this->getCardNumberError())) 75 71 ->appendChild( 76 72 id(new AphrontFormTextControl()) 77 73 ->setLabel('CVC') 78 74 ->setDisableAutocomplete(true) 79 75 ->setSigil('cvc-input') 80 - ->setError($this->getCardCVCError()) 81 - ) 76 + ->setError($this->getCardCVCError())) 82 77 ->appendChild( 83 78 id(new PhortuneMonthYearExpiryControl()) 84 79 ->setLabel('Expiration') 85 80 ->setUser($this->getUser()) 86 - ->setError($this->getCardExpirationError()) 87 - ) 81 + ->setError($this->getCardExpirationError())) 88 82 ->appendChild( 89 83 javelin_tag( 90 84 'input', ··· 92 86 'hidden' => true, 93 87 'name' => 'stripeToken', 94 88 'sigil' => 'stripe-token-input', 95 - ) 96 - ) 97 - ) 89 + ))) 98 90 ->appendChild( 99 91 javelin_tag( 100 92 'input', ··· 102 94 'hidden' => true, 103 95 'name' => 'cardErrors', 104 96 'sigil' => 'card-errors-input' 105 - ) 106 - ) 107 - ) 97 + ))) 108 98 ->appendChild( 109 99 phutil_tag( 110 100 'input', ··· 112 102 'hidden' => true, 113 103 'name' => 'stripeKey', 114 104 'value' => $this->getStripeKey(), 115 - ) 116 - ) 117 - ) 105 + ))) 118 106 ->appendChild( 119 107 id(new AphrontFormSubmitControl()) 120 - ->setValue('Submit Payment') 121 - ); 108 + ->setValue('Submit Payment')); 122 109 123 110 Javelin::initBehavior( 124 111 'stripe-payment-form', 125 112 array( 126 113 'stripePublishKey' => $this->getStripeKey(), 127 114 'root' => $form_id, 128 - ) 129 - ); 115 + )); 130 116 131 117 return $form->render(); 132 118 }
+2 -4
src/applications/ponder/controller/PonderFeedController.php
··· 62 62 $user, 63 63 $user->getPHID(), 64 64 $this->answerOffset, 65 - self::PROFILE_ANSWER_PAGE_SIZE + 1 66 - ); 65 + self::PROFILE_ANSWER_PAGE_SIZE + 1); 67 66 68 67 $side_nav->appendChild( 69 68 id(new PonderUserProfileView()) ··· 71 70 ->setAnswers($answers) 72 71 ->setAnswerOffset($this->answerOffset) 73 72 ->setPageSize(self::PROFILE_ANSWER_PAGE_SIZE) 74 - ->setURI(new PhutilURI("/ponder/profile/"), "aoff") 75 - ); 73 + ->setURI(new PhutilURI("/ponder/profile/"), "aoff")); 76 74 break; 77 75 } 78 76
+1 -2
src/applications/ponder/controller/PonderQuestionAskController.php
··· 107 107 array( 108 108 'device' => true, 109 109 'title' => 'Ask a Question', 110 - ) 111 - ); 110 + )); 112 111 } 113 112 114 113 }
+2 -4
src/applications/ponder/editor/PonderAnswerEditor.php
··· 59 59 60 60 $content = $answer->getContent(); 61 61 $at_mention_phids = PhabricatorMarkupEngine::extractPHIDsFromMentions( 62 - array($content) 63 - ); 62 + array($content)); 64 63 $subeditor->subscribeImplicit($at_mention_phids); 65 64 $subeditor->save(); 66 65 ··· 83 82 $other_subs = 84 83 array_diff( 85 84 $subscribers, 86 - $at_mention_phids 87 - ); 85 + $at_mention_phids); 88 86 89 87 // 'Answered' emails for subscribers who are not @mentiond (and excluding 90 88 // author depending on their MetaMTA settings).
+2 -4
src/applications/ponder/editor/PonderCommentEditor.php
··· 51 51 52 52 $content = $comment->getContent(); 53 53 $at_mention_phids = PhabricatorMarkupEngine::extractPHIDsFromMentions( 54 - array($content) 55 - ); 54 + array($content)); 56 55 $subeditor->subscribeImplicit($at_mention_phids); 57 56 $subeditor->save(); 58 57 ··· 86 85 $other_subs = 87 86 array_diff( 88 87 array_intersect($thread, $subscribers), 89 - $at_mention_phids 90 - ); 88 + $at_mention_phids); 91 89 92 90 // 'Comment' emails for subscribers who are in the same comment thread, 93 91 // including the author of the parent question and/or answer, excluding
+1 -2
src/applications/ponder/editor/PonderQuestionEditor.php
··· 37 37 38 38 $content = $question->getContent(); 39 39 $at_mention_phids = PhabricatorMarkupEngine::extractPHIDsFromMentions( 40 - array($content) 41 - ); 40 + array($content)); 42 41 $subeditor->subscribeImplicit($at_mention_phids); 43 42 $subeditor->save(); 44 43
+2 -4
src/applications/ponder/search/PonderSearchIndexer.php
··· 33 33 foreach ($comments as $curcomment) { 34 34 $doc->addField( 35 35 PhabricatorSearchField::FIELD_COMMENT, 36 - $curcomment->getContent() 37 - ); 36 + $curcomment->getContent()); 38 37 } 39 38 40 39 $answers = $question->getAnswers(); ··· 49 48 foreach ($answer_comments as $curcomment) { 50 49 $doc->addField( 51 50 PhabricatorSearchField::FIELD_COMMENT, 52 - $curcomment->getContent() 53 - ); 51 + $curcomment->getContent()); 54 52 } 55 53 } 56 54
+1 -2
src/applications/ponder/view/PonderQuestionSummaryView.php
··· 50 50 "href" => '/Q' . $question->getID(), 51 51 ), 52 52 'Q' . $question->getID() . 53 - ' ' . $question->getTitle() 54 - )); 53 + ' ' . $question->getTitle())); 55 54 56 55 $rhs = hsprintf( 57 56 '<div class="ponder-metadata">'.
+1 -2
src/applications/ponder/view/PonderUserProfileView.php
··· 67 67 $href = id(new PhutilURI('/Q' . $question->getID())) 68 68 ->setFragment('A' . $answer->getID()); 69 69 $item->setHeader( 70 - 'A'.$answer->getID().' '.self::abbreviate($answer->getContent()) 71 - ); 70 + 'A'.$answer->getID().' '.self::abbreviate($answer->getContent())); 72 71 $item->setHref($href); 73 72 74 73 $item->addAttribute(
+1 -2
src/applications/project/controller/PhabricatorProjectCreateController.php
··· 118 118 $crumbs->addCrumb( 119 119 id(new PhabricatorCrumbView()) 120 120 ->setName(pht('Create Project')) 121 - ->setHref($this->getApplicationURI().'create/') 122 - ); 121 + ->setHref($this->getApplicationURI().'create/')); 123 122 124 123 return $this->buildApplicationPage( 125 124 array(
+1 -2
src/applications/project/controller/PhabricatorProjectListController.php
··· 137 137 $crumbs->addCrumb( 138 138 id(new PhabricatorCrumbView()) 139 139 ->setName($table_header) 140 - ->setHref($this->getApplicationURI()) 141 - ); 140 + ->setHref($this->getApplicationURI())); 142 141 $nav->setCrumbs($crumbs); 143 142 144 143 return $this->buildApplicationPage(
+2 -4
src/applications/project/controller/PhabricatorProjectMembersEditController.php
··· 124 124 $crumbs->addCrumb( 125 125 id(new PhabricatorCrumbView()) 126 126 ->setName($project->getName()) 127 - ->setHref('/project/view/'.$project->getID().'/') 128 - ); 127 + ->setHref('/project/view/'.$project->getID().'/')); 129 128 $crumbs->addCrumb( 130 129 id(new PhabricatorCrumbView()) 131 130 ->setName(pht('Edit Members')) 132 - ->setHref($this->getApplicationURI()) 133 - ); 131 + ->setHref($this->getApplicationURI())); 134 132 $nav->setCrumbs($crumbs); 135 133 136 134 return $this->buildApplicationPage(
+2 -4
src/applications/project/controller/PhabricatorProjectProfileEditController.php
··· 237 237 $crumbs->addCrumb( 238 238 id(new PhabricatorCrumbView()) 239 239 ->setName($project->getName()) 240 - ->setHref('/project/view/'.$project->getID().'/') 241 - ); 240 + ->setHref('/project/view/'.$project->getID().'/')); 242 241 $crumbs->addCrumb( 243 242 id(new PhabricatorCrumbView()) 244 243 ->setName(pht('Edit Project')) 245 - ->setHref($this->getApplicationURI()) 246 - ); 244 + ->setHref($this->getApplicationURI())); 247 245 $nav->setCrumbs($crumbs); 248 246 249 247 return $this->buildApplicationPage(
+1 -2
src/applications/repository/search/PhabricatorRepositoryCommitSearchIndexer.php
··· 49 49 50 50 $project_phids = PhabricatorEdgeQuery::loadDestinationPHIDs( 51 51 $commit->getPHID(), 52 - PhabricatorEdgeConfig::TYPE_COMMIT_HAS_PROJECT 53 - ); 52 + PhabricatorEdgeConfig::TYPE_COMMIT_HAS_PROJECT); 54 53 if ($project_phids) { 55 54 foreach ($project_phids as $project_phid) { 56 55 $doc->addRelationship(
+1 -2
src/applications/search/controller/PhabricatorSearchController.php
··· 115 115 $query->getParameter('author', array()), 116 116 $query->getParameter('owner', array()), 117 117 $query->getParameter('subscribers', array()), 118 - $query->getParameter('project', array()) 119 - ); 118 + $query->getParameter('project', array())); 120 119 121 120 $handles = $this->loadViewerHandles($phids); 122 121
+1 -2
src/applications/search/management/PhabricatorSearchManagementIndexWorkflow.php
··· 40 40 'name' => 'objects', 41 41 'wildcard' => true, 42 42 ), 43 - ) 44 - ); 43 + )); 45 44 } 46 45 47 46 public function execute(PhutilArgumentParser $args) {
+1 -2
src/applications/settings/panel/PhabricatorSettingsPanelEmailPreferences.php
··· 175 175 'adding CCs to a task, closing it, and adding a comment) you will '. 176 176 'still receive an email as long as at least one of the changes '. 177 177 'is set to notify you.'. 178 - '</p>' 179 - )); 178 + '</p>')); 180 179 181 180 $mailtags = $preferences->getPreference('mailtags', array()); 182 181
+5 -10
src/applications/settings/panel/PhabricatorSettingsPanelOAuth.php
··· 110 110 ->appendChild( 111 111 id(new AphrontFormStaticControl()) 112 112 ->setLabel($provider_name.' ID') 113 - ->setValue($oauth_info->getOAuthUID()) 114 - ) 113 + ->setValue($oauth_info->getOAuthUID())) 115 114 ->appendChild( 116 115 id(new AphrontFormStaticControl()) 117 116 ->setLabel($provider_name.' Name') 118 - ->setValue($oauth_info->getAccountName()) 119 - ) 117 + ->setValue($oauth_info->getAccountName())) 120 118 ->appendChild( 121 119 id(new AphrontFormStaticControl()) 122 120 ->setLabel($provider_name.' URI') 123 - ->setValue($oauth_info->getAccountURI()) 124 - ); 121 + ->setValue($oauth_info->getAccountURI())); 125 122 126 123 if (!$expires || $expires > time()) { 127 124 $form->appendChild( 128 125 id(new AphrontFormSubmitControl()) 129 - ->setValue('Refresh Profile Image from '.$provider_name) 130 - ); 126 + ->setValue('Refresh Profile Image from '.$provider_name)); 131 127 } 132 128 133 129 if (!$provider->isProviderLinkPermanent()) { ··· 202 198 $token_form 203 199 ->appendChild( 204 200 id(new AphrontFormSubmitControl()) 205 - ->setValue('Refresh '.$provider_name.' Token') 206 - ); 201 + ->setValue('Refresh '.$provider_name.' Token')); 207 202 } 208 203 209 204 $forms['Account Token Information'] = $token_form;
+1 -2
src/applications/settings/panel/PhabricatorSettingsPanelSearchPreferences.php
··· 45 45 ->addCheckbox($pref_shortcut, 46 46 1, 47 47 "Press '/' to focus the search input.", 48 - $preferences->getPreference($pref_shortcut, 1)) 49 - ) 48 + $preferences->getPreference($pref_shortcut, 1))) 50 49 ->appendChild( 51 50 id(new AphrontFormSubmitControl()) 52 51 ->setValue('Save'));
+2 -4
src/applications/slowvote/controller/PhabricatorSlowvoteCreateController.php
··· 70 70 'class' => 'aphront-form-instructions', 71 71 ), 72 72 pht('Resolve issues and build consensus through '. 73 - 'protracted deliberation.') 74 - ); 73 + 'protracted deliberation.')); 75 74 76 75 $form = id(new AphrontFormView()) 77 76 ->setUser($user) ··· 149 148 $crumbs->addCrumb( 150 149 id(new PhabricatorCrumbView()) 151 150 ->setName(pht('Create Slowvote')) 152 - ->setHref($this->getApplicationURI().'create/') 153 - ); 151 + ->setHref($this->getApplicationURI().'create/')); 154 152 155 153 return $this->buildApplicationPage( 156 154 array(
+1 -2
src/applications/slowvote/controller/PhabricatorSlowvoteListController.php
··· 92 92 $crumbs->addCrumb( 93 93 id(new PhabricatorCrumbView()) 94 94 ->setName($views[$view]) 95 - ->setHref($this->getApplicationURI()) 96 - ); 95 + ->setHref($this->getApplicationURI())); 97 96 $side_nav->setCrumbs($crumbs); 98 97 99 98 return $this->buildApplicationPage(
+1 -2
src/infrastructure/daemon/bot/handler/PhabricatorBotObjectNameHandler.php
··· 78 78 )); 79 79 $revisions = array_select_keys( 80 80 ipull($revisions, null, 'id'), 81 - $revision_ids 82 - ); 81 + $revision_ids); 83 82 foreach ($revisions as $revision) { 84 83 $output[$revision['phid']] = 85 84 'D'.$revision['id'].' '.$revision['title'].' - '.
+1 -1
src/infrastructure/daemon/bot/handler/PhabricatorBotWhatsNewHandler.php
··· 59 59 $phids[] = $uid; 60 60 break; 61 61 } 62 - array_push($phids,$uid); 62 + array_push($phids, $uid); 63 63 } 64 64 65 65 $infs = $this->getConduit()->callMethodSynchronous(
+1 -2
src/infrastructure/markup/rule/PhabricatorRemarkupRuleImageMacro.php
··· 42 42 $style = sprintf( 43 43 'height: %dpx; width: %dpx;', 44 44 $height, 45 - $width 46 - ); 45 + $width); 47 46 } 48 47 } 49 48
+7 -14
src/view/form/control/AphrontFormCropControl.php
··· 34 34 array( 35 35 'src' => PhabricatorUser::getDefaultProfileImageURI() 36 36 ), 37 - '' 38 - ); 37 + ''); 39 38 } 40 39 41 40 $c_id = celerity_generate_unique_node_id(); ··· 43 42 $scale = PhabricatorImageTransformer::getScaleForCrop( 44 43 $file, 45 44 $this->getWidth(), 46 - $this->getHeight() 47 - ); 45 + $this->getHeight()); 48 46 49 47 Javelin::initBehavior( 50 48 'aphront-crop', ··· 55 53 'scale' => $scale, 56 54 'imageH' => $metadata[PhabricatorFile::METADATA_IMAGE_HEIGHT], 57 55 'imageW' => $metadata[PhabricatorFile::METADATA_IMAGE_WIDTH], 58 - ) 59 - ); 56 + )); 60 57 61 58 return javelin_tag( 62 59 'div', ··· 74 71 'class' => 'crop-image', 75 72 'sigil' => 'crop-image' 76 73 ), 77 - '' 78 - ), 74 + ''), 79 75 javelin_tag( 80 76 'input', 81 77 array( ··· 83 79 'name' => 'image_x', 84 80 'sigil' => 'crop-x', 85 81 ), 86 - '' 87 - ), 82 + ''), 88 83 javelin_tag( 89 84 'input', 90 85 array( ··· 92 87 'name' => 'image_y', 93 88 'sigil' => 'crop-y', 94 89 ), 95 - '' 96 - ), 97 - ) 98 - ); 90 + ''), 91 + )); 99 92 } 100 93 101 94 }
+1 -2
src/view/layout/PhabricatorObjectItemView.php
··· 106 106 $icon_href = phutil_tag( 107 107 'a', 108 108 array('href' => $spec['href']), 109 - array($label, $icon) 110 - ); 109 + array($label, $icon)); 111 110 } else { 112 111 $icon_href = array($label, $icon); 113 112 }
+1 -2
src/view/page/PhabricatorStandardPageView.php
··· 117 117 if ($user) { 118 118 $default_img_uri = 119 119 PhabricatorEnv::getCDNURI( 120 - '/rsrc/image/icon/fatcow/document_black.png' 121 - ); 120 + '/rsrc/image/icon/fatcow/document_black.png'); 122 121 $download_form = phabricator_form( 123 122 $user, 124 123 array(