summaryrefslogtreecommitdiff
path: root/ext/spl/tests
diff options
context:
space:
mode:
authorEtienne Kneuss <colder@php.net>2008-06-18 14:54:40 +0000
committerEtienne Kneuss <colder@php.net>2008-06-18 14:54:40 +0000
commit0f5ddaf4cee92d3040dc03aa623f30a87e1e8b7f (patch)
tree6e0403d53fe74a9bf8d2999867fb3adb8e24c00b /ext/spl/tests
parente5e9be2d1aeb3a22933639541b14c734f32c430a (diff)
downloadphp-git-0f5ddaf4cee92d3040dc03aa623f30a87e1e8b7f.tar.gz
MFH: Rename everything from SplFastArray to SplFixedArray
Diffstat (limited to 'ext/spl/tests')
-rw-r--r--ext/spl/tests/fastarray_005.phpt12
-rw-r--r--ext/spl/tests/fastarray_009.phpt10
-rw-r--r--ext/spl/tests/fixedarray_001.phpt (renamed from ext/spl/tests/fastarray_001.phpt)4
-rw-r--r--ext/spl/tests/fixedarray_002.phpt (renamed from ext/spl/tests/fastarray_002.phpt)4
-rw-r--r--ext/spl/tests/fixedarray_003.phpt (renamed from ext/spl/tests/fastarray_003.phpt)6
-rw-r--r--ext/spl/tests/fixedarray_004.phpt (renamed from ext/spl/tests/fastarray_004.phpt)4
-rw-r--r--ext/spl/tests/fixedarray_005.phpt12
-rw-r--r--ext/spl/tests/fixedarray_006.phpt (renamed from ext/spl/tests/fastarray_006.phpt)4
-rw-r--r--ext/spl/tests/fixedarray_007.phpt (renamed from ext/spl/tests/fastarray_007.phpt)4
-rw-r--r--ext/spl/tests/fixedarray_008.phpt (renamed from ext/spl/tests/fastarray_008.phpt)4
-rw-r--r--ext/spl/tests/fixedarray_009.phpt10
-rw-r--r--ext/spl/tests/fixedarray_010.phpt (renamed from ext/spl/tests/fastarray_010.phpt)4
-rw-r--r--ext/spl/tests/fixedarray_011.phpt (renamed from ext/spl/tests/fastarray_011.phpt)4
-rw-r--r--ext/spl/tests/fixedarray_012.phpt (renamed from ext/spl/tests/fastarray_012.phpt)4
-rw-r--r--ext/spl/tests/fixedarray_013.phpt (renamed from ext/spl/tests/fastarray_013.phpt)6
-rw-r--r--ext/spl/tests/fixedarray_014.phpt (renamed from ext/spl/tests/fastarray_014.phpt)4
-rw-r--r--ext/spl/tests/fixedarray_015.phpt (renamed from ext/spl/tests/fastarray_015.phpt)6
17 files changed, 51 insertions, 51 deletions
diff --git a/ext/spl/tests/fastarray_005.phpt b/ext/spl/tests/fastarray_005.phpt
deleted file mode 100644
index 0e6132ad39..0000000000
--- a/ext/spl/tests/fastarray_005.phpt
+++ /dev/null
@@ -1,12 +0,0 @@
---TEST--
-SPL: FastArray: Trying to instantiate passing object to constructor parameter
---FILE--
-<?php
-
-$b = new stdClass;
-
-$a = new SplFastArray($b);
-
-?>
---EXPECTF--
-Warning: SplFastArray::__construct() expects parameter 1 to be long, object given in %s on line %d
diff --git a/ext/spl/tests/fastarray_009.phpt b/ext/spl/tests/fastarray_009.phpt
deleted file mode 100644
index daead117cc..0000000000
--- a/ext/spl/tests/fastarray_009.phpt
+++ /dev/null
@@ -1,10 +0,0 @@
---TEST--
-SPL: FastArray: Trying to instantiate passing string to construtor parameter
---FILE--
-<?php
-
-$a = new SplFastArray('FOO');
-
-?>
---EXPECTF--
-Warning: SplFastArray::__construct() expects parameter 1 to be long, string given in %s on line %d
diff --git a/ext/spl/tests/fastarray_001.phpt b/ext/spl/tests/fixedarray_001.phpt
index 06e82b7b27..39e1bc9f6c 100644
--- a/ext/spl/tests/fastarray_001.phpt
+++ b/ext/spl/tests/fixedarray_001.phpt
@@ -1,10 +1,10 @@
--TEST--
-SPL: FastArray: std operations
+SPL: FixedArray: std operations
--INI--
allow_call_time_pass_reference=1
--FILE--
<?php
-$a = new SplFastArray(0);
+$a = new SplFixedArray(0);
// errors
try {
$a[0] = "value1";
diff --git a/ext/spl/tests/fastarray_002.phpt b/ext/spl/tests/fixedarray_002.phpt
index 4c5d54a367..9b9c0ac315 100644
--- a/ext/spl/tests/fastarray_002.phpt
+++ b/ext/spl/tests/fixedarray_002.phpt
@@ -1,10 +1,10 @@
--TEST--
-SPL: FastArray: overloading
+SPL: FixedArray: overloading
--INI--
allow_call_time_pass_reference=1
--FILE--
<?php
-class A extends SplFastArray {
+class A extends SplFixedArray {
public function count() {
return 2;
}
diff --git a/ext/spl/tests/fastarray_003.phpt b/ext/spl/tests/fixedarray_003.phpt
index a397836a26..b6c5eb53e4 100644
--- a/ext/spl/tests/fastarray_003.phpt
+++ b/ext/spl/tests/fixedarray_003.phpt
@@ -1,8 +1,8 @@
--TEST--
-SPL: FastArray: Iterators
+SPL: FixedArray: Iterators
--FILE--
<?php
-class A extends SplFastArray {
+class A extends SplFixedArray {
public function current() {
echo "A::current\n";
@@ -27,7 +27,7 @@ class A extends SplFastArray {
}
echo "==Direct instance==\n";
-$a = new SplFastArray(5);
+$a = new SplFixedArray(5);
$a[0] = "a";
$a[1] = "c";
$a[2] = "d";
diff --git a/ext/spl/tests/fastarray_004.phpt b/ext/spl/tests/fixedarray_004.phpt
index 1ffbeb958a..cb62e0c2c9 100644
--- a/ext/spl/tests/fastarray_004.phpt
+++ b/ext/spl/tests/fixedarray_004.phpt
@@ -1,9 +1,9 @@
--TEST--
-SPL: FastArray: adding new elements
+SPL: FixedArray: adding new elements
--FILE--
<?php
-$a = new SplFastArray(10);
+$a = new SplFixedArray(10);
try {
$a[] = 1;
diff --git a/ext/spl/tests/fixedarray_005.phpt b/ext/spl/tests/fixedarray_005.phpt
new file mode 100644
index 0000000000..9ccc693d55
--- /dev/null
+++ b/ext/spl/tests/fixedarray_005.phpt
@@ -0,0 +1,12 @@
+--TEST--
+SPL: FixedArray: Trying to instantiate passing object to constructor parameter
+--FILE--
+<?php
+
+$b = new stdClass;
+
+$a = new SplFixedArray($b);
+
+?>
+--EXPECTF--
+Warning: SplFixedArray::__construct() expects parameter 1 to be long, object given in %s on line %d
diff --git a/ext/spl/tests/fastarray_006.phpt b/ext/spl/tests/fixedarray_006.phpt
index f9a4e59616..8641821ae3 100644
--- a/ext/spl/tests/fastarray_006.phpt
+++ b/ext/spl/tests/fixedarray_006.phpt
@@ -1,10 +1,10 @@
--TEST--
-SPL: FastArray: Assigning objects
+SPL: FixedArray: Assigning objects
--FILE--
<?php
$b = 10000;
-$a = new SplFastArray($b);
+$a = new SplFixedArray($b);
try {
for ($i = 0; $i < 100; $i++) {
diff --git a/ext/spl/tests/fastarray_007.phpt b/ext/spl/tests/fixedarray_007.phpt
index 4cc46fee92..308ce315a5 100644
--- a/ext/spl/tests/fastarray_007.phpt
+++ b/ext/spl/tests/fixedarray_007.phpt
@@ -1,10 +1,10 @@
--TEST--
-SPL: FastArray: Assigning the itself object
+SPL: FixedArray: Assigning the itself object
--FILE--
<?php
$b = 10;
-$a = new SplFastArray($b);
+$a = new SplFixedArray($b);
try {
$a[1] = $a;
diff --git a/ext/spl/tests/fastarray_008.phpt b/ext/spl/tests/fixedarray_008.phpt
index 05986a2cfe..8775d61fff 100644
--- a/ext/spl/tests/fastarray_008.phpt
+++ b/ext/spl/tests/fixedarray_008.phpt
@@ -1,10 +1,10 @@
--TEST--
-SPL: FastArray: Assigning the itself object testing the reference
+SPL: FixedArray: Assigning the itself object testing the reference
--FILE--
<?php
$b = 3;
-$a = new SplFastArray($b);
+$a = new SplFixedArray($b);
$a[0] = 1;
$a[1] = 2;
diff --git a/ext/spl/tests/fixedarray_009.phpt b/ext/spl/tests/fixedarray_009.phpt
new file mode 100644
index 0000000000..936d210a65
--- /dev/null
+++ b/ext/spl/tests/fixedarray_009.phpt
@@ -0,0 +1,10 @@
+--TEST--
+SPL: FixedArray: Trying to instantiate passing string to construtor parameter
+--FILE--
+<?php
+
+$a = new SplFixedArray('FOO');
+
+?>
+--EXPECTF--
+Warning: SplFixedArray::__construct() expects parameter 1 to be long, string given in %s on line %d
diff --git a/ext/spl/tests/fastarray_010.phpt b/ext/spl/tests/fixedarray_010.phpt
index dcb2e81b1b..27af3a83a1 100644
--- a/ext/spl/tests/fastarray_010.phpt
+++ b/ext/spl/tests/fixedarray_010.phpt
@@ -1,9 +1,9 @@
--TEST--
-SPL: FastArray: Setting size to 0
+SPL: FixedArray: Setting size to 0
--FILE--
<?php
-$a = new SplFastArray(1);
+$a = new SplFixedArray(1);
$a[0] = 1;
diff --git a/ext/spl/tests/fastarray_011.phpt b/ext/spl/tests/fixedarray_011.phpt
index 746e05f24e..eddf320fcc 100644
--- a/ext/spl/tests/fastarray_011.phpt
+++ b/ext/spl/tests/fixedarray_011.phpt
@@ -1,9 +1,9 @@
--TEST--
-SPL: FastArray: Testing setSize() with NULL
+SPL: FixedArray: Testing setSize() with NULL
--FILE--
<?php
-$a = new SplFastArray(100);
+$a = new SplFixedArray(100);
$a->setSize(NULL);
diff --git a/ext/spl/tests/fastarray_012.phpt b/ext/spl/tests/fixedarray_012.phpt
index d5592f1dbc..3461b3a9b5 100644
--- a/ext/spl/tests/fastarray_012.phpt
+++ b/ext/spl/tests/fixedarray_012.phpt
@@ -1,9 +1,9 @@
--TEST--
-SPL: FastArray: Assigning the object to another variable using []
+SPL: FixedArray: Assigning the object to another variable using []
--FILE--
<?php
-$a = new SplFastArray(100);
+$a = new SplFixedArray(100);
try {
$b = &$a[];
diff --git a/ext/spl/tests/fastarray_013.phpt b/ext/spl/tests/fixedarray_013.phpt
index edc53d9f45..52ae3c161e 100644
--- a/ext/spl/tests/fastarray_013.phpt
+++ b/ext/spl/tests/fixedarray_013.phpt
@@ -1,12 +1,12 @@
--TEST--
-SPL: FastArray: Passing the object using [] as parameter
+SPL: FixedArray: Passing the object using [] as parameter
--FILE--
<?php
-$a = new SplFastArray(100);
+$a = new SplFixedArray(100);
-function test(SplFastArray &$arr) {
+function test(SplFixedArray &$arr) {
print "ok\n";
}
diff --git a/ext/spl/tests/fastarray_014.phpt b/ext/spl/tests/fixedarray_014.phpt
index dfb45b37b7..de8e214dc0 100644
--- a/ext/spl/tests/fastarray_014.phpt
+++ b/ext/spl/tests/fixedarray_014.phpt
@@ -1,10 +1,10 @@
--TEST--
-SPL: FastArray: Trying to access inexistent item
+SPL: FixedArray: Trying to access inexistent item
--FILE--
<?php
try {
- $a = new SplFastArray(NULL);
+ $a = new SplFixedArray(NULL);
echo $a[0]++;
} catch (Exception $e) {
echo $e->getMessage();
diff --git a/ext/spl/tests/fastarray_015.phpt b/ext/spl/tests/fixedarray_015.phpt
index 9f34b63efc..60fc4d12fd 100644
--- a/ext/spl/tests/fastarray_015.phpt
+++ b/ext/spl/tests/fixedarray_015.phpt
@@ -1,9 +1,9 @@
--TEST--
-SPL: FastArray: accessing uninitialized array
+SPL: FixedArray: accessing uninitialized array
--FILE--
<?php
-$a = new SplFastArray('');
+$a = new SplFixedArray('');
try {
var_dump($a[1]);
@@ -40,7 +40,7 @@ try {
echo "Done\n";
?>
--EXPECTF--
-Warning: SplFastArray::__construct() expects parameter 1 to be long, string given in %s on line %d
+Warning: SplFixedArray::__construct() expects parameter 1 to be long, string given in %s on line %d
Index invalid or out of range
Index invalid or out of range
Index invalid or out of range