diff options
Diffstat (limited to 'tests')
18 files changed, 12 insertions, 100 deletions
diff --git a/tests/basic/rfc1867_missing_boundary_2.phpt b/tests/basic/rfc1867_missing_boundary_2.phpt index bdfe977428..d3f93f8387 100644 --- a/tests/basic/rfc1867_missing_boundary_2.phpt +++ b/tests/basic/rfc1867_missing_boundary_2.phpt @@ -15,7 +15,7 @@ Content-Type: text/plain-file1 var_dump($_FILES); var_dump($_POST); ?> ---EXPECTF-- +--EXPECT-- array(1) { ["file1"]=> array(5) { diff --git a/tests/classes/arrayobject_001.phpt b/tests/classes/arrayobject_001.phpt deleted file mode 100644 index b75f8c7ab3..0000000000 --- a/tests/classes/arrayobject_001.phpt +++ /dev/null @@ -1,13 +0,0 @@ ---TEST-- -Ensure that ArrayObject acts like an array ---FILE-- -<?php - -$a = new ArrayObject; -$a['foo'] = 'bar'; -echo reset($a); -echo count($a); -echo current($a); -?> ---EXPECT-- -bar1bar diff --git a/tests/classes/autoload_001.phpt b/tests/classes/autoload_001.phpt index 6c09c4e04d..01115f4888 100644 --- a/tests/classes/autoload_001.phpt +++ b/tests/classes/autoload_001.phpt @@ -8,7 +8,7 @@ ZE2 Autoload and class_exists <?php spl_autoload_register(function ($class_name) { - require_once(dirname(__FILE__) . '/' . $class_name . '.p5c'); + require_once(dirname(__FILE__) . '/' . $class_name . '.inc'); echo 'autoload(' . $class_name . ")\n"; }); diff --git a/tests/classes/autoload_002.phpt b/tests/classes/autoload_002.phpt index ecb1a44512..7f5aa6c9cc 100644 --- a/tests/classes/autoload_002.phpt +++ b/tests/classes/autoload_002.phpt @@ -8,7 +8,7 @@ ZE2 Autoload and get_class_methods <?php spl_autoload_register(function ($class_name) { - require_once(dirname(__FILE__) . '/' . $class_name . '.p5c'); + require_once(dirname(__FILE__) . '/' . $class_name . '.inc'); echo 'autoload(' . $class_name . ")\n"; }); diff --git a/tests/classes/autoload_003.phpt b/tests/classes/autoload_003.phpt index f79b85a9f0..783dd504e2 100644 --- a/tests/classes/autoload_003.phpt +++ b/tests/classes/autoload_003.phpt @@ -8,7 +8,7 @@ ZE2 Autoload and derived classes <?php spl_autoload_register(function ($class_name) { - require_once(dirname(__FILE__) . '/' . $class_name . '.p5c'); + require_once(dirname(__FILE__) . '/' . $class_name . '.inc'); echo 'autoload(' . $class_name . ")\n"; }); diff --git a/tests/classes/autoload_004.phpt b/tests/classes/autoload_004.phpt index 1f754ca030..c6ce400c36 100644 --- a/tests/classes/autoload_004.phpt +++ b/tests/classes/autoload_004.phpt @@ -9,7 +9,7 @@ ZE2 Autoload and recursion spl_autoload_register(function ($class_name) { var_dump(class_exists($class_name)); - require_once(dirname(__FILE__) . '/' . $class_name . '.p5c'); + require_once(dirname(__FILE__) . '/' . $class_name . '.inc'); echo 'autoload(' . $class_name . ")\n"; }); diff --git a/tests/classes/autoload_005.phpt b/tests/classes/autoload_005.phpt index 26f4d6ae10..a04ea0eccf 100644 --- a/tests/classes/autoload_005.phpt +++ b/tests/classes/autoload_005.phpt @@ -9,7 +9,7 @@ ZE2 Autoload from destructor spl_autoload_register(function ($class_name) { var_dump(class_exists($class_name, false)); - require_once(dirname(__FILE__) . '/' . $class_name . '.p5c'); + require_once(dirname(__FILE__) . '/' . $class_name . '.inc'); echo 'autoload(' . $class_name . ")\n"; }); diff --git a/tests/classes/autoload_006.phpt b/tests/classes/autoload_006.phpt index 092e2e2252..127de880ab 100644 --- a/tests/classes/autoload_006.phpt +++ b/tests/classes/autoload_006.phpt @@ -8,7 +8,7 @@ ZE2 Autoload from destructor <?php spl_autoload_register(function ($class_name) { - require_once(dirname(__FILE__) . '/' . strtolower($class_name) . '.p5c'); + require_once(dirname(__FILE__) . '/' . strtolower($class_name) . '.inc'); echo 'autoload(' . $class_name . ")\n"; }); diff --git a/tests/classes/autoload_derived.p5c b/tests/classes/autoload_derived.inc index d897daeed0..d897daeed0 100755..100644 --- a/tests/classes/autoload_derived.p5c +++ b/tests/classes/autoload_derived.inc diff --git a/tests/classes/autoload_implements.p5c b/tests/classes/autoload_implements.inc index 55fcc3cd9f..55fcc3cd9f 100755..100644 --- a/tests/classes/autoload_implements.p5c +++ b/tests/classes/autoload_implements.inc diff --git a/tests/classes/autoload_interface.p5c b/tests/classes/autoload_interface.inc index e6a416e721..e6a416e721 100755..100644 --- a/tests/classes/autoload_interface.p5c +++ b/tests/classes/autoload_interface.inc diff --git a/tests/classes/autoload_root.p5c b/tests/classes/autoload_root.inc index 98149c59b5..98149c59b5 100755..100644 --- a/tests/classes/autoload_root.p5c +++ b/tests/classes/autoload_root.inc diff --git a/tests/classes/bug63462.phpt b/tests/classes/bug63462.phpt deleted file mode 100644 index f425c1526b..0000000000 --- a/tests/classes/bug63462.phpt +++ /dev/null @@ -1,69 +0,0 @@ ---TEST-- -Test script to verify that magic methods should be called only once when accessing an unset property. ---CREDITS-- -Marco Pivetta <ocramius@gmail.com> ---FILE-- -<?php -class Test { - public $publicProperty; - protected $protectedProperty; - private $privateProperty; - - public function __construct() { - unset( - $this->publicProperty, - $this->protectedProperty, - $this->privateProperty - ); - } - - function __get($name) { - echo '__get ' . $name; - return $this->$name; - } - - function __set($name, $value) { - echo '__set ' . $name . "\n"; - $this->$name = $value; - } - - function __isset($name) { - echo '__isset ' . $name . "\n"; - return isset($this->$name); - } -} - -$test = new Test(); - -$test->nonExisting; -$test->publicProperty; -$test->protectedProperty; -$test->privateProperty; -isset($test->nonExisting); -isset($test->publicProperty); -isset($test->protectedProperty); -isset($test->privateProperty); -$test->nonExisting = 'value'; -$test->publicProperty = 'value'; -$test->protectedProperty = 'value'; -$test->privateProperty = 'value'; - -?> - ---EXPECTF-- -__get nonExisting -Notice: Undefined property: Test::$nonExisting in %sbug63462.php on line %d -__get publicProperty -Notice: Undefined property: Test::$publicProperty in %sbug63462.php on line %d -__get protectedProperty -Notice: Undefined property: Test::$protectedProperty in %sbug63462.php on line %d -__get privateProperty -Notice: Undefined property: Test::$privateProperty in %sbug63462.php on line %d -__isset nonExisting -__isset publicProperty -__isset protectedProperty -__isset privateProperty -__set nonExisting -__set publicProperty -__set protectedProperty -__set privateProperty diff --git a/tests/classes/class_abstract.phpt b/tests/classes/class_abstract.phpt index fe95d9bcc3..d852884d52 100644 --- a/tests/classes/class_abstract.phpt +++ b/tests/classes/class_abstract.phpt @@ -1,5 +1,5 @@ --TEST-- -ZE2 An abstract class cannot be instanciated +ZE2 An abstract class cannot be instantiated --FILE-- <?php diff --git a/tests/classes/clone_004.phpt b/tests/classes/clone_004.phpt index 2059103bc5..88ad916bb4 100644 --- a/tests/classes/clone_004.phpt +++ b/tests/classes/clone_004.phpt @@ -12,7 +12,7 @@ abstract class base { class test extends base { public $b = 'test'; - // reenable cloning + // re-enable cloning public function __clone() {} public function show() { diff --git a/tests/classes/ctor_dtor_inheritance.phpt b/tests/classes/ctor_dtor_inheritance.phpt index 78d4efb32f..638772dd7c 100644 --- a/tests/classes/ctor_dtor_inheritance.phpt +++ b/tests/classes/ctor_dtor_inheritance.phpt @@ -6,7 +6,7 @@ ZE2 A derived class can use the inherited constructor/destructor // This test checks for: // - inherited constructors/destructors are not called automatically // - base classes know about derived properties in constructor/destructor -// - base class constructors/destructors know the instanciated class name +// - base class constructors/destructors know the instantiated class name class base { public $name; diff --git a/tests/output/ob_get_contents_basic_001.phpt b/tests/output/ob_get_contents_basic_001.phpt index 8d324e5d61..a3b1f0cb5e 100644 --- a/tests/output/ob_get_contents_basic_001.phpt +++ b/tests/output/ob_get_contents_basic_001.phpt @@ -25,7 +25,7 @@ var_dump($hello); ob_end_flush(); -echo "\ncheck that we dont have a reference\n"; +echo "\ncheck that we don't have a reference\n"; ob_start(); echo "Hello World\n"; $hello2 = ob_get_contents(); @@ -58,7 +58,7 @@ Hello World string(12) "Hello World " -check that we dont have a reference +check that we don't have a reference Hello World string(12) "Hello World " diff --git a/tests/security/open_basedir_mkdir.phpt b/tests/security/open_basedir_mkdir.phpt index 91cb392206..2ef4812cd2 100644 --- a/tests/security/open_basedir_mkdir.phpt +++ b/tests/security/open_basedir_mkdir.phpt @@ -1,11 +1,5 @@ --TEST-- Test open_basedir configuration ---SKIPIF-- -<?php -if(PHP_OS_FAMILY !== "Windows") { - die('skip Windows only variation'); -} -?> --INI-- open_basedir=. --FILE-- |