diff options
| author | Julien Pauli <jpauli@php.net> | 2014-11-28 13:31:53 +0100 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2014-11-28 13:31:53 +0100 |
| commit | 96f2265d583310bcd9782d97460ba73cd64367f6 (patch) | |
| tree | 74f368547a0a9d432e22595fe4a5873a879f2305 /Zend/tests | |
| parent | 5f65c77e98fe2b49ad8b8fcd842ad6b20c999ea4 (diff) | |
| parent | a76f8e297d60201631021cc20526968fd0de4ef0 (diff) | |
| download | php-git-96f2265d583310bcd9782d97460ba73cd64367f6.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
updated NEWS
Fix #65419 - Inside trait, self::class != __CLASS__
Conflicts:
Zend/zend_compile.c
Diffstat (limited to 'Zend/tests')
| -rw-r--r-- | Zend/tests/bug65419.phpt | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/Zend/tests/bug65419.phpt b/Zend/tests/bug65419.phpt new file mode 100644 index 0000000000..677b2750f2 --- /dev/null +++ b/Zend/tests/bug65419.phpt @@ -0,0 +1,23 @@ +--TEST-- +Bug #65419 (Inside trait, self::class != __CLASS__) +--FILE-- +<?php +trait abc +{ + static function def() + { + echo self::class, "\n"; + echo __CLASS__, "\n"; + } +} + +class ghi +{ + use abc; +} + +ghi::def(); +?> +--EXPECTF-- +ghi +ghi
\ No newline at end of file |