mirror/php-htmlpurifier
1
0
Fork 0
mirror of https://github.com/ezyang/htmlpurifier.git synced 2025-08-03 04:37:39 +02:00
Code Issues Releases Wiki Activity

Remove Singleton functionality, the accumulator will just have to be passed around.

Browse Source 
git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@130 48356398-32a2-884e-a903-53898d9a118a
This commit is contained in:
Edward Z. Yang
2006-07-30 16:01:24 +00:00
parent 4ab930dab4
commit bba0d0b77a
2 changed files with 1 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
library/HTMLPurifier/IDAccumulator.php
View File

@@ -5,23 +5,11 @@ class HTMLPurifier_IDAccumulator
var $ids = array(); var $ids = array();
function &instance() {
static $instance = null;
if (empty($instance)) {
$instance = new HTMLPurifier_IDAccumulator();
}
return $instance;
}
function add($id) { function add($id) {
if (isset($this->ids[$id])) return false; if (isset($this->ids[$id])) return false;
return $this->ids[$id] = true; return $this->ids[$id] = true;
} }
function reset() {
$this->ids = array();
}
} }
?> ?>

7
tests/HTMLPurifier/IDAccumulatorTest.php
View File

@@ -8,16 +8,11 @@ class HTMLPurifier_IDAccumulatorTest extends UnitTestCase
function test() { function test() {
// initialize the accumulator // initialize the accumulator
$accumulator = HTMLPurifier_IDAccumulator::instance(); $accumulator = new HTMLPurifier_IDAccumulator();
$accumulator->reset();
$this->assertTrue( $accumulator->add('id1')); $this->assertTrue( $accumulator->add('id1'));
$this->assertTrue( $accumulator->add('id2')); $this->assertTrue( $accumulator->add('id2'));
$this->assertFalse($accumulator->add('id1')); // repeated id $this->assertFalse($accumulator->add('id1')); // repeated id
$accumulator->reset();
$this->assertTrue( $accumulator->add('id2')); // test reset
$accumulator->reset();
} }