Fix tests for E_STRICT and check for E_STRICT in run-tests.php.

32 files changed, 49 insertions, 49 deletions

diff --git a/ext/session/tests/001.phpt b/ext/session/tests/001.phpt
index f499029a73..54918b5799 100644
--- a/ext/session/tests/001.phpt
+++ b/ext/session/tests/001.phpt
@@ -12,7 +12,7 @@ session.serialize_handler=php
 error_reporting(E_ALL);
 
 class foo {
-	var $bar = "ok";
+	public $bar = "ok";
 
 	function method() { $this->yes = "done"; }
 }
diff --git a/ext/session/tests/003.phpt b/ext/session/tests/003.phpt
index f9fa28f4ea..fed90902cd 100644
--- a/ext/session/tests/003.phpt
+++ b/ext/session/tests/003.phpt
@@ -12,7 +12,7 @@ session.serialize_handler=php
 error_reporting(E_ALL);
 
 class foo {
-	var $bar = "ok";
+	public $bar = "ok";
 	function method() { $this->yes++; }
 }
 
diff --git a/ext/session/tests/004.phpt b/ext/session/tests/004.phpt
index 79383705e6..2040476bc0 100644
--- a/ext/session/tests/004.phpt
+++ b/ext/session/tests/004.phpt
@@ -13,7 +13,7 @@ session.serialize_handler=php
 error_reporting(E_ALL);
 
 class handler {
-	var $data = 'baz|O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";i:1;}arr|a:1:{i:3;O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";i:1;}}';
+	public $data = 'baz|O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";i:1;}arr|a:1:{i:3;O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";i:1;}}';
     function open($save_path, $session_name)
     {
         print "OPEN: $session_name\n";
@@ -48,7 +48,7 @@ class handler {
 $hnd = new handler;
 
 class foo {
-    var $bar = "ok";
+    public $bar = "ok";
     function method() { $this->yes++; }
 }
 
diff --git a/ext/session/tests/005.phpt b/ext/session/tests/005.phpt
index 6127ad22f2..5638376b9d 100644
--- a/ext/session/tests/005.phpt
+++ b/ext/session/tests/005.phpt
@@ -14,7 +14,7 @@ session.serialize_handler=php
 error_reporting(E_ALL);
 
 class handler {
-	var $data = 'baz|O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";i:1;}arr|a:1:{i:3;O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";i:1;}}';
+	public $data = 'baz|O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";i:1;}arr|a:1:{i:3;O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";i:1;}}';
     function open($save_path, $session_name)
     {
         print "OPEN: $session_name\n";
@@ -50,7 +50,7 @@ class handler {
 $hnd = new handler;
 
 class foo {
-    var $bar = "ok";
+    public $bar = "ok";
     function method() { $this->yes++; }
 }
 
diff --git a/ext/session/tests/006.phpt b/ext/session/tests/006.phpt
index d93474765d..fb355976fb 100644
--- a/ext/session/tests/006.phpt
+++ b/ext/session/tests/006.phpt
@@ -15,11 +15,11 @@ session_id("abtest");
 session_start();
 
 class a {
-    var $test = "hallo";
+    public $test = "hallo";
 }
  
 class b {
-    var $a;
+    public $a;
     function b(&$a) {
         $this->a = &$a;
     }
diff --git a/ext/session/tests/019.phpt b/ext/session/tests/019.phpt
index 0e274b1536..c258d3ba57 100644
--- a/ext/session/tests/019.phpt
+++ b/ext/session/tests/019.phpt
@@ -13,7 +13,7 @@ session.serialize_handler=php
 error_reporting(E_ALL);
 
 class TFoo {
-	var $c;
+	public $c;
 	function TFoo($c) {
 		$this->c = $c;
 	}
diff --git a/ext/standard/tests/file/fopencookie.phpt b/ext/standard/tests/file/fopencookie.phpt
index 89886559d1..1b2cfb17b8 100644
--- a/ext/standard/tests/file/fopencookie.phpt
+++ b/ext/standard/tests/file/fopencookie.phpt
@@ -18,8 +18,8 @@ fopencookie detected and working (or cast mechanism works)
  */
 
 class userstream {
-	var $position = 0;
-	var $data = "If you can read this, it worked";
+	public $position = 0;
+	public $data = "If you can read this, it worked";
 	
 	function stream_open($path, $mode, $options, &$opened_path)
 	{
diff --git a/ext/standard/tests/file/userstreams.phpt b/ext/standard/tests/file/userstreams.phpt
index 1606d89f06..124825f24e 100644
--- a/ext/standard/tests/file/userstreams.phpt
+++ b/ext/standard/tests/file/userstreams.phpt
@@ -82,12 +82,12 @@ class uselessstream
 
 class mystream 
 {
-	var $path;
-	var $mode;
-	var $options;
+	public $path;
+	public $mode;
+	public $options;
 
-	var $position;
-	var $varname;
+	public $position;
+	public $varname;
 
 	function stream_open($path, $mode, $options, &$opened_path)
 	{
diff --git a/ext/standard/tests/serialize/bug21957.phpt b/ext/standard/tests/serialize/bug21957.phpt
index af2003f3e3..29eeb2ee6c 100644
--- a/ext/standard/tests/serialize/bug21957.phpt
+++ b/ext/standard/tests/serialize/bug21957.phpt
@@ -4,7 +4,7 @@ Bug #21957 (serialize() mangles objects with __sleep)
 <?php 
 class test
 {
-	var $a, $b;
+	public $a, $b;
 
 	function test()
 	{
diff --git a/run-tests.php b/run-tests.php
index e3e4d73e32..b1493f5729 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -163,7 +163,7 @@ $ini_overwrites = array(
 		'safe_mode=0',
 		'disable_functions=',
 		'output_buffering=Off',
-		'error_reporting=2047',
+		'error_reporting=4095',
 		'display_errors=1',
 		'log_errors=0',
 		'html_errors=0',
diff --git a/tests/classes/__call_001.phpt b/tests/classes/__call_001.phpt
index 9a2306250c..f9708e04f1 100644
--- a/tests/classes/__call_001.phpt
+++ b/tests/classes/__call_001.phpt
@@ -6,7 +6,7 @@ ZE2 __call()
 <?php
 
 class Caller {
-	var $x = array(1, 2, 3);
+	public $x = array(1, 2, 3);
 	
 	function __call($m, $a) {
 		echo "Method $m called:\n";
diff --git a/tests/classes/bug23951.phpt b/tests/classes/bug23951.phpt
index 61aa90661e..a49d62f3fe 100644
--- a/tests/classes/bug23951.phpt
+++ b/tests/classes/bug23951.phpt
@@ -8,13 +8,13 @@ define('FOO2', 2);
 
 class A {
     
-    var $a_var = array(FOO1=>'foo1_value', FOO2=>'foo2_value');
+    public $a_var = array(FOO1=>'foo1_value', FOO2=>'foo2_value');
     
 }
 
 class B extends A {
  
-    var $b_var = 'foo';   
+    public $b_var = 'foo';   
             
 }
 
diff --git a/tests/classes/bug24399.phpt b/tests/classes/bug24399.phpt
index 1c62b5bd4a..fedf8e5d24 100644
--- a/tests/classes/bug24399.phpt
+++ b/tests/classes/bug24399.phpt
@@ -3,7 +3,7 @@ Bug #24399 (is_subclass_of() crashes when parent class doesn't exist)
 --FILE--
 <?php
 class dooh {
-    var $blah;
+    public $blah;
 }
 $d = new dooh;
 var_dump(is_subclass_of($d, 'dooh'));
diff --git a/tests/classes/class_example.phpt b/tests/classes/class_example.phpt
index 0e3ae3c338..621958b1bd 100644
--- a/tests/classes/class_example.phpt
+++ b/tests/classes/class_example.phpt
@@ -7,7 +7,7 @@ Classes general test
 /* pretty nifty object oriented code! */
 
 class user {
-  var $first_name,$family_name,$address,$phone_num;
+  public $first_name,$family_name,$address,$phone_num;
   function display()
   {
     echo "User information\n";
diff --git a/tests/classes/destructor_and_references.phpt b/tests/classes/destructor_and_references.phpt
index d2afc2aa2c..b55e7fe94d 100755
--- a/tests/classes/destructor_and_references.phpt
+++ b/tests/classes/destructor_and_references.phpt
@@ -3,10 +3,10 @@ Destucting and references
 --FILE--
 <?php
 
-class test1 {var $x;};
-class test2 {var $x;};
-class test3 {var $x;};
-class test4 {var $x;};
+class test1 {public $x;};
+class test2 {public $x;};
+class test3 {public $x;};
+class test4 {public $x;};
 
 $o1 = new test1;
 $o2 = new test2;
diff --git a/tests/classes/inheritance.phpt b/tests/classes/inheritance.phpt
index d5544a4f77..070ad9147d 100644
--- a/tests/classes/inheritance.phpt
+++ b/tests/classes/inheritance.phpt
@@ -6,8 +6,8 @@ Classes inheritance test
 /* Inheritance test.  Pretty nifty if I do say so myself! */
 
 class foo {
-  var $a;
-  var $b;
+  public $a;
+  public $b;
   function display() {
   	echo "This is class foo\n";
     echo "a = ".$this->a."\n";
@@ -19,7 +19,7 @@ class foo {
 };
 
 class bar extends foo {
-  var $c;
+  public $c;
   function display() {  /* alternative display function for class bar */
     echo "This is class bar\n";
     echo "a = ".$this->a."\n";
diff --git a/tests/classes/interface_doubled.phpt b/tests/classes/interface_doubled.phpt
index fa190c767a..dbc23de754 100644
--- a/tests/classes/interface_doubled.phpt
+++ b/tests/classes/interface_doubled.phpt
@@ -30,7 +30,7 @@ interface if_f extends if_e implements if_a, if_b, if_c, if_d, if_e {
 
 class base {
 	function test($class) {
-		echo "is_a(" . get_class($this) . ", $class) ". (is_a($this, $class) ? "yes\n" : "no\n");
+		echo "is_a(" . get_class($this) . ", $class) ". (($this instanceof $class) ? "yes\n" : "no\n");
 	}
 }
 
diff --git a/tests/classes/interface_implemented.phpt b/tests/classes/interface_implemented.phpt
index 4d101762fc..0f5e5cbe7b 100644
--- a/tests/classes/interface_implemented.phpt
+++ b/tests/classes/interface_implemented.phpt
@@ -15,7 +15,7 @@ interface if_b extends if_a {
 
 class base {
 	function _is_a($sub) {
-		echo 'is_a('.get_class($this).', '.$sub.') = '.(is_a($this, $sub) ? 'yes' : 'no')."\n";
+		echo 'is_a('.get_class($this).', '.$sub.') = '.(($this instanceof $sub) ? 'yes' : 'no')."\n";
 	}
 	function test() {
 		echo $this->_is_a('base');
diff --git a/tests/classes/interface_member.phpt b/tests/classes/interface_member.phpt
index 91ff17af1d..329c0728b5 100644
--- a/tests/classes/interface_member.phpt
+++ b/tests/classes/interface_member.phpt
@@ -6,7 +6,7 @@ ZE2 An interface cannot have properties
 <?php
 
 interface if_a {
-	var $member;
+	public $member;
 }
 ?>
 --EXPECTF--
diff --git a/tests/classes/object_reference_001.phpt b/tests/classes/object_reference_001.phpt
index 360d19e10b..74acb5de13 100644
--- a/tests/classes/object_reference_001.phpt
+++ b/tests/classes/object_reference_001.phpt
@@ -6,7 +6,7 @@ ZE2 object references
 <?php
 
 class Foo {
-	var $name;
+	public $name;
     
 	function Foo() {
 		$this->name = "I'm Foo!\n";
diff --git a/tests/lang/bug21669.phpt b/tests/lang/bug21669.phpt
index f81011cf6f..643b0695ee 100644
--- a/tests/lang/bug21669.phpt
+++ b/tests/lang/bug21669.phpt
@@ -9,7 +9,7 @@ class Test {
 }
 
 class Factory {
-	var $name = "Test";
+	public $name = "Test";
 	function create() {
 		$obj = new $this->name; /* Parse error */
 		return $obj;
diff --git a/tests/lang/bug21961.phpt b/tests/lang/bug21961.phpt
index eb2e8d2ce3..24581d663e 100644
--- a/tests/lang/bug21961.phpt
+++ b/tests/lang/bug21961.phpt
@@ -7,7 +7,7 @@ Bug #21961 (get_parent_class() segfault)
 
 class man
 {
-	var $name, $bars;
+	public $name, $bars;
 	function man()
 	{
 		$this->name = 'Mr. X';
@@ -27,7 +27,7 @@ class man
 
 class bar extends man
 {
-	var $name;
+	public $name;
 
 	function bar($w)
 	{
diff --git a/tests/lang/bug22231.phpt b/tests/lang/bug22231.phpt
index 91e5b2a44b..84142b01ff 100644
--- a/tests/lang/bug22231.phpt
+++ b/tests/lang/bug22231.phpt
@@ -3,7 +3,7 @@ Bug #22231 (segfault when returning a global variable by reference)
 --FILE--
 <?php
 class foo {
-    var $fubar = 'fubar';
+    public $fubar = 'fubar';
 }
 
 function &foo(){
diff --git a/tests/lang/bug22367.phpt b/tests/lang/bug22367.phpt
index acc93e1ef5..5b142b4b00 100644
--- a/tests/lang/bug22367.phpt
+++ b/tests/lang/bug22367.phpt
@@ -4,7 +4,7 @@ Bug #22367 (weird zval allocation problem)
 <?php
 class foo
 {
-	var $test = array(0, 1, 2, 3, 4); 
+	public $test = array(0, 1, 2, 3, 4); 
 
 	function a($arg) {
 		var_dump(array_key_exists($arg, $this->test));
@@ -31,8 +31,8 @@ class foo
 
 class bar extends foo
 {
-	var $i = 0;
-	var $idx;
+	public $i = 0;
+	public $idx;
 
 	function bar($idx) {
 		$this->idx = $idx;
diff --git a/tests/lang/bug22510.phpt b/tests/lang/bug22510.phpt
index 24bed43339..5c05a82f30 100644
--- a/tests/lang/bug22510.phpt
+++ b/tests/lang/bug22510.phpt
@@ -4,7 +4,7 @@ Bug #22510 (segfault among complex references)
 <?php
 class foo 
 {
-	var $list = array();
+	public $list = array();
 
 	function finalize() {
 		print __CLASS__."::".__FUNCTION__."\n";
diff --git a/tests/lang/bug23922.phpt b/tests/lang/bug23922.phpt
index 9d383837a4..1fc6e548ff 100644
--- a/tests/lang/bug23922.phpt
+++ b/tests/lang/bug23922.phpt
@@ -4,7 +4,7 @@ Bug #23922 (scope doesn't properly propagate into internal functions)
 <?php
   class foo
   {
-    var $foo = 1;
+    public $foo = 1;
 
     function as_string()
     { assert('$this->foo == 1'); }
diff --git a/tests/lang/bug24403.phpt b/tests/lang/bug24403.phpt
index 2acc54cf08..fe99257d3d 100644
--- a/tests/lang/bug24403.phpt
+++ b/tests/lang/bug24403.phpt
@@ -4,7 +4,7 @@ Bug #24403 (scope doesn't properly propagate into internal functions)
 <?php
 class a
 {
-	var $a = array();
+	public $a = array();
 
 	function a()
 	{
diff --git a/tests/lang/bug25652.phpt b/tests/lang/bug25652.phpt
index cf0cc1a265..09cfc18197 100755
--- a/tests/lang/bug25652.phpt
+++ b/tests/lang/bug25652.phpt
@@ -8,7 +8,7 @@ Bug #25652 (Calling Global functions dynamically fails from Class scope)
 	}
 	
 	class foo {
-		var $arr = array('testfunc');
+		public $arr = array('testfunc');
 		function bar () {
 			$this->arr[0]('testvalue');
 		}
diff --git a/tests/lang/bug26182.phpt b/tests/lang/bug26182.phpt
index 480d1469a0..7d613f812e 100644
--- a/tests/lang/bug26182.phpt
+++ b/tests/lang/bug26182.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #26182 (Object properties created redundantly)
 --INI--
-error_reporting=2039
+error_reporting=4095
 --FILE--
 <?php
 
diff --git a/tests/run-test/test005.phpt b/tests/run-test/test005.phpt
index 65459f8f86..b54cbc50e6 100644
--- a/tests/run-test/test005.phpt
+++ b/tests/run-test/test005.phpt
@@ -24,7 +24,7 @@ var_dump($php_errormsg);
 ?>
 --EXPECTF--
 string(1) "1"
-string(4) "2047"
+string(4) "4095"
 string(1) "0"
 string(1) "1"
 string(1) "0"
diff --git a/tests/run-test/test008.phpt b/tests/run-test/test008.phpt
index d595b2592b..14fff59bd8 100644
--- a/tests/run-test/test008.phpt
+++ b/tests/run-test/test008.phpt
@@ -25,7 +25,7 @@ var_dump($php_errormsg);
 --EXPECTF--
 %s: %sivision by zero in %s on line %d
 string(1) "1"
-string(4) "2047"
+string(4) "4095"
 string(1) "0"
 string(1) "1"
 string(1) "0"
diff --git a/tests/run-test/test008a.phpt b/tests/run-test/test008a.phpt
index 04a3c71168..7916ff2352 100644
--- a/tests/run-test/test008a.phpt
+++ b/tests/run-test/test008a.phpt
@@ -24,7 +24,7 @@ var_dump($php_errormsg);
 ?>
 --EXPECTF--
 string(1) "1"
-string(4) "2047"
+string(4) "4095"
 string(1) "0"
 string(1) "1"
 string(1) "0"