com php-src: Merge branch 'PHP-5.6': ext/dom/tests/node_textc ontent.phpt
| From: | Christoph Michael Becker | Date: | Fri, 31 Jul 2015 17:55:07 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': ext/dom/tests/node_textc ontent.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-88258@lists.php.net to get a copy of this message | ||
Commit: 78eab007a93c97a509f040d6b6cec58e4f9d22c3
Author: Christoph M. Becker <cmb@php.net> Fri, 31 Jul 2015 19:55:07 +0200
Parents: 3a66a23679487f4feda699ada109ab2b675e9474 6576d809a547b481fecfa8afff1d2ee519a85057
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=78eab007a93c97a509f040d6b6cec58e4f9d22c3
Log:
Merge branch 'PHP-5.6'
* PHP-5.6:
test fails with old libxml2; skip in this case
Changed paths:
MM ext/dom/tests/node_textcontent.phpt
Diff:
diff --cc ext/dom/tests/node_textcontent.phpt
index f731288,e469691..2882784
--- a/ext/dom/tests/node_textcontent.phpt
+++ b/ext/dom/tests/node_textcontent.phpt
@@@ -1,17 -1,13 +1,20 @@@
--TEST--
Testing reading and writing to DOMNode::textContent
--SKIPIF--
- <?php require_once('skipif.inc'); ?>
+ <?php
+ require_once('skipif.inc');
+ if (LIBXML_VERSION < 20707) die ('skip requires libxml2-2.7.7 or higher');
+ ?>
--FILE--
<?php
+/*
+ If this test is failing it is because the libxml2 library being used does
+ not have this bug fix from 2009:
+ https://github.com/GNOME/libxml2/commit/f3c06692e0d200ae0d35b5b3c31de8c56aa99ac6
+
+ The workaround if you are being hit by this is to add a <!DOCTYPE html> tag
+*/
$html = <<<HTML
<div id="test"><span>hi there</span></div>
HTML;