Various fixes:

- Resync standalone with includes
- Fix error queue code
- Fix heisenbug with flush and certain definition error messages
- Fix premature $end in ini files
- Make $php config variable actually do something

git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@1659 48356398-32a2-884e-a903-53898d9a118a

tests/HTMLPurifier/ChildDef/StrictBlockquoteTest.php

@@ -71,9 +71,10 @@ extends HTMLPurifier_ChildDefHarness
     }
     
     function testError() {
-        // $this->expectError('Cannot use non-block element as block wrapper');
+        $this->expectError('Cannot use non-block element as block wrapper');
         $this->obj = new HTMLPurifier_ChildDef_StrictBlockquote('div | p');
         $this->config->set('HTML', 'BlockWrapper', 'dav');
+        $this->config->set('Cache', 'DefinitionImpl', null);
         $this->assertResult('Needs wrap', '<p>Needs wrap</p>');
     }
     

tests/HTMLPurifier/ConfigTest-create.ini

@@ -1,2 +1,2 @@
 [Cake]
-Sprinkles = 42
+Sprinkles = 42

tests/HTMLPurifier/ConfigTest-finalize.ini

@@ -1,2 +1,2 @@
 [Poem]
-Meter = alexandrine
+Meter = alexandrine

tests/HTMLPurifier/ConfigTest-loadIni.ini

@@ -1,4 +1,4 @@
 [Shortcut]
 Copy = q
 Cut = t
-Paste = p
+Paste = p

tests/HTMLPurifier/Strategy/FixNestingTest.php

@@ -106,7 +106,8 @@ class HTMLPurifier_Strategy_FixNestingTest extends HTMLPurifier_StrategyHarness
    function testInvalidParentError() {
         // test fallback to div
         $this->config->set('HTML', 'Parent', 'obviously-impossible');
-        // $this->expectError('Cannot use unrecognized element as parent');
+        $this->config->set('Cache', 'DefinitionImpl', null);
+        $this->expectError('Cannot use unrecognized element as parent');
         $this->assertResult('<div>Accept</div>');
     }