Imported from /home/lorry/working-area/delta_php2/php-5.4.13.tar.bz2.HEADphp-5.4.13master

24 files changed, 170 insertions, 0 deletions

diff --git a/Zend/tests/constants/dir-constant-eval.phpt b/Zend/tests/constants/dir-constant-eval.phpt
new file mode 100644
index 0000000..8fe619d
--- /dev/null
+++ b/Zend/tests/constants/dir-constant-eval.phpt
@@ -0,0 +1,8 @@
+--TEST--
+__DIR__ constant used with eval()
+--FILE--
+<?php
+eval('echo __DIR__ . "\n";');
+?>
+--EXPECTF--
+%stests%sconstants
diff --git a/Zend/tests/constants/dir-constant-includes.phpt b/Zend/tests/constants/dir-constant-includes.phpt
new file mode 100644
index 0000000..8ea6529
--- /dev/null
+++ b/Zend/tests/constants/dir-constant-includes.phpt
@@ -0,0 +1,22 @@
+--TEST--
+__DIR__ constant test with includes
+--FILE--
+<?php
+echo __DIR__ . "\n";
+echo dirname(__FILE__) . "\n";
+include 'fixtures/folder1/fixture.php';
+include 'fixtures/folder2/fixture.php';
+include 'fixtures/folder3/fixture.php';
+include 'fixtures/folder4/fixture.php';
+?>
+--EXPECTF--
+%stests%sconstants
+%stests%sconstants
+%stests%sconstants%sfixtures%sfolder1
+%stests%sconstants%sfixtures%sfolder1
+%stests%sconstants%sfixtures%sfolder2
+%stests%sconstants%sfixtures%sfolder2
+%stests%sconstants%sfixtures%sfolder3
+%stests%sconstants%sfixtures%sfolder3
+%stests%sconstants%sfixtures%sfolder4
+%stests%sconstants%sfixtures%sfolder4
diff --git a/Zend/tests/constants/dir-constant-nested_includes.phpt b/Zend/tests/constants/dir-constant-nested_includes.phpt
new file mode 100644
index 0000000..18bdfa8
--- /dev/null
+++ b/Zend/tests/constants/dir-constant-nested_includes.phpt
@@ -0,0 +1,70 @@
+--TEST--
+__DIR__ constant test with nested includes
+--FILE--
+<?php
+echo __DIR__ . "\n";
+echo dirname(__FILE__) . "\n";
+include 'fixtures/folder1/fixture.php';
+include 'fixtures/folder1/subfolder1/fixture.php';
+include 'fixtures/folder1/subfolder2/fixture.php';
+include 'fixtures/folder1/subfolder3/fixture.php';
+include 'fixtures/folder1/subfolder4/fixture.php';
+include 'fixtures/folder2/fixture.php';
+include 'fixtures/folder2/subfolder1/fixture.php';
+include 'fixtures/folder2/subfolder2/fixture.php';
+include 'fixtures/folder2/subfolder3/fixture.php';
+include 'fixtures/folder2/subfolder4/fixture.php';
+include 'fixtures/folder3/fixture.php';
+include 'fixtures/folder3/subfolder1/fixture.php';
+include 'fixtures/folder3/subfolder2/fixture.php';
+include 'fixtures/folder3/subfolder3/fixture.php';
+include 'fixtures/folder3/subfolder4/fixture.php';
+include 'fixtures/folder4/fixture.php';
+include 'fixtures/folder4/subfolder1/fixture.php';
+include 'fixtures/folder4/subfolder2/fixture.php';
+include 'fixtures/folder4/subfolder3/fixture.php';
+include 'fixtures/folder4/subfolder4/fixture.php';
+?>
+--EXPECTF--
+%stests%sconstants
+%stests%sconstants
+%stests%sconstants%sfixtures%sfolder1
+%stests%sconstants%sfixtures%sfolder1
+%stests%sconstants%sfixtures%sfolder1%ssubfolder1
+%stests%sconstants%sfixtures%sfolder1%ssubfolder1
+%stests%sconstants%sfixtures%sfolder1%ssubfolder2
+%stests%sconstants%sfixtures%sfolder1%ssubfolder2
+%stests%sconstants%sfixtures%sfolder1%ssubfolder3
+%stests%sconstants%sfixtures%sfolder1%ssubfolder3
+%stests%sconstants%sfixtures%sfolder1%ssubfolder4
+%stests%sconstants%sfixtures%sfolder1%ssubfolder4
+%stests%sconstants%sfixtures%sfolder2
+%stests%sconstants%sfixtures%sfolder2
+%stests%sconstants%sfixtures%sfolder2%ssubfolder1
+%stests%sconstants%sfixtures%sfolder2%ssubfolder1
+%stests%sconstants%sfixtures%sfolder2%ssubfolder2
+%stests%sconstants%sfixtures%sfolder2%ssubfolder2
+%stests%sconstants%sfixtures%sfolder2%ssubfolder3
+%stests%sconstants%sfixtures%sfolder2%ssubfolder3
+%stests%sconstants%sfixtures%sfolder2%ssubfolder4
+%stests%sconstants%sfixtures%sfolder2%ssubfolder4
+%stests%sconstants%sfixtures%sfolder3
+%stests%sconstants%sfixtures%sfolder3
+%stests%sconstants%sfixtures%sfolder3%ssubfolder1
+%stests%sconstants%sfixtures%sfolder3%ssubfolder1
+%stests%sconstants%sfixtures%sfolder3%ssubfolder2
+%stests%sconstants%sfixtures%sfolder3%ssubfolder2
+%stests%sconstants%sfixtures%sfolder3%ssubfolder3
+%stests%sconstants%sfixtures%sfolder3%ssubfolder3
+%stests%sconstants%sfixtures%sfolder3%ssubfolder4
+%stests%sconstants%sfixtures%sfolder3%ssubfolder4
+%stests%sconstants%sfixtures%sfolder4
+%stests%sconstants%sfixtures%sfolder4
+%stests%sconstants%sfixtures%sfolder4%ssubfolder1
+%stests%sconstants%sfixtures%sfolder4%ssubfolder1
+%stests%sconstants%sfixtures%sfolder4%ssubfolder2
+%stests%sconstants%sfixtures%sfolder4%ssubfolder2
+%stests%sconstants%sfixtures%sfolder4%ssubfolder3
+%stests%sconstants%sfixtures%sfolder4%ssubfolder3
+%stests%sconstants%sfixtures%sfolder4%ssubfolder4
+%stests%sconstants%sfixtures%sfolder4%ssubfolder4
diff --git a/Zend/tests/constants/dir-constant-normal.phpt b/Zend/tests/constants/dir-constant-normal.phpt
new file mode 100644
index 0000000..1a573a2
--- /dev/null
+++ b/Zend/tests/constants/dir-constant-normal.phpt
@@ -0,0 +1,10 @@
+--TEST--
+Standard behaviour of __DIR__
+--FILE--
+<?php
+echo __DIR__ . "\n";
+echo dirname(__FILE__) . "\n";
+?>
+--EXPECTF--
+%stests%sconstants
+%stests%sconstants
diff --git a/Zend/tests/constants/fixtures/folder1/fixture.php b/Zend/tests/constants/fixtures/folder1/fixture.php
new file mode 100755
index 0000000..3406c99
--- /dev/null
+++ b/Zend/tests/constants/fixtures/folder1/fixture.php
@@ -0,0 +1,3 @@
+<?php
+echo __DIR__ . "\n";
+ echo dirname(__FILE__) . "\n";
diff --git a/Zend/tests/constants/fixtures/folder1/subfolder1/fixture.php b/Zend/tests/constants/fixtures/folder1/subfolder1/fixture.php
new file mode 100755
index 0000000..86e6859
--- /dev/null
+++ b/Zend/tests/constants/fixtures/folder1/subfolder1/fixture.php
@@ -0,0 +1,3 @@
+<?php
+echo __DIR__ . "\n";
+echo dirname(__FILE__) . "\n";
diff --git a/Zend/tests/constants/fixtures/folder1/subfolder2/fixture.php b/Zend/tests/constants/fixtures/folder1/subfolder2/fixture.php
new file mode 100755
index 0000000..86e6859
--- /dev/null
+++ b/Zend/tests/constants/fixtures/folder1/subfolder2/fixture.php
@@ -0,0 +1,3 @@
+<?php
+echo __DIR__ . "\n";
+echo dirname(__FILE__) . "\n";
diff --git a/Zend/tests/constants/fixtures/folder1/subfolder3/fixture.php b/Zend/tests/constants/fixtures/folder1/subfolder3/fixture.php
new file mode 100755
index 0000000..86e6859
--- /dev/null
+++ b/Zend/tests/constants/fixtures/folder1/subfolder3/fixture.php
@@ -0,0 +1,3 @@
+<?php
+echo __DIR__ . "\n";
+echo dirname(__FILE__) . "\n";
diff --git a/Zend/tests/constants/fixtures/folder1/subfolder4/fixture.php b/Zend/tests/constants/fixtures/folder1/subfolder4/fixture.php
new file mode 100755
index 0000000..86e6859
--- /dev/null
+++ b/Zend/tests/constants/fixtures/folder1/subfolder4/fixture.php
@@ -0,0 +1,3 @@
+<?php
+echo __DIR__ . "\n";
+echo dirname(__FILE__) . "\n";
diff --git a/Zend/tests/constants/fixtures/folder2/fixture.php b/Zend/tests/constants/fixtures/folder2/fixture.php
new file mode 100755
index 0000000..3406c99
--- /dev/null
+++ b/Zend/tests/constants/fixtures/folder2/fixture.php
@@ -0,0 +1,3 @@
+<?php
+echo __DIR__ . "\n";
+ echo dirname(__FILE__) . "\n";
diff --git a/Zend/tests/constants/fixtures/folder2/subfolder1/fixture.php b/Zend/tests/constants/fixtures/folder2/subfolder1/fixture.php
new file mode 100755
index 0000000..86e6859
--- /dev/null
+++ b/Zend/tests/constants/fixtures/folder2/subfolder1/fixture.php
@@ -0,0 +1,3 @@
+<?php
+echo __DIR__ . "\n";
+echo dirname(__FILE__) . "\n";
diff --git a/Zend/tests/constants/fixtures/folder2/subfolder2/fixture.php b/Zend/tests/constants/fixtures/folder2/subfolder2/fixture.php
new file mode 100755
index 0000000..86e6859
--- /dev/null
+++ b/Zend/tests/constants/fixtures/folder2/subfolder2/fixture.php
@@ -0,0 +1,3 @@
+<?php
+echo __DIR__ . "\n";
+echo dirname(__FILE__) . "\n";
diff --git a/Zend/tests/constants/fixtures/folder2/subfolder3/fixture.php b/Zend/tests/constants/fixtures/folder2/subfolder3/fixture.php
new file mode 100755
index 0000000..86e6859
--- /dev/null
+++ b/Zend/tests/constants/fixtures/folder2/subfolder3/fixture.php
@@ -0,0 +1,3 @@
+<?php
+echo __DIR__ . "\n";
+echo dirname(__FILE__) . "\n";
diff --git a/Zend/tests/constants/fixtures/folder2/subfolder4/fixture.php b/Zend/tests/constants/fixtures/folder2/subfolder4/fixture.php
new file mode 100755
index 0000000..86e6859
--- /dev/null
+++ b/Zend/tests/constants/fixtures/folder2/subfolder4/fixture.php
@@ -0,0 +1,3 @@
+<?php
+echo __DIR__ . "\n";
+echo dirname(__FILE__) . "\n";
diff --git a/Zend/tests/constants/fixtures/folder3/fixture.php b/Zend/tests/constants/fixtures/folder3/fixture.php
new file mode 100755
index 0000000..3406c99
--- /dev/null
+++ b/Zend/tests/constants/fixtures/folder3/fixture.php
@@ -0,0 +1,3 @@
+<?php
+echo __DIR__ . "\n";
+ echo dirname(__FILE__) . "\n";
diff --git a/Zend/tests/constants/fixtures/folder3/subfolder1/fixture.php b/Zend/tests/constants/fixtures/folder3/subfolder1/fixture.php
new file mode 100755
index 0000000..86e6859
--- /dev/null
+++ b/Zend/tests/constants/fixtures/folder3/subfolder1/fixture.php
@@ -0,0 +1,3 @@
+<?php
+echo __DIR__ . "\n";
+echo dirname(__FILE__) . "\n";
diff --git a/Zend/tests/constants/fixtures/folder3/subfolder2/fixture.php b/Zend/tests/constants/fixtures/folder3/subfolder2/fixture.php
new file mode 100755
index 0000000..86e6859
--- /dev/null
+++ b/Zend/tests/constants/fixtures/folder3/subfolder2/fixture.php
@@ -0,0 +1,3 @@
+<?php
+echo __DIR__ . "\n";
+echo dirname(__FILE__) . "\n";
diff --git a/Zend/tests/constants/fixtures/folder3/subfolder3/fixture.php b/Zend/tests/constants/fixtures/folder3/subfolder3/fixture.php
new file mode 100755
index 0000000..86e6859
--- /dev/null
+++ b/Zend/tests/constants/fixtures/folder3/subfolder3/fixture.php
@@ -0,0 +1,3 @@
+<?php
+echo __DIR__ . "\n";
+echo dirname(__FILE__) . "\n";
diff --git a/Zend/tests/constants/fixtures/folder3/subfolder4/fixture.php b/Zend/tests/constants/fixtures/folder3/subfolder4/fixture.php
new file mode 100755
index 0000000..86e6859
--- /dev/null
+++ b/Zend/tests/constants/fixtures/folder3/subfolder4/fixture.php
@@ -0,0 +1,3 @@
+<?php
+echo __DIR__ . "\n";
+echo dirname(__FILE__) . "\n";
diff --git a/Zend/tests/constants/fixtures/folder4/fixture.php b/Zend/tests/constants/fixtures/folder4/fixture.php
new file mode 100755
index 0000000..3406c99
--- /dev/null
+++ b/Zend/tests/constants/fixtures/folder4/fixture.php
@@ -0,0 +1,3 @@
+<?php
+echo __DIR__ . "\n";
+ echo dirname(__FILE__) . "\n";
diff --git a/Zend/tests/constants/fixtures/folder4/subfolder1/fixture.php b/Zend/tests/constants/fixtures/folder4/subfolder1/fixture.php
new file mode 100755
index 0000000..86e6859
--- /dev/null
+++ b/Zend/tests/constants/fixtures/folder4/subfolder1/fixture.php
@@ -0,0 +1,3 @@
+<?php
+echo __DIR__ . "\n";
+echo dirname(__FILE__) . "\n";
diff --git a/Zend/tests/constants/fixtures/folder4/subfolder2/fixture.php b/Zend/tests/constants/fixtures/folder4/subfolder2/fixture.php
new file mode 100755
index 0000000..86e6859
--- /dev/null
+++ b/Zend/tests/constants/fixtures/folder4/subfolder2/fixture.php
@@ -0,0 +1,3 @@
+<?php
+echo __DIR__ . "\n";
+echo dirname(__FILE__) . "\n";
diff --git a/Zend/tests/constants/fixtures/folder4/subfolder3/fixture.php b/Zend/tests/constants/fixtures/folder4/subfolder3/fixture.php
new file mode 100755
index 0000000..86e6859
--- /dev/null
+++ b/Zend/tests/constants/fixtures/folder4/subfolder3/fixture.php
@@ -0,0 +1,3 @@
+<?php
+echo __DIR__ . "\n";
+echo dirname(__FILE__) . "\n";
diff --git a/Zend/tests/constants/fixtures/folder4/subfolder4/fixture.php b/Zend/tests/constants/fixtures/folder4/subfolder4/fixture.php
new file mode 100755
index 0000000..86e6859
--- /dev/null
+++ b/Zend/tests/constants/fixtures/folder4/subfolder4/fixture.php
@@ -0,0 +1,3 @@
+<?php
+echo __DIR__ . "\n";
+echo dirname(__FILE__) . "\n";