Remove support for legacy constructors

This has been deprecated in PHP 7.0 by
https://wiki.php.net/rfc/remove_php4_constructors.

13 files changed, 28 insertions, 354 deletions

diff --git a/ext/reflection/tests/004.phpt b/ext/reflection/tests/004.phpt
index 36ae406b43..924c3fe283 100644
--- a/ext/reflection/tests/004.phpt
+++ b/ext/reflection/tests/004.phpt
@@ -4,7 +4,7 @@ ReflectionMethod::invoke() with non object or null value
 <?php
 
 class a {
-	function a(){
+	function __construct(){
 	}
 }
 class b {
@@ -13,7 +13,7 @@ class b {
 $b = new b();
 
 $a=new ReflectionClass("a");
-$m=$a->getMethod("a");
+$m=$a->getMethod("__construct");
 
 try {
         $m->invoke(null);
@@ -35,9 +35,7 @@ try {
         echo $E->getMessage()."\n";
 }
 
-echo "===DONE===\n";?>
---EXPECTF--
-Deprecated: Methods with the same name as their class will not be constructors in a future version of PHP; a has a deprecated constructor in %s on line %d
-Trying to invoke non static method a::a() without an object
+?>
+--EXPECT--
+Trying to invoke non static method a::__construct() without an object
 Given object is not an instance of the class this method was declared in
-===DONE===
diff --git a/ext/reflection/tests/ReflectionClass_getConstructor_basic.phpt b/ext/reflection/tests/ReflectionClass_getConstructor_basic.phpt
index 5db9d8f3d3..df6880aedb 100644
--- a/ext/reflection/tests/ReflectionClass_getConstructor_basic.phpt
+++ b/ext/reflection/tests/ReflectionClass_getConstructor_basic.phpt
@@ -9,48 +9,7 @@ class NewCtor {
 class ExtendsNewCtor extends NewCtor {
 }
 
-class OldCtor {
-	function OldCtor() {}
-}
-
-class ExtendsOldCtor extends OldCtor {
-}
-
-
-class X {
-	function Y() {}
-}
-
-class Y extends X {
-}
-
-class OldAndNewCtor {
-	function OldAndNewCtor() {}
-	function __construct() {}
-}
-
-class NewAndOldCtor {
-	function __construct() {}
-	function NewAndOldCtor() {}
-}
-class B {
-	function B() {}
-}
-
-class C extends B {
-	function C() {}
-}
-
-class D1 extends C {
-	function __construct() {}
-}
-
-class D2 extends C {
-}
-
-$classes = array('NewCtor', 'ExtendsNewCtor', 'OldCtor', 'ExtendsOldCtor',
-				 'OldAndNewCtor', 'NewAndOldCtor', 'B', 'C', 'D1', 'D2', 'X', 'Y');
-
+$classes = array('NewCtor', 'ExtendsNewCtor');
 foreach ($classes as $class) {
 	$rc = new ReflectionClass($class);
 	$rm = $rc->getConstructor();
@@ -63,21 +22,6 @@ foreach ($classes as $class) {
 }
 
 ?>
---EXPECTF--
-Deprecated: Methods with the same name as their class will not be constructors in a future version of PHP; OldCtor has a deprecated constructor in %s on line %d
-
-Deprecated: Methods with the same name as their class will not be constructors in a future version of PHP; B has a deprecated constructor in %s on line %d
-
-Deprecated: Methods with the same name as their class will not be constructors in a future version of PHP; C has a deprecated constructor in %s on line %d
+--EXPECT--
 Constructor of NewCtor: __construct
 Constructor of ExtendsNewCtor: __construct
-Constructor of OldCtor: OldCtor
-Constructor of ExtendsOldCtor: OldCtor
-Constructor of OldAndNewCtor: __construct
-Constructor of NewAndOldCtor: __construct
-Constructor of B: B
-Constructor of C: C
-Constructor of D1: __construct
-Constructor of D2: C
-No constructor for X
-No constructor for Y
diff --git a/ext/reflection/tests/ReflectionClass_isInstantiable_error.phpt b/ext/reflection/tests/ReflectionClass_isInstantiable_error.phpt
index 5263643023..e192e436f0 100644
--- a/ext/reflection/tests/ReflectionClass_isInstantiable_error.phpt
+++ b/ext/reflection/tests/ReflectionClass_isInstantiable_error.phpt
@@ -2,18 +2,16 @@
 ReflectionClass::IsInstantiable()
 --FILE--
 <?php
-class privateCtorOld {
-	private function privateCtorOld() {}
+class privateCtorNew {
+	private function __construct() {}
 }
-$reflectionClass = new ReflectionClass("privateCtorOld");
+$reflectionClass = new ReflectionClass("privateCtorNew");
 
 var_dump($reflectionClass->IsInstantiable('X'));
 var_dump($reflectionClass->IsInstantiable(0, null));
 
 ?>
 --EXPECTF--
-Deprecated: Methods with the same name as their class will not be constructors in a future version of PHP; privateCtorOld has a deprecated constructor in %s on line %d
-
 Warning: ReflectionClass::isInstantiable() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
diff --git a/ext/reflection/tests/ReflectionClass_isInstantiable_variation.phpt b/ext/reflection/tests/ReflectionClass_isInstantiable_variation.phpt
index 1378edd3d2..e688b40f46 100644
--- a/ext/reflection/tests/ReflectionClass_isInstantiable_variation.phpt
+++ b/ext/reflection/tests/ReflectionClass_isInstantiable_variation.phpt
@@ -17,39 +17,16 @@ class privateCtorNew {
 	private function __construct() {}
 }
 
-class publicCtorOld {
-	public function publicCtorOld() {}
-}
-
-class protectedCtorOld {
-	protected function protectedCtorOld() {}
-}
-
-class privateCtorOld {
-	private function privateCtorOld() {}
-}
-
-
-$classes = array("noCtor", "publicCtorNew", "protectedCtorNew", "privateCtorNew",
-				 	"publicCtorOld", "protectedCtorOld", "privateCtorOld");
-
-foreach($classes  as $class ) {
+$classes = array("noCtor", "publicCtorNew", "protectedCtorNew", "privateCtorNew");
+foreach ($classes as $class) {
 	$reflectionClass = new ReflectionClass($class);
 	echo "Is $class instantiable?  ";
 	var_dump($reflectionClass->IsInstantiable());
 }
 
 ?>
---EXPECTF--
-Deprecated: Methods with the same name as their class will not be constructors in a future version of PHP; publicCtorOld has a deprecated constructor in %s on line %d
-
-Deprecated: Methods with the same name as their class will not be constructors in a future version of PHP; protectedCtorOld has a deprecated constructor in %s on line %d
-
-Deprecated: Methods with the same name as their class will not be constructors in a future version of PHP; privateCtorOld has a deprecated constructor in %s on line %d
+--EXPECT--
 Is noCtor instantiable?  bool(true)
 Is publicCtorNew instantiable?  bool(true)
 Is protectedCtorNew instantiable?  bool(false)
 Is privateCtorNew instantiable?  bool(false)
-Is publicCtorOld instantiable?  bool(true)
-Is protectedCtorOld instantiable?  bool(false)
-Is privateCtorOld instantiable?  bool(false)
diff --git a/ext/reflection/tests/ReflectionClass_newInstanceArgs_001.phpt b/ext/reflection/tests/ReflectionClass_newInstanceArgs_001.phpt
index 068710311d..11bd44077f 100644
--- a/ext/reflection/tests/ReflectionClass_newInstanceArgs_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_newInstanceArgs_001.phpt
@@ -5,11 +5,6 @@ Robin Fernandes <robinf@php.net>
 Steve Seear <stevseea@php.net>
 --FILE--
 <?php
-class A {
-	public function A() {
-		echo "In constructor of class A\n";
-	}
-}
 
 class B {
 	public function __construct($a, $b) {
@@ -32,28 +27,17 @@ class E {
 }
 
 
-$rcA = new ReflectionClass('A');
 $rcB = new ReflectionClass('B');
 $rcC = new ReflectionClass('C');
 $rcD = new ReflectionClass('D');
 $rcE = new ReflectionClass('E');
 
 try {
-	var_dump($rcA->newInstanceArgs());
-} catch (Throwable $e) {
-	echo "Exception: " . $e->getMessage() . "\n";
-}
-try {
-	var_dump($rcA->newInstanceArgs(array('x')));
-} catch (Throwable $e) {
-	echo "Exception: " . $e->getMessage() . "\n";
-}
-
-try {
 	var_dump($rcB->newInstanceArgs());
 } catch (Throwable $e) {
 	echo "Exception: " . $e->getMessage() . "\n";
 }
+
 try {
 	var_dump($rcB->newInstanceArgs(array('x', 123)));
 } catch (Throwable $e) {
@@ -85,13 +69,6 @@ try {
 }
 ?>
 --EXPECTF--
-Deprecated: Methods with the same name as their class will not be constructors in a future version of PHP; A has a deprecated constructor in %s on line %d
-In constructor of class A
-object(A)#%d (0) {
-}
-In constructor of class A
-object(A)#%d (0) {
-}
 Exception: Too few arguments to function B::__construct(), 0 passed and exactly 2 expected
 In constructor of class B with args x, 123
 object(B)#%d (0) {
diff --git a/ext/reflection/tests/ReflectionClass_newInstance_001.phpt b/ext/reflection/tests/ReflectionClass_newInstance_001.phpt
index c91d2ee958..bf68098a7d 100644
--- a/ext/reflection/tests/ReflectionClass_newInstance_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_newInstance_001.phpt
@@ -5,11 +5,6 @@ Robin Fernandes <robinf@php.net>
 Steve Seear <stevseea@php.net>
 --FILE--
 <?php
-class A {
-	public function A() {
-		echo "In constructor of class A\n";
-	}
-}
 
 class B {
 	public function __construct($a, $b) {
@@ -28,20 +23,15 @@ class D {
 		echo "In constructor of class D\n";
 	}
 }
+
 class E {
 }
 
-
-$rcA = new ReflectionClass('A');
 $rcB = new ReflectionClass('B');
 $rcC = new ReflectionClass('C');
 $rcD = new ReflectionClass('D');
 $rcE = new ReflectionClass('E');
 
-$a1 = $rcA->newInstance();
-$a2 = $rcA->newInstance('x');
-var_dump($a1, $a2);
-
 try {
 	var_dump($rcB->newInstance());
 } catch (Throwable $e) {
@@ -78,13 +68,6 @@ try {
 }
 ?>
 --EXPECTF--
-Deprecated: Methods with the same name as their class will not be constructors in a future version of PHP; A has a deprecated constructor in %s on line %d
-In constructor of class A
-In constructor of class A
-object(A)#%d (0) {
-}
-object(A)#%d (0) {
-}
 Exception: Too few arguments to function B::__construct(), 0 passed and exactly 2 expected
 In constructor of class B with args x, 123
 object(B)#%d (0) {
diff --git a/ext/reflection/tests/ReflectionMethod_constructor_basic.phpt b/ext/reflection/tests/ReflectionMethod_constructor_basic.phpt
index 243c59504b..da108d258d 100644
--- a/ext/reflection/tests/ReflectionMethod_constructor_basic.phpt
+++ b/ext/reflection/tests/ReflectionMethod_constructor_basic.phpt
@@ -19,21 +19,6 @@ echo "\nInherited new-style constructor\n";
 $methodInfo = new ReflectionMethod("ExtendsNewCtor::__construct");
 var_dump($methodInfo->isConstructor());
 
-class OldCtor {
-    function OldCtor() {
-        echo "In " . __METHOD__ . "\n";
-    }
-}
-echo "\nOld-style constructor:\n";
-$methodInfo = new ReflectionMethod("OldCtor::OldCtor");
-var_dump($methodInfo->isConstructor());
-
-class ExtendsOldCtor extends OldCtor {
-}
-echo "\nInherited old-style constructor:\n";
-$methodInfo = new ReflectionMethod("ExtendsOldCtor::OldCtor");
-var_dump($methodInfo->isConstructor());
-
 class X {
     function Y() {
         echo "In " . __METHOD__ . "\n";
@@ -49,69 +34,16 @@ echo "\nInherited method of the same name as the class:\n";
 $methodInfo = new ReflectionMethod("Y::Y");
 var_dump($methodInfo->isConstructor());
 
-class OldAndNewCtor {
-    function OldAndNewCtor() {
-        echo "In " . __METHOD__ . "\n";
-    }
-
-    function __construct() {
-        echo "In " . __METHOD__ . "\n";
-    }
-}
-echo "\nOld-style constructor:\n";
-$methodInfo = new ReflectionMethod("OldAndNewCtor::OldAndNewCtor");
-var_dump($methodInfo->isConstructor());
-
-echo "\nRedefined constructor:\n";
-$methodInfo = new ReflectionMethod("OldAndNewCtor::__construct");
-var_dump($methodInfo->isConstructor());
-
-class NewAndOldCtor {
-    function __construct() {
-        echo "In " . __METHOD__ . "\n";
-    }
-
-    function NewAndOldCtor() {
-        echo "In " . __METHOD__ . "\n";
-    }
-}
-echo "\nNew-style constructor:\n";
-$methodInfo = new ReflectionMethod("NewAndOldCtor::__construct");
-var_dump($methodInfo->isConstructor());
-
-echo "\nRedefined old-style constructor:\n";
-$methodInfo = new ReflectionMethod("NewAndOldCtor::NewAndOldCtor");
-var_dump($methodInfo->isConstructor());
-
 ?>
---EXPECTF--
-Deprecated: Methods with the same name as their class will not be constructors in a future version of PHP; OldCtor has a deprecated constructor in %s on line %d
+--EXPECT--
 New-style constructor:
 bool(true)
 
 Inherited new-style constructor
 bool(true)
 
-Old-style constructor:
-bool(true)
-
-Inherited old-style constructor:
-bool(true)
-
 Not a constructor:
 bool(false)
 
 Inherited method of the same name as the class:
 bool(false)
-
-Old-style constructor:
-bool(false)
-
-Redefined constructor:
-bool(true)
-
-New-style constructor:
-bool(true)
-
-Redefined old-style constructor:
-bool(false)
diff --git a/ext/reflection/tests/ReflectionObject_getConstructor_basic.phpt b/ext/reflection/tests/ReflectionObject_getConstructor_basic.phpt
index aecc9b97d2..fee873fe01 100644
--- a/ext/reflection/tests/ReflectionObject_getConstructor_basic.phpt
+++ b/ext/reflection/tests/ReflectionObject_getConstructor_basic.phpt
@@ -9,14 +9,6 @@ class NewCtor {
 class ExtendsNewCtor extends NewCtor {
 }
 
-class OldCtor {
-	function OldCtor() {}
-}
-
-class ExtendsOldCtor extends OldCtor {
-}
-
-
 class X {
 	function Y() {}
 }
@@ -24,15 +16,6 @@ class X {
 class Y extends X {
 }
 
-class OldAndNewCtor {
-	function OldAndNewCtor() {}
-	function __construct() {}
-}
-
-class NewAndOldCtor {
-	function __construct() {}
-	function NewAndOldCtor() {}
-}
 class B {
 	function B() {}
 }
@@ -48,8 +31,8 @@ class D1 extends C {
 class D2 extends C {
 }
 
-$classes = array('NewCtor', 'ExtendsNewCtor', 'OldCtor', 'ExtendsOldCtor',
-				 'OldAndNewCtor', 'NewAndOldCtor', 'B', 'C', 'D1', 'D2', 'X', 'Y');
+$classes = array('NewCtor', 'ExtendsNewCtor',
+				 'B', 'C', 'D1', 'D2', 'X', 'Y');
 
 foreach ($classes as $class) {
 	$rc = new ReflectionObject(new $class);
@@ -63,21 +46,12 @@ foreach ($classes as $class) {
 }
 
 ?>
---EXPECTF--
-Deprecated: Methods with the same name as their class will not be constructors in a future version of PHP; OldCtor has a deprecated constructor in %s on line %d
-
-Deprecated: Methods with the same name as their class will not be constructors in a future version of PHP; B has a deprecated constructor in %s on line %d
-
-Deprecated: Methods with the same name as their class will not be constructors in a future version of PHP; C has a deprecated constructor in %s on line %d
+--EXPECT--
 Constructor of NewCtor: __construct
 Constructor of ExtendsNewCtor: __construct
-Constructor of OldCtor: OldCtor
-Constructor of ExtendsOldCtor: OldCtor
-Constructor of OldAndNewCtor: __construct
-Constructor of NewAndOldCtor: __construct
-Constructor of B: B
-Constructor of C: C
+No constructor for B
+No constructor for C
 Constructor of D1: __construct
-Constructor of D2: C
+No constructor for D2
 No constructor for X
 No constructor for Y
diff --git a/ext/reflection/tests/ReflectionObject_isInstantiable_error.phpt b/ext/reflection/tests/ReflectionObject_isInstantiable_error.phpt
index f6d4c9d3d2..f24958421f 100644
--- a/ext/reflection/tests/ReflectionObject_isInstantiable_error.phpt
+++ b/ext/reflection/tests/ReflectionObject_isInstantiable_error.phpt
@@ -2,21 +2,19 @@
 ReflectionObject::IsInstantiable() - invalid params
 --FILE--
 <?php
-class privateCtorOld {
-	private function privateCtorOld() {}
+class privateCtornew {
+	private function __construct() {}
 	public static function reflectionObjectFactory() {
 		return new ReflectionObject(new self);
 	}
 }
-$reflectionObject =  privateCtorOld::reflectionObjectFactory();
+$reflectionObject = privateCtorNew::reflectionObjectFactory();
 
 var_dump($reflectionObject->IsInstantiable('X'));
 var_dump($reflectionObject->IsInstantiable(0, null));
 
 ?>
 --EXPECTF--
-Deprecated: Methods with the same name as their class will not be constructors in a future version of PHP; privateCtorOld has a deprecated constructor in %s on line %d
-
 Warning: ReflectionClass::isInstantiable() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
diff --git a/ext/reflection/tests/ReflectionObject_isInstantiable_variation.phpt b/ext/reflection/tests/ReflectionObject_isInstantiable_variation.phpt
index 675bbdde8d..3baa8a0950 100644
--- a/ext/reflection/tests/ReflectionObject_isInstantiable_variation.phpt
+++ b/ext/reflection/tests/ReflectionObject_isInstantiable_variation.phpt
@@ -30,54 +30,21 @@ class privateCtorNew {
 	}
 }
 
-class publicCtorOld {
-	public function publicCtorOld() {}
-	public static function reflectionObjectFactory() {
-		return new ReflectionObject(new self);
-	}
-}
-
-class protectedCtorOld {
-	protected function protectedCtorOld() {}
-	public static function reflectionObjectFactory() {
-		return new ReflectionObject(new self);
-	}
-}
-
-class privateCtorOld {
-	private function privateCtorOld() {}
-	public static function reflectionObjectFactory() {
-		return new ReflectionObject(new self);
-	}
-}
-
-
 $reflectionObjects = array(
 		noCtor::reflectionObjectFactory(),
 		publicCtorNew::reflectionObjectFactory(),
 		protectedCtorNew::reflectionObjectFactory(),
 		privateCtorNew::reflectionObjectFactory(),
-		publicCtorOld::reflectionObjectFactory(),
-		protectedCtorOld::reflectionObjectFactory(),
-		privateCtorOld::reflectionObjectFactory()
 	);
 
-foreach($reflectionObjects  as $reflectionObject ) {
+foreach ($reflectionObjects as $reflectionObject) {
 	$name = $reflectionObject->getName();
 	echo "Is $name instantiable? ";
 	var_dump($reflectionObject->IsInstantiable());
 }
 ?>
---EXPECTF--
-Deprecated: Methods with the same name as their class will not be constructors in a future version of PHP; publicCtorOld has a deprecated constructor in %s on line %d
-
-Deprecated: Methods with the same name as their class will not be constructors in a future version of PHP; protectedCtorOld has a deprecated constructor in %s on line %d
-
-Deprecated: Methods with the same name as their class will not be constructors in a future version of PHP; privateCtorOld has a deprecated constructor in %s on line %d
+--EXPECT--
 Is noCtor instantiable? bool(true)
 Is publicCtorNew instantiable? bool(true)
 Is protectedCtorNew instantiable? bool(false)
 Is privateCtorNew instantiable? bool(false)
-Is publicCtorOld instantiable? bool(true)
-Is protectedCtorOld instantiable? bool(false)
-Is privateCtorOld instantiable? bool(false)
diff --git a/ext/reflection/tests/bug30148.phpt b/ext/reflection/tests/bug30148.phpt
deleted file mode 100644
index 27c31ca6ae..0000000000
--- a/ext/reflection/tests/bug30148.phpt
+++ /dev/null
@@ -1,36 +0,0 @@
---TEST--
-Reflection Bug #30148 (ReflectionMethod->isConstructor() fails for inherited classes)
---FILE--
-<?php
-
-class Root
-{
-	function Root() {}
-}
-class Base extends Root
-{
-	function __construct() {}
-}
-class Derived extends Base
-{
-}
-$a = new ReflectionMethod('Root','Root');
-$b = new ReflectionMethod('Base','Root');
-$c = new ReflectionMethod('Base','__construct');
-$d = new ReflectionMethod('Derived','Root');
-$e = new ReflectionMethod('Derived','__construct');
-var_dump($a->isConstructor());
-var_dump($b->isConstructor());
-var_dump($c->isConstructor());
-var_dump($d->isConstructor());
-var_dump($e->isConstructor());
-?>
-===DONE===
---EXPECTF--
-Deprecated: Methods with the same name as their class will not be constructors in a future version of PHP; Root has a deprecated constructor in %s on line %d
-bool(true)
-bool(false)
-bool(true)
-bool(false)
-bool(true)
-===DONE===
diff --git a/ext/reflection/tests/bug38942.phpt b/ext/reflection/tests/bug38942.phpt
deleted file mode 100644
index 59666607cb..0000000000
--- a/ext/reflection/tests/bug38942.phpt
+++ /dev/null
@@ -1,35 +0,0 @@
---TEST--
-Bug #38942 (Double old-style-ctor inheritance)
---FILE--
-<?php
-class foo {
-    public function foo() {}
-}
-
-class bar extends foo {
-}
-ReflectionClass::export("bar");
-?>
---EXPECTF--
-Deprecated: Methods with the same name as their class will not be constructors in a future version of PHP; foo has a deprecated constructor in %s on line %d
-Class [ <user> class bar extends foo ] {
-  @@ %sbug38942.php 6-7
-
-  - Constants [0] {
-  }
-
-  - Static properties [0] {
-  }
-
-  - Static methods [0] {
-  }
-
-  - Properties [0] {
-  }
-
-  - Methods [1] {
-    Method [ <user, inherits foo, ctor> public method foo ] {
-      @@ %sbug38942.php 3 - 3
-    }
-  }
-}
diff --git a/ext/reflection/tests/bug47254.phpt b/ext/reflection/tests/bug47254.phpt
index e3ce114c9c..b6f33fcfc6 100644
--- a/ext/reflection/tests/bug47254.phpt
+++ b/ext/reflection/tests/bug47254.phpt
@@ -23,10 +23,7 @@ $m = $R->getMethods();
 print_r($m);
 
 ?>
---EXPECTF--
-Deprecated: Methods with the same name as their class will not be constructors in a future version of PHP; A has a deprecated constructor in %s on line %d
-
-Deprecated: Methods with the same name as their class will not be constructors in a future version of PHP; B has a deprecated constructor in %s on line %d
+--EXPECT--
 Array
 (
     [0] => ReflectionMethod Object