- Fix #52854 (ReflectionClass::newInstanceArgs does not work for classes without...

diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
index 9f06deeabf91418d11e69fcf72ae0a161d0788f8..fce1b583c4e7906e80ee6f9b801150f013a1de31 100644 (file)
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@ -4296,7 +4296,7 @@ ZEND_METHOD(reflection_class, newInstanceArgs)
                if (params) {
                        efree(params);
                }
-       } else if (!ZEND_NUM_ARGS()) {
+       } else if (!ZEND_NUM_ARGS() || !argc) {
                object_init_ex(return_value, ce);
        } else {
                zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC, "Class %s does not have a constructor, so you cannot pass any constructor arguments", ce->name);

diff --git a/ext/reflection/tests/bug52854.phpt b/ext/reflection/tests/bug52854.phpt
new file mode 100644 (file)
index 0000000..94f79d8
--- /dev/null
+++ b/ext/reflection/tests/bug52854.phpt
@@ -0,0 +1,28 @@
+--TEST--
+Bug #52854: ReflectionClass::newInstanceArgs does not work for classes without constructors
+--FILE--
+<?php
+class Test {
+}
+$c = new ReflectionClass('Test');
+var_dump(new Test);
+var_dump(new Test());
+var_dump($c->newInstance());
+var_dump($c->newInstanceArgs(array()));
+
+try {
+       var_dump($c->newInstanceArgs(array(1)));
+} catch(ReflectionException $e) {
+       echo $e->getMessage()."\n";
+}
+?>
+--EXPECTF--
+object(Test)#2 (0) {
+}
+object(Test)#2 (0) {
+}
+object(Test)#2 (0) {
+}
+object(Test)#2 (0) {
+}
+Class Test does not have a constructor, so you cannot pass any constructor arguments