deblan/php-censor
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed migration for pull request branches.

Browse source
This commit is contained in:
Dmitry Khomutov 2018-02-23 19:31:06 +07:00
parent 3400271bc5
commit 0cfb12f222
No known key found for this signature in database
GPG key ID: EC19426474B37AAC
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/PHPCensor/Migrations/20180223052715_added_request_branch_to_build.php
View file

@ -15,14 +15,14 @@ class AddedRequestBranchToBuild extends AbstractMigration
$count = 100; $count = 100;
$offset = 0; $offset = 0;
while ($count >= 100) { while ($count >= 100) {
$builds = $buildStore->getBuilds(100, $offset); $builds = $buildStore->getBuilds(100, $offset);
$offset =+ 100; $offset += 100;
$count = count($builds); $count = count($builds);
/** @var Build $build */ /** @var Build $build */
foreach ($builds as &$build) { foreach ($builds as &$build) {
$extra = $build->getExtra(); $extra = $build->getExtra();
if (isset($extra['build_type']) && 'pull_request' === $extra['build_type']) { if (isset($extra['build_type'])) {
unset($extra['build_type']); unset($extra['build_type']);
$build->setSource(Build::SOURCE_WEBHOOK_PULL_REQUEST); $build->setSource(Build::SOURCE_WEBHOOK_PULL_REQUEST);
@ -39,11 +39,11 @@ class AddedRequestBranchToBuild extends AbstractMigration
if ($remoteReference && empty($extra['remote_reference'])) { if ($remoteReference && empty($extra['remote_reference'])) {
$extra['remote_reference'] = $remoteReference; $extra['remote_reference'] = $remoteReference;
} }
unset($extra['remote_url']);
} }
unset($extra['build_type']);
unset($extra['pull_request_id']);
$build->setExtra($extra); $build->setExtra(json_encode($extra));
$buildStore->save($build); $buildStore->save($build);
} }
unset($build); unset($build);

10
src/PHPCensor/View/BuildStatus/view.phtml
View file

@ -159,17 +159,17 @@
</td> </td>
<td> <td>
<?php $branches = $build->getExtra('branches'); ?>
<a href="<?= $build->getBranchLink();?>">
<i class="fa fa-code-fork"></i>
<?= $build->getBranch(); ?>
</a>
<?php if (\PHPCensor\Model\Build::SOURCE_WEBHOOK_PULL_REQUEST === $build->getSource()): ?> <?php if (\PHPCensor\Model\Build::SOURCE_WEBHOOK_PULL_REQUEST === $build->getSource()): ?>
<a href="<?= $build->getRemoteBranchLink(); ?>"> <a href="<?= $build->getRemoteBranchLink(); ?>">
<i class="fa fa-code-fork"></i> <i class="fa fa-code-fork"></i>
<?= $build->getRemoteBranch(); ?> : <?= $build->getRemoteBranch(); ?> :
</a> </a>
<?php endif; ?> <?php endif; ?>
<a href="<?= $build->getBranchLink();?>">
<i class="fa fa-code-fork"></i>
<?= $build->getBranch(); ?>
</a>
<?php $branches = $build->getExtra('branches'); ?>
<?= $branches ? ' + '.implode(', ', $branches) : ''; ?> <?= $branches ? ' + '.implode(', ', $branches) : ''; ?>
<?php if ($tag = $build->getTag()): ?> / <?php if ($tag = $build->getTag()): ?> /
<a href="<?= $build->getTagLink(); ?>"> <a href="<?= $build->getTagLink(); ?>">