Skip to content

Commit 2d92914

Browse files
nikicnikic
committed
phar test fixes
1 parent 226c2ff commit 2d92914

32 files changed

+240
-245
lines changed

‎ext/phar/tests/002.phpt

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,17 @@ Phar::mapPhar truncated manifest/improper params
55
--FILE--
66
<?php
77
try {
8-
Phar::mapPhar(5, 'hio', 'hi');
8+
Phar::mapPhar(5, 'hio', 'hi');
9+
} catch (TypeError $e) {
10+
echo $e->getMessage(), "\n";
11+
}
912

10-
Phar::mapPhar();
13+
try {
14+
Phar::mapPhar();
1115
} catch (Exception $e) {
12-
echo $e->getMessage();
16+
echo $e->getMessage(), "\n";
1317
}
1418
__HALT_COMPILER(); ?>
1519
--EXPECTF--
16-
Warning: Phar::mapPhar() expects at most 2 parameters, 3 given in %s002.php on line %d
20+
Phar::mapPhar() expects at most 2 parameters, 3 given
1721
internal corruption of phar "%s002.php" (truncated manifest at manifest length)

‎ext/phar/tests/badparameters.phpt

Lines changed: 168 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -8,200 +8,263 @@ phar.readonly=0
88
<?php
99
ini_set('phar.readonly', 1);
1010

11-
function print_exception($e) {
12-
echo "\nException: " . $e->getMessage() . " in " . $e->getFile() . " on line " . $e->getLine() . "\n";
11+
try {
12+
Phar::mungServer('hi');
13+
} catch (TypeError $e) {
14+
echo $e->getMessage(), "\n";
15+
}
16+
try {
17+
Phar::createDefaultStub(array());
18+
} catch (TypeError $e) {
19+
echo $e->getMessage(), "\n";
20+
}
21+
try {
22+
Phar::loadPhar(array());
23+
} catch (TypeError $e) {
24+
echo $e->getMessage(), "\n";
25+
}
26+
try {
27+
Phar::canCompress('hi');
28+
} catch (TypeError $e) {
29+
echo $e->getMessage(), "\n";
1330
}
14-
15-
Phar::mungServer('hi');
16-
Phar::createDefaultStub(array());
17-
Phar::loadPhar(array());
18-
Phar::canCompress('hi');
1931
try {
2032
$a = new Phar(array());
2133
} catch (TypeError $e) {
22-
print_exception($e);
34+
echo $e->getMessage(), "\n";
2335
}
2436
try {
2537
$a = new Phar(dirname(__FILE__) . '/files/frontcontroller10.phar');
2638
} catch (PharException $e) {
27-
print_exception($e);
39+
echo $e->getMessage(), "\n";
40+
}
41+
try {
42+
$a->convertToExecutable(array());
43+
} catch (TypeError $e) {
44+
echo $e->getMessage(), "\n";
45+
}
46+
try {
47+
$a->convertToData(array());
48+
} catch (TypeError $e) {
49+
echo $e->getMessage(), "\n";
2850
}
29-
$a->convertToExecutable(array());
30-
$a->convertToData(array());
3151
try {
3252
$b = new PharData(dirname(__FILE__) . '/whatever.tar');
3353
} catch (PharException $e) {
34-
print_exception($e);
54+
echo $e->getMessage(), "\n";
3555
}
3656
try {
3757
$c = new PharData(dirname(__FILE__) . '/whatever.zip');
3858
} catch (PharException $e) {
39-
print_exception($e);
59+
echo $e->getMessage(), "\n";
4060
}
41-
$b->delete(array());
4261
try {
43-
$a->delete('oops');
62+
$b->delete(array());
63+
} catch (TypeError $e) {
64+
echo $e->getMessage(), "\n";
65+
}
66+
try {
67+
$a->delete('oops');
4468
} catch (Exception $e) {
45-
echo $e->getMessage() . "\n";
69+
echo $e->getMessage() . "\n";
4670
}
4771
try {
48-
$b->delete('oops');
72+
$b->delete('oops');
4973
} catch (Exception $e) {
50-
echo $e->getMessage() . "\n";
74+
echo $e->getMessage() . "\n";
75+
}
76+
try {
77+
echo $a->getPath() . "\n";
78+
} catch (TypeError $e) {
79+
echo $e->getMessage(), "\n";
5180
}
52-
echo $a->getPath() . "\n";
5381
try {
54-
$a->setAlias('oops');
82+
$a->setAlias('oops');
5583
} catch (Exception $e) {
56-
echo $e->getMessage() . "\n";
84+
echo $e->getMessage() . "\n";
5785
}
5886
try {
59-
$b->setAlias('oops');
87+
$b->setAlias('oops');
6088
} catch (Exception $e) {
61-
echo $e->getMessage() . "\n";
89+
echo $e->getMessage() . "\n";
6290
}
6391
ini_set('phar.readonly', 0);
64-
$a->setAlias(array());
92+
try {
93+
$a->setAlias(array());
94+
} catch (TypeError $e) {
95+
echo $e->getMessage(), "\n";
96+
}
6597
ini_set('phar.readonly', 1);
6698
try {
67-
$b->stopBuffering();
99+
$b->stopBuffering();
68100
} catch (Exception $e) {
69-
echo $e->getMessage() . "\n";
101+
echo $e->getMessage() . "\n";
70102
}
71103
try {
72-
$a->setStub('oops');
104+
$a->setStub('oops');
73105
} catch (Exception $e) {
74-
echo $e->getMessage() . "\n";
106+
echo $e->getMessage() . "\n";
75107
}
76108
try {
77-
$b->setStub('oops');
109+
$b->setStub('oops');
78110
} catch (Exception $e) {
79-
echo $e->getMessage() . "\n";
111+
echo $e->getMessage() . "\n";
80112
}
81113
ini_set('phar.readonly', 0);
82-
$a->setStub(array());
114+
try {
115+
$a->setStub(array());
116+
} catch (TypeError $e) {
117+
echo $e->getMessage(), "\n";
118+
}
83119
ini_set('phar.readonly', 1);
84120
try {
85-
$b->setDefaultStub('oops');
121+
$b->setDefaultStub('oops');
86122
} catch (Exception $e) {
87-
echo $e->getMessage() . "\n";
123+
echo $e->getMessage() . "\n";
124+
}
125+
try {
126+
$a->setDefaultStub(array());
127+
} catch (TypeError $e) {
128+
echo $e->getMessage(), "\n";
88129
}
89-
$a->setDefaultStub(array());
90130
try {
91-
$a->setDefaultStub('oops');
131+
$a->setDefaultStub('oops');
92132
} catch (Exception $e) {
93-
echo $e->getMessage() . "\n";
133+
echo $e->getMessage() . "\n";
94134
}
95135
try {
96-
$a->setSignatureAlgorithm(Phar::MD5);
136+
$a->setSignatureAlgorithm(Phar::MD5);
97137
} catch (Exception $e) {
98-
echo $e->getMessage() . "\n";
138+
echo $e->getMessage() . "\n";
99139
}
100-
$a->compress(array());
101140
try {
102-
$a->compress(1);
141+
$a->compress(array());
142+
} catch (TypeError $e) {
143+
echo $e->getMessage(), "\n";
144+
}
145+
try {
146+
$a->compress(1);
103147
} catch (Exception $e) {
104-
echo $e->getMessage() . "\n";
148+
echo $e->getMessage() . "\n";
149+
}
150+
try {
151+
$a->compressFiles(array());
152+
} catch (TypeError $e) {
153+
echo $e->getMessage(), "\n";
105154
}
106-
$a->compressFiles(array());
107155
try {
108-
$a->decompressFiles();
156+
$a->decompressFiles();
109157
} catch (Exception $e) {
110-
echo $e->getMessage() . "\n";
158+
echo $e->getMessage() . "\n";
111159
}
112-
$a->copy(array());
113160
try {
114-
$a->copy('a', 'b');
161+
$a->copy(array());
162+
} catch (TypeError $e) {
163+
echo $e->getMessage(), "\n";
164+
}
165+
try {
166+
$a->copy('a', 'b');
115167
} catch (Exception $e) {
116-
echo $e->getMessage() . "\n";
168+
echo $e->getMessage() . "\n";
169+
}
170+
try {
171+
$a->offsetExists(array());
172+
} catch (TypeError $e) {
173+
echo $e->getMessage(), "\n";
174+
}
175+
try {
176+
$a->offsetGet(array());
177+
} catch (TypeError $e) {
178+
echo $e->getMessage(), "\n";
117179
}
118-
$a->offsetExists(array());
119-
$a->offsetGet(array());
120180
ini_set('phar.readonly', 0);
121-
$a->offsetSet(array());
181+
try {
182+
$a->offsetSet(array());
183+
} catch (TypeError $e) {
184+
echo $e->getMessage(), "\n";
185+
}
122186
ini_set('phar.readonly', 1);
123-
$b->offsetUnset(array());
124187
try {
125-
$a->offsetUnset('a');
188+
$b->offsetUnset(array());
189+
} catch (TypeError $e) {
190+
echo $e->getMessage(), "\n";
191+
}
192+
try {
193+
$a->offsetUnset('a');
126194
} catch (Exception $e) {
127-
echo $e->getMessage() . "\n";
195+
echo $e->getMessage() . "\n";
196+
}
197+
try {
198+
$a->addEmptyDir(array());
199+
} catch (TypeError $e) {
200+
echo $e->getMessage(), "\n";
201+
}
202+
try {
203+
$a->addFile(array());
204+
} catch (TypeError $e) {
205+
echo $e->getMessage(), "\n";
128206
}
129-
$a->addEmptyDir(array());
130-
$a->addFile(array());
131-
$a->addFromString(array());
132207
try {
133-
$a->setMetadata('a');
208+
$a->addFromString(array());
209+
} catch (TypeError $e) {
210+
echo $e->getMessage(), "\n";
211+
}
212+
try {
213+
$a->setMetadata('a');
134214
} catch (Exception $e) {
135-
echo $e->getMessage() . "\n";
215+
echo $e->getMessage() . "\n";
136216
}
137217
ini_set('phar.readonly', 0);
138-
$a->setMetadata(1,2);
218+
try {
219+
$a->setMetadata(1,2);
220+
} catch (TypeError $e) {
221+
echo $e->getMessage(), "\n";
222+
}
139223
ini_set('phar.readonly', 1);
140224
try {
141-
$a->delMetadata();
225+
$a->delMetadata();
142226
} catch (Exception $e) {
143-
echo $e->getMessage() . "\n";
227+
echo $e->getMessage() . "\n";
144228
}
145229
?>
146230
===DONE===
147231
--EXPECTF--
148-
Warning: Phar::mungServer() expects parameter 1 to be array, string given in %sbadparameters.php on line %d
149-
150-
Warning: Phar::createDefaultStub() expects parameter 1 to be a valid path, array given in %sbadparameters.php on line %d
151-
152-
Warning: Phar::loadPhar() expects parameter 1 to be a valid path, array given in %sbadparameters.php on line %d
153-
154-
Warning: Phar::canCompress() expects parameter 1 to be int, string given in %sbadparameters.php on line %d
155-
156-
Exception: Phar::__construct() expects parameter 1 to be a valid path, array given in %sbadparameters.php on line %d
157-
158-
Warning: Phar::convertToExecutable() expects parameter 1 to be int, array given in %sbadparameters.php on line %d
159-
160-
Warning: Phar::convertToData() expects parameter 1 to be int, array given in %sbadparameters.php on line %d
161-
162-
Warning: PharData::delete() expects parameter 1 to be a valid path, array given in %sbadparameters.php on line %d
232+
Phar::mungServer() expects parameter 1 to be array, string given
233+
Phar::createDefaultStub() expects parameter 1 to be a valid path, array given
234+
Phar::loadPhar() expects parameter 1 to be a valid path, array given
235+
Phar::canCompress() expects parameter 1 to be int, string given
236+
Phar::__construct() expects parameter 1 to be a valid path, array given
237+
Phar::convertToExecutable() expects parameter 1 to be int, array given
238+
Phar::convertToData() expects parameter 1 to be int, array given
239+
PharData::delete() expects parameter 1 to be a valid path, array given
163240
Cannot write out phar archive, phar is read-only
164241
Entry oops does not exist and cannot be deleted
165-
%sfiles/frontcontroller10.phar
242+
%sfrontcontroller10.phar
166243
Cannot write out phar archive, phar is read-only
167244
A Phar alias cannot be set in a plain tar archive
168-
169-
Warning: Phar::setAlias() expects parameter 1 to be %string, array given in %sbadparameters.php on line %d
245+
Phar::setAlias() expects parameter 1 to be string, array given
170246
Cannot change stub, phar is read-only
171247
A Phar stub cannot be set in a plain tar archive
172-
173-
Warning: Phar::setStub() expects parameter 1 to be %string, array given in %sbadparameters.php on line %d
248+
Phar::setStub() expects parameter 1 to be string, array given
174249
A Phar stub cannot be set in a plain tar archive
175-
176-
Warning: Phar::setDefaultStub() expects parameter 1 to be %string, array given in %sbadparameters.php on line %d
250+
Phar::setDefaultStub() expects parameter 1 to be string, array given
177251
Cannot change stub: phar.readonly=1
178252
Cannot set signature algorithm, phar is read-only
179-
180-
Warning: Phar::compress() expects parameter 1 to be int, array given in %sbadparameters.php on line %d
253+
Phar::compress() expects parameter 1 to be int, array given
181254
Cannot compress phar archive, phar is read-only
182-
183-
Warning: Phar::compressFiles() expects parameter 1 to be int, array given in %sbadparameters.php on line %d
255+
Phar::compressFiles() expects parameter 1 to be int, array given
184256
Phar is readonly, cannot change compression
185-
186-
Warning: Phar::copy() expects exactly 2 parameters, 1 given in %sbadparameters.php on line %d
257+
Phar::copy() expects exactly 2 parameters, 1 given
187258
Cannot copy "a" to "b", phar is read-only
188-
189-
Warning: Phar::offsetExists() expects parameter 1 to be a valid path, array given in %sbadparameters.php on line %d
190-
191-
Warning: Phar::offsetGet() expects parameter 1 to be a valid path, array given in %sbadparameters.php on line %d
192-
193-
Warning: Phar::offsetSet() expects exactly 2 parameters, 1 given in %sbadparameters.php on line %d
194-
195-
Warning: PharData::offsetUnset() expects parameter 1 to be a valid path, array given in %sbadparameters.php on line %d
259+
Phar::offsetExists() expects parameter 1 to be a valid path, array given
260+
Phar::offsetGet() expects parameter 1 to be a valid path, array given
261+
Phar::offsetSet() expects exactly 2 parameters, 1 given
262+
PharData::offsetUnset() expects parameter 1 to be a valid path, array given
196263
Write operations disabled by the php.ini setting phar.readonly
197-
198-
Warning: Phar::addEmptyDir() expects parameter 1 to be a valid path, array given in %sbadparameters.php on line %d
199-
200-
Warning: Phar::addFile() expects parameter 1 to be a valid path, array given in %sbadparameters.php on line %d
201-
202-
Warning: Phar::addFromString() expects exactly 2 parameters, 1 given in %sbadparameters.php on line %d
264+
Phar::addEmptyDir() expects parameter 1 to be a valid path, array given
265+
Phar::addFile() expects parameter 1 to be a valid path, array given
266+
Phar::addFromString() expects exactly 2 parameters, 1 given
203267
Write operations disabled by the php.ini setting phar.readonly
204-
205-
Warning: Phar::setMetadata() expects exactly 1 parameter, 2 given in %sbadparameters.php on line %d
268+
Phar::setMetadata() expects exactly 1 parameter, 2 given
206269
Write operations disabled by the php.ini setting phar.readonly
207270
===DONE===

0 commit comments

Comments
 (0)