diff --git a/src/PHPCensor/Migrations/20180223052715_added_request_branch_to_build.php b/src/PHPCensor/Migrations/20180223052715_added_request_branch_to_build.php index 9466b5fe..edf1bdde 100644 --- a/src/PHPCensor/Migrations/20180223052715_added_request_branch_to_build.php +++ b/src/PHPCensor/Migrations/20180223052715_added_request_branch_to_build.php @@ -15,14 +15,14 @@ class AddedRequestBranchToBuild extends AbstractMigration $count = 100; $offset = 0; while ($count >= 100) { - $builds = $buildStore->getBuilds(100, $offset); - $offset =+ 100; - $count = count($builds); + $builds = $buildStore->getBuilds(100, $offset); + $offset += 100; + $count = count($builds); /** @var Build $build */ foreach ($builds as &$build) { $extra = $build->getExtra(); - if (isset($extra['build_type']) && 'pull_request' === $extra['build_type']) { + if (isset($extra['build_type'])) { unset($extra['build_type']); $build->setSource(Build::SOURCE_WEBHOOK_PULL_REQUEST); @@ -39,11 +39,11 @@ class AddedRequestBranchToBuild extends AbstractMigration if ($remoteReference && empty($extra['remote_reference'])) { $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); } unset($build); diff --git a/src/PHPCensor/View/BuildStatus/view.phtml b/src/PHPCensor/View/BuildStatus/view.phtml index e92769e9..19edc08c 100644 --- a/src/PHPCensor/View/BuildStatus/view.phtml +++ b/src/PHPCensor/View/BuildStatus/view.phtml @@ -159,17 +159,17 @@ - getExtra('branches'); ?> - - - getBranch(); ?> - getSource()): ?> getRemoteBranch(); ?> : + + + getBranch(); ?> + + getExtra('branches'); ?> getTag()): ?> /