Merge branch 'PHP-5.6'

Conflicts:
	Zend/zend_compile.c
	Zend/zend_compile.h
	Zend/zend_language_parser.y
This commit is contained in:
Nikita Popov 2015-04-06 22:09:22 +02:00
commit f53e20e595

View File

@ -3,6 +3,8 @@
--FILE--
<?php
use A;
use \B;
--EXPECTF--
Warning: The use statement with non-compound name 'A' has no effect in %sns_033.php on line 2
Warning: The use statement with non-compound name 'B' has no effect in %sns_033.php on line 3