Merge branch 'master' into merge-fastcgi

1 files changed, 37 insertions, 0 deletions

diff --git a/Zend/tests/grammar/semi_reserved_007.phpt b/Zend/tests/grammar/semi_reserved_007.phpt
new file mode 100644
index 0000000000..5105629cbe
--- /dev/null
+++ b/Zend/tests/grammar/semi_reserved_007.phpt
@@ -0,0 +1,37 @@
+--TEST--
+Edge case: self::self, self::parent, parent::self semi reserved constants access
+--FILE--
+<?php
+
+class Foo {
+    const self = "self";
+    const parent = "parent";
+    public function __construct() {
+        echo "From ", __METHOD__, ":", PHP_EOL;
+        echo self::self, PHP_EOL;
+        echo self::parent, PHP_EOL;
+    }
+}
+
+class Bar extends Foo {
+    public function __construct() {
+        parent::__construct();
+        echo "From ", __METHOD__, ":", PHP_EOL;
+        echo parent::self, PHP_EOL;
+        echo parent::parent, PHP_EOL;
+    }
+}
+
+new Bar;
+
+echo "\nDone\n";
+
+--EXPECTF--
+From Foo::__construct:
+self
+parent
+From Bar::__construct:
+self
+parent
+
+Done
\ No newline at end of file