improve fix for bug #71201

* PHP-5.6:
  fork test
  fix test
  fork test
  fork test for win32
  fork test

.gitignore

@@ -245,10 +245,6 @@ ext/reflection/spl.chm
 ext/simplexml/examples/security.new.xml
 ext/spl/examples/.htaccess
 ext/spl/examples/*.phps
-ext/sqlite/weztest.sqlite
-ext/sqlite/libsqlite/src/sqlite.h
-ext/sqlite/libsqlite/src/parse.out
-ext/sqlite/libsqlite/src/libsqlite.dsw
 ext/sqlite3/tests/phpsql*
 ext/sqlite3/tests/*.db
 ext/sqlite3/tests/*.tmp

.travis.yml

@@ -1,4 +1,22 @@
 language: c
+sudo: false
+addons:
+  apt:
+    packages:
+      - locales
+      - language-pack-de
+      - re2c
+      - libgmp-dev
+      - libicu-dev
+      - libmcrypt-dev
+      - libtidy-dev
+      - libenchant-dev
+      - libaspell-dev
+      - libpspell-dev
+      - librecode-dev
+      - libsasl2-dev
+      - libxpm-dev
+      - libt1-dev
 
 notifications:
     email: 
@@ -27,13 +45,6 @@ env:
       - ENABLE_MAINTAINER_ZTS=0 ENABLE_DEBUG=0
       - ENABLE_MAINTAINER_ZTS=1 ENABLE_DEBUG=1
 
-before_install:
-    - sudo apt-get update -qq
-    - sudo apt-get install -y libenchant-dev libaspell-dev libpspell-dev librecode-dev libsasl2-dev libxpm-dev libt1-dev libc-client2007e-dev
-    - sudo cp ./travis/de /var/lib/locales/supported.d/de
-    - sudo dpkg-reconfigure locales
-    - ./travis/install.sh
-
 before_script:
     # Compile PHP
     - ./travis/compile.sh
@@ -43,7 +54,6 @@ before_script:
     - . ./travis/ext/pdo_mysql/setup.sh
     - . ./travis/ext/pgsql/setup.sh
     - . ./travis/ext/pdo_pgsql/setup.sh
-    - . ./travis/ext/imap/setup.sh
 
 # Run PHPs run-tests.php 
 script:

LICENSE

@@ -1,6 +1,6 @@
 -------------------------------------------------------------------- 
                   The PHP License, version 3.01
-Copyright (c) 1999 - 2015 The PHP Group. All rights reserved.
+Copyright (c) 1999 - 2016 The PHP Group. All rights reserved.
 -------------------------------------------------------------------- 
 
 Redistribution and use in source and binary forms, with or without

Makefile.gcov

@@ -57,7 +57,7 @@ php_lcov.info: lcov-test
 			cp $$x.bbg  lcov_data/$$y.bbg ; \
 		fi; \
 	done; \
-	for dir in ext/bcmath/libbcmath ext/fileinfo/libmagic ext/gd/libgd ext/mbstring/libmbfl ext/mbstring/oniguruma ext/pcre/pcrelib ext/pdo_sqlite/libsqlite ext/sqlite/libsqlite ext/sqlite3/libsqlite ext/xmlrpc/libxmlrpc ext/zip/lib; do \
+	for dir in ext/bcmath/libbcmath ext/date/lib ext/fileinfo/libmagic ext/gd/libgd ext/mbstring/libmbfl ext/mbstring/oniguruma ext/pcre/pcrelib ext/pdo_sqlite/libsqlite ext/sqlite3/libsqlite ext/xmlrpc/libxmlrpc ext/zip/lib; do \
 		if test -d lcov_data/$$dir; then \
 			rm -rf lcov_data/$$dir ; \
 		fi; \

TSRM/tsrm_nw.c

@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 7                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2015 The PHP Group                                |
+   | Copyright (c) 1997-2016 The PHP Group                                |
    +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |

TSRM/tsrm_nw.h

@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 7                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2015 The PHP Group                                |
+   | Copyright (c) 1997-2016 The PHP Group                                |
    +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |

TSRM/tsrm_win32.c

@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 7                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2015 The PHP Group                                |
+   | Copyright (c) 1997-2016 The PHP Group                                |
    +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -599,10 +599,8 @@ TSRM_API int shmget(int key, int size, int flags)
 		return -1;
 	}
 
-	snprintf(shm_segment, sizeof(shm_segment)-1, "TSRM_SHM_SEGMENT:%d", key);
-	snprintf(shm_info, sizeof(shm_info)-1, "TSRM_SHM_DESCRIPTOR:%d", key);
-	shm_segment[sizeof(shm_segment)-1] = '\0';
-	shm_info[sizeof(shm_info)-1] = '\0';
+	snprintf(shm_segment, sizeof(shm_segment), "TSRM_SHM_SEGMENT:%d", key);
+	snprintf(shm_info, sizeof(shm_info), "TSRM_SHM_DESCRIPTOR:%d", key);
 
 	shm_handle  = OpenFileMapping(FILE_MAP_ALL_ACCESS, FALSE, shm_segment);
 	info_handle = OpenFileMapping(FILE_MAP_ALL_ACCESS, FALSE, shm_info);

TSRM/tsrm_win32.h

@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 7                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2015 The PHP Group                                |
+   | Copyright (c) 1997-2016 The PHP Group                                |
    +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |

UPGRADING

@@ -352,7 +352,7 @@ Relevant RFCs:
 Other language changes
 ----------------------
 
-* Removed support for static calls to non-static calls form an incompatible
+* Removed support for static calls to non-static methods from an incompatible
   $this context. In this case $this will not be defined, but the call will be
   allowed with a deprecation notice. An example:
 
@@ -556,6 +556,10 @@ Other
   . Added ability to move PHP code pages (PHP TEXT segment) into HUGE pages.
     It's possible to enable/disable this feature in php.ini through
     opcache.huge_code_pages=0/1. OS should be configured to provide huge pages.
+  . Added Windows only opcache.file_cache_fallback=1 ini option, which implies
+    the implemented fallback mechanism. When OPcache was not able to reattach
+    the shared memory segment to the desired address and opcache.file_cache
+    is on, opcache.file_cache_only=1 will be automatically enforced.
 
 - OpenSSL
   . Added "alpn_protocols" SSL context option allowing encrypted client/server
@@ -604,9 +608,6 @@ Other
 5. Changed Functions
 ========================================
 
-- parse_ini_file():
-- parse_ini_string():
-  . Added scanner mode INI_SCANNER_TYPED to yield typed .ini values.
 - unserialize():
   . Added second parameter for unserialize function 
     (RFC: https://wiki.php.net/rfc/secure_unserialize) allowing to specify

UPGRADING.INTERNALS

@@ -90,7 +90,7 @@ changes. See: https://wiki.php.net/phpng-upgrading
 
        The only exceptions are the snprintf and zend_sprintf functions yet, because in some cases
        they can use the implemenations available on the system, not the PHP one. With snprintf the
-       macros ZEND_INT_FMT and ZEND_UINT_FMT should be used.
+       macros ZEND_LONG_FMT and ZEND_ULONG_FMT should be used.
 
   h. HashTable API
 
@@ -248,7 +248,7 @@ changes. See: https://wiki.php.net/phpng-upgrading
 
   w. Tick functions internal API change
      Tick functions have different declaration now. They expect a single
-	 single parameter while before they were parameterless. When registering the
+	 parameter while before they were parameterless. When registering the
 	 tick function a value for this parameter must be passed. This value will be
 	 provided to the tick function on every execution.
 

Zend/tests/array_addition_not_commutative.phpt

@@ -0,0 +1,19 @@
+--TEST--
+Array addition is not commutative -- do not swap operands
+--FILE--
+<?php
+
+$array = [1, 2, 3];
+$array = [4, 5, 6] + $array;
+var_dump($array);
+
+?>
+--EXPECT--
+array(3) {
+  [0]=>
+  int(4)
+  [1]=>
+  int(5)
+  [2]=>
+  int(6)
+}

Zend/tests/assert/expect_016.phpt

@@ -18,7 +18,7 @@ bool(true)
 bool(true)
 
 Warning: assert(): assert(false) failed in %sexpect_016.php on line 6
-NULL
+bool(false)
 bool(true)
 
 Warning: zend.assertions may be completely enabled or disabled only in php.ini in %sexpect_016.php on line 8

Zend/tests/assert/expect_018.phpt

@@ -25,9 +25,9 @@ bool(true)
 bool(true)
 
 Warning: assert(): assert(false) failed in %sexpect_018.php on line 10
-NULL
+bool(false)
 bool(true)
 
 Warning: assert(): assert(false) failed in %sexpect_018.php on line 12
-NULL
+bool(false)
 bool(true)

Zend/tests/bug26166.phpt

@@ -68,7 +68,7 @@ catch (Exception $e) {
 --EXPECTF--
 Hello World!
 ===NONE===
-string(56) "Method NoneTest::__toString() must return a string value"
+string(%d) "Method NoneTest::__toString() must return a string value"
 ===THROW===
 
-Fatal error: Method ErrorTest::__toString() must not throw an exception in %sbug26166.php on line %d
+Fatal error: Method ErrorTest::__toString() must not throw an exception, caught Exception: This is an error! in %sbug26166.php on line %d

Zend/tests/bug42802.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Bug #42802 (Namespace not supported in typehints)
+Bug #42802 (Namespace not supported in types)
 --FILE--
 <?php
 namespace foo;

Zend/tests/bug52355.phpt

@@ -0,0 +1,20 @@
+--TEST--
+Bug #52355 (Negating zero does not produce negative zero)
+--FILE--
+<?php
+
+var_dump(-0.0);
+var_dump(-(float)"0");
+
+$foo = -sin(0);
+
+var_dump($foo);
+
+var_dump(@(1.0 / -0.0));
+
+?>
+--EXPECT--
+float(-0)
+float(-0)
+float(-0)
+float(-INF)

Zend/tests/bug60909_2.phpt

@@ -14,7 +14,7 @@ class Bad {
 $bad = new Bad();
 echo "$bad";
 --EXPECTF--
-Fatal error: Method Bad::__toString() must not throw an exception in %sbug60909_2.php on line 0
+Fatal error: Method Bad::__toString() must not throw an exception, caught Exception: Oops, I cannot do this in %sbug60909_2.php on line %d
 
 
 !!!shutdown!!!

Zend/tests/bug69767.phpt

@@ -5,4 +5,4 @@ Bug #69767 (Default parameter value with wrong type segfaults)
 function foo(String $bar = 0) {}
 ?>
 --EXPECTF--
-Fatal error: Default value for parameters with a string type hint can only be string or NULL in %sbug69767.php on line %d
+Fatal error: Default value for parameters with a string type can only be string or NULL in %sbug69767.php on line %d

Zend/tests/bug70083.phpt

@@ -0,0 +1,26 @@
+--TEST--
+Bug #70083 (Use after free with assign by ref to overloaded objects)
+--FILE--
+<?php
+
+class foo {
+	private $var;
+	function __get($e) {
+		return $this;
+	}
+}
+
+function &noref() { $foo = 1; return $foo; }
+
+$foo = new foo;
+$foo->i = &noref();
+var_dump($foo);
+
+?>
+--EXPECTF--
+
+Fatal error: Uncaught Error: Cannot assign by reference to overloaded object in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
+

Zend/tests/bug70430.phpt

@@ -0,0 +1,10 @@
+--TEST--
+Bug #70430: Stack buffer overflow in zend_language_parser()
+--FILE--
+<?php
+
+$"*** Testing function() :  ***\n";
+
+?>
+--EXPECTF--
+Parse error: syntax error, unexpected '"*** Testing function() :  ***' (T_CONSTANT_ENCAPSED_STRING), expecting variable (T_VARIABLE) or '{' or '$' in %s on line %d

Zend/tests/bug70689.phpt

@@ -0,0 +1,22 @@
+--TEST--
+Bug #70689 (Exception handler does not work as expected)
+--FILE--
+<?php
+
+function foo($foo) {
+	echo "Executing foo\n";
+}
+
+set_error_handler(function($errno, $errstr) {
+	throw new Exception($errstr);
+});
+
+try {
+	foo();
+} catch (Exception $e) {
+	echo $e->getMessage(), "\n";
+}
+
+?>
+--EXPECTF--
+Missing argument 1 for foo(), called in %sbug70689.php on line %d and defined

Zend/tests/bug70748.phpt

@@ -0,0 +1,20 @@
+--TEST--
+Bug #70748 (Segfault in ini_lex () at Zend/zend_ini_scanner.l)
+--FILE--
+<?php
+$ini = '[${ 	';
+
+$ini_file = __DIR__ . "/bug70748.ini";
+
+file_put_contents($ini_file, $ini);
+
+var_dump(parse_ini_file($ini_file));
+?>
+--CLEAN--
+<?php
+unlink(__DIR__ . "/bug70748.ini");
+?>
+--EXPECTF--
+Warning: syntax error, unexpected $end, expecting '}' in %sbug70748.ini on line %d
+ in %sbug70748.php on line %d
+bool(false)

Zend/tests/bug70782.phpt

@@ -0,0 +1,10 @@
+--TEST--
+Bug #70782: null ptr deref and segfault (zend_get_class_fetch_type)
+--FILE--
+<?php
+
+(-0)::$prop;
+
+?>
+--EXPECTF--
+Fatal error: Illegal class name in %s on line %d

Zend/tests/bug70785.phpt

@@ -0,0 +1,25 @@
+--TEST--
+Bug #70785 (Infinite loop due to exception during identical comparison)
+--FILE--
+<?php
+
+set_error_handler(function($no, $msg) {
+	throw new Exception($msg);
+});
+
+try {
+	if ($a === null) { // ZEND_VM_SMART_BRANCH  
+		undefined_function('Null');
+	}
+} catch (Exception $e) {
+}
+
+try  {
+	$c === 3; // ZEND_VM_NEXT_OPCODE
+	undefined_function();
+} catch (Exception $e) {
+}
+?>
+okey
+--EXPECT--
+okey

Zend/tests/bug70804.phpt

@@ -0,0 +1,17 @@
+--TEST--
+Bug #70804 (Unary add on negative zero produces positive zero)
+--FILE--
+<?php
+
+var_dump(+(-0.0));
+var_dump(+(float)"-0");
+
+$foo = +(-sin(0));
+
+var_dump($foo);
+
+?>
+--EXPECT--
+float(-0)
+float(-0)
+float(-0)

Zend/tests/bug70805.phpt

@@ -0,0 +1,46 @@
+--TEST--
+Bug #70805 (Segmentation faults whilst running Drupal 8 test suite)
+--FILE--
+<?php
+class A {
+}
+
+class B {
+}
+
+class C {
+	public function __destruct() {
+		if (isset($GLOBALS["a"])) {
+			unset($GLOBALS["array"]);
+			unset($GLOBALS["a"]); // this will be called in gc_colloct_roots and put $a into gc roots buf
+		}
+	}
+}
+
+$a = new A;
+$a->b = new B;
+$a->b->a = $a;
+
+$i = 0;
+
+$c = new A;
+$array = array($c); //This is used to leave a room for $GLOBALS["a"]
+unset($c);
+
+while ($i++ < 9997) {
+	$t = [];
+	$t[] = &$t;
+	unset($t);
+}
+$t = [new C];
+$t[] = &$t;
+unset($t); // This is used to trigger C::__destruct while doing gc_colloct_roots
+
+$e = $a;
+unset($a); // This one can not be putted into roots buf because it's full, thus gc_colloct_roots will be called, 
+           // but C::__destructor which is called in gc_colloct_roots will put $a into buf
+		   // which will make $a be putted into gc roots buf twice
+var_dump(gc_collect_cycles());
+?>
+--EXPECT--
+int(0)

Zend/tests/bug70805_1.phpt

@@ -0,0 +1,43 @@
+--TEST--
+Bug #70805 (Segmentation faults whilst running Drupal 8 test suite) (Crash)
+--FILE--
+<?php
+class A {
+}
+
+class B {
+}
+
+class C {
+	public function __destruct() {
+		if (isset($GLOBALS["a"])) {
+			unset($GLOBALS["array"]);
+			unset($GLOBALS["a"]);
+		}
+	}
+}
+
+$a = new A;
+$a->b = new B;
+$a->b->a = $a;
+
+$i = 0;
+
+$c = new A;
+$array = array($c); 
+unset($c);
+
+while ($i++ < 9997) {
+	$t = [];
+	$t[] = &$t;
+	unset($t);
+}
+$t = [new C];
+$t[] = &$t;
+unset($t);
+unset($a);
+
+var_dump(gc_collect_cycles());
+?>
+--EXPECT--
+int(2)

Zend/tests/bug70805_2.phpt

@@ -0,0 +1,37 @@
+--TEST--
+Bug #70805 (Segmentation faults whilst running Drupal 8 test suite) (Memleak)
+--FILE--
+<?php
+class A {
+}
+
+class B {
+}
+
+class C {
+	public function __destruct() {
+		if (isset($GLOBALS["a"])) {
+			unset($GLOBALS["a"]);
+		}
+	}
+}
+
+$a = new A;
+$a->b = new B;
+$a->b->a = $a;
+
+$i = 0;
+
+while ($i++ < 9998) {
+	$t = [];
+	$t[] = &$t;
+	unset($t);
+}
+$t = [new C];
+$t[] = &$t;
+unset($t);
+
+unset($a);
+var_dump(gc_collect_cycles());
+--EXPECT--
+int(2)

Zend/tests/bug70873.phpt

@@ -0,0 +1,34 @@
+--TEST--
+Bug #70873 (Regression on private static properties access)
+--FILE--
+<?php
+
+class A {
+	private static $x = 1;
+}
+
+class B extends A {
+	function bar() {
+		var_dump(self::$x);
+	}
+};
+
+class C extends A {
+	function bar() {
+		var_dump(A::$x);
+	}
+};
+
+
+$a = new B;
+$a->bar();
+
+$b = new C;
+$b->bar();
+?>
+--EXPECTF--
+Fatal error: Uncaught Error: Cannot access  property B::$x in %sbug70873.php:%d
+Stack trace:
+#0 %sbug70873.php(%d): B->bar()
+#1 {main}
+  thrown in %sbug70873.php on line %d

Zend/tests/bug70895.phpt

@@ -0,0 +1,15 @@
+--TEST--
+Bug #70895 null ptr deref and segfault with crafted callable
+--FILE--
+<?php
+
+array_map("%n", 0);
+array_map("%n %i", 0);
+array_map("%n %i aoeu %f aoeu %p", 0);
+?>
+--EXPECTREGEX--
+Warning: array_map\(\) expects parameter 1 to be a valid callback, function '%n' not found or invalid function name in .+
+
+Warning: array_map\(\) expects parameter 1 to be a valid callback, function '%n %i' not found or invalid function name in .+
+
+Warning: array_map\(\) expects parameter 1 to be a valid callback, function '%n %i aoeu %f aoeu %p' not found or invalid function name in .+bug70895.php on line \d+

Zend/tests/bug70898.phpt

@@ -0,0 +1,22 @@
+--TEST--
+Bug #70895 null ptr deref and segfault with crafted callable
+--FILE--
+<?php 
+	function m($f,$a){
+		return array_map($f,0);
+	}
+
+	echo implode(m("",m("",m("",m("",m("0000000000000000000000000000000000",("")))))));
+?>
+--EXPECTF--
+Warning: array_map() expects parameter 1 to be a valid callback, function '0000000000000000000000000000000000' not found or invalid function name in %sbug70898.php on line %d
+
+Warning: array_map() expects parameter 1 to be a valid callback, function '' not found or invalid function name in %sbug70898.php on line %d
+
+Warning: array_map() expects parameter 1 to be a valid callback, function '' not found or invalid function name in %sbug70898.php on line %d
+
+Warning: array_map() expects parameter 1 to be a valid callback, function '' not found or invalid function name in %sbug70898.php on line %d
+
+Warning: array_map() expects parameter 1 to be a valid callback, function '' not found or invalid function name in %sbug70898.php on line %d
+
+Warning: implode(): Argument must be an array in %sbug70898.php on line %d

Zend/tests/bug70912.phpt

@@ -0,0 +1,10 @@
+--TEST--
+Bug #70912 (Null ptr dereference when class property is initialised to a dereferenced value)
+--FILE--
+<?php
+class A {
+	public $a=[][];
+}
+?>
+--EXPECTF--
+Fatal error: Cannot use [] for reading in %sbug70912.php on line %d

Zend/tests/bug70914.phpt

@@ -0,0 +1,17 @@
+--TEST--
+Bug #70914 zend_throw_or_error() format string vulnerability 
+--SKIPIF--
+<?php
+if (!extension_loaded("pdo_sqlite")) {
+	die("skip pdo_sqlite required");
+}
+?>
+--FILE--
+<?php
+
+$db = new PDO('sqlite::memory:');
+$st = $db->query('SELECT 1');
+$re = $st->fetchObject('%Z');
+?>
+--EXPECTREGEX--
+Fatal error: Class '%Z' not found in .+bug70914.php on line \d+

Zend/tests/bug70944.phpt

@@ -0,0 +1,37 @@
+--TEST--
+Bug #70944 (try{ } finally{} can create infinite chains of exceptions)
+--FILE--
+<?php
+try {
+	$e = new Exception("Foo");
+	try {
+		throw  new Exception("Bar", 0, $e);
+	} finally {
+		throw $e;
+	}
+} catch (Exception $e) {
+	var_dump((string)$e);
+}
+
+try {
+	$e = new Exception("Foo");
+	try {
+		throw new Exception("Bar", 0, $e);
+	} finally {
+		throw new Exception("Dummy", 0, $e);
+	}
+} catch (Exception $e) {
+	var_dump((string)$e);
+}
+?>
+--EXPECTF--
+string(%d) "Exception: Foo in %sbug70944.php:%d
+Stack trace:
+#0 {main}"
+string(%d) "Exception: Foo in %sbug70944.php:%d
+Stack trace:
+#0 {main}
+
+Next Exception: Dummy in %sbug70944.php:%d
+Stack trace:
+#0 {main}"

Zend/tests/bug70957.phpt

@@ -0,0 +1,22 @@
+--TEST--
+Bug #70957 (self::class can not be resolved with reflection for abstract class)
+--FILE--
+<?php
+
+abstract class Foo
+{
+    function bar($a = self::class) {}
+}
+
+trait T {
+    public function bar() {
+    }
+}
+
+class B extends Foo
+{
+    use T;
+}
+?>
+--EXPECTF--
+Warning: Declaration of T::bar() should be compatible with Foo::bar($a = 'Foo') in %sbug70957.php on line %d

Zend/tests/bug70958.phpt

@@ -0,0 +1,21 @@
+--TEST--
+Bug #70958 (Invalid opcode while using ::class as trait method paramater default value)
+--FILE--
+<?php
+trait Foo
+{
+	function bar($a = self::class) {
+		var_dump($a);
+	}
+}
+
+class B {
+	use Foo;
+}
+
+$b = new B;
+
+$b->bar();
+?>
+--EXPECT--
+string(1) "B"

Zend/tests/bug70967.phpt

@@ -0,0 +1,14 @@
+--TEST--
+Bug #70967 (Weird error handling for __toString when Error is thrown)
+--FILE--
+<?php
+class A {
+	public function __toString() {
+		undefined_function();
+	}
+}
+
+echo (new A);
+?>
+--EXPECTF--
+Fatal error: Method A::__toString() must not throw an exception, caught Error: Call to undefined function undefined_function() in %sbug70967.php on line %d

Zend/tests/bug70987.phpt

@@ -0,0 +1,15 @@
+--TEST--
+Bug #70987 (static::class within Closure::call() causes segfault)
+--FILE--
+<?php
+
+class foo {}
+$bar = function () {
+   return static::class;
+};
+
+var_dump($bar->call(new foo));
+
+?>
+--EXPECTF--
+string(3) "foo"

Zend/tests/bug70997.phpt

@@ -0,0 +1,26 @@
+--TEST--
+Bug #70997 (When using parentClass:: instead of parent::, static context changed)
+--FILE--
+<?php
+class A {
+    const TEST = false;
+    
+    public function test()
+    {
+        var_dump(static::TEST);
+    }
+}
+
+class B extends A {
+    const TEST = true;
+    
+    public function test()
+    {
+        A::test();
+    }
+}
+
+$b = new B;
+$b->test();
+--EXPECT--
+bool(true)

Zend/tests/bug71067.phpt

@@ -0,0 +1,31 @@
+--TEST--
+Bug #71067 (Local object in class method stays in memory for each call)
+--INI--
+opcache.enable=0
+error_reporting=0
+--FILE--
+<?php
+class Test {
+	public function test(){
+		$arr = (object) [
+			'children' => []
+		];
+		$arr->children[] = 1;
+		return $arr;
+	}
+}
+
+$o = new Test();
+$o->test();
+
+print_r($o->test());
+?>
+--EXPECT--
+stdClass Object
+(
+    [children] => Array
+        (
+            [0] => 1
+        )
+
+)

Zend/tests/bug71086.phpt

@@ -0,0 +1,14 @@
+--TEST--
+Bug #71086: Invalid numeric literal parse error within highlight_string() function
+--FILE--
+<?php
+
+$highlightedString = highlight_string("<?php \n 09 09 09;", true);
+var_dump($highlightedString);
+
+?>
+--EXPECT--
+string(169) "<code><span style="color: #000000">
+<span style="color: #0000BB">&lt;?php&nbsp;<br />&nbsp;</span><span style="color: #007700">09&nbsp;09&nbsp;09;</span>
+</span>
+</code>"

Zend/tests/bug71154.phpt

@@ -0,0 +1,19 @@
+--TEST--
+Bug #71154: Incorrect HT iterator invalidation causes iterator reuse
+--FILE--
+<?php
+
+$array = [1, 2, 3];
+foreach ($array as &$ref) {
+    /* Free array, causing free of iterator */
+    $array = [];
+    /* Reuse the iterator.
+     * However it will also be reused on next foreach iteration */
+    $it = new ArrayIterator([1, 2, 3]);
+    $it->rewind();
+}
+var_dump($it->current());
+
+?>
+--EXPECT--
+int(1)

Zend/tests/bug71163.phpt

@@ -0,0 +1,25 @@
+--TEST--
+Bug #71163 (Segmentation Fault (cleanup_unfinished_calls))
+--FILE--
+<?php
+function __autoload($name) { 
+	eval ("class $name extends Exception { public static function foo() {}}");
+	throw new Exception("boom");
+}
+
+function test2() {
+	try {
+		Test::foo();
+	} catch (Exception $e) {
+		echo "okey";
+	}
+}
+
+function test() {
+	test2();
+}
+
+test();
+?>
+--EXPECT--
+okey

Zend/tests/bug71221.phpt

@@ -0,0 +1,10 @@
+--TEST--
+Bug #71221 (Null pointer deref (segfault) in get_defined_vars via ob_start)
+--FILE--
+<?php 
+ob_start("get_defined_vars");
+ob_end_clean();
+?>
+okey
+--EXPECT--
+okey

Zend/tests/bug71248.phpt

@@ -0,0 +1,28 @@
+--TEST--
+Bug #71248 (Wrong interface is enforced)
+--FILE--
+<?php
+class Hint1 { }
+class Hint2 { }
+
+abstract class Base {
+    public function __construct(Hint1 $x) { }
+}
+
+interface Iface {
+    public function __construct(Hint1 $x);
+}
+
+class Foo extends Base implements Iface {
+}
+
+$code = <<<'PHP'
+abstract class Bar extends Base {
+    public function __construct(Hint2 $x) { }
+}
+PHP;
+eval($code);
+?>
+OK
+--EXPECT--
+OK

Zend/tests/bug71275.phpt

@@ -0,0 +1,27 @@
+--TEST--
+Bug #71275 (Bad method called on cloning an object having a trait)
+--FILE--
+<?php
+
+trait MyTrait {
+	public function _() {
+		throw new RuntimeException('Should not be called');
+	}
+}
+
+
+class MyClass {
+	use MyTrait;
+
+	public function __clone() {
+		echo "I'm working hard to clone";
+	}
+}
+
+
+$instance = new MyClass();
+clone $instance;
+
+?>
+--EXPECT--
+I'm working hard to clone

Zend/tests/bug71300.phpt

@@ -0,0 +1,28 @@
+--TEST--
+Bug #71300 (Segfault in zend_fetch_string_offset)
+--FILE--
+<?php
+function test1() {
+	for ($n = 'a'; $n < 'g'; $n++) {
+		$$n = 1;
+	}
+	$$n = $$n[++$n] = "test";
+	return $$n;
+}
+
+var_dump(test1());
+
+function test2() {
+    /* See #71303 for why not using for loop here */
+	$n = "a";
+	$$n .= $$n[++$n] = "test";
+	return $$n;
+}
+
+var_dump(test2());
+?>
+--EXPECTF--
+string(4) "test"
+
+Notice: Array to string conversion in %sbug71300.php on line %d
+string(9) "Arraytest"

Zend/tests/bug71336.phpt

@@ -0,0 +1,48 @@
+--TEST--
+Bug #71336 (Wrong is_ref on properties as exposed via get_object_vars())
+--FILE--
+<?php
+class A
+{
+	protected $bar = array('baz');
+
+	function bar()
+	{
+		array_pop($this->bar);
+		$vars = get_object_vars($this);
+		$this->bar[] = array('buz');
+		print_r($vars);
+	}
+
+	function foo() {
+		array_pop($this->bar);
+		$dummy = &$this->bar;
+		$vars = get_object_vars($this);
+		$this->bar[] = array('buz');
+		print_r($vars);
+	}
+}
+
+(new A())->bar();
+(new A())->foo();
+?>
+--EXPECT--
+Array
+(
+    [bar] => Array
+        (
+        )
+
+)
+Array
+(
+    [bar] => Array
+        (
+            [0] => Array
+                (
+                    [0] => buz
+                )
+
+        )
+
+)

Zend/tests/closure_059.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Closure 059: Closure type hinting
+Closure 059: Closure type declaration
 --FILE--
 <?php
 class A {

Zend/tests/closure_061.phpt

@@ -64,6 +64,15 @@ $tests = [
         [new DLL, null],
         [new DLL, ClsUnrelated::class],
     ]],
+
+    [function() {}, [
+        [null,         null],
+        [new Cls,      null],
+        [new Cls,      'Cls'],
+        [null,         'Cls'],
+        [null,         'stdClass'],
+        [new stdClass, null],
+    ]],
 ];
 
 set_error_handler(function($errno, $errstr) {
@@ -79,6 +88,9 @@ foreach ($tests as list($fn, $bindings)) {
         $c = (new ReflectionFunction($fn))->getClosure();
         $fnStr = $fn;
     }
+    if ($fn instanceof Closure) {
+        $fnStr = "(function() {})";
+    }
 
     echo "$fnStr()\n" . str_repeat('-', strlen($fnStr) + 2), "\n\n";
 
@@ -206,3 +218,24 @@ Cannot rebind scope of closure created by ReflectionFunctionAbstract::getClosure
 
 bindTo(new SplDoublyLinkedList, ClsUnrelated::class):
 Cannot rebind scope of closure created by ReflectionFunctionAbstract::getClosure()
+
+(function() {})()
+-----------------
+
+bindTo(null, null):
+Success!
+
+bindTo(new Cls, null):
+Success!
+
+bindTo(new Cls, Cls::class):
+Success!
+
+bindTo(null, Cls::class):
+Success!
+
+bindTo(null, stdClass::class):
+Cannot bind closure to scope of internal class stdClass
+
+bindTo(new stdClass, null):
+Success!

Zend/tests/concat_003.phpt

@@ -0,0 +1,52 @@
+--TEST--
+Concatenating many small strings should not slowdown allocations
+--SKIPIF--
+<?php if (PHP_DEBUG) { die ("skip debug version is slow"); } ?>
+--INI--
+memory_limit=256m
+--FILE--
+<?php
+
+/* To note is that memory usage can vary depending on whether opcache is on. The actual
+  measuring that matters is timing here. */
+
+$time = microtime(TRUE);
+
+/* This might vary on Linux/Windows, so the worst case and also count in slow machines. */
+$t0_max = 0.1;
+$t1_max = 0.4;
+
+$datas = [];
+for ($i = 0; $i < 220000; $i++)
+{
+    $datas[] = [
+        '000.000.000.000',
+        '000.255.255.255',
+        '保留地址',
+        '保留地址',
+        '保留地址',
+        '保留地址',
+        '保留地址',
+        '保留地址',
+    ];
+}
+
+$t0 = microtime(TRUE) - $time;
+var_dump($t0 < $t0_max);
+
+
+$texts = '';
+foreach ($datas AS $data)
+{
+    $texts .= implode("\t", $data) . "\r\n";
+}
+
+$t1 = microtime(TRUE) - $time;
+var_dump($t1 < $t1_max);
+
+?>
++++DONE+++
+--EXPECT--
+bool(true)
+bool(true)
++++DONE+++

Zend/tests/errmsg_013.phpt

@@ -1,5 +1,5 @@
 --TEST--
-errmsg: default value for parameters with array type hint can only be an array or NULL
+errmsg: default value for parameters with array type can only be an array or NULL
 --FILE--
 <?php
 
@@ -11,4 +11,4 @@ class test {
 echo "Done\n";
 ?>
 --EXPECTF--	
-Fatal error: Default value for parameters with array type hint can only be an array or NULL in %s on line %d
+Fatal error: Default value for parameters with array type can only be an array or NULL in %s on line %d

Zend/tests/generators/bug70904.phpt

@@ -0,0 +1,43 @@
+--TEST--
+Bug #70904 (yield from incorrectly marks valid generator as finished)
+--FILE--
+<?php
+
+function g1() {
+	yield 1;
+}
+
+function g2($g1) {
+	yield from $g1;
+	echo "reached!\n";
+	yield 2;
+}
+
+$g1 = g1();
+$g2 = g2($g1);
+
+var_dump($g2->valid());
+var_dump($g2->current());
+$g1->next();
+var_dump($g1->valid());
+var_dump($g2->valid());
+var_dump($g2->current());
+$g2->next();
+var_dump($g2->valid());
+var_dump($g2->current());
+$g2->next();
+var_dump($g2->valid());
+var_dump($g2->current());
+
+?>
+--EXPECT--
+bool(true)
+int(1)
+bool(false)
+bool(true)
+int(1)
+reached!
+bool(true)
+int(2)
+bool(false)
+NULL

Zend/tests/generators/bug70965.phpt

@@ -0,0 +1,32 @@
+--TEST--
+Bug #70965 (yield from with a common iterator primes too much)
+--FILE--
+<?php
+
+function it() {
+    yield from [1, 2, 3, 4, 5];
+}
+
+function bar($g) {
+    yield from $g;
+}
+
+$gen = it();
+$gens[] = bar($gen);
+$gens[] = bar($gen);
+
+do {
+    foreach($gens as $g) {
+        var_dump($g->current());
+        $gen->next();
+    }
+} while ($gen->valid());
+
+?>
+--EXPECT--
+int(1)
+int(2)
+int(3)
+int(4)
+int(5)
+int(5)

Zend/tests/generators/bug71013.phpt

@@ -0,0 +1,49 @@
+--TEST--
+Bug #71013 (Incorrect exception handler with yield from)
+--FILE--
+<?php
+
+class FooBar implements Iterator {
+    function __construct()   { echo "Constructing new FooBar\n"; }
+    function __destruct()    { echo "Destructing FooBar\n"; }
+    function current ()      { throw new Exception; }
+    function key ()          { return 0; }
+    function next ()         {}
+    function rewind ()       {}
+    function valid ()        { return true; }
+}
+
+function foo() {
+    try {
+        $f = new FooBar;
+        yield from $f;
+    } catch (Exception $e) {
+        echo "[foo()] Caught Exception\n";
+    }
+}
+
+function bar() {
+    echo "Starting bar()\n";
+    $x = foo();
+    try {
+        var_dump($x->current());
+    } catch (Exception $e) {
+        echo "[bar()] Caught Exception\n";
+    }
+    echo "Unsetting \$x\n";
+    unset($x);
+    echo "Finishing bar()\n";
+}
+
+bar();
+
+?>
+--EXPECT--
+Starting bar()
+Constructing new FooBar
+[foo()] Caught Exception
+Destructing FooBar
+NULL
+Unsetting $x
+Finishing bar()
+

Zend/tests/generators/bug71297.phpt

@@ -0,0 +1,25 @@
+--TEST--
+Bug #71297 (Memory leak with consecutive yield from)
+--FILE--
+<?php
+
+function foo() {
+	yield array_fill(0, 10000, 4);
+}
+
+function genLeak() {
+	$i = 0;
+	while (1) {
+		yield from foo();
+		print $i++;
+	}
+}
+
+$x = 0;
+foreach (genLeak() as $i) {
+	if ($x++ == 3) break;
+}
+
+?>
+--EXPECT--
+012

Zend/tests/generators/get_return.phpt

@@ -58,7 +58,7 @@ $gen->next();
 var_dump($gen->getReturn());
 
 // Explicit value-less return also results in a NULL generator
-// return value and there is no interference with type hints
+// return value and there is no interference with type declarations
 function gen6() : Generator {
     return;
     yield 24;

Zend/tests/generators/multiple_yield_from_on_same_generator.phpt

@@ -37,5 +37,8 @@ int(4)
 int(6)
 int(3)
 int(5)
+int(3)
+int(5)
+NULL
 bool(false)
 

Zend/tests/generators/throw_into_yield_from_array.phpt

@@ -0,0 +1,43 @@
+--TEST--
+Throwing into a generator yielding from an array/iterator
+--FILE--
+<?php
+
+$data = [1, 2, 3];
+
+function yielditer($arr) {
+	foreach($arr as $val) {
+		yield $val;
+	}
+}
+
+function yf($in) {
+	yield from $in;
+}
+
+function test($g) {
+	var_dump($g->current());
+	try {
+		$g->throw(new Exception("Exception!"));
+	} catch (Exception $e) {
+		echo "{$e->getMessage()}\n";
+	}
+	var_dump($g->current());
+}
+
+$yfiter = yf($data);
+$yfgen = yf(yielditer($data));
+
+test(yf($data));
+echo "\n";
+test(yf(yielditer($data)));
+
+?>
+--EXPECT--
+int(1)
+Exception!
+NULL
+
+int(1)
+Exception!
+NULL

Zend/tests/int_static_prop_name.phpt

@@ -0,0 +1,43 @@
+--TEST--
+Using an integer as a static property name
+--FILE--
+<?php
+
+class Foo {
+    public static $bar = 42;
+}
+
+$n = 42;
+
+${42} = 24;
+var_dump(${42});
+var_dump(${(int) 42});
+var_dump(${(int) $n});
+
+try {
+    var_dump(Foo::${42});
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
+
+try {
+    var_dump(Foo::${(int) 42});
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
+
+try {
+    var_dump(Foo::${(int) $n});
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
+
+?>
+--EXPECT--
+int(24)
+int(24)
+int(24)
+Access to undeclared static property: Foo::$42
+Access to undeclared static property: Foo::$42
+Access to undeclared static property: Foo::$42
+

Zend/tests/memory_get_peak_usage.phpt

@@ -0,0 +1,19 @@
+--TEST--
+int memory_get_peak_usage ([ bool $real_usage = false ] );
+--CREDITS--
+marcosptf - <marcosptf@yahoo.com.br> - #phparty7 - @phpsp - novatec/2015 - sao paulo - br
+--INI--
+memory_limit=-1
+--FILE--
+<?php
+var_dump($a = memory_get_peak_usage());
+var_dump(memory_get_peak_usage(true));
+var_dump(memory_get_peak_usage(false));
+$array = range(1,1024*1024);
+var_dump(memory_get_peak_usage() > $a);
+?>
+--EXPECTF--
+int(%d)
+int(%d)
+int(%d)
+bool(true)

Zend/tests/ns_055.phpt

@@ -1,5 +1,5 @@
 --TEST--
-055: typehints in namespaces
+055: types in namespaces
 --FILE--
 <?php
 namespace test\ns1;

Zend/tests/ns_068.phpt

@@ -11,4 +11,4 @@ echo __NAMESPACE__ . "\n";
 ===DONE===
 --EXPECTF--
 
-Fatal error: Namespace declaration statement has to be the very first statement in the script in %sns_068.php on line %d
+Fatal error: Namespace declaration statement has to be the very first statement or after any declare call in the script in %sns_068.php on line %d

Zend/tests/ns_083.phpt

@@ -11,4 +11,4 @@ echo "ok\n";
 }
 ?>
 --EXPECTF--
-Fatal error: Namespace declaration statement has to be the very first statement in the script in %s on line %d
+Fatal error: Namespace declaration statement has to be the very first statement or after any declare call in the script in %sns_083.php on line %d

Zend/tests/return_types/029.phpt

@@ -0,0 +1,23 @@
+--TEST--
+return type with finally
+--INI--
+opcache.enable=0
+--FILE--
+<?php
+
+function foo() : array {
+	try {
+		throw new Exception("xxxx");
+	} finally {
+		return ;
+	}
+}
+
+foo();
+?>
+--EXPECTF--
+Fatal error: Uncaught TypeError: Return value of foo() must be of the type array, none returned in %s29.php:%d
+Stack trace:
+#0 %s(%d): foo()
+#1 {main}
+  thrown in %s029.php on line %d

Zend/tests/return_types/bug71092.phpt

@@ -0,0 +1,23 @@
+--TEST--
+Bug #71092 (Segmentation fault with return type hinting)
+--INI--
+opcache.enable=0
+--FILE--
+<?php
+
+function boom(): array {
+	$data = [['id']];
+	switch ($data[0]) {
+	case ['id']:
+		return;
+	}
+}
+
+boom();
+?>
+--EXPECTF--
+Fatal error: Uncaught TypeError: Return value of boom() must be of the type array, none returned in %sbug71092.php:%d
+Stack trace:
+#0 %s(%d): boom()
+#1 {main}
+  thrown in %sbug71092.php on line %d

Zend/tests/return_types/internal_functions001.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Return type hinting for internal functions
+Return type for internal functions
 
 --SKIPIF--
 <?php

Zend/tests/return_types/internal_functions002.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Return type hinting for internal functions 2
+Return type for internal functions 2
 
 --SKIPIF--
 <?php

Zend/tests/return_types/reflection001.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Return type hinting and Reflection::export()
+Return type and Reflection::export()
 
 --SKIPIF--
 <?php

Zend/tests/try/try_finally_019.phpt

@@ -0,0 +1,40 @@
+--TEST--
+Combination of foreach, finally and goto (call order)
+--FILE--
+<?php
+class A {
+	public $n = 0;
+	function __construct($n) {
+		$this->n = $n;
+	}
+	function __destruct() {
+		echo "destruct" . $this->n . "\n";
+	}
+}
+
+foreach ([new A(1)] as $a) {
+    $a = null;
+    try {
+        foreach ([new A(2)] as $a) {
+            $a = null;
+            try {
+                foreach ([new A(3)] as $a) {
+                    $a = null;
+                    goto out;
+                }
+            } finally {
+                echo "finally1\n";
+            }
+out: ;
+        }
+    } finally {
+        echo "finally2\n";
+    }
+}
+?>
+--EXPECT--
+destruct3
+finally1
+destruct2
+finally2
+destruct1

Zend/tests/try/try_finally_020.phpt

@@ -0,0 +1,42 @@
+--TEST--
+Combination of foreach, finally and exception (call order)
+--FILE--
+<?php
+class A {
+	public $n = 0;
+	function __construct($n) {
+		$this->n = $n;
+	}
+	function __destruct() {
+		echo "destruct" . $this->n . "\n";
+	}
+}
+
+foreach ([new A(1)] as $a) {
+    $a = null;
+    try {
+        foreach ([new A(2)] as $a) {
+            $a = null;
+            try {
+                foreach ([new A(3)] as $a) {
+                    $a = null;
+                    throw new Exception();
+                }
+            } finally {
+                echo "finally1\n";
+            }
+        }
+    } catch (Exception $e) {
+        echo "catch\n";
+    } finally {
+        echo "finally2\n";
+    }
+}
+?>
+--EXPECT--
+destruct3
+finally1
+destruct2
+catch
+finally2
+destruct1

Zend/tests/type_declarations/array_001.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Array type hint
+Array type declaration
 --FILE--
 <?php
 function foo(array $a) {
@@ -12,8 +12,8 @@ foo(123);
 --EXPECTF--
 3
 
-Fatal error: Uncaught TypeError: Argument 1 passed to foo() must be of the type array, integer given, called in %sarray_type_hint_001.php on line 7 and defined in %sarray_type_hint_001.php:2
+Fatal error: Uncaught TypeError: Argument 1 passed to foo() must be of the type array, integer given, called in %s on line 7 and defined in %s:2
 Stack trace:
 #0 %s(%d): foo(123)
 #1 {main}
-  thrown in %sarray_type_hint_001.php on line 2
+  thrown in %s on line 2

Zend/tests/type_declarations/callable_001.phpt

@@ -1,5 +1,5 @@
 --TEST--
-callable type hint#001
+callable type#001
 --FILE--
 <?php
 
@@ -21,7 +21,7 @@ foo($closure);
 string(6) "strpos"
 string(3) "foo"
 
-Deprecated: Non-static method bar::baz() should not be called statically in %scallable_type_hint_001.php on line %d
+Deprecated: Non-static method bar::baz() should not be called statically in %s on line %d
 array(2) {
   [0]=>
   string(3) "bar"

Zend/tests/type_declarations/callable_002.phpt

@@ -1,5 +1,5 @@
 --TEST--
-callable type hint#002 - Reflection
+callable type#002 - Reflection
 --FILE--
 <?php
 

Zend/tests/type_declarations/callable_003.phpt

@@ -1,5 +1,5 @@
 --TEST--
-callable type hint#003
+callable type#003
 --FILE--
 <?php
 

Zend/tests/type_declarations/closure_with_variadic.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Closure with variadic type hint
+Closure with variadic type declaration
 --FILE--
 <?php
 $f = function (stdClass ...$a) {

Zend/tests/type_declarations/inexistent_class_hint_with_scalar_arg.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Inexistent class as typehint receiving scalar argument
+Inexistent class as type receiving scalar argument
 --FILE--
 <?php
 

Zend/tests/type_declarations/internal_function_strict_mode.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Scalar type hint - internal function strict mode
+Scalar type - internal function strict mode
 --FILE--
 <?php
 declare(strict_types=1);
@@ -32,4 +32,4 @@ try {
 *** Trying Array Map With Invalid Callback
 *** Caught array_map() expects parameter 1 to be a valid callback, first array member is not a valid class name or object
 *** Trying Strlen With Float
-*** Caught strlen() expects parameter 1 to be string, float given
+*** Caught strlen() expects parameter 1 to be string, float given

Zend/tests/type_declarations/scalar_basic.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Scalar type hint basics
+Scalar type basics
 --FILE--
 <?php
 
@@ -45,7 +45,7 @@ $values = [
 ];
 
 foreach ($functions as $type => $function) {
-    echo PHP_EOL, "Testing '$type' typehint:", PHP_EOL;
+    echo PHP_EOL, "Testing '$type' type:", PHP_EOL;
     foreach ($values as $value) {
         echo PHP_EOL . "*** Trying ";
         var_dump($value);
@@ -60,7 +60,7 @@ echo PHP_EOL . "Done";
 ?>
 --EXPECTF--
 
-Testing 'int' typehint:
+Testing 'int' type:
 
 *** Trying int(1)
 int(1)
@@ -114,7 +114,7 @@ int(0)
 *** Trying resource(%d) of type (stream)
 *** Caught Argument 1 passed to {closure}() must be of the type integer, resource given, called in %s on line %d
 
-Testing 'float' typehint:
+Testing 'float' type:
 
 *** Trying int(1)
 float(1)
@@ -168,7 +168,7 @@ float(0)
 *** Trying resource(%d) of type (stream)
 *** Caught Argument 1 passed to {closure}() must be of the type float, resource given, called in %s on line %d
 
-Testing 'string' typehint:
+Testing 'string' type:
 
 *** Trying int(1)
 string(1) "1"
@@ -221,7 +221,7 @@ string(6) "foobar"
 *** Trying resource(%d) of type (stream)
 *** Caught Argument 1 passed to {closure}() must be of the type string, resource given, called in %s on line %d
 
-Testing 'bool' typehint:
+Testing 'bool' type:
 
 *** Trying int(1)
 bool(true)

Zend/tests/type_declarations/scalar_constant_defaults.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Scalar type hint - default via constants
+Scalar type - default via constants
 --FILE--
 <?php
 
@@ -80,4 +80,4 @@ string(14) "this is a test"
 Testing int with default null constant
 NULL
 Testing int with null null constant
-NULL
+NULL

Zend/tests/type_declarations/scalar_constant_defaults_error.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Scalar type hint - default via constants - error condition
+Scalar type - default via constants - error condition
 --FILE--
 <?php
 
@@ -17,4 +17,4 @@ Fatal error: Uncaught TypeError: Argument 1 passed to int_val() must be of the t
 Stack trace:
 #0 %s(%d): int_val()
 #1 {main}
-  thrown in %s on line %d
+  thrown in %s on line %d

Zend/tests/type_declarations/scalar_float_with_integer_default_strict.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Float type hint should allow an integer as default even with strict types
+Float type should allow an integer as default even with strict types
 --FILE--
 <?php
 

Zend/tests/type_declarations/scalar_float_with_integer_default_weak.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Float type hint should allow an integer as default
+Float type should allow an integer as default
 --FILE--
 <?php
 

Zend/tests/type_declarations/scalar_float_with_invalid_default.phpt

@@ -0,0 +1,16 @@
+--TEST--
+Float type should not allow invalid types as default
+--FILE--
+<?php
+
+function test(float $arg = true)
+{
+    var_dump($arg);
+}
+
+test();
+
+?>
+--EXPECTF--
+
+Fatal error: Default value for parameters with a float type can only be float, integer, or NULL in %s on line %d

Zend/tests/type_declarations/scalar_none.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Scalar type hint missing parameters
+Scalar type missing parameters
 --FILE--
 <?php
 

Zend/tests/type_declarations/scalar_null.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Scalar type hint nullability
+Scalar type nullability
 --FILE--
 <?php
 

Zend/tests/type_declarations/scalar_relative_typehint_disallowed.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Scalar type hint - disallow relative typehints
+Scalar type - disallow relative types
 --FILE--
 <?php
 

Zend/tests/type_declarations/scalar_reserved2.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Scalar type hint names cannot be used as class, trait or interface names (2)
+Scalar type names cannot be used as class, trait or interface names (2)
 --FILE--
 <?php
 

Zend/tests/type_declarations/scalar_reserved2_class_alias.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Scalar type hint names cannot be used as class, trait or interface names (2) - class_alias
+Scalar type names cannot be used as class, trait or interface names (2) - class_alias
 --FILE--
 <?php
 

Zend/tests/type_declarations/scalar_reserved2_use.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Scalar type hint names cannot be used as class, trait or interface names (2) - use
+Scalar type names cannot be used as class, trait or interface names (2) - use
 --FILE--
 <?php
 

Zend/tests/type_declarations/scalar_reserved3.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Scalar type hint names cannot be used as class, trait or interface names (3)
+Scalar type names cannot be used as class, trait or interface names (3)
 --FILE--
 <?php
 

Zend/tests/type_declarations/scalar_reserved3_class_alias.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Scalar type hint names cannot be used as class, trait or interface names (3) - class_alias
+Scalar type names cannot be used as class, trait or interface names (3) - class_alias
 --FILE--
 <?php
 

Zend/tests/type_declarations/scalar_reserved3_use.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Scalar type hint names cannot be used as class, trait or interface names (3) - use
+Scalar type names cannot be used as class, trait or interface names (3) - use
 --FILE--
 <?php
 

Zend/tests/type_declarations/scalar_reserved4.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Scalar type hint names cannot be used as class, trait or interface names (4)
+Scalar type names cannot be used as class, trait or interface names (4)
 --FILE--
 <?php
 

Zend/tests/type_declarations/scalar_reserved4_class_alias.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Scalar type hint names cannot be used as class, trait or interface names (4) - class_alias
+Scalar type names cannot be used as class, trait or interface names (4) - class_alias
 --FILE--
 <?php