summaryrefslogtreecommitdiff
path: root/ext/zip
diff options
context:
space:
mode:
authorShein Alexey <shein@php.net>2011-09-02 17:41:39 (GMT)
committerShein Alexey <shein@php.net>2011-09-02 17:41:39 (GMT)
commit920fa567bdf2e8ac3f037ef94008827afed0ea76 (patch)
treeb2373915e42f2fb6c6d5b1d139f0ea3105237303 /ext/zip
parentab99790eca8259a7230a290eebfb5b9d44afaced (diff)
downloadphp-920fa567bdf2e8ac3f037ef94008827afed0ea76.tar.gz
Removed old (< 5.3) version of test and cleaned up the actual version.
Diffstat (limited to 'ext/zip')
-rw-r--r--ext/zip/tests/bug38943.inc16
-rw-r--r--ext/zip/tests/bug38943.phpt24
-rw-r--r--ext/zip/tests/bug38943_2.phpt38
3 files changed, 18 insertions, 60 deletions
diff --git a/ext/zip/tests/bug38943.inc b/ext/zip/tests/bug38943.inc
deleted file mode 100644
index a6f45e8..0000000
--- a/ext/zip/tests/bug38943.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-class myZip extends ZipArchive {
- private $test = 0;
- public $testp = 1;
- private $testarray = array();
-
- public function __construct() {
- $this->testarray[] = 1;
- var_dump($this->testarray);
- }
-}
-
-$z = new myZip;
-$z->testp = "foobar";
-var_dump($z);
-
diff --git a/ext/zip/tests/bug38943.phpt b/ext/zip/tests/bug38943.phpt
index 0298584..c5e2284 100644
--- a/ext/zip/tests/bug38943.phpt
+++ b/ext/zip/tests/bug38943.phpt
@@ -1,14 +1,26 @@
--TEST--
-#38943, properties in extended class cannot be set (< 5.3)
+#38943, properties in extended class cannot be set (5.3+)
--SKIPIF--
<?php
-/* $Id$ */
if(!extension_loaded('zip')) die('skip');
-if (!defined('PHP_VERSION_MAJOR')) die('skip');
?>
--FILE--
<?php
-include dirname(__FILE__) . '/bug38943.inc';
+class myZip extends ZipArchive {
+ private $test = 0;
+ public $testp = 1;
+ private $testarray = array();
+
+ public function __construct() {
+ $this->testarray[] = 1;
+ var_dump($this->testarray);
+ }
+}
+
+$z = new myZip;
+$z->testp = "foobar";
+var_dump($z);
+
?>
--EXPECTF--
array(1) {
@@ -16,11 +28,11 @@ array(1) {
int(1)
}
object(myZip)#1 (%d) {
- ["test:private"]=>
+ ["test":"myZip":private]=>
int(0)
["testp"]=>
string(6) "foobar"
- ["testarray:private"]=>
+ ["testarray":"myZip":private]=>
array(1) {
[0]=>
int(1)
diff --git a/ext/zip/tests/bug38943_2.phpt b/ext/zip/tests/bug38943_2.phpt
deleted file mode 100644
index 8672d9d..0000000
--- a/ext/zip/tests/bug38943_2.phpt
+++ /dev/null
@@ -1,38 +0,0 @@
---TEST--
-#38943, properties in extended class cannot be set (5.3)
---SKIPIF--
-<?php
-/* $Id$ */
-if(!extension_loaded('zip')) die('skip');
-if (version_compare(PHP_VERSION, "5.3", "<")) die('skip test for5.3+ only');
-?>
---FILE--
-<?php
-include 'bug38943.inc';
-?>
---EXPECTF--
-array(1) {
- [0]=>
- int(1)
-}
-object(myZip)#1 (%d) {
- ["test":"myZip":private]=>
- int(0)
- ["testp"]=>
- string(6) "foobar"
- ["testarray":"myZip":private]=>
- array(1) {
- [0]=>
- int(1)
- }
- ["status"]=>
- int(0)
- ["statusSys"]=>
- int(0)
- ["numFiles"]=>
- int(0)
- ["filename"]=>
- string(0) ""
- ["comment"]=>
- string(0) ""
-}