From 47413f64604422556a32b4aa6594a659101413ff Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sat, 16 May 2009 16:04:42 +0000
Subject: - Patch #368116 by chx, c960657: fixed bug in tokenizer for registry.

---
 modules/simpletest/tests/registry.test | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'modules/simpletest/tests')

diff --git a/modules/simpletest/tests/registry.test b/modules/simpletest/tests/registry.test
index 97ac23da8..9a363849f 100644
--- a/modules/simpletest/tests/registry.test
+++ b/modules/simpletest/tests/registry.test
@@ -146,12 +146,20 @@ class RegistrySkipBodyTestCase extends DrupalWebTestCase {
   
   function testRegistrySkipBody () {
     // This string contains all three kinds of opening braces.
-    $function = '<?php function foo () { $x = "{$y}"; $x = "${y}" }';
+    $function = '<?php function foo () { $x = "{$y}"; $x = "${y}"; }';
     $tokens = token_get_all($function);
     _registry_skip_body($tokens);
     // Consume the last }
     each($tokens);
     $this->assertIdentical(each($tokens), FALSE, t('Tokens skipped'));
+
+    // Check workaround for PHP < 5.2.3 regarding tokenization of strings
+    // containing variables. The { contained in the string should not be
+    // treated as a separate token.
+    $function = '<?php function foo() { $x = "$y {"; $x = `$y {`; $x = ' . "<<<EOD\n\$y {\nEOD\n; } function bar() {}";
+    $tokens = token_get_all($function);
+    _registry_skip_body($tokens);
+    $this->assertTrue(each($tokens), t('Tokens not skipped to end of file.'));
   }
 
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3