Compare commits
1 commit
master
...
view-refac
Author | SHA1 | Date | |
---|---|---|---|
1fe8d68f03 |
|
@ -1,4 +1,5 @@
|
||||||
build_settings:
|
build_settings:
|
||||||
|
clone_depth: 1
|
||||||
ignore:
|
ignore:
|
||||||
- vendor
|
- vendor
|
||||||
- tests
|
- tests
|
||||||
|
@ -13,6 +14,11 @@ test:
|
||||||
- phpunit.xml
|
- phpunit.xml
|
||||||
coverage: true
|
coverage: true
|
||||||
|
|
||||||
|
php_mess_detector:
|
||||||
|
allow_failures: true
|
||||||
|
rules:
|
||||||
|
- phpmd.xml
|
||||||
|
|
||||||
php_code_sniffer:
|
php_code_sniffer:
|
||||||
standard: PSR2
|
standard: PSR2
|
||||||
encoding: UTF-8
|
encoding: UTF-8
|
||||||
|
@ -27,6 +33,9 @@ test:
|
||||||
php_parallel_lint:
|
php_parallel_lint:
|
||||||
allow_failures: true
|
allow_failures: true
|
||||||
|
|
||||||
|
php_docblock_checker:
|
||||||
|
allow_failures: true
|
||||||
|
|
||||||
security_checker:
|
security_checker:
|
||||||
allow_failures: false
|
allow_failures: false
|
||||||
|
|
||||||
|
|
|
@ -76,7 +76,7 @@
|
||||||
"codeception/codeception": "~2.3.0",
|
"codeception/codeception": "~2.3.0",
|
||||||
"phpmd/phpmd": "~2.6.0",
|
"phpmd/phpmd": "~2.6.0",
|
||||||
"sebastian/phpcpd": "~2.0.0",
|
"sebastian/phpcpd": "~2.0.0",
|
||||||
"squizlabs/php_codesniffer": "~3.2.0",
|
"squizlabs/php_codesniffer": "~2.8.0",
|
||||||
"block8/php-docblock-checker": "~1.3.0",
|
"block8/php-docblock-checker": "~1.3.0",
|
||||||
"phploc/phploc": "~4.0.0",
|
"phploc/phploc": "~4.0.0",
|
||||||
"jakub-onderka/php-parallel-lint": "~0.9.0",
|
"jakub-onderka/php-parallel-lint": "~0.9.0",
|
||||||
|
|
51
composer.lock
generated
51
composer.lock
generated
|
@ -1,10 +1,10 @@
|
||||||
{
|
{
|
||||||
"_readme": [
|
"_readme": [
|
||||||
"This file locks the dependencies of your project to a known state",
|
"This file locks the dependencies of your project to a known state",
|
||||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
|
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||||
"This file is @generated automatically"
|
"This file is @generated automatically"
|
||||||
],
|
],
|
||||||
"content-hash": "8ed0d649c464752b717de050e04cd313",
|
"content-hash": "6c8facd9ea26fd63006a35d445fac984",
|
||||||
"packages": [
|
"packages": [
|
||||||
{
|
{
|
||||||
"name": "behat/gherkin",
|
"name": "behat/gherkin",
|
||||||
|
@ -2959,37 +2959,64 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "squizlabs/php_codesniffer",
|
"name": "squizlabs/php_codesniffer",
|
||||||
"version": "3.2.3",
|
"version": "2.8.1",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
|
"url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
|
||||||
"reference": "4842476c434e375f9d3182ff7b89059583aa8b27"
|
"reference": "d7cf0d894e8aa4c73712ee4a331cc1eaa37cdc7d"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/4842476c434e375f9d3182ff7b89059583aa8b27",
|
"url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/d7cf0d894e8aa4c73712ee4a331cc1eaa37cdc7d",
|
||||||
"reference": "4842476c434e375f9d3182ff7b89059583aa8b27",
|
"reference": "d7cf0d894e8aa4c73712ee4a331cc1eaa37cdc7d",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"ext-simplexml": "*",
|
"ext-simplexml": "*",
|
||||||
"ext-tokenizer": "*",
|
"ext-tokenizer": "*",
|
||||||
"ext-xmlwriter": "*",
|
"ext-xmlwriter": "*",
|
||||||
"php": ">=5.4.0"
|
"php": ">=5.1.2"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
|
"phpunit/phpunit": "~4.0"
|
||||||
},
|
},
|
||||||
"bin": [
|
"bin": [
|
||||||
"bin/phpcs",
|
"scripts/phpcs",
|
||||||
"bin/phpcbf"
|
"scripts/phpcbf"
|
||||||
],
|
],
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-master": "3.x-dev"
|
"dev-master": "2.x-dev"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"autoload": {
|
||||||
|
"classmap": [
|
||||||
|
"CodeSniffer.php",
|
||||||
|
"CodeSniffer/CLI.php",
|
||||||
|
"CodeSniffer/Exception.php",
|
||||||
|
"CodeSniffer/File.php",
|
||||||
|
"CodeSniffer/Fixer.php",
|
||||||
|
"CodeSniffer/Report.php",
|
||||||
|
"CodeSniffer/Reporting.php",
|
||||||
|
"CodeSniffer/Sniff.php",
|
||||||
|
"CodeSniffer/Tokens.php",
|
||||||
|
"CodeSniffer/Reports/",
|
||||||
|
"CodeSniffer/Tokenizers/",
|
||||||
|
"CodeSniffer/DocGenerators/",
|
||||||
|
"CodeSniffer/Standards/AbstractPatternSniff.php",
|
||||||
|
"CodeSniffer/Standards/AbstractScopeSniff.php",
|
||||||
|
"CodeSniffer/Standards/AbstractVariableSniff.php",
|
||||||
|
"CodeSniffer/Standards/IncorrectPatternException.php",
|
||||||
|
"CodeSniffer/Standards/Generic/Sniffs/",
|
||||||
|
"CodeSniffer/Standards/MySource/Sniffs/",
|
||||||
|
"CodeSniffer/Standards/PEAR/Sniffs/",
|
||||||
|
"CodeSniffer/Standards/PSR1/Sniffs/",
|
||||||
|
"CodeSniffer/Standards/PSR2/Sniffs/",
|
||||||
|
"CodeSniffer/Standards/Squiz/Sniffs/",
|
||||||
|
"CodeSniffer/Standards/Zend/Sniffs/"
|
||||||
|
]
|
||||||
|
},
|
||||||
"notification-url": "https://packagist.org/downloads/",
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
"license": [
|
"license": [
|
||||||
"BSD-3-Clause"
|
"BSD-3-Clause"
|
||||||
|
@ -3006,7 +3033,7 @@
|
||||||
"phpcs",
|
"phpcs",
|
||||||
"standards"
|
"standards"
|
||||||
],
|
],
|
||||||
"time": "2018-02-20T21:35:23+00:00"
|
"time": "2017-03-01T22:17:45+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "swiftmailer/swiftmailer",
|
"name": "swiftmailer/swiftmailer",
|
||||||
|
|
|
@ -78,7 +78,7 @@ Plugins
|
||||||
|
|
||||||
* [Campfire](plugins/campfire.md) - `campfire`
|
* [Campfire](plugins/campfire.md) - `campfire`
|
||||||
* [Email](plugins/email.md) - `email`
|
* [Email](plugins/email.md) - `email`
|
||||||
* [FlowDock](plugins/flowdock_notify.md) - `flowdock_notify`
|
* FlowDock - `flowdock_notify`
|
||||||
* [HipChat](plugins/hipchat_notify.md) - `hipchat_notify`
|
* [HipChat](plugins/hipchat_notify.md) - `hipchat_notify`
|
||||||
* [IRC](plugins/irc.md) - `irc`
|
* [IRC](plugins/irc.md) - `irc`
|
||||||
* [Slack](plugins/slack_notify.md) - `slack_notify`
|
* [Slack](plugins/slack_notify.md) - `slack_notify`
|
||||||
|
|
|
@ -1,14 +0,0 @@
|
||||||
Plugin FlowdockNotify
|
|
||||||
=====================
|
|
||||||
|
|
||||||
This plugin joins a [Flowdock](https://www.flowdock.com/) room and sends a user-defined message, for example a
|
|
||||||
"Build Succeeded" message.
|
|
||||||
|
|
||||||
Installation
|
|
||||||
------------
|
|
||||||
|
|
||||||
The plugin depends on `mremi/flowdock` library. To use FlowdockNotify plugin you should install dependency:
|
|
||||||
|
|
||||||
```
|
|
||||||
composer require "mremi/flowdock"
|
|
||||||
```
|
|
|
@ -1,18 +1,9 @@
|
||||||
Plugin HipchatNotify
|
Plugin Hipchat Notify
|
||||||
=====================
|
=====================
|
||||||
|
|
||||||
This plugin joins a [HipChat](https://www.hipchat.com/) room and sends a user-defined message, for example a
|
This plugin joins a [HipChat](https://www.hipchat.com/) room and sends a user-defined message, for example a
|
||||||
"Build Succeeded" message.
|
"Build Succeeded" message.
|
||||||
|
|
||||||
Installation
|
|
||||||
------------
|
|
||||||
|
|
||||||
The plugin depends on `hipchat/hipchat-php` library. To use HipchatNotify plugin you should install dependency:
|
|
||||||
|
|
||||||
```
|
|
||||||
composer require "hipchat/hipchat-php"
|
|
||||||
```
|
|
||||||
|
|
||||||
Configuration
|
Configuration
|
||||||
-------------
|
-------------
|
||||||
|
|
||||||
|
|
|
@ -1,18 +1,9 @@
|
||||||
Plugin SlackNotify
|
Plugin Slack Notify
|
||||||
===================
|
===================
|
||||||
|
|
||||||
This plugin joins a [Slack](https://www.slack.com/) room and sends a user-defined message, for example a "Build
|
This plugin joins a [Slack](https://www.slack.com/) room and sends a user-defined message, for example a "Build
|
||||||
Succeeded" message.
|
Succeeded" message.
|
||||||
|
|
||||||
Installation
|
|
||||||
------------
|
|
||||||
|
|
||||||
The plugin depends on `maknz/slack` library. To use SlackNotify plugin you should install dependency:
|
|
||||||
|
|
||||||
```
|
|
||||||
composer require "maknz/slack"
|
|
||||||
```
|
|
||||||
|
|
||||||
Configuration
|
Configuration
|
||||||
-------------
|
-------------
|
||||||
|
|
||||||
|
|
|
@ -498,3 +498,17 @@ var Lang = {
|
||||||
return string;
|
return string;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
jquery(document).ready(function() {
|
||||||
|
jquery('#delete-build').on('click', function (e) {
|
||||||
|
e.preventDefault();
|
||||||
|
|
||||||
|
var buildId = this.data('buildId');
|
||||||
|
var projectId = this.data('projectId');
|
||||||
|
|
||||||
|
confirmDelete(APP_URL + 'build/delete/' + buildId)
|
||||||
|
.onCloseConfirmed = function () {
|
||||||
|
window.location = APP_URL + 'project/view/' + projectId;
|
||||||
|
};
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
|
@ -10,6 +10,7 @@ use PHPCensor\Helper\AnsiConverter;
|
||||||
use PHPCensor\Helper\Lang;
|
use PHPCensor\Helper\Lang;
|
||||||
use PHPCensor\Http\Response\RedirectResponse;
|
use PHPCensor\Http\Response\RedirectResponse;
|
||||||
use PHPCensor\Model\Build;
|
use PHPCensor\Model\Build;
|
||||||
|
use PHPCensor\Model\Project;
|
||||||
use PHPCensor\Model\User;
|
use PHPCensor\Model\User;
|
||||||
use PHPCensor\Service\BuildService;
|
use PHPCensor\Service\BuildService;
|
||||||
use PHPCensor\WebController;
|
use PHPCensor\WebController;
|
||||||
|
@ -47,8 +48,6 @@ class BuildController extends WebController
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* View a specific build.
|
|
||||||
*
|
|
||||||
* @param integer $buildId
|
* @param integer $buildId
|
||||||
*
|
*
|
||||||
* @throws NotFoundException
|
* @throws NotFoundException
|
||||||
|
@ -143,6 +142,77 @@ class BuildController extends WebController
|
||||||
$this->layout->actions = $actions;
|
$this->layout->actions = $actions;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param integer $buildId
|
||||||
|
*
|
||||||
|
* @throws NotFoundException
|
||||||
|
*/
|
||||||
|
public function viewLog($buildId)
|
||||||
|
{
|
||||||
|
$build = BuildFactory::getBuildById($buildId);
|
||||||
|
|
||||||
|
if (!$build) {
|
||||||
|
throw new NotFoundException(Lang::get('build_x_not_found', $buildId));
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @var Project $project */
|
||||||
|
$project = Factory::getStore('Project')->getByPrimaryKey($build->getProjectId());
|
||||||
|
|
||||||
|
/** @var \PHPCensor\Store\BuildErrorStore $errorStore */
|
||||||
|
$errorStore = Factory::getStore('BuildError');
|
||||||
|
|
||||||
|
$this->view->build = $build;
|
||||||
|
$this->view->totalErrors = $errorStore->getErrorTotalForBuild($build->getId());
|
||||||
|
|
||||||
|
$this->layout->title = Lang::get('build_n', $buildId);
|
||||||
|
$this->layout->subtitle = $build->getProjectTitle();
|
||||||
|
|
||||||
|
switch ($build->getStatus()) {
|
||||||
|
case 0:
|
||||||
|
$this->layout->skin = 'blue';
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 1:
|
||||||
|
$this->layout->skin = 'yellow';
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 2:
|
||||||
|
$this->layout->skin = 'green';
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 3:
|
||||||
|
$this->layout->skin = 'red';
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
$rebuildLabel = Lang::get('rebuild_now');
|
||||||
|
$rebuildLink = APP_URL . 'build/rebuild/' . $build->getId();
|
||||||
|
|
||||||
|
$deleteLabel = Lang::get('delete_build');
|
||||||
|
$deleteLink = APP_URL . 'build/delete/' . $build->getId();
|
||||||
|
|
||||||
|
$actions = '';
|
||||||
|
if (!$project->getArchived()) {
|
||||||
|
$actions .= sprintf(
|
||||||
|
'<a class="btn btn-default" href="%s">%s</a>',
|
||||||
|
$rebuildLink,
|
||||||
|
$rebuildLabel
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($this->currentUserIsAdmin()) {
|
||||||
|
$actions .= sprintf(
|
||||||
|
'<a class="btn btn-danger" id="delete-build" data-build-id="%s" data-project-id="%s" href="%s">%s</a>',
|
||||||
|
$build->getId(),
|
||||||
|
$build->getProjectId(),
|
||||||
|
$deleteLink,
|
||||||
|
$deleteLabel
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->layout->actions = $actions;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns an array of the JS plugins to include.
|
* Returns an array of the JS plugins to include.
|
||||||
* @return array
|
* @return array
|
||||||
|
|
|
@ -592,11 +592,11 @@ class WebhookController extends Controller
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* Called by Gogs Webhooks:
|
||||||
|
*
|
||||||
* @param string $projectId
|
* @param string $projectId
|
||||||
*
|
*
|
||||||
* @return array
|
* @return array
|
||||||
*
|
|
||||||
* @throws Exception
|
|
||||||
*/
|
*/
|
||||||
public function gogs($projectId)
|
public function gogs($projectId)
|
||||||
{
|
{
|
||||||
|
@ -605,17 +605,15 @@ class WebhookController extends Controller
|
||||||
Project::TYPE_GIT,
|
Project::TYPE_GIT,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
$contentType = !empty($_SERVER['CONTENT_TYPE'])
|
switch ($_SERVER['CONTENT_TYPE']) {
|
||||||
? $_SERVER['CONTENT_TYPE']
|
case 'application/json':
|
||||||
: null;
|
$payload = json_decode(file_get_contents('php://input'), true);
|
||||||
|
break;
|
||||||
switch ($contentType) {
|
|
||||||
case 'application/x-www-form-urlencoded':
|
case 'application/x-www-form-urlencoded':
|
||||||
$payload = json_decode($this->getParam('payload'), true);
|
$payload = json_decode($this->getParam('payload'), true);
|
||||||
break;
|
break;
|
||||||
case 'application/json':
|
|
||||||
default:
|
default:
|
||||||
$payload = json_decode(file_get_contents('php://input'), true);
|
return ['status' => 'failed', 'error' => 'Content type not supported.', 'responseCode' => 401];
|
||||||
}
|
}
|
||||||
|
|
||||||
// Handle Push web hooks:
|
// Handle Push web hooks:
|
||||||
|
|
|
@ -1,85 +0,0 @@
|
||||||
<?php
|
|
||||||
|
|
||||||
namespace PHPCensor\Helper;
|
|
||||||
|
|
||||||
class XmlUtf8CleanFilter extends \php_user_filter
|
|
||||||
{
|
|
||||||
const PATTERN = '/[^\x{0009}\x{000a}\x{000d}\x{0020}-\x{D7FF}\x{E000}-\x{FFFD}]+/u';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param resource $in
|
|
||||||
* @param resource $out
|
|
||||||
* @param int $consumed
|
|
||||||
* @param bool $closing
|
|
||||||
*
|
|
||||||
* @return int
|
|
||||||
*/
|
|
||||||
function filter($in, $out, &$consumed, $closing)
|
|
||||||
{
|
|
||||||
while ($bucket = stream_bucket_make_writeable($in)) {
|
|
||||||
$bucket->data = preg_replace(self::PATTERN, '', $bucket->data);
|
|
||||||
$consumed += $bucket->datalen;
|
|
||||||
|
|
||||||
stream_bucket_append($out, $bucket);
|
|
||||||
}
|
|
||||||
|
|
||||||
return PSFS_PASS_ON;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
class Xml
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* @param $filePath
|
|
||||||
*
|
|
||||||
* @return null|\SimpleXMLElement
|
|
||||||
*/
|
|
||||||
public static function loadFromFile($filePath)
|
|
||||||
{
|
|
||||||
stream_filter_register('xml_utf8_clean', 'PHPCensor\Helper\XmlUtf8CleanFilter');
|
|
||||||
|
|
||||||
try {
|
|
||||||
$xml = simplexml_load_file('php://filter/read=xml_utf8_clean/resource=' . $filePath);
|
|
||||||
} catch (\Exception $ex) {
|
|
||||||
$xml = null;
|
|
||||||
} catch (\Throwable $ex) { // since php7
|
|
||||||
$xml = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!$xml) {
|
|
||||||
// from https://stackoverflow.com/questions/7766455/how-to-handle-invalid-unicode-with-simplexml/8092672#8092672
|
|
||||||
$oldUse = libxml_use_internal_errors(true);
|
|
||||||
|
|
||||||
libxml_clear_errors();
|
|
||||||
|
|
||||||
$dom = new \DOMDocument("1.0", "UTF-8");
|
|
||||||
|
|
||||||
$dom->strictErrorChecking = false;
|
|
||||||
$dom->validateOnParse = false;
|
|
||||||
$dom->recover = true;
|
|
||||||
|
|
||||||
$dom->loadXML(strtr(
|
|
||||||
file_get_contents($filePath),
|
|
||||||
['"' => "'"] // " in attribute names may mislead the parser
|
|
||||||
));
|
|
||||||
|
|
||||||
/** @var \LibXMLError $xmlError */
|
|
||||||
$xmlError = libxml_get_last_error();
|
|
||||||
if ($xmlError) {
|
|
||||||
$warning = sprintf('L%s C%s: %s', $xmlError->line, $xmlError->column, $xmlError->message);
|
|
||||||
print 'WARNING: ignored errors while reading phpunit result, '.$warning."\n";
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!$dom->hasChildNodes()) {
|
|
||||||
new \SimpleXMLElement('<empty/>');
|
|
||||||
}
|
|
||||||
|
|
||||||
$xml = simplexml_import_dom($dom);
|
|
||||||
|
|
||||||
libxml_clear_errors();
|
|
||||||
libxml_use_internal_errors($oldUse);
|
|
||||||
}
|
|
||||||
|
|
||||||
return $xml;
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -145,7 +145,8 @@ class Codeception extends Plugin implements ZeroConfigPluginInterface
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$parser = new Parser($this->builder, ($outputPath . 'report.xml'));
|
$xml = file_get_contents($outputPath . 'report.xml', false);
|
||||||
|
$parser = new Parser($this->builder, $xml);
|
||||||
$output = $parser->parse();
|
$output = $parser->parse();
|
||||||
|
|
||||||
$meta = [
|
$meta = [
|
||||||
|
|
|
@ -2,8 +2,6 @@
|
||||||
|
|
||||||
namespace PHPCensor\Plugin\Util;
|
namespace PHPCensor\Plugin\Util;
|
||||||
|
|
||||||
use PHPCensor\Helper\Xml;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class PhpUnitResultJunit parses the results for the PhpUnitV2 plugin
|
* Class PhpUnitResultJunit parses the results for the PhpUnitV2 plugin
|
||||||
*
|
*
|
||||||
|
@ -26,11 +24,11 @@ class PhpUnitResultJunit extends PhpUnitResult
|
||||||
|
|
||||||
$suites = $this->loadResultFile();
|
$suites = $this->loadResultFile();
|
||||||
|
|
||||||
if ($suites) {
|
foreach ($suites->xpath('//testcase') as $testCase) {
|
||||||
foreach ($suites->xpath('//testcase') as $testCase) {
|
$this->parseTestcase($testCase);
|
||||||
$this->parseTestcase($testCase);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
$suites['failures'];
|
||||||
|
$suites['errors'];
|
||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
@ -141,7 +139,44 @@ class PhpUnitResultJunit extends PhpUnitResult
|
||||||
return new \SimpleXMLElement('<empty/>'); // new empty element
|
return new \SimpleXMLElement('<empty/>'); // new empty element
|
||||||
}
|
}
|
||||||
|
|
||||||
return Xml::loadFromFile($this->outputFile);
|
try {
|
||||||
|
$suites = simplexml_load_file($this->outputFile);
|
||||||
|
} catch (\Exception $ex) {
|
||||||
|
$suites = null;
|
||||||
|
} catch (\Throwable $ex) { // since php7
|
||||||
|
$suites = null;
|
||||||
|
}
|
||||||
|
if (!$suites) {
|
||||||
|
// from https://stackoverflow.com/questions/7766455/how-to-handle-invalid-unicode-with-simplexml/8092672#8092672
|
||||||
|
$oldUse = libxml_use_internal_errors(true);
|
||||||
|
libxml_clear_errors();
|
||||||
|
$dom = new \DOMDocument("1.0", "UTF-8");
|
||||||
|
$dom->strictErrorChecking = false;
|
||||||
|
$dom->validateOnParse = false;
|
||||||
|
$dom->recover = true;
|
||||||
|
$dom->loadXML(strtr(
|
||||||
|
file_get_contents($this->outputFile),
|
||||||
|
array('"' => "'") // " in attribute names may mislead the parser
|
||||||
|
));
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var \LibXMLError
|
||||||
|
*/
|
||||||
|
$xmlError = libxml_get_last_error();
|
||||||
|
if ($xmlError) {
|
||||||
|
$warning = sprintf('L%s C%s: %s', $xmlError->line, $xmlError->column, $xmlError->message);
|
||||||
|
print 'WARNING: ignored errors while reading phpunit result, '.$warning."\n";
|
||||||
|
}
|
||||||
|
if (!$dom->hasChildNodes()) {
|
||||||
|
$this->internalProblem('xml file with no content');
|
||||||
|
}
|
||||||
|
$suites = simplexml_import_dom($dom);
|
||||||
|
|
||||||
|
libxml_clear_errors();
|
||||||
|
libxml_use_internal_errors($oldUse);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $suites;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -150,5 +185,7 @@ class PhpUnitResultJunit extends PhpUnitResult
|
||||||
private function internalProblem($description)
|
private function internalProblem($description)
|
||||||
{
|
{
|
||||||
throw new \RuntimeException($description);
|
throw new \RuntimeException($description);
|
||||||
|
|
||||||
|
// alternative to error throwing: append to $this->errors
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,7 +3,6 @@
|
||||||
namespace PHPCensor\Plugin\Util\TestResultParsers;
|
namespace PHPCensor\Plugin\Util\TestResultParsers;
|
||||||
|
|
||||||
use PHPCensor\Builder;
|
use PHPCensor\Builder;
|
||||||
use PHPCensor\Helper\Xml;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class Codeception
|
* Class Codeception
|
||||||
|
@ -12,49 +11,23 @@ use PHPCensor\Helper\Xml;
|
||||||
*/
|
*/
|
||||||
class Codeception implements ParserInterface
|
class Codeception implements ParserInterface
|
||||||
{
|
{
|
||||||
/**
|
|
||||||
* @var Builder
|
|
||||||
*/
|
|
||||||
protected $builder;
|
protected $builder;
|
||||||
|
protected $resultsXml;
|
||||||
/**
|
|
||||||
* @var string
|
|
||||||
*/
|
|
||||||
protected $xmlPath;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @var array
|
|
||||||
*/
|
|
||||||
protected $results;
|
protected $results;
|
||||||
|
protected $totalTests;
|
||||||
/**
|
protected $totalTimeTaken;
|
||||||
* @var int
|
protected $totalFailures;
|
||||||
*/
|
protected $totalErrors;
|
||||||
protected $totalTests = 0;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @var int
|
|
||||||
*/
|
|
||||||
protected $totalTimeTaken = 0;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @var int
|
|
||||||
*/
|
|
||||||
protected $totalFailures = 0;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @var int
|
|
||||||
*/
|
|
||||||
protected $totalErrors = 0;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param Builder $builder
|
* @param Builder $builder
|
||||||
* @param string $xmlPath
|
* @param $resultsXml
|
||||||
*/
|
*/
|
||||||
public function __construct(Builder $builder, $xmlPath)
|
public function __construct(Builder $builder, $resultsXml)
|
||||||
{
|
{
|
||||||
$this->builder = $builder;
|
$this->builder = $builder;
|
||||||
$this->xmlPath = $xmlPath;
|
$this->resultsXml = $resultsXml;
|
||||||
|
$this->totalTests = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -63,43 +36,42 @@ class Codeception implements ParserInterface
|
||||||
public function parse()
|
public function parse()
|
||||||
{
|
{
|
||||||
$rtn = [];
|
$rtn = [];
|
||||||
$this->results = Xml::loadFromFile($this->xmlPath);
|
$this->results = new \SimpleXMLElement($this->resultsXml);
|
||||||
|
|
||||||
if ($this->results) {
|
// calculate total results
|
||||||
foreach ($this->results->testsuite as $testSuite) {
|
foreach ($this->results->testsuite as $testSuite) {
|
||||||
$this->totalTests += (int)$testSuite['tests'];
|
$this->totalTests += (int)$testSuite['tests'];
|
||||||
$this->totalTimeTaken += (float)$testSuite['time'];
|
$this->totalTimeTaken += (float)$testSuite['time'];
|
||||||
$this->totalFailures += (int)$testSuite['failures'];
|
$this->totalFailures += (int)$testSuite['failures'];
|
||||||
$this->totalErrors += (int)$testSuite['errors'];
|
$this->totalErrors += (int)$testSuite['errors'];
|
||||||
|
|
||||||
foreach ($testSuite->testcase as $testCase) {
|
foreach ($testSuite->testcase as $testCase) {
|
||||||
$testResult = [
|
$testResult = [
|
||||||
'suite' => (string)$testSuite['name'],
|
'suite' => (string)$testSuite['name'],
|
||||||
'file' => str_replace($this->builder->buildPath, '/', (string) $testCase['file']),
|
'file' => str_replace($this->builder->buildPath, '/', (string) $testCase['file']),
|
||||||
'name' => (string)$testCase['name'],
|
'name' => (string)$testCase['name'],
|
||||||
'feature' => (string)$testCase['feature'],
|
'feature' => (string)$testCase['feature'],
|
||||||
'assertions' => (int)$testCase['assertions'],
|
'assertions' => (int)$testCase['assertions'],
|
||||||
'time' => (float)$testCase['time']
|
'time' => (float)$testCase['time']
|
||||||
];
|
];
|
||||||
|
|
||||||
if (isset($testCase['class'])) {
|
if (isset($testCase['class'])) {
|
||||||
$testResult['class'] = (string) $testCase['class'];
|
$testResult['class'] = (string) $testCase['class'];
|
||||||
}
|
|
||||||
|
|
||||||
// PHPUnit testcases does not have feature field. Use class::method instead
|
|
||||||
if (!$testResult['feature']) {
|
|
||||||
$testResult['feature'] = sprintf('%s::%s', $testResult['class'], $testResult['name']);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isset($testCase->failure) || isset($testCase->error)) {
|
|
||||||
$testResult['pass'] = false;
|
|
||||||
$testResult['message'] = isset($testCase->failure) ? (string)$testCase->failure : (string)$testCase->error;
|
|
||||||
} else {
|
|
||||||
$testResult['pass'] = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
$rtn[] = $testResult;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// PHPUnit testcases does not have feature field. Use class::method instead
|
||||||
|
if (!$testResult['feature']) {
|
||||||
|
$testResult['feature'] = sprintf('%s::%s', $testResult['class'], $testResult['name']);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isset($testCase->failure) || isset($testCase->error)) {
|
||||||
|
$testResult['pass'] = false;
|
||||||
|
$testResult['message'] = isset($testCase->failure) ? (string)$testCase->failure : (string)$testCase->error;
|
||||||
|
} else {
|
||||||
|
$testResult['pass'] = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
$rtn[] = $testResult;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -21,7 +21,9 @@ foreach ($errors as $error):
|
||||||
<tr>
|
<tr>
|
||||||
<td>
|
<td>
|
||||||
<?php if ($error->getIsNew()): ?>
|
<?php if ($error->getIsNew()): ?>
|
||||||
<span class="label label-danger"><?= Lang::get('new'); ?></span>
|
<span class="label label-danger">
|
||||||
|
<?= Lang::get('new'); ?>
|
||||||
|
</span>
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
|
@ -29,19 +31,25 @@ foreach ($errors as $error):
|
||||||
<?= Lang::get($error->getSeverityString()); ?>
|
<?= Lang::get($error->getSeverityString()); ?>
|
||||||
</span>
|
</span>
|
||||||
</td>
|
</td>
|
||||||
<td><?= Lang::get($error->getPlugin()); ?></td>
|
<td>
|
||||||
<td><a href="<?= $link; ?>"><?= $error->getFile(); ?></a></td>
|
<?= Lang::get($error->getPlugin()); ?>
|
||||||
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<a href="<?= $link; ?>">
|
<a href="<?= $link; ?>">
|
||||||
<?php
|
<?= $error->getFile(); ?>
|
||||||
if ($error->getLineStart() == $error->getLineEnd() || !$error->getLineEnd()) {
|
|
||||||
echo $error->getLineStart();
|
|
||||||
} else {
|
|
||||||
echo ($error->getLineStart() . ' - ' . $error->getLineEnd());
|
|
||||||
}
|
|
||||||
?>
|
|
||||||
</a>
|
</a>
|
||||||
</td>
|
</td>
|
||||||
<td class="visible-line-breaks"><?= htmlspecialchars(trim($error->getMessage())); ?></td>
|
<td>
|
||||||
|
<a href="<?= $link; ?>">
|
||||||
|
<?php if ($error->getLineStart() == $error->getLineEnd() || !$error->getLineEnd()): ?>
|
||||||
|
<?= $error->getLineStart(); ?>
|
||||||
|
<?php else: ?>
|
||||||
|
<?= ($error->getLineStart() . ' - ' . $error->getLineEnd()); ?>
|
||||||
|
<?php endif; ?>
|
||||||
|
</a>
|
||||||
|
</td>
|
||||||
|
<td class="visible-line-breaks">
|
||||||
|
<?= htmlspecialchars(trim($error->getMessage())); ?>
|
||||||
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<?php endforeach; ?>
|
<?php endforeach; ?>
|
||||||
|
|
205
src/View/Build/viewLog.phtml
Normal file
205
src/View/Build/viewLog.phtml
Normal file
|
@ -0,0 +1,205 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
use PHPCensor\Helper\Lang;
|
||||||
|
use PHPCensor\Model\Build;
|
||||||
|
use PHPCensor\Helper\AnsiConverter;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var Build $build
|
||||||
|
* @var integer $totalErrors
|
||||||
|
*/
|
||||||
|
|
||||||
|
?>
|
||||||
|
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-sm-4">
|
||||||
|
<div class="box">
|
||||||
|
<div class="box-header">
|
||||||
|
<h3 class="box-title">
|
||||||
|
<?= Lang::get('build_details'); ?>
|
||||||
|
</h3>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="box-body no-padding">
|
||||||
|
<table class="table">
|
||||||
|
<tr>
|
||||||
|
<th><?= Lang::get('project'); ?></th>
|
||||||
|
<td style="text-align: right">
|
||||||
|
<a href="<?= APP_URL . 'project/view/' . $build->getProjectId(); ?>">
|
||||||
|
<i class="fa fa-<?= $build->getProject()->getIcon(); ?>"></i>
|
||||||
|
<?= $build->getProject()->getTitle(); ?>
|
||||||
|
</a>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
|
||||||
|
<tr>
|
||||||
|
<th><?= Lang::get('branch'); ?></th>
|
||||||
|
<td style="text-align: right">
|
||||||
|
<?php if (Build::SOURCE_WEBHOOK_PULL_REQUEST === $build->getSource()): ?>
|
||||||
|
<a href="<?= $build->getRemoteBranchLink(); ?>">
|
||||||
|
<i class="fa fa-code-fork"></i>
|
||||||
|
<?= $build->getRemoteBranch(); ?> :
|
||||||
|
</a>
|
||||||
|
<?php endif; ?>
|
||||||
|
<a href="<?= $build->getBranchLink(); ?>">
|
||||||
|
<i class="fa fa-code-fork"></i>
|
||||||
|
<?= $build->getBranch(); ?>
|
||||||
|
</a>
|
||||||
|
<?php if ($tag = $build->getTag()): ?> /
|
||||||
|
<a href="<?= $build->getTagLink(); ?>">
|
||||||
|
<i class="fa fa-tag"></i> <?= $tag; ?>
|
||||||
|
</a>
|
||||||
|
<?php endif; ?>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
|
||||||
|
<tr>
|
||||||
|
<th><?= Lang::get('environment'); ?></th>
|
||||||
|
<td style="text-align: right">
|
||||||
|
<?php
|
||||||
|
$environment = $build->getEnvironment();
|
||||||
|
echo !empty($environment) ? ('<i class="fa fa-gear"> ' . $environment) : '—' ;
|
||||||
|
?>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
|
||||||
|
<tr>
|
||||||
|
<th><?= Lang::get('merged_branches'); ?></th>
|
||||||
|
<td style="text-align: right">
|
||||||
|
<a href="<?= $build->getBranchLink(); ?>">
|
||||||
|
<i class="fa fa-code-fork"></i> <?= $build->getBranch(); ?>
|
||||||
|
</a>
|
||||||
|
+ <?php
|
||||||
|
$branches = $build->getExtra('branches');
|
||||||
|
if (!empty($branches)) {
|
||||||
|
foreach($branches as $branch) {
|
||||||
|
?><i class="fa fa-code-fork"></i> <?= $branch ?><?php
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
?>—<?php
|
||||||
|
}
|
||||||
|
?>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="col-sm-4">
|
||||||
|
<div class="box">
|
||||||
|
<div class="box-header">
|
||||||
|
<h3 class="box-title">
|
||||||
|
<?= Lang::get('commit_details'); ?>
|
||||||
|
</h3>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="box-body no-padding">
|
||||||
|
<table class="table">
|
||||||
|
<tr>
|
||||||
|
<th><?= Lang::get('build_source'); ?></th>
|
||||||
|
<td style="text-align: right">
|
||||||
|
<?= Lang::get($build->getSourceHumanize()); ?>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<th><?= Lang::get('commit'); ?></th>
|
||||||
|
<td style="text-align: right">
|
||||||
|
<a href="<?= $build->getCommitLink(); ?>">
|
||||||
|
<?= substr($build->getCommitId(), 0, 7); ?>
|
||||||
|
</a>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
|
||||||
|
<tr>
|
||||||
|
<th><?= Lang::get('committer'); ?></th>
|
||||||
|
<td style="text-align: right">
|
||||||
|
<?= $build->getCommitterEmail(); ?>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
|
||||||
|
<tr>
|
||||||
|
<th><?= Lang::get('commit_message'); ?></th>
|
||||||
|
<td style="text-align: right">
|
||||||
|
<?= htmlspecialchars($build->getCommitMessage()); ?>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="col-sm-4">
|
||||||
|
<div class="box">
|
||||||
|
<div class="box-header">
|
||||||
|
<h3 class="box-title">
|
||||||
|
<?= Lang::get('timing'); ?>
|
||||||
|
</h3>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="box-body no-padding">
|
||||||
|
<table class="table">
|
||||||
|
<tr>
|
||||||
|
<th><?= Lang::get('created'); ?></th>
|
||||||
|
<td style="text-align: right" class="build-created datetime">
|
||||||
|
<?= ($build->getCreateDate() ? $build->getCreateDate()->format('Y-m-d H:i:s') : ''); ?>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
|
||||||
|
<tr>
|
||||||
|
<th><?= Lang::get('started'); ?></th>
|
||||||
|
<td style="text-align: right" class="build-started datetime">
|
||||||
|
<?= ($build->getStartDate() ? $build->getStartDate()->format('Y-m-d H:i:s') : ''); ?>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
|
||||||
|
<tr>
|
||||||
|
<th><?= Lang::get('finished'); ?></th>
|
||||||
|
<td style="text-align: right" class="build-finished datetime">
|
||||||
|
<?= ($build->getFinishDate() ? $build->getFinishDate()->format('Y-m-d H:i:s') : ''); ?>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
|
||||||
|
<tr>
|
||||||
|
<th><?= Lang::get('duration'); ?></th>
|
||||||
|
<td style="text-align: right" class="build-duration duration">
|
||||||
|
<?= $build->getDuration(); ?> <?= Lang::get('seconds'); ?>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="nav-tabs-custom">
|
||||||
|
<ul class="nav nav-tabs">
|
||||||
|
<li class="active">
|
||||||
|
<a href="#">
|
||||||
|
<i class="fa fa-cogs"></i> <?= Lang::get('build_log'); ?>
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
<li class="">
|
||||||
|
<a href="<?= APP_URL . 'build/viewErrors/' . $build->getProjectId(); ?>">
|
||||||
|
<i class="fa fa-exclamation-triangle"></i> <?= Lang::get('errors'); ?>
|
||||||
|
<?php if (!$totalErrors): ?>
|
||||||
|
<span class="errors-label label label-danger" style="display: none">0</span>
|
||||||
|
<?php else: ?>
|
||||||
|
<span class="errors-label label label-danger"><?= $totalErrors; ?></span>
|
||||||
|
<?php endif; ?>
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
<li class="">
|
||||||
|
<a href="<?= APP_URL . 'build/viewInformation/' . $build->getProjectId(); ?>">
|
||||||
|
<i class="fa fa-info-circle"></i> <?= Lang::get('information'); ?>
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
<div class="tab-content">
|
||||||
|
<div class="tab-pane active">
|
||||||
|
<pre style="overflow-y: visible; white-space: pre-wrap"><?= AnsiConverter::convert($build->getLog()); ?></pre>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
|
@ -2,6 +2,10 @@
|
||||||
|
|
||||||
use PHPCensor\Helper\Lang;
|
use PHPCensor\Helper\Lang;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var string $projects
|
||||||
|
*/
|
||||||
|
|
||||||
?>
|
?>
|
||||||
<div class="box">
|
<div class="box">
|
||||||
<div class="box-header">
|
<div class="box-header">
|
||||||
|
|
Loading…
Reference in a new issue