Merge branch '2.3' into 2.4

fabpot · fabpot · commit 268d0a51166e · 2014-05-12T11:27:48.000+02:00
* 2.3:
  [Console]Improve formatter for double-width character
  Lower mbstring dep, remove it for Yaml and CssSelector components
  [Security] Add check for supported attributes in AclVoter
  [Form] Fixed TrimListenerTest as of PHP 5.5
  Added more IDE links
  [DependencyInjection] Fix parameter description in ConfigurationExtensionInterface
  [Finder] fixed typehint of the Finder::addAdapter() method
  [TwigBridge][Transchoice] set %count% from the current context.
  [DependencyInjection] Fix travis unit tests
  Update PHPUnit before run
  [Validator] fixed wrong test
  [WebProfilerBundle] added test case for #10773
  [WebProfilerBundle] fixed profiler homepage, fixed #10806
  [WebProfilerBundle] Added test case for #10806
  changed travis to run on the nightly builds of HHVM until everything gets stable
  Fixed issue #5427
  Allow URLs that don't contain a path

Conflicts:
	.travis.yml
diff --git a/Parser/Tokenizer/TokenizerEscaping.php b/Parser/Tokenizer/TokenizerEscaping.php
@@ -65,14 +65,18 @@ public function escapeUnicodeAndNewLine($value)
      */
     private function replaceUnicodeSequences($value)
     {
-        return preg_replace_callback($this->patterns->getUnicodeEscapePattern(), function (array $match) {
-            $code = $match[1];
+        return preg_replace_callback($this->patterns->getUnicodeEscapePattern(), function ($match) {
+            $c = hexdec($match[1]);
 
-            if (bin2hex($code) > 0xFFFD) {
-                $code = '\\FFFD';
+            if (0x80 > $c %= 0x200000) {
+                return chr($c);
+            }
+            if (0x800 > $c) {
+                return chr(0xC0 | $c>>6).chr(0x80 | $c & 0x3F);
+            }
+            if (0x10000 > $c) {
+                return chr(0xE0 | $c>>12).chr(0x80 | $c>>6 & 0x3F).chr(0x80 | $c & 0x3F);
             }
-
-            return mb_convert_encoding(pack('H*', $code), 'UTF-8', 'UCS-2BE');
         }, $value);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -65,14 +65,18 @@ public function escapeUnicodeAndNewLine($value)`
`65`	`65`	`*/`
`66`	`66`	`private function replaceUnicodeSequences($value)`
`67`	`67`	`{`
`68`		`- return preg_replace_callback($this->patterns->getUnicodeEscapePattern(), function (array $match) {`
`69`		`- $code = $match[1];`
	`68`	`+ return preg_replace_callback($this->patterns->getUnicodeEscapePattern(), function ($match) {`
	`69`	`+ $c = hexdec($match[1]);`
`70`	`70`
`71`		`- if (bin2hex($code) > 0xFFFD) {`
`72`		`- $code = '\\FFFD';`
	`71`	`+ if (0x80 > $c %= 0x200000) {`
	`72`	`+ return chr($c);`
	`73`	`+ }`
	`74`	`+ if (0x800 > $c) {`
	`75`	`+ return chr(0xC0 \| $c>>6).chr(0x80 \| $c & 0x3F);`
	`76`	`+ }`
	`77`	`+ if (0x10000 > $c) {`
	`78`	`+ return chr(0xE0 \| $c>>12).chr(0x80 \| $c>>6 & 0x3F).chr(0x80 \| $c & 0x3F);`
`73`	`79`	`}`
`74`		`-`
`75`		`- return mb_convert_encoding(pack('H*', $code), 'UTF-8', 'UCS-2BE');`
`76`	`80`	`}, $value);`
`77`	`81`	`}`
`78`	`82`	`}`