mirror of
https://github.com/ezyang/htmlpurifier.git
synced 2025-07-30 19:00:10 +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:
committed by
Edward Z. Yang
parent
19eee14899
commit
fac747bdbd
@@ -5,48 +5,56 @@ generate_mock_once('HTMLPurifier_DefinitionCache');
|
||||
class HTMLPurifier_DefinitionCache_Decorator_CleanupTest extends HTMLPurifier_DefinitionCache_DecoratorHarness
|
||||
{
|
||||
|
||||
function setup() {
|
||||
public function setup()
|
||||
{
|
||||
$this->cache = new HTMLPurifier_DefinitionCache_Decorator_Cleanup();
|
||||
parent::setup();
|
||||
}
|
||||
|
||||
function setupMockForSuccess($op) {
|
||||
public function setupMockForSuccess($op)
|
||||
{
|
||||
$this->mock->expectOnce($op, array($this->def, $this->config));
|
||||
$this->mock->setReturnValue($op, true, array($this->def, $this->config));
|
||||
$this->mock->expectNever('cleanup');
|
||||
}
|
||||
|
||||
function setupMockForFailure($op) {
|
||||
public function setupMockForFailure($op)
|
||||
{
|
||||
$this->mock->expectOnce($op, array($this->def, $this->config));
|
||||
$this->mock->setReturnValue($op, false, array($this->def, $this->config));
|
||||
$this->mock->expectOnce('cleanup', array($this->config));
|
||||
}
|
||||
|
||||
function test_get() {
|
||||
public function test_get()
|
||||
{
|
||||
$this->mock->expectOnce('get', array($this->config));
|
||||
$this->mock->setReturnValue('get', true, array($this->config));
|
||||
$this->mock->expectNever('cleanup');
|
||||
$this->assertEqual($this->cache->get($this->config), $this->def);
|
||||
}
|
||||
|
||||
function test_get_failure() {
|
||||
public function test_get_failure()
|
||||
{
|
||||
$this->mock->expectOnce('get', array($this->config));
|
||||
$this->mock->setReturnValue('get', false, array($this->config));
|
||||
$this->mock->expectOnce('cleanup', array($this->config));
|
||||
$this->assertEqual($this->cache->get($this->config), false);
|
||||
}
|
||||
|
||||
function test_set() {
|
||||
public function test_set()
|
||||
{
|
||||
$this->setupMockForSuccess('set');
|
||||
$this->assertEqual($this->cache->set($this->def, $this->config), true);
|
||||
}
|
||||
|
||||
function test_replace() {
|
||||
public function test_replace()
|
||||
{
|
||||
$this->setupMockForSuccess('replace');
|
||||
$this->assertEqual($this->cache->replace($this->def, $this->config), true);
|
||||
}
|
||||
|
||||
function test_add() {
|
||||
public function test_add()
|
||||
{
|
||||
$this->setupMockForSuccess('add');
|
||||
$this->assertEqual($this->cache->add($this->def, $this->config), true);
|
||||
}
|
||||
|
@@ -5,61 +5,71 @@ generate_mock_once('HTMLPurifier_DefinitionCache');
|
||||
class HTMLPurifier_DefinitionCache_Decorator_MemoryTest extends HTMLPurifier_DefinitionCache_DecoratorHarness
|
||||
{
|
||||
|
||||
function setup() {
|
||||
public function setup()
|
||||
{
|
||||
$this->cache = new HTMLPurifier_DefinitionCache_Decorator_Memory();
|
||||
parent::setup();
|
||||
}
|
||||
|
||||
function setupMockForSuccess($op) {
|
||||
public function setupMockForSuccess($op)
|
||||
{
|
||||
$this->mock->expectOnce($op, array($this->def, $this->config));
|
||||
$this->mock->setReturnValue($op, true, array($this->def, $this->config));
|
||||
$this->mock->expectNever('get');
|
||||
}
|
||||
|
||||
function setupMockForFailure($op) {
|
||||
public function setupMockForFailure($op)
|
||||
{
|
||||
$this->mock->expectOnce($op, array($this->def, $this->config));
|
||||
$this->mock->setReturnValue($op, false, array($this->def, $this->config));
|
||||
$this->mock->expectOnce('get', array($this->config));
|
||||
}
|
||||
|
||||
function test_get() {
|
||||
public function test_get()
|
||||
{
|
||||
$this->mock->expectOnce('get', array($this->config)); // only ONE call!
|
||||
$this->mock->setReturnValue('get', $this->def, array($this->config));
|
||||
$this->assertEqual($this->cache->get($this->config), $this->def);
|
||||
$this->assertEqual($this->cache->get($this->config), $this->def);
|
||||
}
|
||||
|
||||
function test_set() {
|
||||
public function test_set()
|
||||
{
|
||||
$this->setupMockForSuccess('set', 'get');
|
||||
$this->assertEqual($this->cache->set($this->def, $this->config), true);
|
||||
$this->assertEqual($this->cache->get($this->config), $this->def);
|
||||
}
|
||||
|
||||
function test_set_failure() {
|
||||
public function test_set_failure()
|
||||
{
|
||||
$this->setupMockForFailure('set', 'get');
|
||||
$this->assertEqual($this->cache->set($this->def, $this->config), false);
|
||||
$this->cache->get($this->config);
|
||||
}
|
||||
|
||||
function test_replace() {
|
||||
public function test_replace()
|
||||
{
|
||||
$this->setupMockForSuccess('replace', 'get');
|
||||
$this->assertEqual($this->cache->replace($this->def, $this->config), true);
|
||||
$this->assertEqual($this->cache->get($this->config), $this->def);
|
||||
}
|
||||
|
||||
function test_replace_failure() {
|
||||
public function test_replace_failure()
|
||||
{
|
||||
$this->setupMockForFailure('replace', 'get');
|
||||
$this->assertEqual($this->cache->replace($this->def, $this->config), false);
|
||||
$this->cache->get($this->config);
|
||||
}
|
||||
|
||||
function test_add() {
|
||||
public function test_add()
|
||||
{
|
||||
$this->setupMockForSuccess('add', 'get');
|
||||
$this->assertEqual($this->cache->add($this->def, $this->config), true);
|
||||
$this->assertEqual($this->cache->get($this->config), $this->def);
|
||||
}
|
||||
|
||||
function test_add_failure() {
|
||||
public function test_add_failure()
|
||||
{
|
||||
$this->setupMockForFailure('add', 'get');
|
||||
$this->assertEqual($this->cache->add($this->def, $this->config), false);
|
||||
$this->cache->get($this->config);
|
||||
|
@@ -5,7 +5,8 @@ generate_mock_once('HTMLPurifier_DefinitionCache');
|
||||
class HTMLPurifier_DefinitionCache_DecoratorHarness extends HTMLPurifier_DefinitionCacheHarness
|
||||
{
|
||||
|
||||
function setup() {
|
||||
public function setup()
|
||||
{
|
||||
$this->mock = new HTMLPurifier_DefinitionCacheMock();
|
||||
$this->mock->type = 'Test';
|
||||
$this->cache = $this->cache->decorate($this->mock);
|
||||
@@ -13,7 +14,8 @@ class HTMLPurifier_DefinitionCache_DecoratorHarness extends HTMLPurifier_Definit
|
||||
$this->config = $this->generateConfigMock();
|
||||
}
|
||||
|
||||
function teardown() {
|
||||
public function teardown()
|
||||
{
|
||||
unset($this->mock);
|
||||
unset($this->cache);
|
||||
}
|
||||
|
@@ -3,8 +3,8 @@
|
||||
class HTMLPurifier_DefinitionCache_DecoratorTest extends HTMLPurifier_DefinitionCacheHarness
|
||||
{
|
||||
|
||||
function test() {
|
||||
|
||||
public function test()
|
||||
{
|
||||
generate_mock_once('HTMLPurifier_DefinitionCache');
|
||||
$mock = new HTMLPurifier_DefinitionCacheMock();
|
||||
$mock->type = 'Test';
|
||||
|
@@ -3,7 +3,8 @@
|
||||
class HTMLPurifier_DefinitionCache_SerializerTest extends HTMLPurifier_DefinitionCacheHarness
|
||||
{
|
||||
|
||||
function test() {
|
||||
public function test()
|
||||
{
|
||||
// XXX SimpleTest does some really crazy stuff in the background
|
||||
// to do equality checks. Unfortunately, this makes some
|
||||
// versions of PHP segfault. So we need to define a better,
|
||||
@@ -66,7 +67,8 @@ class HTMLPurifier_DefinitionCache_SerializerTest extends HTMLPurifier_Definitio
|
||||
|
||||
}
|
||||
|
||||
function test_errors() {
|
||||
public function test_errors()
|
||||
{
|
||||
$cache = new HTMLPurifier_DefinitionCache_Serializer('Test');
|
||||
$def = $this->generateDefinition();
|
||||
$def->setup = true;
|
||||
@@ -83,8 +85,8 @@ class HTMLPurifier_DefinitionCache_SerializerTest extends HTMLPurifier_Definitio
|
||||
$cache->replace($def, $config);
|
||||
}
|
||||
|
||||
function test_flush() {
|
||||
|
||||
public function test_flush()
|
||||
{
|
||||
$cache = new HTMLPurifier_DefinitionCache_Serializer('Test');
|
||||
|
||||
$config1 = $this->generateConfigMock('test1');
|
||||
@@ -111,8 +113,8 @@ class HTMLPurifier_DefinitionCache_SerializerTest extends HTMLPurifier_Definitio
|
||||
|
||||
}
|
||||
|
||||
function testCleanup() {
|
||||
|
||||
public function testCleanup()
|
||||
{
|
||||
$cache = new HTMLPurifier_DefinitionCache_Serializer('Test');
|
||||
|
||||
// in order of age, oldest first
|
||||
@@ -139,8 +141,8 @@ class HTMLPurifier_DefinitionCache_SerializerTest extends HTMLPurifier_Definitio
|
||||
|
||||
}
|
||||
|
||||
function testCleanupOnlySameID() {
|
||||
|
||||
public function testCleanupOnlySameID()
|
||||
{
|
||||
$cache = new HTMLPurifier_DefinitionCache_Serializer('Test');
|
||||
|
||||
$config1 = $this->generateConfigMock('serial1');
|
||||
@@ -168,7 +170,8 @@ class HTMLPurifier_DefinitionCache_SerializerTest extends HTMLPurifier_Definitio
|
||||
/**
|
||||
* Asserts that a file exists, ignoring the stat cache
|
||||
*/
|
||||
function assertFileExist($file) {
|
||||
public function assertFileExist($file)
|
||||
{
|
||||
clearstatcache();
|
||||
$this->assertTrue(file_exists($file), 'Expected ' . $file . ' exists');
|
||||
}
|
||||
@@ -176,13 +179,14 @@ class HTMLPurifier_DefinitionCache_SerializerTest extends HTMLPurifier_Definitio
|
||||
/**
|
||||
* Asserts that a file does not exist, ignoring the stat cache
|
||||
*/
|
||||
function assertFileNotExist($file) {
|
||||
public function assertFileNotExist($file)
|
||||
{
|
||||
clearstatcache();
|
||||
$this->assertFalse(file_exists($file), 'Expected ' . $file . ' does not exist');
|
||||
}
|
||||
|
||||
function testAlternatePath() {
|
||||
|
||||
public function testAlternatePath()
|
||||
{
|
||||
$cache = new HTMLPurifier_DefinitionCache_Serializer('Test');
|
||||
$config = $this->generateConfigMock('serial');
|
||||
$config->version = '1.0.0';
|
||||
@@ -199,8 +203,8 @@ class HTMLPurifier_DefinitionCache_SerializerTest extends HTMLPurifier_Definitio
|
||||
|
||||
}
|
||||
|
||||
function testAlternatePermissions() {
|
||||
|
||||
public function testAlternatePermissions()
|
||||
{
|
||||
$cache = new HTMLPurifier_DefinitionCache_Serializer('Test');
|
||||
$config = $this->generateConfigMock('serial');
|
||||
$config->version = '1.0.0';
|
||||
|
Reference in New Issue
Block a user