]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Tue, 13 Aug 2019 18:24:39 +0000 (20:24 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Tue, 13 Aug 2019 18:24:39 +0000 (20:24 +0200)
1  2 
EXTENSIONS
ext/reflection/php_reflection.c

diff --cc EXTENSIONS
index 937aaf80ab15be5a3bb4fbed5774095d7eb5aea6,754239fbaae75a7cbe16eb935bf2dceaaf5cf05a..fff75c19b96504a8d3e2f7df9f61a71e44c0517d
@@@ -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
index d6977a8a3434637080f765e299c7f0a0b01bc9c6,61f09ca643be8c5baba1e3eec7f03b235fd64ac4..5f7dd80435546a3d0bc5dd69637a5d3edea0062f
@@@ -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)
  {