1
0
mirror of https://github.com/ezyang/htmlpurifier.git synced 2025-08-16 11:03:58 +02:00

PSR-2 reformatting PHPDoc corrections

With minor corrections.

Signed-off-by: Marcus Bointon <marcus@synchromedia.co.uk>
Signed-off-by: Edward Z. Yang <ezyang@mit.edu>
This commit is contained in:
Marcus Bointon
2013-07-16 13:56:14 +02:00
committed by Edward Z. Yang
parent 19eee14899
commit fac747bdbd
433 changed files with 13302 additions and 6690 deletions

View File

@@ -8,12 +8,14 @@ class PHPT_Controller_SimpleTest extends SimpleTestCase
protected $_path;
public function __construct($path) {
public function __construct($path)
{
$this->_path = $path;
parent::__construct($path);
}
public function testPhpt() {
public function testPhpt()
{
$suite = new PHPT_Suite(array($this->_path));
$phpt_reporter = new PHPT_Reporter_SimpleTest($this->reporter);
$suite->run($phpt_reporter);

View File

@@ -10,7 +10,8 @@ class PHPT_Reporter_SimpleTest implements PHPT_Reporter
protected $reporter;
/** @param SimpleTest reporter */
public function __construct($reporter) {
public function __construct($reporter)
{
$this->reporter = $reporter;
}
@@ -21,42 +22,48 @@ class PHPT_Reporter_SimpleTest implements PHPT_Reporter
* Called when the Reporter is started from a PHPT_Suite
* @todo Figure out if Suites can be named
*/
public function onSuiteStart(PHPT_Suite $suite) {
public function onSuiteStart(PHPT_Suite $suite)
{
//$this->reporter->paintGroupStart('PHPT Suite', $suite->count());
}
/**
* Called when the Reporter is finished in a PHPT_Suite
*/
public function onSuiteEnd(PHPT_Suite $suite) {
public function onSuiteEnd(PHPT_Suite $suite)
{
//$this->reporter->paintGroupEnd('PHPT Suite');
}
/**
* Called when a Case is started
*/
public function onCaseStart(PHPT_Case $case) {
public function onCaseStart(PHPT_Case $case)
{
//$this->reporter->paintCaseStart($case->name);
}
/**
* Called when a Case ends
*/
public function onCaseEnd(PHPT_Case $case) {
public function onCaseEnd(PHPT_Case $case)
{
//$this->reporter->paintCaseEnd($case->name);
}
/**
* Called when a Case runs without Exception
*/
public function onCasePass(PHPT_Case $case) {
public function onCasePass(PHPT_Case $case)
{
$this->reporter->paintPass("{$case->name} in {$case->filename}");
}
/**
* Called when a PHPT_Case_VetoException is thrown during a Case's run()
*/
public function onCaseSkip(PHPT_Case $case, PHPT_Case_VetoException $veto) {
public function onCaseSkip(PHPT_Case $case, PHPT_Case_VetoException $veto)
{
$this->reporter->paintSkip($veto->getMessage() . ' [' . $case->filename .']');
}
@@ -64,11 +71,13 @@ class PHPT_Reporter_SimpleTest implements PHPT_Reporter
* Called when any Exception other than a PHPT_Case_VetoException is encountered
* during a Case's run()
*/
public function onCaseFail(PHPT_Case $case, PHPT_Case_FailureException $failure) {
public function onCaseFail(PHPT_Case $case, PHPT_Case_FailureException $failure)
{
$this->reporter->paintFail($failure->getReason());
}
public function onParserError(Exception $exception) {
public function onParserError(Exception $exception)
{
$this->reporter->paintException($exception);
}

View File

@@ -4,31 +4,31 @@ class PHPT_Section_PRESKIPIF implements PHPT_Section_RunnableBefore
{
private $_data = null;
private $_runner_factory = null;
public function __construct($data)
{
$this->_data = $data;
$this->_runner_factory = new PHPT_CodeRunner_Factory();
}
public function run(PHPT_Case $case)
{
// @todo refactor this code into PHPT_Util class as its used in multiple places
$filename = dirname($case->filename) . '/' . basename($case->filename, '.php') . '.skip.php';
// @todo refactor to PHPT_CodeRunner
file_put_contents($filename, $this->_data);
$runner = $this->_runner_factory->factory($case);
$runner->ini = "";
$response = $runner->run($filename)->output;
unlink($filename);
if (preg_match('/^skip( - (.*))?/', $response, $matches)) {
$message = !empty($matches[2]) ? $matches[2] : '';
throw new PHPT_Case_VetoException($message);
}
}
public function getPriority()
{
return -2;