From: Nikita Popov <nikita.ppv@gmail.com>
Date: Tue, 13 Aug 2019 18:24:39 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d0f4ec4c31c873d64728a8fb6b9e7939948461c6;p=php

Merge branch 'PHP-7.4'
---

d0f4ec4c31c873d64728a8fb6b9e7939948461c6
diff --cc EXTENSIONS
index 937aaf80ab,754239fbaa..fff75c19b9
--- a/EXTENSIONS
+++ b/EXTENSIONS
@@@ -328,8 -327,9 +328,9 @@@ MAINTENANCE:         Unknow
  STATUS:              Working
  -------------------------------------------------------------------------------
  EXTENSION:           gmp
 -PRIMARY MAINTAINER:  Stanislav Malyshev <stas@php.net> (2000 - 2018)
 +PRIMARY MAINTAINER:  Stanislav Malyshev <stas@php.net> (2000 - 2019)
                       Antony Dovgal <tony2001@php.net> (2005 - 2010)
+                      Nikita Popov <nikic@php.net> (2013 - 2019)
  MAINTENANCE:         Maintained
  STATUS:              Working
  SINCE:               4.0.4
diff --cc ext/reflection/php_reflection.c
index d6977a8a34,61f09ca643..5f7dd80435
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@@ -4583,7 -4589,7 +4583,7 @@@ ZEND_METHOD(reflection_class, isInstanc
  }
  /* }}} */
  
- /* {{{ proto public stdclass ReflectionClass::newInstance([mixed* args], ...)
 -/* {{{ proto public object ReflectionClass::newInstance(mixed* args, ...)
++/* {{{ proto public object ReflectionClass::newInstance([mixed* args], ...)
     Returns an instance of this class */
  ZEND_METHOD(reflection_class, newInstance)
  {