]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Thu, 28 Mar 2019 08:31:18 +0000 (09:31 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Thu, 28 Mar 2019 08:31:18 +0000 (09:31 +0100)
1  2 
Zend/zend_compile.c
Zend/zend_compile.h
Zend/zend_globals.h

index 3cb1720ecc098d11c7cf9cb7ce00cfbc5890b372,2fa847d180d6c92cdd5a715ed4093d6a2daa08ef..23b6759167958abd8647618a408a59792d575f52
@@@ -7944,8 -8067,7 +7940,8 @@@ void zend_compile_const_expr_const(zend
        }
  
        zend_ast_destroy(ast);
-       *ast_ptr = zend_ast_create_constant(&loc, resolved_name,
 -      *ast_ptr = zend_ast_create_constant(resolved_name, !is_fully_qualified ? IS_CONSTANT_UNQUALIFIED : 0);
++      *ast_ptr = zend_ast_create_constant(resolved_name,
 +              !is_fully_qualified && FC(current_namespace) ? IS_CONSTANT_UNQUALIFIED_IN_NAMESPACE : 0);
  }
  /* }}} */
  
Simple merge
Simple merge