Merged pull request xdebug#997

Author: derickr

.azure-pipelines.yml

@@ -44,6 +44,6 @@ jobs:
   - template: .azure/macos/job.yml
     parameters:
       configurationName: 'OSX_PHP_80_ZTS'
-      phpVersion: '8.0.31'
+      phpVersion: '8.0.30'
       configurationParameters: '--enable-debug --enable-zts'
       xdebugConfigurationParameters: '--without-xdebug-compression'

src/lib/var.c

@@ -1039,6 +1039,7 @@ static const char xml_encode_count[256] = {
 	1, 1, 1, 1,  1, 1, 1, 1,  1, 1, 1, 1,  1, 1, 1, 1,
 	1, 1, 1, 1,  1, 1, 1, 1,  1, 1, 1, 1,  1, 1, 1, 1,
 	1, 1, 1, 1,  1, 1, 1, 1,  1, 1, 1, 1,  1, 1, 1, 1,
+	1, 1, 1, 1,  1, 1, 1, 1,  1, 1, 1, 1,  1, 1, 1, 1,
 };
 
 static const char* xml_encode_map[64] = {

tests/base/bug02319.phpt

@@ -0,0 +1,14 @@
+--TEST--
+Test for bug #2319: Emojis are not handled correctly in xdebug's var_dumps
+--INI--
+xdebug.mode=develop
+html_errors=1
+--FILE--
+<?php
+$str = 'hello 👍';
+var_dump($str);
+?>
+--EXPECTF--
+<pre class='xdebug-var-dump' dir='ltr'>
+<small>%sbug02319.php:3:</small><small>string</small> <font color='#cc0000'>'hello 👍'</font> <i>(length=10)</i>
+</pre>