Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Rename Jira to JiraController

Browse Source 
[MAILPOET-1885]
This commit is contained in:
Jan Jakeš
2019-04-09 09:06:33 +02:00
committed by M. Shull
parent 1433852383
commit 32eb71da7f
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
RoboFile.php
View File

@ -567,7 +567,7 @@ class RoboFile extends \Robo\Tasks {
return \MailPoetTasks\Release\ChangelogController::createWithJiraCredentials( return \MailPoetTasks\Release\ChangelogController::createWithJiraCredentials(
getenv('WP_JIRA_TOKEN'), getenv('WP_JIRA_TOKEN'),
getenv('WP_JIRA_USER'), getenv('WP_JIRA_USER'),
\MailPoetTasks\Release\Jira::PROJECT_MAILPOET, \MailPoetTasks\Release\JiraController::PROJECT_MAILPOET,
__DIR__ . '/readme.txt' __DIR__ . '/readme.txt'
); );
} }
@ -578,7 +578,7 @@ class RoboFile extends \Robo\Tasks {
return \MailPoetTasks\Release\ReleaseVersionController::createWithJiraCredentials( return \MailPoetTasks\Release\ReleaseVersionController::createWithJiraCredentials(
getenv('WP_JIRA_TOKEN'), getenv('WP_JIRA_TOKEN'),
getenv('WP_JIRA_USER'), getenv('WP_JIRA_USER'),
\MailPoetTasks\Release\Jira::PROJECT_MAILPOET \MailPoetTasks\Release\JiraController::PROJECT_MAILPOET
); );
} }

14
tasks/release/ChangelogController.php
View File

@ -2,7 +2,7 @@
namespace MailPoetTasks\Release; namespace MailPoetTasks\Release;
require_once __DIR__ . '/Jira.php'; require_once __DIR__ . '/JiraController.php';
class ChangelogController { class ChangelogController {
@ -12,16 +12,16 @@ class ChangelogController {
/** @var string */ /** @var string */
private $readme_file; private $readme_file;
/** @var Jira */ /** @var JiraController */
private $jira; private $jira;
function __construct(Jira $jira, $readme_file) { function __construct(JiraController $jira, $readme_file) {
$this->jira = $jira; $this->jira = $jira;
$this->readme_file = $readme_file; $this->readme_file = $readme_file;
} }
static function createWithJiraCredentials($token, $user, $project, $readme_file) { static function createWithJiraCredentials($token, $user, $project, $readme_file) {
return new self(new Jira($token, $user, $project), $readme_file); return new self(new JiraController($token, $user, $project), $readme_file);
} }
function update($version_name = null) { function update($version_name = null) {
@ -34,11 +34,11 @@ class ChangelogController {
$version = $this->jira->getVersion($version_name); $version = $this->jira->getVersion($version_name);
$issues = $this->jira->getIssuesDataForVersion($version); $issues = $this->jira->getIssuesDataForVersion($version);
$heading = $this->renderHeading($version); $heading = $this->renderHeading($version);
$changelog = $this->renderList($issues, Jira::CHANGELOG_FIELD_ID); $changelog = $this->renderList($issues, JiraController::CHANGELOG_FIELD_ID);
if (!$changelog) { if (!$changelog) {
$changelog = self::FALLBACK_RECORD; $changelog = self::FALLBACK_RECORD;
} }
$notes = $this->renderList($issues, Jira::RELEASENOTE_FIELD_ID); $notes = $this->renderList($issues, JiraController::RELEASENOTE_FIELD_ID);
return [$heading, $changelog, $notes]; return [$heading, $changelog, $notes];
} }
@ -52,7 +52,7 @@ class ChangelogController {
foreach ($issues as $issue) { foreach ($issues as $issue) {
if ( if (
!isset($issue['fields'][$field]) !isset($issue['fields'][$field])
|| ($issue['fields']['resolution']['id'] === Jira::WONT_DO_RESOLUTION_ID) || ($issue['fields']['resolution']['id'] === JiraController::WONT_DO_RESOLUTION_ID)
) { ) {
continue; continue;
} }

2
tasks/release/Jira.php → tasks/release/JiraController.php
View File

@ -4,7 +4,7 @@ namespace MailPoetTasks\Release;
require_once __DIR__ . '/HttpClient.php'; require_once __DIR__ . '/HttpClient.php';
class Jira { class JiraController {
const CHANGELOG_FIELD_ID = 'customfield_10500'; const CHANGELOG_FIELD_ID = 'customfield_10500';
const RELEASENOTE_FIELD_ID = 'customfield_10504'; const RELEASENOTE_FIELD_ID = 'customfield_10504';

8
tasks/release/ReleaseVersionController.php
View File

@ -2,23 +2,23 @@
namespace MailPoetTasks\Release; namespace MailPoetTasks\Release;
require_once __DIR__ . '/Jira.php'; require_once __DIR__ . '/JiraController.php';
class ReleaseVersionController { class ReleaseVersionController {
/** @var Jira */ /** @var JiraController */
private $jira; private $jira;
/** @var string */ /** @var string */
private $project; private $project;
function __construct(Jira $jira, $project) { function __construct(JiraController $jira, $project) {
$this->jira = $jira; $this->jira = $jira;
$this->project = $project; $this->project = $project;
} }
static function createWithJiraCredentials($token, $user, $project) { static function createWithJiraCredentials($token, $user, $project) {
return new self(new Jira($token, $user, $project), $project); return new self(new JiraController($token, $user, $project), $project);
} }
function assignVersionToCompletedTickets($version = null) { function assignVersionToCompletedTickets($version = null) {