From: Bob Weinand <bobwei9@hotmail.com>
Date: Fri, 2 Dec 2016 14:42:19 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.1RC1~157
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7b5e89de8214c85cf5af96fe43d00b5e87f87048;p=php

Merge branch 'PHP-7.0' into PHP-7.1
---

7b5e89de8214c85cf5af96fe43d00b5e87f87048
diff --cc Zend/tests/self_xor.phpt
index f56177567b,f306a9cd69..e36a315b10
--- a/Zend/tests/self_xor.phpt
+++ b/Zend/tests/self_xor.phpt
@@@ -28,12 -28,8 +28,12 @@@ echo "Done\n"
  ?>
  --EXPECTF--
  int(109)
 +
 +Warning: A non-numeric value encountered in %s on line %d
  int(11)
 +
 +Notice: A non well formed numeric value encountered in %s on line %d
  int(45312)
- string(1) "f"
- string(2) "ff"
- Done
+ string(1) "F"
+ string(2) "FF"
+ Done