Christopher Johnson (WMDE) has submitted this change and it was merged.
Change subject: Created new standard directory structure
......................................................................
Created new standard directory structure
Change-Id: Ib1c5f6a02e0c23ea002654ac2fb39384ee2e3a70
---
M __phutil_library_map__.php
R src/__tests__/BurndownTestDataGenerator.php
R src/application/BurndownApplication.php
R src/constants/SprintConstants.php
R src/controller/BurndownController.php
R src/controller/BurndownDataViewController.php
R src/controller/BurndownListController.php
R src/controller/SprintReportController.php
R src/customfield/SprintEndDateField.php
R src/customfield/SprintProjectCustomField.php
R src/customfield/SprintStartDateField.php
R src/customfield/SprintTaskStoryPointsField.php
R src/events/BurndownActionMenuEventListener.php
R src/exception/BurndownException.php
R src/util/BurndownDataDate.php
R src/view/BurndownDataView.php
R src/view/SprintReportBurndownView.php
R src/view/SprintReportOpenTasksView.php
R src/view/SprintView.php
19 files changed, 40 insertions(+), 70 deletions(-)
Approvals:
Christopher Johnson (WMDE): Verified; Looks good to me, approved
diff --git a/__phutil_library_map__.php b/__phutil_library_map__.php
index fe151c1..148ffec 100644
--- a/__phutil_library_map__.php
+++ b/__phutil_library_map__.php
@@ -9,27 +9,24 @@
phutil_register_library_map(array(
'__library_version__' => 2,
'class' => array(
- 'BurndownActionMenuEventListener' =>
'src/BurndownActionMenuEventListener.php',
- 'BurndownApplication' => 'src/BurndownApplication.php',
- 'BurndownController' => 'src/BurndownController.php',
- 'BurndownDataDate' => 'src/BurndownDataDate.php',
- 'BurndownDataView' => 'src/BurndownDataView.php',
- 'BurndownDataViewController' => 'src/BurndownDataViewController.php',
- 'BurndownException' => 'src/BurndownException.php',
- 'BurndownListController' => 'src/BurndownListController.php',
- 'BurndownTestDataGenerator' => 'src/BurndownTestDataGenerator.php',
- 'SprintConstants' => 'src/SprintConstants.php',
- 'SprintEndDateField' => 'src/SprintEndDateField.php',
- 'SprintProjectCustomField' => 'src/SprintProjectCustomField.php',
- 'SprintReportBurndownView' => 'src/SprintReportBurndownView.php',
- 'SprintReportController' => 'src/SprintReportController.php',
- 'SprintStartDateField' => 'src/SprintStartDateField.php',
-
-
- 'SprintReportOpenTasksView' => 'src/SprintReportOpenTasksView.php',
- 'SprintStartDateField' => 'src/SprintStartDateField.php',
- 'SprintTaskStoryPointsField' => 'src/SprintTaskStoryPointsField.php',
- 'SprintView' => 'src/SprintView.php',
+ 'BurndownActionMenuEventListener' =>
'src/events/BurndownActionMenuEventListener.php',
+ 'BurndownApplication' => 'src/application/BurndownApplication.php',
+ 'BurndownController' => 'src/controller/BurndownController.php',
+ 'BurndownDataDate' => 'src/util/BurndownDataDate.php',
+ 'BurndownDataView' => 'src/view/BurndownDataView.php',
+ 'BurndownDataViewController' =>
'src/controller/BurndownDataViewController.php',
+ 'BurndownException' => 'src/exception/BurndownException.php',
+ 'BurndownListController' => 'src/controller/BurndownListController.php',
+ 'BurndownTestDataGenerator' =>
'src/__tests__/BurndownTestDataGenerator.php',
+ 'SprintConstants' => 'src/constants/SprintConstants.php',
+ 'SprintEndDateField' => 'src/customfield/SprintEndDateField.php',
+ 'SprintProjectCustomField' =>
'src/customfield/SprintProjectCustomField.php',
+ 'SprintReportBurndownView' => 'src/view/SprintReportBurndownView.php',
+ 'SprintReportController' => 'src/controller/SprintReportController.php',
+ 'SprintReportOpenTasksView' => 'src/view/SprintReportOpenTasksView.php',
+ 'SprintStartDateField' => 'src/customfield/SprintStartDateField.php',
+ 'SprintTaskStoryPointsField' =>
'src/customfield/SprintTaskStoryPointsField.php',
+ 'SprintView' => 'src/view/SprintView.php',
),
'function' => array(),
'xmap' => array(
@@ -43,15 +40,11 @@
'BurndownTestDataGenerator' => 'PhabricatorTestDataGenerator',
'SprintConstants' => 'ManiphestConstants',
'SprintStartDateField' => 'SprintProjectCustomField',
- 'SprintConstants' => 'ManiphestConstants',
- 'SprintStartDateField' => 'SprintProjectCustomField',
'SprintEndDateField' => 'SprintProjectCustomField',
'SprintProjectCustomField' => array(
'PhabricatorProjectCustomField',
'PhabricatorStandardCustomFieldInterface',
),
- 'SprintReportController' => 'BurndownController',
- 'SprintReportController' => 'ManiphestController',
'SprintReportBurndownView' => 'SprintView',
'SprintReportController' => 'BurndownController',
'SprintReportOpenTasksView' => 'SprintView',
diff --git a/src/BurndownTestDataGenerator.php
b/src/__tests__/BurndownTestDataGenerator.php
similarity index 100%
rename from src/BurndownTestDataGenerator.php
rename to src/__tests__/BurndownTestDataGenerator.php
diff --git a/src/BurndownApplication.php
b/src/application/BurndownApplication.php
similarity index 100%
rename from src/BurndownApplication.php
rename to src/application/BurndownApplication.php
diff --git a/src/SprintConstants.php b/src/constants/SprintConstants.php
similarity index 100%
rename from src/SprintConstants.php
rename to src/constants/SprintConstants.php
diff --git a/src/BurndownController.php b/src/controller/BurndownController.php
similarity index 76%
rename from src/BurndownController.php
rename to src/controller/BurndownController.php
index 55e2694..1893c0e 100644
--- a/src/BurndownController.php
+++ b/src/controller/BurndownController.php
@@ -6,7 +6,7 @@
abstract class BurndownController extends PhabricatorController {
- public function shouldAllowPublic() {
+ public function shouldAllowPublic() {
return true;
}
@@ -18,6 +18,20 @@
return $this->buildSideNavView(true)->getMenu();
}
+ public function buildNavMenu() {
+ $nav = new AphrontSideNavFilterView();
+ $nav->setBaseURI(new PhutilURI('/sprint/report/'));
+ $nav->addLabel(pht('Sprint Projects'));
+ $nav->addFilter('list', pht('List'));
+ $nav->addLabel(pht('Open Tasks'));
+ $nav->addFilter('project', pht('By Project'));
+ $nav->addFilter('user', pht('By User'));
+ $nav->addLabel(pht('Burndown'));
+ $nav->addFilter('burn', pht('Burndown Rate'));
+
+ return $nav;
+ }
+
public function buildSideNavView($for_app = false) {
$user = $this->getRequest()->getUser();
diff --git a/src/BurndownDataViewController.php
b/src/controller/BurndownDataViewController.php
similarity index 100%
rename from src/BurndownDataViewController.php
rename to src/controller/BurndownDataViewController.php
diff --git a/src/BurndownListController.php
b/src/controller/BurndownListController.php
similarity index 88%
rename from src/BurndownListController.php
rename to src/controller/BurndownListController.php
index 31a92d6..e112242 100644
--- a/src/BurndownListController.php
+++ b/src/controller/BurndownListController.php
@@ -15,7 +15,7 @@
$nav = $this->buildNavMenu();
$projects = $this->loadAllProjects($viewer);
-
+ $this->view = $nav->selectFilter($this->view, 'list');
$order = $request->getStr('order', 'name');
list($order, $reverse) = AphrontTableView::parseSort($order);
@@ -120,22 +120,6 @@
'title' => array(pht('Sprint List')),
'device' => true,
));
- }
-
- private function buildNavMenu() {
- $nav = new AphrontSideNavFilterView();
- $nav->setBaseURI(new PhutilURI('/sprint/report/'));
- $nav->addLabel(pht('Sprint Projects'));
- $nav->addFilter('list', pht('List'));
- $nav->addLabel(pht('Open Tasks'));
- $nav->addFilter('project', pht('By Project'));
- $nav->addFilter('user', pht('By User'));
- $nav->addLabel(pht('Burndown'));
- $nav->addFilter('burn', pht('Burndown Rate'));
-
- $this->view = $nav->selectFilter($this->view, 'list');
-
- return $nav;
}
// Load all projects with "§" in the name.
diff --git a/src/SprintReportController.php
b/src/controller/SprintReportController.php
similarity index 73%
rename from src/SprintReportController.php
rename to src/controller/SprintReportController.php
index fa01104..37e066f 100644
--- a/src/SprintReportController.php
+++ b/src/controller/SprintReportController.php
@@ -26,9 +26,7 @@
}
$nav = $this->buildNavMenu();
- $handle_factory = function(){ return id(new loadViewerHandles())
- ->execute(); };
-
+ $this->view = $nav->selectFilter($this->view, 'List');
require_celerity_resource('maniphest-report-css');
switch ($this->view) {
@@ -61,23 +59,5 @@
'device' => false,
));
}
-
- private function buildNavMenu() {
-
- $nav = new AphrontSideNavFilterView();
- $nav->setBaseURI(new PhutilURI('/sprint/report/'));
- $nav->addLabel(pht('Sprint Projects'));
- $nav->addFilter('list', pht('List'));
- $nav->addLabel(pht('Open Tasks'));
- $nav->addFilter('project', pht('By Project'));
- $nav->addFilter('user', pht('By User'));
- $nav->addLabel(pht('Burndown'));
- $nav->addFilter('burn', pht('Burndown Rate'));
-
- $this->view = $nav->selectFilter($this->view, 'List');
-
- return $nav;
- }
-
}
diff --git a/src/SprintEndDateField.php b/src/customfield/SprintEndDateField.php
similarity index 100%
rename from src/SprintEndDateField.php
rename to src/customfield/SprintEndDateField.php
diff --git a/src/SprintProjectCustomField.php
b/src/customfield/SprintProjectCustomField.php
similarity index 100%
rename from src/SprintProjectCustomField.php
rename to src/customfield/SprintProjectCustomField.php
diff --git a/src/SprintStartDateField.php
b/src/customfield/SprintStartDateField.php
similarity index 100%
rename from src/SprintStartDateField.php
rename to src/customfield/SprintStartDateField.php
diff --git a/src/SprintTaskStoryPointsField.php
b/src/customfield/SprintTaskStoryPointsField.php
similarity index 100%
rename from src/SprintTaskStoryPointsField.php
rename to src/customfield/SprintTaskStoryPointsField.php
diff --git a/src/BurndownActionMenuEventListener.php
b/src/events/BurndownActionMenuEventListener.php
similarity index 95%
rename from src/BurndownActionMenuEventListener.php
rename to src/events/BurndownActionMenuEventListener.php
index e197fa5..192c3fe 100644
--- a/src/BurndownActionMenuEventListener.php
+++ b/src/events/BurndownActionMenuEventListener.php
@@ -22,7 +22,7 @@
$object = $event->getValue('object');
$actions = null;
- if ($object instanceof PhabricatorProject &&
+ if ($object instanceof \PhabricatorProject &&
stripos($object->getName(), '§') !== false) {
$actions = $this->renderUserItems($event);
}
diff --git a/src/BurndownException.php b/src/exception/BurndownException.php
similarity index 100%
rename from src/BurndownException.php
rename to src/exception/BurndownException.php
diff --git a/src/BurndownDataDate.php b/src/util/BurndownDataDate.php
similarity index 100%
rename from src/BurndownDataDate.php
rename to src/util/BurndownDataDate.php
diff --git a/src/BurndownDataView.php b/src/view/BurndownDataView.php
similarity index 99%
rename from src/BurndownDataView.php
rename to src/view/BurndownDataView.php
index 35ba12b..c1014a1 100644
--- a/src/BurndownDataView.php
+++ b/src/view/BurndownDataView.php
@@ -648,7 +648,6 @@
private function getPointsData () {
- $handle = null;
$project_phid = $this->project->getPHID();
$table = new ManiphestTransaction();
@@ -705,7 +704,7 @@
if ($old_is_closed == $new_is_closed) {
// This was just a status change from one open status to another,
- // or from one closed status to another, so it's not an event we
+ // or from one closed status to another, so it's not an events we
// care about.
break;
}
@@ -770,7 +769,7 @@
break;
}
- // If we found some kind of event that we care about, stick it in the
+ // If we found some kind of events that we care about, stick it in the
// list of events.
if ($event_type !== null) {
$events[] = array(
diff --git a/src/SprintReportBurndownView.php
b/src/view/SprintReportBurndownView.php
similarity index 98%
rename from src/SprintReportBurndownView.php
rename to src/view/SprintReportBurndownView.php
index 2e638d0..5154c31 100644
--- a/src/SprintReportBurndownView.php
+++ b/src/view/SprintReportBurndownView.php
@@ -73,7 +73,7 @@
$data[$key]['_is_close'] = $is_close;
if (!$is_open && !$is_close) {
- // This is either some kind of bogus event, or a resolution change
+ // This is either some kind of bogus events, or a resolution change
// (e.g., resolved -> invalid). Just skip it.
continue;
}
diff --git a/src/SprintReportOpenTasksView.php
b/src/view/SprintReportOpenTasksView.php
similarity index 99%
rename from src/SprintReportOpenTasksView.php
rename to src/view/SprintReportOpenTasksView.php
index af93a68..2f6d4a1 100644
--- a/src/SprintReportOpenTasksView.php
+++ b/src/view/SprintReportOpenTasksView.php
@@ -312,7 +312,7 @@
*/
private function loadRecentlyClosedTasks() {
- list($ignored, $window_epoch) = $this->getWindow();
+ list(,, $window_epoch) = $this->getWindow();
$table = new ManiphestTask();
$xtable = new ManiphestTransaction();
diff --git a/src/SprintView.php b/src/view/SprintView.php
similarity index 100%
rename from src/SprintView.php
rename to src/view/SprintView.php
--
To view, visit https://gerrit.wikimedia.org/r/166718
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib1c5f6a02e0c23ea002654ac2fb39384ee2e3a70
Gerrit-PatchSet: 1
Gerrit-Project: phabricator/extensions/Sprint
Gerrit-Branch: master
Gerrit-Owner: Christopher Johnson (WMDE) <christopher.john...@wikimedia.de>
Gerrit-Reviewer: Christopher Johnson (WMDE) <christopher.john...@wikimedia.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
