prevent static access

Author: withinboredom

Zend/zend_compile.c

@@ -2933,7 +2933,7 @@ static void zend_compile_inner_class_ref(znode *result, zend_ast *ast, uint32_t
 	if (outer_class->kind == ZEND_AST_INNER_CLASS) {
 		zend_compile_inner_class_ref(&outer_node, outer_class, fetch_flags);
 	} else {
-		zend_compile_class_ref(&outer_node, outer_class, fetch_flags);
+		zend_compile_class_ref(&outer_node, outer_class, fetch_flags | ZEND_FETCH_CLASS_OUTER);
 	}
 
 	if (inner_class->kind == ZEND_AST_ZVAL && Z_TYPE_P(zend_ast_get_zval(inner_class)) == IS_STRING) {
@@ -2999,10 +2999,12 @@ static void zend_compile_class_ref(znode *result, zend_ast *name_ast, uint32_t f
 	if (ZEND_FETCH_CLASS_DEFAULT == fetch_type) {
 		result->op_type = IS_CONST;
 		ZVAL_STR(&result->u.constant, zend_resolve_class_name_ast(name_ast));
+	} else if (fetch_flags & ZEND_FETCH_CLASS_OUTER && fetch_type == ZEND_FETCH_CLASS_STATIC) {
+		zend_error_noreturn(E_COMPILE_ERROR, "Cannot use the static modifier on an inner class");
 	} else {
 		zend_ensure_valid_class_fetch_type(fetch_type);
 		result->op_type = IS_UNUSED;
-		result->u.op.num = fetch_type | fetch_flags;
+		result->u.op.num = fetch_type | (fetch_flags & ~ZEND_FETCH_CLASS_OUTER);
 	}
 }
 /* }}} */

Zend/zend_compile.h

@@ -1021,6 +1021,7 @@ ZEND_API zend_string *zend_type_to_string(zend_type type);
 #define ZEND_FETCH_CLASS_AUTO		4
 #define ZEND_FETCH_CLASS_INTERFACE	5
 #define ZEND_FETCH_CLASS_TRAIT		6
+#define ZEND_FETCH_CLASS_OUTER		7
 #define ZEND_FETCH_CLASS_MASK        0x0f
 #define ZEND_FETCH_CLASS_NO_AUTOLOAD 0x80
 #define ZEND_FETCH_CLASS_SILENT      0x0100

tests/classes/inner_classes/simple_declaration_004.phpt

@@ -6,9 +6,6 @@ scope resolution access
 class Outer {
     public class Middle {
     }
-    public static function testStatic(): self:>Middle {
-        return new static:>Middle();
-    }
     public static function testSelf(): self:>Middle {
         return new self:>Middle();
     }
@@ -21,12 +18,15 @@ class Outer2 extends Outer {
     public static function testParent(): parent:>Middle {
         return new parent:>Middle();
     }
+
+    public static function testSelf(): self:>Middle {
+        return new self:>Middle();
+    }
 }
 
-var_dump(Outer::testStatic());
 var_dump(Outer::testSelf());
 var_dump(Outer2::testParent());
-var_dump(Outer2::testStatic());
+var_dump(Outer2::testSelf());
 var_dump(Outer2::testSelf());
 
 ?>
@@ -35,9 +35,7 @@ object(Outer:>Middle)#1 (0) {
 }
 object(Outer:>Middle)#1 (0) {
 }
-object(Outer:>Middle)#1 (0) {
-}
 object(Outer2:>Middle)#1 (0) {
 }
-object(Outer:>Middle)#1 (0) {
+object(Outer2:>Middle)#1 (0) {
 }

tests/classes/inner_classes/static_resolution.phpt

@@ -0,0 +1,16 @@
+--TEST--
+static resolution
+--FILE--
+<?php
+
+class Outer {
+    class Inner {}
+
+    public function test() {
+        return new static:>Inner();
+    }
+}
+var_dump(new Outer()->test());
+?>
+--EXPECTF--
+Fatal error: Cannot use the static modifier on an inner class in %s on line %d