Skip to content

Commit 60c405f

Browse files
petkpetk
committed
Merge branch 'PHP-8.5'
2 parents 51a805f + 32ec93c commit 60c405f

File tree

4 files changed

+231
-47
lines changed

4 files changed

+231
-47
lines changed

‎patches/8.3/tests.patch‎

Lines changed: 57 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ Subject: Fix tests
2525
when test fails.
2626
---
2727
ext/standard/tests/file/002.phpt | 2 +-
28-
ext/standard/tests/file/copy_variation4.phpt | 11 ++++++++--
29-
ext/standard/tests/file/file.inc | 21 +++++++++++++++++++
30-
.../tests/file/unlink_variation10.phpt | 12 ++++++++---
31-
ext/zip/tests/gh18431.phpt | 4 ++++
28+
ext/standard/tests/file/copy_variation4.phpt | 11 +++++--
29+
ext/standard/tests/file/file.inc | 21 +++++++++++++
30+
.../tests/file/unlink_variation10.phpt | 31 ++++++++++++-------
31+
ext/zip/tests/gh18431.phpt | 4 +++
3232
ext/zip/tests/oo_addemptydir_error.phpt | 2 +-
33-
ext/zip/tests/oo_addglob2.phpt | 6 ++++++
34-
ext/zip/tests/oo_encryption.phpt | 6 ++++++
35-
8 files changed, 57 insertions(+), 7 deletions(-)
33+
ext/zip/tests/oo_addglob2.phpt | 6 ++++
34+
ext/zip/tests/oo_encryption.phpt | 6 ++++
35+
8 files changed, 67 insertions(+), 16 deletions(-)
3636

3737
diff --git a/ext/standard/tests/file/002.phpt b/ext/standard/tests/file/002.phpt
3838
index 134f5416fc4..0eb882dc397 100644
@@ -100,10 +100,10 @@ index c972784f9da..c7665d2846d 100644
100100
+
101101
?>
102102
diff --git a/ext/standard/tests/file/unlink_variation10.phpt b/ext/standard/tests/file/unlink_variation10.phpt
103-
index 127b070d23a..a3355a99560 100644
103+
index 127b070d23a..5894ab0b91a 100644
104104
--- a/ext/standard/tests/file/unlink_variation10.phpt
105105
+++ b/ext/standard/tests/file/unlink_variation10.phpt
106-
@@ -10,14 +10,20 @@
106+
@@ -10,26 +10,33 @@
107107
?>
108108
--FILE--
109109
<?php
@@ -118,15 +118,61 @@ index 127b070d23a..a3355a99560 100644
118118
+$cwd = getcwd();
119119
+$relativePath = relativePath($cwd, __DIR__);
120120
+
121-
+$workDir = $relativePath . '/unlinkVar10.tmp';
122-
+$tmpDir = $relativePath . '/subDir.tmp';
121+
+$workDirName = 'unlinkVar10.tmp';
122+
+$workDir = $relativePath . '/' . $workDirName;
123+
+$tmpDir = 'subDir.tmp';
123124
$dirToLinkTo = $workDir.'/'."linkme.tmp";
124125

125126
mkdir($workDir);
126127
-$cwd = getcwd();
127128
mkdir($dirToLinkTo);
128129

129130
$dirs = array(
131+
// relative
132+
$workDir.'/'.$tmpDir,
133+
'./'.$workDir.'/'.$tmpDir,
134+
- $workDir.'/../'.$workDir.'/'.$tmpDir,
135+
+ $workDir.'/../'.$workDirName.'/'.$tmpDir,
136+
137+
//absolute
138+
$cwd.'/'.$workDir.'/'.$tmpDir,
139+
$cwd.'/./'.$workDir.'/'.$tmpDir,
140+
- $cwd.'/'.$workDir.'/../'.$workDir.'/'.$tmpDir,
141+
+ $cwd.'/'.$workDir.'/../'.$workDirName.'/'.$tmpDir,
142+
143+
// multiple separators
144+
$workDir.'//'.$tmpDir,
145+
@@ -76,23 +83,23 @@ function test_link($linkedDir, $toLinkTo, $tounlink, $softlink) {
146+
?>
147+
--EXPECTF--
148+
*** Testing unlink() : variation ***
149+
--- unlinking soft link unlinkVar10.tmp/subDir.tmp --
150+
+-- unlinking soft link %SunlinkVar10.tmp/subDir.tmp --
151+
directory unlinked
152+
--- unlinking soft link ./unlinkVar10.tmp/subDir.tmp --
153+
+-- unlinking soft link ./%SunlinkVar10.tmp/subDir.tmp --
154+
directory unlinked
155+
--- unlinking soft link unlinkVar10.tmp/../unlinkVar10.tmp/subDir.tmp --
156+
+-- unlinking soft link %SunlinkVar10.tmp/../unlinkVar10.tmp/subDir.tmp --
157+
directory unlinked
158+
-- unlinking soft link /%s/unlinkVar10.tmp/subDir.tmp --
159+
directory unlinked
160+
--- unlinking soft link /%s/./unlinkVar10.tmp/subDir.tmp --
161+
+-- unlinking soft link /%s/./%SunlinkVar10.tmp/subDir.tmp --
162+
directory unlinked
163+
-- unlinking soft link /%s/unlinkVar10.tmp/../unlinkVar10.tmp/subDir.tmp --
164+
directory unlinked
165+
--- unlinking soft link unlinkVar10.tmp//subDir.tmp --
166+
+-- unlinking soft link %SunlinkVar10.tmp//subDir.tmp --
167+
directory unlinked
168+
--- unlinking soft link /%s//unlinkVar10.tmp//subDir.tmp --
169+
+-- unlinking soft link /%s//%SunlinkVar10.tmp//subDir.tmp --
170+
directory unlinked
171+
172+
--- try to unlink a directory ---
173+
174+
-Warning: unlink(unlinkVar10.tmp/linkme.tmp): %s in %s on line %d
175+
+Warning: unlink(%SunlinkVar10.tmp/linkme.tmp): %s in %s on line %d
130176
diff --git a/ext/zip/tests/gh18431.phpt b/ext/zip/tests/gh18431.phpt
131177
index d4eb89c36c6..dcd7db6f400 100644
132178
--- a/ext/zip/tests/gh18431.phpt

‎patches/8.4/tests.patch‎

Lines changed: 58 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ Subject: Fix tests
2323
are creating directories and files all over the place on the system,
2424
when test fails.
2525
---
26-
ext/dom/tests/dom_xinclude.phpt | 4 ++--
27-
ext/standard/tests/file/copy_variation4.phpt | 12 ++++++++---
28-
ext/standard/tests/file/file.inc | 21 +++++++++++++++++++
29-
.../tests/file/unlink_variation10.phpt | 12 ++++++++---
30-
ext/zip/tests/gh18431.phpt | 4 ++++
26+
ext/dom/tests/dom_xinclude.phpt | 4 +--
27+
ext/standard/tests/file/copy_variation4.phpt | 12 +++++--
28+
ext/standard/tests/file/file.inc | 21 +++++++++++++
29+
.../tests/file/unlink_variation10.phpt | 31 ++++++++++++-------
30+
ext/zip/tests/gh18431.phpt | 4 +++
3131
ext/zip/tests/oo_addemptydir_error.phpt | 2 +-
32-
ext/zip/tests/oo_addglob2.phpt | 6 ++++++
33-
ext/zip/tests/oo_encryption.phpt | 6 ++++++
34-
8 files changed, 58 insertions(+), 9 deletions(-)
32+
ext/zip/tests/oo_addglob2.phpt | 6 ++++
33+
ext/zip/tests/oo_encryption.phpt | 6 ++++
34+
8 files changed, 68 insertions(+), 18 deletions(-)
3535

3636
diff --git a/ext/dom/tests/dom_xinclude.phpt b/ext/dom/tests/dom_xinclude.phpt
3737
index 0dfeb2dfb4a..410431de877 100644
@@ -104,10 +104,10 @@ index c972784f9da..c7665d2846d 100644
104104
+
105105
?>
106106
diff --git a/ext/standard/tests/file/unlink_variation10.phpt b/ext/standard/tests/file/unlink_variation10.phpt
107-
index 127b070d23a..a3355a99560 100644
107+
index 127b070d23a..5894ab0b91a 100644
108108
--- a/ext/standard/tests/file/unlink_variation10.phpt
109109
+++ b/ext/standard/tests/file/unlink_variation10.phpt
110-
@@ -10,14 +10,20 @@
110+
@@ -10,26 +10,33 @@
111111
?>
112112
--FILE--
113113
<?php
@@ -122,15 +122,61 @@ index 127b070d23a..a3355a99560 100644
122122
+$cwd = getcwd();
123123
+$relativePath = relativePath($cwd, __DIR__);
124124
+
125-
+$workDir = $relativePath . '/unlinkVar10.tmp';
126-
+$tmpDir = $relativePath . '/subDir.tmp';
125+
+$workDirName = 'unlinkVar10.tmp';
126+
+$workDir = $relativePath . '/' . $workDirName;
127+
+$tmpDir = 'subDir.tmp';
127128
$dirToLinkTo = $workDir.'/'."linkme.tmp";
128129

129130
mkdir($workDir);
130131
-$cwd = getcwd();
131132
mkdir($dirToLinkTo);
132133

133134
$dirs = array(
135+
// relative
136+
$workDir.'/'.$tmpDir,
137+
'./'.$workDir.'/'.$tmpDir,
138+
- $workDir.'/../'.$workDir.'/'.$tmpDir,
139+
+ $workDir.'/../'.$workDirName.'/'.$tmpDir,
140+
141+
//absolute
142+
$cwd.'/'.$workDir.'/'.$tmpDir,
143+
$cwd.'/./'.$workDir.'/'.$tmpDir,
144+
- $cwd.'/'.$workDir.'/../'.$workDir.'/'.$tmpDir,
145+
+ $cwd.'/'.$workDir.'/../'.$workDirName.'/'.$tmpDir,
146+
147+
// multiple separators
148+
$workDir.'//'.$tmpDir,
149+
@@ -76,23 +83,23 @@ function test_link($linkedDir, $toLinkTo, $tounlink, $softlink) {
150+
?>
151+
--EXPECTF--
152+
*** Testing unlink() : variation ***
153+
--- unlinking soft link unlinkVar10.tmp/subDir.tmp --
154+
+-- unlinking soft link %SunlinkVar10.tmp/subDir.tmp --
155+
directory unlinked
156+
--- unlinking soft link ./unlinkVar10.tmp/subDir.tmp --
157+
+-- unlinking soft link ./%SunlinkVar10.tmp/subDir.tmp --
158+
directory unlinked
159+
--- unlinking soft link unlinkVar10.tmp/../unlinkVar10.tmp/subDir.tmp --
160+
+-- unlinking soft link %SunlinkVar10.tmp/../unlinkVar10.tmp/subDir.tmp --
161+
directory unlinked
162+
-- unlinking soft link /%s/unlinkVar10.tmp/subDir.tmp --
163+
directory unlinked
164+
--- unlinking soft link /%s/./unlinkVar10.tmp/subDir.tmp --
165+
+-- unlinking soft link /%s/./%SunlinkVar10.tmp/subDir.tmp --
166+
directory unlinked
167+
-- unlinking soft link /%s/unlinkVar10.tmp/../unlinkVar10.tmp/subDir.tmp --
168+
directory unlinked
169+
--- unlinking soft link unlinkVar10.tmp//subDir.tmp --
170+
+-- unlinking soft link %SunlinkVar10.tmp//subDir.tmp --
171+
directory unlinked
172+
--- unlinking soft link /%s//unlinkVar10.tmp//subDir.tmp --
173+
+-- unlinking soft link /%s//%SunlinkVar10.tmp//subDir.tmp --
174+
directory unlinked
175+
176+
--- try to unlink a directory ---
177+
178+
-Warning: unlink(unlinkVar10.tmp/linkme.tmp): %s in %s on line %d
179+
+Warning: unlink(%SunlinkVar10.tmp/linkme.tmp): %s in %s on line %d
134180
diff --git a/ext/zip/tests/gh18431.phpt b/ext/zip/tests/gh18431.phpt
135181
index d4eb89c36c6..dcd7db6f400 100644
136182
--- a/ext/zip/tests/gh18431.phpt

‎patches/8.5/tests.patch‎

Lines changed: 58 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ Subject: Fix tests
2323
are creating directories and files all over the place on the system,
2424
when test fails.
2525
---
26-
ext/dom/tests/dom_xinclude.phpt | 4 ++--
27-
ext/standard/tests/file/copy_variation4.phpt | 12 ++++++++---
28-
ext/standard/tests/file/file.inc | 21 +++++++++++++++++++
29-
.../tests/file/unlink_variation10.phpt | 12 ++++++++---
30-
ext/zip/tests/gh18431.phpt | 4 ++++
26+
ext/dom/tests/dom_xinclude.phpt | 4 +--
27+
ext/standard/tests/file/copy_variation4.phpt | 12 +++++--
28+
ext/standard/tests/file/file.inc | 21 +++++++++++++
29+
.../tests/file/unlink_variation10.phpt | 31 ++++++++++++-------
30+
ext/zip/tests/gh18431.phpt | 4 +++
3131
ext/zip/tests/oo_addemptydir_error.phpt | 2 +-
32-
ext/zip/tests/oo_addglob2.phpt | 6 ++++++
33-
ext/zip/tests/oo_encryption.phpt | 6 ++++++
34-
8 files changed, 58 insertions(+), 9 deletions(-)
32+
ext/zip/tests/oo_addglob2.phpt | 6 ++++
33+
ext/zip/tests/oo_encryption.phpt | 6 ++++
34+
8 files changed, 68 insertions(+), 18 deletions(-)
3535

3636
diff --git a/ext/dom/tests/dom_xinclude.phpt b/ext/dom/tests/dom_xinclude.phpt
3737
index 0dfeb2dfb4a..410431de877 100644
@@ -104,10 +104,10 @@ index c972784f9da..c7665d2846d 100644
104104
+
105105
?>
106106
diff --git a/ext/standard/tests/file/unlink_variation10.phpt b/ext/standard/tests/file/unlink_variation10.phpt
107-
index 127b070d23a..a3355a99560 100644
107+
index 127b070d23a..5894ab0b91a 100644
108108
--- a/ext/standard/tests/file/unlink_variation10.phpt
109109
+++ b/ext/standard/tests/file/unlink_variation10.phpt
110-
@@ -10,14 +10,20 @@
110+
@@ -10,26 +10,33 @@
111111
?>
112112
--FILE--
113113
<?php
@@ -122,15 +122,61 @@ index 127b070d23a..a3355a99560 100644
122122
+$cwd = getcwd();
123123
+$relativePath = relativePath($cwd, __DIR__);
124124
+
125-
+$workDir = $relativePath . '/unlinkVar10.tmp';
126-
+$tmpDir = $relativePath . '/subDir.tmp';
125+
+$workDirName = 'unlinkVar10.tmp';
126+
+$workDir = $relativePath . '/' . $workDirName;
127+
+$tmpDir = 'subDir.tmp';
127128
$dirToLinkTo = $workDir.'/'."linkme.tmp";
128129

129130
mkdir($workDir);
130131
-$cwd = getcwd();
131132
mkdir($dirToLinkTo);
132133

133134
$dirs = array(
135+
// relative
136+
$workDir.'/'.$tmpDir,
137+
'./'.$workDir.'/'.$tmpDir,
138+
- $workDir.'/../'.$workDir.'/'.$tmpDir,
139+
+ $workDir.'/../'.$workDirName.'/'.$tmpDir,
140+
141+
//absolute
142+
$cwd.'/'.$workDir.'/'.$tmpDir,
143+
$cwd.'/./'.$workDir.'/'.$tmpDir,
144+
- $cwd.'/'.$workDir.'/../'.$workDir.'/'.$tmpDir,
145+
+ $cwd.'/'.$workDir.'/../'.$workDirName.'/'.$tmpDir,
146+
147+
// multiple separators
148+
$workDir.'//'.$tmpDir,
149+
@@ -76,23 +83,23 @@ function test_link($linkedDir, $toLinkTo, $tounlink, $softlink) {
150+
?>
151+
--EXPECTF--
152+
*** Testing unlink() : variation ***
153+
--- unlinking soft link unlinkVar10.tmp/subDir.tmp --
154+
+-- unlinking soft link %SunlinkVar10.tmp/subDir.tmp --
155+
directory unlinked
156+
--- unlinking soft link ./unlinkVar10.tmp/subDir.tmp --
157+
+-- unlinking soft link ./%SunlinkVar10.tmp/subDir.tmp --
158+
directory unlinked
159+
--- unlinking soft link unlinkVar10.tmp/../unlinkVar10.tmp/subDir.tmp --
160+
+-- unlinking soft link %SunlinkVar10.tmp/../unlinkVar10.tmp/subDir.tmp --
161+
directory unlinked
162+
-- unlinking soft link /%s/unlinkVar10.tmp/subDir.tmp --
163+
directory unlinked
164+
--- unlinking soft link /%s/./unlinkVar10.tmp/subDir.tmp --
165+
+-- unlinking soft link /%s/./%SunlinkVar10.tmp/subDir.tmp --
166+
directory unlinked
167+
-- unlinking soft link /%s/unlinkVar10.tmp/../unlinkVar10.tmp/subDir.tmp --
168+
directory unlinked
169+
--- unlinking soft link unlinkVar10.tmp//subDir.tmp --
170+
+-- unlinking soft link %SunlinkVar10.tmp//subDir.tmp --
171+
directory unlinked
172+
--- unlinking soft link /%s//unlinkVar10.tmp//subDir.tmp --
173+
+-- unlinking soft link /%s//%SunlinkVar10.tmp//subDir.tmp --
174+
directory unlinked
175+
176+
--- try to unlink a directory ---
177+
178+
-Warning: unlink(unlinkVar10.tmp/linkme.tmp): %s in %s on line %d
179+
+Warning: unlink(%SunlinkVar10.tmp/linkme.tmp): %s in %s on line %d
134180
diff --git a/ext/zip/tests/gh18431.phpt b/ext/zip/tests/gh18431.phpt
135181
index d4eb89c36c6..dcd7db6f400 100644
136182
--- a/ext/zip/tests/gh18431.phpt

0 commit comments

Comments
 (0)