From: Michael Orlitzky Date: Fri, 10 Jun 2016 03:12:17 +0000 (-0400) Subject: ext/tidy: fix non-deterministic expected output in two tests. X-Git-Tag: php-7.1.0beta1~115 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=08b10f17f1794e0bee209383b505d4c66bf5f39e;p=php ext/tidy: fix non-deterministic expected output in two tests. Some of the tidy tests expect output that can change. The motivating example is an object "id" that is some integer, but no integer in particular. Those hard-coded values have been changed to accept any integer so that the test suite passes when tidy-html5 is used. --- diff --git a/ext/tidy/tests/010.phpt b/ext/tidy/tests/010.phpt index 85d9df5190..695e1c9ce5 100644 --- a/ext/tidy/tests/010.phpt +++ b/ext/tidy/tests/010.phpt @@ -11,7 +11,7 @@ var_dump($a->html()); var_dump($a->head()); ?> ---EXPECT-- +--EXPECTF-- object(tidyNode)#2 (8) { ["value"]=> string(94) " @@ -100,7 +100,7 @@ object(tidyNode)#2 (8) { ["proprietary"]=> bool(false) ["id"]=> - int(111) + int(%i) ["attribute"]=> NULL ["child"]=> @@ -231,7 +231,7 @@ object(tidyNode)#2 (9) { ["proprietary"]=> bool(false) ["id"]=> - int(111) + int(%i) ["attribute"]=> NULL ["child"]=> @@ -307,7 +307,7 @@ object(tidyNode)#2 (9) { ["proprietary"]=> bool(false) ["id"]=> - int(111) + int(%i) ["attribute"]=> NULL ["child"]=> diff --git a/ext/tidy/tests/012.phpt b/ext/tidy/tests/012.phpt index 39ce22bec1..e86aa6c45c 100644 --- a/ext/tidy/tests/012.phpt +++ b/ext/tidy/tests/012.phpt @@ -30,7 +30,7 @@ Accessing children nodes dump_nodes($html); ?> ---EXPECT-- +--EXPECTF-- bool(true) object(tidyNode)#3 (9) { ["value"]=> @@ -70,7 +70,7 @@ object(tidyNode)#3 (9) { ["proprietary"]=> bool(false) ["id"]=> - int(111) + int(%i) ["attribute"]=> NULL ["child"]=> @@ -94,7 +94,7 @@ object(tidyNode)#4 (9) { ["proprietary"]=> bool(false) ["id"]=> - int(111) + int(%i) ["attribute"]=> NULL ["child"]=> @@ -222,7 +222,7 @@ object(tidyNode)#5 (9) { ["proprietary"]=> bool(false) ["id"]=> - int(114) + int(%i) ["attribute"]=> NULL ["child"]=> @@ -365,7 +365,7 @@ object(tidyNode)#8 (9) { ["proprietary"]=> bool(false) ["id"]=> - int(114) + int(%i) ["attribute"]=> NULL ["child"]=> @@ -426,7 +426,7 @@ object(tidyNode)#10 (9) { ["proprietary"]=> bool(false) ["id"]=> - int(114) + int(%i) ["attribute"]=> NULL ["child"]=>