helly Sun Nov 30 08:57:21 2003 EDT
Modified files:
/php-src run-tests.php
/php-src/ext/session/tests 001.phpt 003.phpt 004.phpt 005.phpt
006.phpt 019.phpt
/php-src/ext/standard/tests/file fopencookie.phpt userstreams.phpt
/php-src/ext/standard/tests/serialize bug21957.phpt
/php-src/tests/classes __call_001.phpt bug23951.phpt bug24399.phpt
class_example.phpt
destructor_and_references.phpt
inheritance.phpt interface_doubled.phpt
interface_implemented.phpt
interface_member.phpt
object_reference_001.phpt
/php-src/tests/lang bug21669.phpt bug21961.phpt bug22231.phpt
bug22367.phpt bug22510.phpt bug23922.phpt
bug24403.phpt bug25652.phpt bug26182.phpt
/php-src/tests/run-test test005.phpt test008.phpt test008a.phpt
Log:
Fix tests for E_STRICT and check for E_STRICT in run-tests.php.
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.179 php-src/run-tests.php:1.180
--- php-src/run-tests.php:1.179 Thu Oct 2 14:11:10 2003
+++ php-src/run-tests.php Sun Nov 30 08:57:15 2003
@@ -163,7 +163,7 @@
'safe_mode=0',
'disable_functions=',
'output_buffering=Off',
- 'error_reporting=2047',
+ 'error_reporting=4095',
'display_errors=1',
'log_errors=0',
'html_errors=0',
Index: php-src/ext/session/tests/001.phpt
diff -u php-src/ext/session/tests/001.phpt:1.9 php-src/ext/session/tests/001.phpt:1.10
--- php-src/ext/session/tests/001.phpt:1.9 Mon Nov 25 18:20:05 2002
+++ php-src/ext/session/tests/001.phpt Sun Nov 30 08:57:16 2003
@@ -12,7 +12,7 @@
error_reporting(E_ALL);
class foo {
- var $bar = "ok";
+ public $bar = "ok";
function method() { $this->yes = "done"; }
}
Index: php-src/ext/session/tests/003.phpt
diff -u php-src/ext/session/tests/003.phpt:1.12 php-src/ext/session/tests/003.phpt:1.13
--- php-src/ext/session/tests/003.phpt:1.12 Sat May 31 09:10:00 2003
+++ php-src/ext/session/tests/003.phpt Sun Nov 30 08:57:16 2003
@@ -12,7 +12,7 @@
error_reporting(E_ALL);
class foo {
- var $bar = "ok";
+ public $bar = "ok";
function method() { $this->yes++; }
}
Index: php-src/ext/session/tests/004.phpt
diff -u php-src/ext/session/tests/004.phpt:1.15 php-src/ext/session/tests/004.phpt:1.16
--- php-src/ext/session/tests/004.phpt:1.15 Sat May 31 09:10:00 2003
+++ php-src/ext/session/tests/004.phpt Sun Nov 30 08:57:16 2003
@@ -13,7 +13,7 @@
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 @@
$hnd = new handler;
class foo {
- var $bar = "ok";
+ public $bar = "ok";
function method() { $this->yes++; }
}
Index: php-src/ext/session/tests/005.phpt
diff -u php-src/ext/session/tests/005.phpt:1.13 php-src/ext/session/tests/005.phpt:1.14
--- php-src/ext/session/tests/005.phpt:1.13 Sat May 31 09:10:00 2003
+++ php-src/ext/session/tests/005.phpt Sun Nov 30 08:57:16 2003
@@ -14,7 +14,7 @@
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 @@
$hnd = new handler;
class foo {
- var $bar = "ok";
+ public $bar = "ok";
function method() { $this->yes++; }
}
Index: php-src/ext/session/tests/006.phpt
diff -u php-src/ext/session/tests/006.phpt:1.12 php-src/ext/session/tests/006.phpt:1.13
--- php-src/ext/session/tests/006.phpt:1.12 Sat May 31 09:10:00 2003
+++ php-src/ext/session/tests/006.phpt Sun Nov 30 08:57:16 2003
@@ -15,11 +15,11 @@
session_start();
class a {
- var $test = "hallo";
+ public $test = "hallo";
}
class b {
- var $a;
+ public $a;
function b(&$a) {
$this->a = &$a;
}
Index: php-src/ext/session/tests/019.phpt
diff -u php-src/ext/session/tests/019.phpt:1.6 php-src/ext/session/tests/019.phpt:1.7
--- php-src/ext/session/tests/019.phpt:1.6 Fri Jun 13 05:19:52 2003
+++ php-src/ext/session/tests/019.phpt Sun Nov 30 08:57:16 2003
@@ -13,7 +13,7 @@
error_reporting(E_ALL);
class TFoo {
- var $c;
+ public $c;
function TFoo($c) {
$this->c = $c;
}
Index: php-src/ext/standard/tests/file/fopencookie.phpt
diff -u php-src/ext/standard/tests/file/fopencookie.phpt:1.3
php-src/ext/standard/tests/file/fopencookie.phpt:1.4
--- php-src/ext/standard/tests/file/fopencookie.phpt:1.3 Mon May 19 11:35:06
2003
+++ php-src/ext/standard/tests/file/fopencookie.phpt Sun Nov 30 08:57:17 2003
@@ -18,8 +18,8 @@
*/
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)
{
Index: php-src/ext/standard/tests/file/userstreams.phpt
diff -u php-src/ext/standard/tests/file/userstreams.phpt:1.10
php-src/ext/standard/tests/file/userstreams.phpt:1.11
--- php-src/ext/standard/tests/file/userstreams.phpt:1.10 Mon May 19 11:35:06
2003
+++ php-src/ext/standard/tests/file/userstreams.phpt Sun Nov 30 08:57:17 2003
@@ -82,12 +82,12 @@
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)
{
Index: php-src/ext/standard/tests/serialize/bug21957.phpt
diff -u php-src/ext/standard/tests/serialize/bug21957.phpt:1.1
php-src/ext/standard/tests/serialize/bug21957.phpt:1.2
--- php-src/ext/standard/tests/serialize/bug21957.phpt:1.1 Sun Aug 10 23:22:24
2003
+++ php-src/ext/standard/tests/serialize/bug21957.phpt Sun Nov 30 08:57:18 2003
@@ -4,7 +4,7 @@
<?php
class test
{
- var $a, $b;
+ public $a, $b;
function test()
{
Index: php-src/tests/classes/__call_001.phpt
diff -u php-src/tests/classes/__call_001.phpt:1.2
php-src/tests/classes/__call_001.phpt:1.3
--- php-src/tests/classes/__call_001.phpt:1.2 Tue Mar 4 13:35:03 2003
+++ php-src/tests/classes/__call_001.phpt Sun Nov 30 08:57:18 2003
@@ -6,7 +6,7 @@
<?php
class Caller {
- var $x = array(1, 2, 3);
+ public $x = array(1, 2, 3);
function __call($m, $a) {
echo "Method $m called:\n";
Index: php-src/tests/classes/bug23951.phpt
diff -u php-src/tests/classes/bug23951.phpt:1.3 php-src/tests/classes/bug23951.phpt:1.4
--- php-src/tests/classes/bug23951.phpt:1.3 Thu Oct 23 23:31:52 2003
+++ php-src/tests/classes/bug23951.phpt Sun Nov 30 08:57:18 2003
@@ -8,13 +8,13 @@
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';
}
Index: php-src/tests/classes/bug24399.phpt
diff -u php-src/tests/classes/bug24399.phpt:1.3 php-src/tests/classes/bug24399.phpt:1.4
--- php-src/tests/classes/bug24399.phpt:1.3 Thu Oct 23 23:31:52 2003
+++ php-src/tests/classes/bug24399.phpt Sun Nov 30 08:57:18 2003
@@ -3,7 +3,7 @@
--FILE--
<?php
class dooh {
- var $blah;
+ public $blah;
}
$d = new dooh;
var_dump(is_subclass_of($d, 'dooh'));
Index: php-src/tests/classes/class_example.phpt
diff -u php-src/tests/classes/class_example.phpt:1.4
php-src/tests/classes/class_example.phpt:1.5
--- php-src/tests/classes/class_example.phpt:1.4 Sat Aug 9 10:48:47 2003
+++ php-src/tests/classes/class_example.phpt Sun Nov 30 08:57:18 2003
@@ -7,7 +7,7 @@
/* 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";
Index: php-src/tests/classes/destructor_and_references.phpt
diff -u php-src/tests/classes/destructor_and_references.phpt:1.2
php-src/tests/classes/destructor_and_references.phpt:1.3
--- php-src/tests/classes/destructor_and_references.phpt:1.2 Thu Oct 23 23:31:52
2003
+++ php-src/tests/classes/destructor_and_references.phpt Sun Nov 30 08:57:18
2003
@@ -3,10 +3,10 @@
--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;
Index: php-src/tests/classes/inheritance.phpt
diff -u php-src/tests/classes/inheritance.phpt:1.3
php-src/tests/classes/inheritance.phpt:1.4
--- php-src/tests/classes/inheritance.phpt:1.3 Sat Aug 9 10:48:47 2003
+++ php-src/tests/classes/inheritance.phpt Sun Nov 30 08:57:18 2003
@@ -6,8 +6,8 @@
/* 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 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";
Index: php-src/tests/classes/interface_doubled.phpt
diff -u php-src/tests/classes/interface_doubled.phpt:1.4
php-src/tests/classes/interface_doubled.phpt:1.5
--- php-src/tests/classes/interface_doubled.phpt:1.4 Thu Oct 23 23:31:52 2003
+++ php-src/tests/classes/interface_doubled.phpt Sun Nov 30 08:57:18 2003
@@ -30,7 +30,7 @@
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");
}
}
Index: php-src/tests/classes/interface_implemented.phpt
diff -u php-src/tests/classes/interface_implemented.phpt:1.3
php-src/tests/classes/interface_implemented.phpt:1.4
--- php-src/tests/classes/interface_implemented.phpt:1.3 Thu Oct 23 23:31:52
2003
+++ php-src/tests/classes/interface_implemented.phpt Sun Nov 30 08:57:18 2003
@@ -15,7 +15,7 @@
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');
Index: php-src/tests/classes/interface_member.phpt
diff -u php-src/tests/classes/interface_member.phpt:1.3
php-src/tests/classes/interface_member.phpt:1.4
--- php-src/tests/classes/interface_member.phpt:1.3 Thu Oct 23 23:31:52 2003
+++ php-src/tests/classes/interface_member.phpt Sun Nov 30 08:57:18 2003
@@ -6,7 +6,7 @@
<?php
interface if_a {
- var $member;
+ public $member;
}
?>
--EXPECTF--
Index: php-src/tests/classes/object_reference_001.phpt
diff -u php-src/tests/classes/object_reference_001.phpt:1.1
php-src/tests/classes/object_reference_001.phpt:1.2
--- php-src/tests/classes/object_reference_001.phpt:1.1 Mon Mar 3 11:44:38 2003
+++ php-src/tests/classes/object_reference_001.phpt Sun Nov 30 08:57:18 2003
@@ -6,7 +6,7 @@
<?php
class Foo {
- var $name;
+ public $name;
function Foo() {
$this->name = "I'm Foo!\n";
Index: php-src/tests/lang/bug21669.phpt
diff -u php-src/tests/lang/bug21669.phpt:1.2 php-src/tests/lang/bug21669.phpt:1.3
--- php-src/tests/lang/bug21669.phpt:1.2 Mon Aug 11 15:52:38 2003
+++ php-src/tests/lang/bug21669.phpt Sun Nov 30 08:57:19 2003
@@ -9,7 +9,7 @@
}
class Factory {
- var $name = "Test";
+ public $name = "Test";
function create() {
$obj = new $this->name; /* Parse error */
return $obj;
Index: php-src/tests/lang/bug21961.phpt
diff -u php-src/tests/lang/bug21961.phpt:1.3 php-src/tests/lang/bug21961.phpt:1.4
--- php-src/tests/lang/bug21961.phpt:1.3 Mon Feb 10 05:58:56 2003
+++ php-src/tests/lang/bug21961.phpt Sun Nov 30 08:57:19 2003
@@ -7,7 +7,7 @@
class man
{
- var $name, $bars;
+ public $name, $bars;
function man()
{
$this->name = 'Mr. X';
@@ -27,7 +27,7 @@
class bar extends man
{
- var $name;
+ public $name;
function bar($w)
{
Index: php-src/tests/lang/bug22231.phpt
diff -u php-src/tests/lang/bug22231.phpt:1.2 php-src/tests/lang/bug22231.phpt:1.3
--- php-src/tests/lang/bug22231.phpt:1.2 Mon Mar 10 15:46:39 2003
+++ php-src/tests/lang/bug22231.phpt Sun Nov 30 08:57:19 2003
@@ -3,7 +3,7 @@
--FILE--
<?php
class foo {
- var $fubar = 'fubar';
+ public $fubar = 'fubar';
}
function &foo(){
Index: php-src/tests/lang/bug22367.phpt
diff -u php-src/tests/lang/bug22367.phpt:1.2 php-src/tests/lang/bug22367.phpt:1.3
--- php-src/tests/lang/bug22367.phpt:1.2 Wed Jul 2 11:08:11 2003
+++ php-src/tests/lang/bug22367.phpt Sun Nov 30 08:57:19 2003
@@ -4,7 +4,7 @@
<?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 bar extends foo
{
- var $i = 0;
- var $idx;
+ public $i = 0;
+ public $idx;
function bar($idx) {
$this->idx = $idx;
Index: php-src/tests/lang/bug22510.phpt
diff -u php-src/tests/lang/bug22510.phpt:1.3 php-src/tests/lang/bug22510.phpt:1.4
--- php-src/tests/lang/bug22510.phpt:1.3 Wed Jul 2 11:47:24 2003
+++ php-src/tests/lang/bug22510.phpt Sun Nov 30 08:57:19 2003
@@ -4,7 +4,7 @@
<?php
class foo
{
- var $list = array();
+ public $list = array();
function finalize() {
print __CLASS__."::".__FUNCTION__."\n";
Index: php-src/tests/lang/bug23922.phpt
diff -u php-src/tests/lang/bug23922.phpt:1.1 php-src/tests/lang/bug23922.phpt:1.2
--- php-src/tests/lang/bug23922.phpt:1.1 Wed Jul 2 14:05:45 2003
+++ php-src/tests/lang/bug23922.phpt Sun Nov 30 08:57:19 2003
@@ -4,7 +4,7 @@
<?php
class foo
{
- var $foo = 1;
+ public $foo = 1;
function as_string()
{ assert('$this->foo == 1'); }
Index: php-src/tests/lang/bug24403.phpt
diff -u php-src/tests/lang/bug24403.phpt:1.2 php-src/tests/lang/bug24403.phpt:1.3
--- php-src/tests/lang/bug24403.phpt:1.2 Wed Jul 2 14:00:51 2003
+++ php-src/tests/lang/bug24403.phpt Sun Nov 30 08:57:19 2003
@@ -4,7 +4,7 @@
<?php
class a
{
- var $a = array();
+ public $a = array();
function a()
{
Index: php-src/tests/lang/bug25652.phpt
diff -u php-src/tests/lang/bug25652.phpt:1.2 php-src/tests/lang/bug25652.phpt:1.3
--- php-src/tests/lang/bug25652.phpt:1.2 Sat Nov 29 02:16:58 2003
+++ php-src/tests/lang/bug25652.phpt Sun Nov 30 08:57:19 2003
@@ -8,7 +8,7 @@
}
class foo {
- var $arr = array('testfunc');
+ public $arr = array('testfunc');
function bar () {
$this->arr[0]('testvalue');
}
Index: php-src/tests/lang/bug26182.phpt
diff -u php-src/tests/lang/bug26182.phpt:1.3 php-src/tests/lang/bug26182.phpt:1.4
--- php-src/tests/lang/bug26182.phpt:1.3 Thu Nov 27 12:06:25 2003
+++ php-src/tests/lang/bug26182.phpt Sun Nov 30 08:57:19 2003
@@ -1,7 +1,7 @@
--TEST--
Bug #26182 (Object properties created redundantly)
--INI--
-error_reporting=2039
+error_reporting=4095
--FILE--
<?php
Index: php-src/tests/run-test/test005.phpt
diff -u php-src/tests/run-test/test005.phpt:1.2 php-src/tests/run-test/test005.phpt:1.3
--- php-src/tests/run-test/test005.phpt:1.2 Wed Jan 1 07:43:59 2003
+++ php-src/tests/run-test/test005.phpt Sun Nov 30 08:57:20 2003
@@ -24,7 +24,7 @@
?>
--EXPECTF--
string(1) "1"
-string(4) "2047"
+string(4) "4095"
string(1) "0"
string(1) "1"
string(1) "0"
Index: php-src/tests/run-test/test008.phpt
diff -u php-src/tests/run-test/test008.phpt:1.2 php-src/tests/run-test/test008.phpt:1.3
--- php-src/tests/run-test/test008.phpt:1.2 Mon Jan 13 14:18:18 2003
+++ php-src/tests/run-test/test008.phpt Sun Nov 30 08:57:20 2003
@@ -25,7 +25,7 @@
--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"
Index: php-src/tests/run-test/test008a.phpt
diff -u php-src/tests/run-test/test008a.phpt:1.1
php-src/tests/run-test/test008a.phpt:1.2
--- php-src/tests/run-test/test008a.phpt:1.1 Sun Mar 2 19:58:15 2003
+++ php-src/tests/run-test/test008a.phpt Sun Nov 30 08:57:20 2003
@@ -24,7 +24,7 @@
?>
--EXPECTF--
string(1) "1"
-string(4) "2047"
+string(4) "4095"
string(1) "0"
string(1) "1"
string(1) "0"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
