Finish PHP 4 constructor deprecation

Author: nikic

Zend/tests/bug31177-2.phpt

@@ -3,13 +3,13 @@ Bug #31177 (memory corruption because of incorrect refcounting)
 --FILE--
 <?php
 class foo {
-  function foo($n=0) {
+  function __construct($n=0) {
     if($n) throw new Exception("new");
   }
 }
 $x = new foo();
 try {
-  $y=$x->foo(1);
+  $y=$x->__construct(1);
 } catch (Exception $e) {
   var_dump($x);
 }

Zend/tests/bug38942.phpt

@@ -10,7 +10,8 @@ class bar extends foo {
 }
 print_r(get_class_methods("bar"));
 ?>
---EXPECT--
+--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
 Array
 (
     [0] => foo

Zend/tests/bug39127.phpt

@@ -14,6 +14,7 @@ var_dump(is_callable(array($b,"__construct")));
 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
 string(13) "a::a() called"
 bool(true)
 bool(false)

Zend/tests/bug40784.phpt

@@ -19,6 +19,7 @@ $b = new B;
 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
 I'm A
 I'm A
 Done

Zend/tests/bug43323.phpt

@@ -9,4 +9,6 @@ abstract class bar {
 class foo extends bar {
 }
 --EXPECTF--
+Deprecated: Methods with the same name as their class will not be constructors in a future version of PHP; bar has a deprecated constructor in %s on line %d
+
 Fatal error: Class foo contains 1 abstract method and must therefore be declared abstract or implement the remaining methods (bar::bar) in %sbug43323.php on line 7

Zend/tests/bug46381.phpt

@@ -1,17 +1,15 @@
 --TEST--
 Bug #46381 (wrong $this passed to internal methods causes segfault)
---SKIPIF--
-<?php if (!extension_loaded("spl")) die("skip SPL is no available"); ?>
 --FILE--
 <?php
 
 class test {
-	public function test() {
+	public function method() {
 		return ArrayIterator::current();
 	}
 }
 $test = new test();
-$test->test();
+$test->method();
 
 echo "Done\n";
 ?>

Zend/tests/bug47343.phpt

@@ -20,7 +20,7 @@ class A
 
 class B
 {
-	public function B($A)
+	public function __construct($A)
 	{
 		$this->A = $A;
 	}

Zend/tests/bug48215_2.phpt

@@ -8,7 +8,7 @@ class a {
 }
 class b extends a {}
 class c extends b { 
-	function C() {
+	function __construct() {
 		b::b();
 	}
 }

Zend/tests/bug50261.phpt

@@ -30,7 +30,8 @@ class testClass2 extends testClass {
 new testClass2;
 
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Methods with the same name as their class will not be constructors in a future version of PHP; testClass has a deprecated constructor in %s on line %d
 testClass::testClass (1)
 testClass::testClass (2)
 testClass::testClass (3)

Zend/tests/bug52051.phpt

@@ -22,6 +22,13 @@ class C extends B {
 new C();
 
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Methods with the same name as their class will not be constructors in a future version of PHP; AA 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; CC 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; 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; C has a deprecated constructor in %s on line %d
 foo
 bar