Merge 1.5.2.3 (~r10623)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10624 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-04-26 09:17:29 +00:00
parent 79fdf10866
commit e4306a789f
915 changed files with 71076 additions and 245 deletions

View file

@ -0,0 +1,20 @@
<?php
class HTMLPurifier_DefinitionTest extends HTMLPurifier_Harness
{
function test_setup() {
$def = new HTMLPurifier_DefinitionTestable();
$config = HTMLPurifier_Config::createDefault();
$def->expectOnce('doSetup', array($config));
$def->setup($config);
}
function test_setup_redundant() {
$def = new HTMLPurifier_DefinitionTestable();
$config = HTMLPurifier_Config::createDefault();
$def->expectNever('doSetup');
$def->setup = true;
$def->setup($config);
}
}
// vim: et sw=4 sts=4