Merge branch 'master' of git.php.net:/php-src

* 'master' of git.php.net:/php-src:
  Added expectation
  Fix initialisation order
  Fix NEWS
  Fix a memleak with mysqlnd and SSL
  Move exceptional code into helpers
  Fix negotiaton of MySQL auth plugin
  Use EXPECT instead of EXPECTF when possible
  Move cold code, duplicated by specializer, into helper functions
  Fixed build without global register variables
  Sync --enable-native-intrinsics to pecl
  [ci skip] Sort recent NEWS entries alphabetically
  Fix openssl_* arginfos
  Update binary tools SDK branch for AppVeyor
  Separate slow path with make_real_object() and related code into "cold" function.
  [ci skip] run-tests.php: add missing put section

.appveyor.yml

@@ -23,7 +23,7 @@ environment:
         PHP_BUILD_CACHE_BASE_DIR: c:\build-cache  
         PHP_BUILD_OBJ_DIR: c:\obj
         PHP_BUILD_CACHE_SDK_DIR: c:\build-cache\sdk
-        PHP_BUILD_SDK_BRANCH: php-sdk-2.1.0
+        PHP_BUILD_SDK_BRANCH: php-sdk-2.1.1
         PHP_BUILD_CRT: vc15
         # ext and env setup for tests
         #MYSQL_TEST_PASSWD: Password12!

NEWS

@@ -41,6 +41,10 @@ PHP                                                                        NEWS
   . Fixed bug #75164 (split_bc_num() is pointless). (cmb)
   . Fixed bug #75169 (BCMath errors/warnings bypass PHP's error handling). (cmb)
 
+- cURL:
+  . Fixed bug #74125 (Fixed finding CURL on systems with multiarch support).
+    (cebe)
+
 - Date:
   . Implemented FR #74668: Add DateTime::createFromImmutable() method.
     (majkl578, Rican7)
@@ -51,10 +55,6 @@ PHP                                                                        NEWS
 - DBA:
   . Fixed bug #75264 (compiler warnings emitted). (petk)
 
-- cURL:
-  . Fixed bug #74125 (Fixed finding CURL on systems with multiarch support).
-    (cebe)
-
 - GD:
   . Added support for WebP in imagecreatefromstring() (Andreas Treichel, cmb).
 
@@ -65,13 +65,13 @@ PHP                                                                        NEWS
   . Added gmp_perfect_power(a). (Nikita)
   . Added gmp_kronecker(a, b). (Nikita)
 
+- interbase:
+  . Fixed bug #75453 (Incorrect reflection for ibase_[p]connect). (villfa)
+
 - intl:
   . Fixed bug #75317 (UConverter::setDestinationEncoding changes source instead 
     of destination). (andrewnester)
 
-- interbase:
-  . Fixed bug #75453 (Incorrect reflection for ibase_[p]connect). (villfa)
-
 - JSON:
   . Added JSON_THROW_ON_ERROR flag. (Andrea)
 
@@ -125,12 +125,6 @@ PHP                                                                        NEWS
 - PDO SQLite
   . Add support for additional open flags
 
-- phar:
-  . Fixed bug #74991 (include_path has a 4096 char limit in some cases).
-    (bwbroersma)
-  . Fixed bug #65414 (deal with leading slash when adding files correctly).
-    (bishopb)
-
 - pgsql:
   . Added new error constants for pg_result_error(): (Kalle)
     - Requires Postgres 9.3
@@ -142,6 +136,12 @@ PHP                                                                        NEWS
 	- Requires Postgres 9.6
 	  - PGSQL_DIAG_SEVERITY_NONLOCALIZED
 
+- phar:
+  . Fixed bug #74991 (include_path has a 4096 char limit in some cases).
+    (bwbroersma)
+  . Fixed bug #65414 (deal with leading slash when adding files correctly).
+    (bishopb)
+
 - Session:
   . Fixed bug #74941 (session fails to start after having headers sent). 
     (morozov)
@@ -151,6 +151,8 @@ PHP                                                                        NEWS
 
 - SOAP:
   . Fixed bug #75464 (Wrong reflection on SoapClient::__setSoapHeaders). (villfa)
+  . Fixed bug #70469 (SoapClient generates E_ERROR even if exceptions=1 is
+    used). (Anton Artamonov)
 
 - SPL:
   . Fixed bug #74977 (Appending AppendIterator leads to segfault). 
@@ -166,10 +168,6 @@ PHP                                                                        NEWS
 - SQLite3:
   . Updated bundled libsqlite to 3.22.0. (cmb)
 
-- Soap:
-  . Fixed bug #70469 (SoapClient generates E_ERROR even if exceptions=1 is
-    used). (Anton Artamonov)
-
 - Standard:
   . Fixed bug #75916 (DNS_CAA record results contain garbage). (Mike, 
     Philip Sharp)

Zend/tests/010.phpt

@@ -41,7 +41,7 @@ var_dump(get_parent_class(1));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 bool(false)
 bool(false)
 string(3) "foo"

Zend/tests/ErrorException_getSeverity.phpt

@@ -862,7 +862,7 @@ try {
 }
 
 ?>
---EXPECTF--
+--EXPECT--
 This exception severity is: 1bool(true)
 bool(true)
 bool(true)

Zend/tests/abstract-static.phpt

@@ -8,6 +8,6 @@ abstract class TestClass
 }
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 
 ===DONE===

Zend/tests/access_modifiers_011.phpt

@@ -32,7 +32,7 @@ echo $a->func1(),"\n";
 echo $a->func2(),"\n";
 
 ?>
---EXPECTF--	
+--EXPECT--	
 var1 value
 var2 value
 in func1

Zend/tests/access_modifiers_012.phpt

@@ -15,7 +15,7 @@ call_user_func(array($c, 'none'));
 call_user_func(array($c, 'prot'));
 call_user_func(array($c, 'priv'));
 ?>
---EXPECTF--
+--EXPECT--
 In __call() for method none()
 In __call() for method prot()
 In __call() for method priv()

Zend/tests/add_001.phpt

@@ -29,7 +29,7 @@ var_dump($c);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 array(3) {
   [0]=>
   int(1)

Zend/tests/add_005.phpt

@@ -16,7 +16,7 @@ var_dump($c);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 float(2834756759.1231)
 float(2834756759.1231)
 Done

Zend/tests/and_001.phpt

@@ -30,7 +30,7 @@ var_dump($s);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 string(3) "020"
 string(4) "pead"
 string(4) "pead"

Zend/tests/anon/002.phpt

@@ -15,7 +15,7 @@ $a = new class extends A implements B {
 };
 
 var_dump($a instanceof A, $a instanceof B);
---EXPECTF--
+--EXPECT--
 bool(true)
 bool(true)
 

Zend/tests/anon/013.phpt

@@ -10,6 +10,6 @@ $foo = function() {
 $closure = Closure::bind($foo, $class, $class);
 var_dump($closure());
 ?>
---EXPECTF--
+--EXPECT--
 object(class@anonymous)#1 (0) {
 }

Zend/tests/anon/014.phpt

@@ -12,5 +12,5 @@ $class = new class() {
 };
 var_dump($class->run());
 ?>
---EXPECTF--
+--EXPECT--
 string(10) "Running..."

Zend/tests/arg_unpack/by_ref.phpt

@@ -50,7 +50,7 @@ test2($a, $b, $c, $d, ...$array);
 var_dump($a, $b, $c, $d, $array);
 
 ?>
---EXPECTF--
+--EXPECT--
 array(3) {
   [0]=>
   int(2)

Zend/tests/arg_unpack/string_keys.phpt

@@ -19,6 +19,6 @@ try {
 }
 
 ?>
---EXPECTF--
+--EXPECT--
 string(36) "Cannot unpack array with string keys"
 string(42) "Cannot unpack Traversable with string keys"

Zend/tests/argument_restriction_004.phpt

@@ -14,4 +14,4 @@ class Sub extends Base {
 	}	
 }
 ?>
---EXPECTF--
+--EXPECT--

Zend/tests/assert/expect_001.phpt

@@ -8,5 +8,5 @@ assert.exception=1
 assert(true);
 var_dump(true);
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)

Zend/tests/assert/expect_019.phpt

@@ -12,7 +12,7 @@ var_dump(\assert(true));
 var_dump(assert(false));
 var_dump(assert(true));
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
 bool(true)
 bool(true)

Zend/tests/assign_to_var_001.phpt

@@ -12,7 +12,7 @@ var_dump($var1);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 int(2)
 int(2)
 Done

Zend/tests/assign_to_var_002.phpt

@@ -12,7 +12,7 @@ var_dump($var1);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 string(1) "g"
 string(1) "g"
 Done

Zend/tests/assign_to_var_003.phpt

@@ -12,7 +12,7 @@ var_dump($var1);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 NULL
 NULL
 Done

Zend/tests/assign_to_var_004.phpt

@@ -15,7 +15,7 @@ var_dump($var2);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 string(5) "space"
 string(5) "space"
 string(5) "space"

Zend/tests/bug22836.phpt

@@ -13,7 +13,7 @@ for ($i = 0; $i < 8; $i++) {
 	$h =& f();
 }
 ?>
---EXPECTF--
+--EXPECT--
 string(3) "foo"
 'foo'
 string(3) "foo"

Zend/tests/bug26229.phpt

@@ -24,6 +24,6 @@ catch(Exception $e)
 }
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 Objects returned by array_iterator::getIterator() must be traversable or implement interface Iterator
 ===DONE===

Zend/tests/bug26697.phpt

@@ -13,7 +13,7 @@ var_dump(class_exists('NotExistingClass'));
 
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 {closure}(NotExistingClass)
 bool(false)
 {closure}(NotExistingClass), done

Zend/tests/bug28442.phpt

@@ -45,7 +45,7 @@ var_dump(ClassC::$prop);
 
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 ===INIT===
 string(1) "A"
 string(1) "C"

Zend/tests/bug29210.phpt

@@ -89,7 +89,7 @@ if (is_callable(array('test_class','test_func4'))) {
 $object = new foo();
 $object->test();
 ?>
---EXPECTF--
+--EXPECT--
 test_func1
 test_func2
 test_func3

Zend/tests/bug29368.phpt

@@ -28,7 +28,7 @@ unset($bar);
 
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 Foo::__construct
 Caught exception!
 ===DONE===

Zend/tests/bug32290.phpt

@@ -96,7 +96,7 @@ var_dump($x->doSomethingStatic(1));
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 ===A===
 TestB::doSomething(1)
 TestA::doSomething(2)

Zend/tests/bug33771.phpt

@@ -33,7 +33,7 @@ var_dump(error_reporting());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 int(32767)
 int(32767)
 int(30719)

Zend/tests/bug40815.phpt

@@ -14,5 +14,5 @@ set_exception_handler("ehandle::exh");
 throw new Exception ("Whiii");
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 foo

Zend/tests/bug41026.phpt

@@ -20,7 +20,7 @@ try_class::main ();
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 Done
 
 Warning: (Registered shutdown functions) Unable to call self::on_shutdown() - function does not exist in Unknown on line 0

Zend/tests/bug41075.phpt

@@ -26,6 +26,6 @@ try {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 string(40) "Creating default object from empty value"
 Done

Zend/tests/bug43027.phpt

@@ -6,5 +6,5 @@ declare(ticks=1);
 namespace test;
 echo "ok\n";
 ?>
---EXPECTF--
+--EXPECT--
 ok

Zend/tests/bug43200_2.phpt

@@ -21,5 +21,5 @@ $o = new C();
 $o->foo();
 
 ?>
---EXPECTF--
+--EXPECT--
 works

Zend/tests/bug46196.phpt

@@ -23,7 +23,7 @@ function myErrorHandler($errno, $errstr, $errfile, $errline)
 
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 *** Testing restore_error_handler() : error bug #46196 ***
 NULL
 bool(true)

Zend/tests/bug46811.phpt

@@ -7,7 +7,7 @@ arg_separator.output=&
 var_dump(ini_set("arg_separator.output", ""));
 var_dump(ini_get("arg_separator.output"));
 ?>
---EXPECTF--
+--EXPECT--
 bool(false)
 string(1) "&"
 

Zend/tests/bug47353.phpt

@@ -22,5 +22,5 @@ $a = new A();
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 Done

Zend/tests/bug47981.phpt

@@ -13,5 +13,5 @@ interface a{}
 class b implements a { function f($a=1) {}}
 class c extends b {function f() {}}
 ?>
---EXPECTF--
+--EXPECT--
 string(60) "Declaration of c::f() should be compatible with b::f($a = 1)"

Zend/tests/bug48215.phpt

@@ -28,7 +28,7 @@ $b = new B();
 $b->A();
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 B::__construct
 A::__construct
 B::A

Zend/tests/bug48770.phpt

@@ -49,5 +49,5 @@ $c = new C;
 $c->func('This should work!');
 
 ?>
---EXPECTF--
+--EXPECT--
 string(26) "A::func: This should work!"

Zend/tests/bug53632.phpt

@@ -6,5 +6,5 @@ $d = 2.2250738585072011e-308;
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 Done

Zend/tests/bug53748.phpt

@@ -30,7 +30,7 @@ $o= myHelloWorld::getInstance(array(1=>2));
 $o= myHelloWorld::getInstance(array(1=>2));
 
 ?>
---EXPECTF--
+--EXPECT--
 int(1)
 int(2)
 array(1) {

Zend/tests/bug54624.phpt

@@ -22,5 +22,5 @@ eval('
 
 echo "DONE\n";
 ?>
---EXPECTF--
+--EXPECT--
 DONE

Zend/tests/bug55156.phpt

@@ -26,7 +26,7 @@ namespace foo {
 }
 	
 ?>
---EXPECTF--
+--EXPECT--
 bool(false)
 string(12) "/** test1 */"
 string(12) "/** test2 */"

Zend/tests/bug55445.phpt

@@ -4,5 +4,5 @@ Bug #55445 (Lexer error with short open tags)
 short_open_tag=0
 --FILE--
 <?php $u = "chris"; ?><p>Welcome <?= $u ?></p>
---EXPECTF--
+--EXPECT--
 <p>Welcome chris</p>

Zend/tests/bug60536_004.phpt

@@ -28,7 +28,7 @@ class Notice extends Base {
 }
 echo "POST-CLASS-GUARD2\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 PRE-CLASS-GUARD
 POST-CLASS-GUARD
 POST-CLASS-GUARD2

Zend/tests/bug60536_005.phpt

@@ -27,7 +27,7 @@ class Notice extends Base {
 }
 echo "POST-CLASS-GUARD2\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 PRE-CLASS-GUARD
 POST-CLASS-GUARD
 POST-CLASS-GUARD2

Zend/tests/bug61761.phpt

@@ -15,5 +15,5 @@ class B extends A
 
 ?>
 ==DONE==
---EXPECTF--
+--EXPECT--
 ==DONE==

Zend/tests/bug62892.phpt

@@ -16,6 +16,6 @@ $class = new \ReflectionClass('myClass');
 var_dump($class->getTraitAliases());
 
 ?>
---EXPECTF--
+--EXPECT--
 array(0) {
 }

Zend/tests/bug63055.phpt

@@ -21,5 +21,5 @@ $matches[2] = $dummy;
 str_replace("foo", "bar", "foobar", $matches);
 echo "okey";
 ?>
---EXPECTF--
+--EXPECT--
 okey

Zend/tests/bug63982.phpt

@@ -10,6 +10,6 @@ $test = new Test();
 
 var_dump(isset($test->protectedProperty));
 var_dump(isset($test->protectedProperty->foo));
---EXPECTF--
+--EXPECT--
 bool(false)
 bool(false)

Zend/tests/bug64354.phpt

@@ -20,5 +20,5 @@ try {
     var_dump($e->getMessage());
 }
 ?>
---EXPECTF--
+--EXPECT--
 string(9) "serialize"

Zend/tests/bug64578.phpt

@@ -9,6 +9,6 @@ function x($s) { $s['a'] = 1; };
 $y = '1';
 x($y);
 print_r($y);
---EXPECTF--
+--EXPECT--
 string(25) "Illegal string offset 'a'"
 1

Zend/tests/bug65419.phpt

@@ -18,6 +18,6 @@ class ghi
 
 ghi::def();
 ?>
---EXPECTF--
+--EXPECT--
 ghi
 ghi

Zend/tests/bug66015.phpt

@@ -25,7 +25,7 @@ $test = new Test();
 ?>
 
 ===DONE===
---EXPECTF--
+--EXPECT--
 array (
   1 => 'first',
   2 => 'second',

Zend/tests/bug66218.phpt

@@ -16,6 +16,6 @@ foreach ($fcts as $fct) {
 }
 ?>
 Done
---EXPECTF--
+--EXPECT--
 dl Ok
 Done

Zend/tests/bug67368.phpt

@@ -8,5 +8,5 @@ class FooBar {
 		const bar = ["bar" => 3]["bar"];
 }
 echo "okey";
---EXPECTF--
+--EXPECT--
 okey

Zend/tests/bug69221.phpt

@@ -20,5 +20,5 @@ unset($gen1);
 foreach ($gen2 as $v) { var_dump($v); }
 
 ?>
---EXPECTF--
+--EXPECT--
 int(1)

Zend/tests/bug69955.phpt

@@ -25,7 +25,7 @@ class C10 implements ArrayAccess
 $c10 = new C10;
 
 var_dump($c10[] += 5);
---EXPECTF--
+--EXPECT--
 Inside C10::offsetGet
 NULL
 

Zend/tests/bug70089.phpt

@@ -30,7 +30,7 @@ try {
 	var_dump($e->getMessage());
 }
 ?>
---EXPECTF--
+--EXPECT--
 string(36) "Cannot use string offset as an array"
 string(27) "Cannot unset string offsets"
 string(41) "Only variables can be passed by reference"

Zend/tests/bug70987.phpt

@@ -11,5 +11,5 @@ $bar = function () {
 var_dump($bar->call(new foo));
 
 ?>
---EXPECTF--
+--EXPECT--
 string(3) "foo"

Zend/tests/bug71756.phpt

@@ -20,7 +20,7 @@ function c ($option) {
 }
 a(array('bla' => 'false'));
 ?>
---EXPECTF--
+--EXPECT--
 array(1) {
   ["bla"]=>
   string(7) "changed"

Zend/tests/bug72594.phpt

@@ -22,7 +22,7 @@ var_dump(get_object_vars($oldFoo));
 
 $newFoo->bing($oldFoo);
 ?>
---EXPECTF--
+--EXPECT--
 array(1) {
   [0]=>
   string(4) "bing"

Zend/tests/bug72911.phpt

@@ -12,6 +12,4 @@ var_dump($b);
 ?>
 --EXPECTF--
 Warning: Attempt to modify property 'b' of non-object in %sbug72911.php on line %d
-
-Warning: Attempt to assign property 'i' of non-object in %sbug72911.php on line %d
 NULL

Zend/tests/bug73753.phpt

@@ -25,5 +25,5 @@ function traverse($a) {
 $arr = array(1 => 'foo', 'b' => 'bar', 'baz');
 var_dump(traverse($arr));
 ?>
---EXPECTF--
+--EXPECT--
 string(3) "baz"

Zend/tests/bug74947.phpt

@@ -8,5 +8,5 @@ echo 200000000000000000000000000000000000000000000000000000000000000000000000000
 echo -200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000;
 
 ?>
---EXPECTF--
+--EXPECT--
 INF-INF

Zend/tests/call_static_002.phpt

@@ -19,7 +19,7 @@ call_user_func(array($a, 'aAa'));
 call_user_func(array('Foo', 'aAa'));
 
 ?>
---EXPECTF--
+--EXPECT--
 nonstatic
 string(3) "aAa"
 static

Zend/tests/cast_to_bool.phpt

@@ -36,7 +36,7 @@ foreach ($vars as $var) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 bool(true)
 bool(true)
 bool(false)

Zend/tests/class_alias_017.phpt

@@ -26,7 +26,7 @@ baz::test();
 bar::test();
 
 ?>
---EXPECTF--
+--EXPECT--
 foo
 baz
 foo

Zend/tests/class_constants_003.phpt

@@ -27,7 +27,7 @@ unlink($filename);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 int(1)
 int(5)
 Done

Zend/tests/class_name_as_scalar.phpt

@@ -51,7 +51,7 @@ namespace {
 }
 
 ?>
---EXPECTF--
+--EXPECT--
 In NS
 string(11) "Foo\Bar\Moo"
 Top

Zend/tests/class_properties_dynamic.phpt

@@ -9,5 +9,5 @@ class Foo {
 }
 echo (new Foo)->bar;
 ?>
---EXPECTF--
+--EXPECT--
 3

Zend/tests/closure_024.phpt

@@ -18,7 +18,7 @@ echo $cc(10)."\n";
 
 echo "Done.\n";
 ?>
---EXPECTF--
+--EXPECT--
 11
 11
 12

Zend/tests/closure_036.phpt

@@ -27,7 +27,7 @@ var_dump($cb());
 var_dump($cb2());
 
 ?>
---EXPECTF--
+--EXPECT--
 int(1)
 int(11)
 int(12)

Zend/tests/closure_037.phpt

@@ -37,7 +37,7 @@ $closure = $b->getClosure();
 $closure();
 ?>
 Done.
---EXPECTF--
+--EXPECT--
 1
 42
 42

Zend/tests/closure_044.phpt

@@ -39,7 +39,7 @@ $d = $nonstaticScoped->bindTo(new A, 'A'); $d(); echo "\n";
 
 echo "Done.\n";
 
---EXPECTF--
+--EXPECT--
 Before binding
 bool(false)
 bool(false)

Zend/tests/closure_045.phpt

@@ -14,5 +14,5 @@ $a->bindTo(new A);
 
 echo "Done.\n";
 
---EXPECTF--
+--EXPECT--
 Done.

Zend/tests/closure_046.phpt

@@ -39,7 +39,7 @@ $d = $nonstaticScoped->bindTo(new B, "static"); $d(); echo "\n";
 
 echo "Done.\n";
 
---EXPECTF--
+--EXPECT--
 Before binding
 bool(false)
 bool(false)

Zend/tests/closures/closure_from_callable_reflection.phpt

@@ -35,7 +35,7 @@ foreach ($callables as $callable) {
 }
 
 ?>
---EXPECTF--
+--EXPECT--
 Bar
 int
 Bar

Zend/tests/compare_002.phpt

@@ -48,7 +48,7 @@ foreach($a as $var) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} === array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} !== string(0) ""
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} !== int(1)

Zend/tests/compound_assign_with_numeric_strings.phpt

@@ -38,7 +38,7 @@ try{
 $n = "-1";
 $n %= $n;
 var_dump($n);
---EXPECTF--
+--EXPECT--
 int(0)
 
 Exception: Bit shift by negative number

Zend/tests/declare_005.phpt

@@ -12,6 +12,6 @@ foo();
 
 }
 ?>
---EXPECTF--
+--EXPECT--
 tick
 tick

Zend/tests/div_001.phpt

@@ -25,7 +25,7 @@ var_dump($c);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 float(394758.39454545)
 float(394758.39454545)
 float(394758.39454545)

Zend/tests/double_to_string_64bit.phpt

@@ -35,7 +35,7 @@ foreach ($doubles as $d) {
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 string(7) "2.9E+37"
 string(18) "290000000000000000"
 string(15) "290000000000000"

Zend/tests/empty_str_offset.phpt

@@ -54,7 +54,7 @@ var_dump(empty($str[$f]));
 print "done\n";
 
 ?>
---EXPECTF--
+--EXPECT--
 - empty ---
 bool(false)
 bool(true)

Zend/tests/errmsg_024.phpt

@@ -13,5 +13,5 @@ class test extends test1 {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 Done

Zend/tests/errmsg_040.phpt

@@ -9,7 +9,7 @@ class test {
 var_dump(test::TEST);
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 array(3) {
   [0]=>
   int(1)

Zend/tests/error_reporting06.phpt

@@ -25,6 +25,6 @@ var_dump(error_reporting());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 int(32767)
 Done

Zend/tests/error_reporting07.phpt

@@ -25,6 +25,6 @@ var_dump(error_reporting());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 int(32767)
 Done

Zend/tests/error_reporting10.phpt

@@ -29,7 +29,7 @@ var_dump(error_reporting());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 int(32767)
 int(32759)
 Done

Zend/tests/exception_handler_001.phpt

@@ -16,5 +16,5 @@ throw new test();
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 string(12) "test thrown!"

Zend/tests/exception_handler_003.phpt

@@ -20,5 +20,5 @@ throw new Exception();
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 string(17) "Exception thrown!"

Zend/tests/exception_handler_005.phpt

@@ -19,5 +19,5 @@ throw new excEption();
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 string(25) "foo1(): Exception thrown!"

Zend/tests/exception_handler_006.phpt

@@ -21,5 +21,5 @@ throw new excEption();
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 string(24) "foo(): Exception thrown!"

Zend/tests/foreach_list_002.phpt

@@ -14,7 +14,7 @@ foreach($array as list(, $a)) {
 }
 
 ?>
---EXPECTF--
+--EXPECT--
 int(1)
 int(3)
 string(1) "b"

Zend/tests/foreach_reference.phpt

@@ -16,7 +16,7 @@ var_dump($a);
 var_dump(array_reverse($array));
 
 ?>
---EXPECTF--
+--EXPECT--
 array(4) {
   [0]=>
   string(1) "a"

Zend/tests/foreach_unset_globals.phpt

@@ -11,7 +11,7 @@ foreach ($arr as $key => $val) {
 var_dump($arr);
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 array(2) {
   ["a"]=>
   int(1)

Zend/tests/gc_031.phpt

@@ -7,5 +7,5 @@ zend.enable_gc=0
 gc_collect_cycles();
 echo "DONE\n";
 ?>
---EXPECTF--
+--EXPECT--
 DONE

Zend/tests/generators/bug74157.phpt

@@ -15,7 +15,7 @@ foreach (a(range(1, 3)) as $a) {
 	var_dump($a);
 }
 ?>
---EXPECTF--
+--EXPECT--
 int(1)
 int(2)
 int(3)