shein Fri, 02 Sep 2011 17:41:39 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=316041
Log:
Removed old (< 5.3) version of test and cleaned up the actual version.
Changed paths:
D php/php-src/branches/PHP_5_3/ext/zip/tests/bug38943.inc
D php/php-src/branches/PHP_5_3/ext/zip/tests/bug38943.phpt
A + php/php-src/branches/PHP_5_3/ext/zip/tests/bug38943.phpt
(from
php/php-src/branches/PHP_5_3/ext/zip/tests/bug38943_2.phpt:r316040)
D php/php-src/branches/PHP_5_3/ext/zip/tests/bug38943_2.phpt
D php/php-src/branches/PHP_5_4/ext/zip/tests/bug38943.inc
D php/php-src/branches/PHP_5_4/ext/zip/tests/bug38943.phpt
A + php/php-src/branches/PHP_5_4/ext/zip/tests/bug38943.phpt
(from
php/php-src/branches/PHP_5_4/ext/zip/tests/bug38943_2.phpt:r316040)
D php/php-src/branches/PHP_5_4/ext/zip/tests/bug38943_2.phpt
D php/php-src/trunk/ext/zip/tests/bug38943.inc
D php/php-src/trunk/ext/zip/tests/bug38943.phpt
A + php/php-src/trunk/ext/zip/tests/bug38943.phpt
(from php/php-src/trunk/ext/zip/tests/bug38943_2.phpt:r316040)
D php/php-src/trunk/ext/zip/tests/bug38943_2.phpt
Deleted: php/php-src/branches/PHP_5_3/ext/zip/tests/bug38943.inc
===================================================================
--- php/php-src/branches/PHP_5_3/ext/zip/tests/bug38943.inc 2011-09-02 14:40:39 UTC (rev 316040)
+++ php/php-src/branches/PHP_5_3/ext/zip/tests/bug38943.inc 2011-09-02 17:41:39 UTC (rev 316041)
@@ -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);
-
Deleted: php/php-src/branches/PHP_5_3/ext/zip/tests/bug38943.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/zip/tests/bug38943.phpt 2011-09-02 14:40:39 UTC (rev 316040)
+++ php/php-src/branches/PHP_5_3/ext/zip/tests/bug38943.phpt 2011-09-02 17:41:39 UTC (rev 316041)
@@ -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 (!defined('PHP_VERSION_MAJOR')) die('skip');
-?>
---FILE--
-<?php
-include dirname(__FILE__) . '/bug38943.inc';
-?>
---EXPECTF--
-array(1) {
- [0]=>
- int(1)
-}
-object(myZip)#1 (%d) {
- ["test:private"]=>
- int(0)
- ["testp"]=>
- string(6) "foobar"
- ["testarray:private"]=>
- array(1) {
- [0]=>
- int(1)
- }
- ["status"]=>
- int(0)
- ["statusSys"]=>
- int(0)
- ["numFiles"]=>
- int(0)
- ["filename"]=>
- string(0) ""
- ["comment"]=>
- string(0) ""
-}
Copied: php/php-src/branches/PHP_5_3/ext/zip/tests/bug38943.phpt (from rev 316040, php/php-src/branches/PHP_5_3/ext/zip/tests/bug38943_2.phpt)
===================================================================
--- php/php-src/branches/PHP_5_3/ext/zip/tests/bug38943.phpt (rev 0)
+++ php/php-src/branches/PHP_5_3/ext/zip/tests/bug38943.phpt 2011-09-02 17:41:39 UTC (rev 316041)
@@ -0,0 +1,50 @@
+--TEST--
+#38943, properties in extended class cannot be set (5.3+)
+--SKIPIF--
+<?php
+if(!extension_loaded('zip')) die('skip');
+?>
+--FILE--
+<?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);
+
+?>
+--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) ""
+}
Deleted: php/php-src/branches/PHP_5_3/ext/zip/tests/bug38943_2.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/zip/tests/bug38943_2.phpt 2011-09-02 14:40:39 UTC (rev 316040)
+++ php/php-src/branches/PHP_5_3/ext/zip/tests/bug38943_2.phpt 2011-09-02 17:41:39 UTC (rev 316041)
@@ -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) ""
-}
Deleted: php/php-src/branches/PHP_5_4/ext/zip/tests/bug38943.inc
===================================================================
--- php/php-src/branches/PHP_5_4/ext/zip/tests/bug38943.inc 2011-09-02 14:40:39 UTC (rev 316040)
+++ php/php-src/branches/PHP_5_4/ext/zip/tests/bug38943.inc 2011-09-02 17:41:39 UTC (rev 316041)
@@ -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);
-
Deleted: php/php-src/branches/PHP_5_4/ext/zip/tests/bug38943.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/zip/tests/bug38943.phpt 2011-09-02 14:40:39 UTC (rev 316040)
+++ php/php-src/branches/PHP_5_4/ext/zip/tests/bug38943.phpt 2011-09-02 17:41:39 UTC (rev 316041)
@@ -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 (!defined('PHP_VERSION_MAJOR')) die('skip');
-?>
---FILE--
-<?php
-include dirname(__FILE__) . '/bug38943.inc';
-?>
---EXPECTF--
-array(1) {
- [0]=>
- int(1)
-}
-object(myZip)#1 (%d) {
- ["test:private"]=>
- int(0)
- ["testp"]=>
- string(6) "foobar"
- ["testarray:private"]=>
- array(1) {
- [0]=>
- int(1)
- }
- ["status"]=>
- int(0)
- ["statusSys"]=>
- int(0)
- ["numFiles"]=>
- int(0)
- ["filename"]=>
- string(0) ""
- ["comment"]=>
- string(0) ""
-}
Copied: php/php-src/branches/PHP_5_4/ext/zip/tests/bug38943.phpt (from rev 316040, php/php-src/branches/PHP_5_4/ext/zip/tests/bug38943_2.phpt)
===================================================================
--- php/php-src/branches/PHP_5_4/ext/zip/tests/bug38943.phpt (rev 0)
+++ php/php-src/branches/PHP_5_4/ext/zip/tests/bug38943.phpt 2011-09-02 17:41:39 UTC (rev 316041)
@@ -0,0 +1,50 @@
+--TEST--
+#38943, properties in extended class cannot be set (5.3+)
+--SKIPIF--
+<?php
+if(!extension_loaded('zip')) die('skip');
+?>
+--FILE--
+<?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);
+
+?>
+--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) ""
+}
Deleted: php/php-src/branches/PHP_5_4/ext/zip/tests/bug38943_2.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/zip/tests/bug38943_2.phpt 2011-09-02 14:40:39 UTC (rev 316040)
+++ php/php-src/branches/PHP_5_4/ext/zip/tests/bug38943_2.phpt 2011-09-02 17:41:39 UTC (rev 316041)
@@ -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) ""
-}
Deleted: php/php-src/trunk/ext/zip/tests/bug38943.inc
===================================================================
--- php/php-src/trunk/ext/zip/tests/bug38943.inc 2011-09-02 14:40:39 UTC (rev 316040)
+++ php/php-src/trunk/ext/zip/tests/bug38943.inc 2011-09-02 17:41:39 UTC (rev 316041)
@@ -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);
-
Deleted: php/php-src/trunk/ext/zip/tests/bug38943.phpt
===================================================================
--- php/php-src/trunk/ext/zip/tests/bug38943.phpt 2011-09-02 14:40:39 UTC (rev 316040)
+++ php/php-src/trunk/ext/zip/tests/bug38943.phpt 2011-09-02 17:41:39 UTC (rev 316041)
@@ -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 (!defined('PHP_VERSION_MAJOR')) die('skip');
-?>
---FILE--
-<?php
-include dirname(__FILE__) . '/bug38943.inc';
-?>
---EXPECTF--
-array(1) {
- [0]=>
- int(1)
-}
-object(myZip)#1 (%d) {
- ["test:private"]=>
- int(0)
- ["testp"]=>
- string(6) "foobar"
- ["testarray:private"]=>
- array(1) {
- [0]=>
- int(1)
- }
- ["status"]=>
- int(0)
- ["statusSys"]=>
- int(0)
- ["numFiles"]=>
- int(0)
- ["filename"]=>
- string(0) ""
- ["comment"]=>
- string(0) ""
-}
Copied: php/php-src/trunk/ext/zip/tests/bug38943.phpt (from rev 316040, php/php-src/trunk/ext/zip/tests/bug38943_2.phpt)
===================================================================
--- php/php-src/trunk/ext/zip/tests/bug38943.phpt (rev 0)
+++ php/php-src/trunk/ext/zip/tests/bug38943.phpt 2011-09-02 17:41:39 UTC (rev 316041)
@@ -0,0 +1,50 @@
+--TEST--
+#38943, properties in extended class cannot be set (5.3+)
+--SKIPIF--
+<?php
+if(!extension_loaded('zip')) die('skip');
+?>
+--FILE--
+<?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);
+
+?>
+--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) ""
+}
Deleted: php/php-src/trunk/ext/zip/tests/bug38943_2.phpt
===================================================================
--- php/php-src/trunk/ext/zip/tests/bug38943_2.phpt 2011-09-02 14:40:39 UTC (rev 316040)
+++ php/php-src/trunk/ext/zip/tests/bug38943_2.phpt 2011-09-02 17:41:39 UTC (rev 316041)
@@ -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) ""
-}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php