Deprecate PHP 4 constructors

Author: hikari-no-yume

Zend/tests/019.phpt

@@ -201,7 +201,7 @@ class Point
   var $y;
   var $lable;
 
-  function Point($x, $y) {
+  function __construct($x, $y) {
     $this->x = $x;
     $this->y = $y;
   }
@@ -1271,7 +1271,7 @@ bool(false)
 bool(true)
 array(3) {
   [0]=>
-  string(5) "Point"
+  string(11) "__construct"
   [1]=>
   string(8) "setLable"
   [2]=>

Zend/tests/bug18556.phpt

@@ -8,7 +8,7 @@ setlocale(LC_ALL, $g_lang);
 
 class InfoBlob {
    var $foo;
-   function InfoBlob() {
+   function __construct() {
       $this->foo = "Foo";
    }
 }

Zend/tests/bug20240.phpt

@@ -9,7 +9,7 @@ class test
 {
     public $member;
 
-    function test() {
+    function __construct() {
         $this->member = 1;
         register_shutdown_function(array($this, 'destructor'));
     }

Zend/tests/bug30080.phpt

@@ -3,7 +3,7 @@ Bug #30080 (Passing array or non array of objects)
 --FILE--
 <?php
 class foo { 	
-  function foo($arrayobj) { 
+  function __construct($arrayobj) { 
     var_dump($arrayobj);
   } 
 } 

Zend/tests/bug32226.phpt

@@ -5,7 +5,7 @@ Bug #32226 (SEGV with exception handler on non existing instance)
 
 class A
 {
-        public function A()
+        public function __construct()
         {
                 set_exception_handler(array($this, 'EH'));
 

Zend/tests/bug39542/bug39542.php

@@ -1,6 +1,6 @@
 <?php
 class bug39542 {
-	function bug39542() {
+	function __construct() {
 		echo "ok\n";
 	}
 }

Zend/tests/bug60536_001.phpt

@@ -8,17 +8,17 @@ class X {
 }
 class Y extends X {
 	  use T;
-	  function x() {
+	  function __construct() {
 	      return ++$this->x;
       }
 }
 class Z extends Y {
-	  function z() {
+	  function __construct() {
 		  return ++$this->x;
       }
 }
 $a = new Z();
-$a->x();
+$a->__construct();
 echo "DONE";
 ?>
 --EXPECTF--

Zend/tests/bug65108.phpt

@@ -8,7 +8,7 @@ class C {
 }
 
 class B {
-	public function B() {
+	public function __construct() {
 		$isCallable = is_callable(array(new C, 'f'));
 		var_dump($isCallable);
 	}

Zend/tests/bug65322.phpt

@@ -13,10 +13,12 @@ set_error_handler(function($_, $msg, $file) {
     new B;
 });
 
-eval('class A { function a() {} function __construct() {} }');
+/* This is just a particular example of a non-fatal compile-time error
+ * If this breaks in future, just find another example and use it instead */
+eval('abstract class foo { abstract static function bar(); }');
 
 ?>
 --EXPECTF--
-string(50) "Redefining already defined constructor for class A"
+string(%d) "Static function foo::bar() should not be abstract"
 string(%d) "%s(%d) : eval()'d code"
 string(1) "B"

Zend/tests/errmsg_045.phpt

@@ -8,11 +8,13 @@ set_error_handler(function($_, $msg, $file) {
 	echo $undefined;
 });
 
-eval('class A { function a() {} function __construct() {} }');
+/* This is just a particular example of a non-fatal compile-time error
+ * If this breaks in future, just find another example and use it instead */
+eval('abstract class foo { abstract static function bar(); }');
 
 ?>
 --EXPECTF--
-string(50) "Redefining already defined constructor for class A"
+string(%d) "Static function foo::bar() should not be abstract"
 string(%d) "%s(%d) : eval()'d code"
 
 Notice: Undefined variable: undefined in %s on line %d