Merge branch 'PHP-7.2' into PHP-7.3

diff --cc Zend/zend_compile.c
index a970718bfeaf19d39c87ee9e4f467154c4e2d81d,d91b656182f4a4738a8835b7cafdd8ac737d2d60..e0ccd56a5c009491eba1c996d028a15a3b3953f2
--- 1/Zend/zend_compile.c
--- 2/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@@ -8086,12 -8009,16 +8086,10 @@@ void zend_compile_const_expr_magic_cons
        zend_ast *ast = *ast_ptr;
  
        /* Other cases already resolved by constant folding */
-       ZEND_ASSERT(ast->attr == T_CLASS_C &&
-                   CG(active_class_entry) &&
-                   (CG(active_class_entry)->ce_flags & ZEND_ACC_TRAIT) != 0);
+       ZEND_ASSERT(ast->attr == T_CLASS_C);
  
 -      {
 -              zval const_zv;
 -              Z_STR(const_zv) = zend_string_init("__CLASS__", sizeof("__CLASS__")-1, 0);
 -              Z_TYPE_INFO(const_zv) = IS_CONSTANT_EX | (IS_CONSTANT_CLASS << Z_CONST_FLAGS_SHIFT);
 -
 -              zend_ast_destroy(ast);
 -              *ast_ptr = zend_ast_create_zval(&const_zv);
 -      }
 +      zend_ast_destroy(ast);
 +      *ast_ptr = zend_ast_create(ZEND_AST_CONSTANT_CLASS);
  }
  /* }}} */