1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
|
diff -up ./src/Framework/MockObject/Builder/Match.php.php8 ./src/Framework/MockObject/Builder/Match.php
--- ./src/Framework/MockObject/Builder/Match.php.php8 2020-01-08 09:45:45.000000000 +0100
+++ ./src/Framework/MockObject/Builder/Match.php 2021-03-26 14:22:46.505856216 +0100
@@ -12,7 +12,7 @@ namespace PHPUnit\Framework\MockObject\B
/**
* Builder interface for invocation order matches.
*/
-interface Match extends Stub
+interface Match_ extends Stub
{
/**
* Defines the expectation which must occur before the current is valid.
diff -up ./src/Framework/MockObject/Builder/NamespaceMatch.php.php8 ./src/Framework/MockObject/Builder/NamespaceMatch.php
--- ./src/Framework/MockObject/Builder/NamespaceMatch.php.php8 2020-01-08 09:45:45.000000000 +0100
+++ ./src/Framework/MockObject/Builder/NamespaceMatch.php 2021-03-26 14:22:46.505856216 +0100
@@ -33,5 +33,5 @@ interface NamespaceMatch
* @param string $id The identification of the match builder
* @param Match $builder The builder which is being registered
*/
- public function registerId($id, Match $builder);
+ public function registerId($id, Match_ $builder);
}
diff -up ./src/Framework/MockObject/Builder/ParametersMatch.php.php8 ./src/Framework/MockObject/Builder/ParametersMatch.php
--- ./src/Framework/MockObject/Builder/ParametersMatch.php.php8 2020-01-08 09:45:45.000000000 +0100
+++ ./src/Framework/MockObject/Builder/ParametersMatch.php 2021-03-26 14:22:46.505856216 +0100
@@ -14,7 +14,7 @@ use PHPUnit\Framework\MockObject\Matcher
/**
* Builder interface for parameter matchers.
*/
-interface ParametersMatch extends Match
+interface ParametersMatch extends Match_
{
/**
* Sets the parameters to match for, each parameter to this function will
diff -up ./src/Framework/MockObject/InvocationMocker.php.php8 ./src/Framework/MockObject/InvocationMocker.php
--- ./src/Framework/MockObject/InvocationMocker.php.php8 2020-01-08 09:45:45.000000000 +0100
+++ ./src/Framework/MockObject/InvocationMocker.php 2021-03-26 14:22:46.505856216 +0100
@@ -12,7 +12,7 @@ namespace PHPUnit\Framework\MockObject;
use Exception;
use PHPUnit\Framework\ExpectationFailedException;
use PHPUnit\Framework\MockObject\Builder\InvocationMocker as BuilderInvocationMocker;
-use PHPUnit\Framework\MockObject\Builder\Match;
+use PHPUnit\Framework\MockObject\Builder\Match_;
use PHPUnit\Framework\MockObject\Builder\NamespaceMatch;
use PHPUnit\Framework\MockObject\Matcher\DeferredError;
use PHPUnit\Framework\MockObject\Matcher\Invocation as MatcherInvocation;
@@ -82,7 +82,7 @@ class InvocationMocker implements Invoka
/**
* @throws RuntimeException
*/
- public function registerId($id, Match $builder): void
+ public function registerId($id, Match_ $builder): void
{
if (isset($this->builderMap[$id])) {
throw new RuntimeException(
diff -up ./src/Framework/MockObject/MockMethod.php.php8 ./src/Framework/MockObject/MockMethod.php
--- ./src/Framework/MockObject/MockMethod.php.php8 2020-01-08 09:45:45.000000000 +0100
+++ ./src/Framework/MockObject/MockMethod.php 2021-03-26 14:23:49.737575694 +0100
@@ -12,6 +12,7 @@ namespace PHPUnit\Framework\MockObject;
use ReflectionClass;
use ReflectionException;
use ReflectionMethod;
+use ReflectionNamedType;
use Text_Template;
final class MockMethod
@@ -269,7 +270,7 @@ final class MockMethod
*
* @throws RuntimeException
*/
- private static function getMethodParameters(ReflectionMethod $method, bool $forCall = false): string
+ private static function getMethodParametersForDeclaration(ReflectionMethod $method): string
{
$parameters = [];
@@ -283,63 +284,38 @@ final class MockMethod
$name = '$arg' . $i;
}
- if ($parameter->isVariadic()) {
- if ($forCall) {
- continue;
- }
-
- $name = '...' . $name;
- }
-
$nullable = '';
$default = '';
$reference = '';
$typeDeclaration = '';
+ $type = null;
+ $typeName = null;
- if (!$forCall) {
- if ($parameter->hasType() && $parameter->allowsNull()) {
- $nullable = '?';
+ if ($parameter->hasType()) {
+ $type = $parameter->getType();
+
+ if ($type instanceof ReflectionNamedType) {
+ $typeName = $type->getName();
}
+ }
+
+ if ($parameter->isVariadic()) {
+ $name = '...' . $name;
+ } elseif ($parameter->isDefaultValueAvailable()) {
+ $default = ' = ' . var_export($parameter->getDefaultValue(), true);
+ } elseif ($parameter->isOptional()) {
+ $default = ' = null';
+ }
- if ($parameter->hasType() && $parameter->getType()->getName() !== 'self') {
- $typeDeclaration = $parameter->getType()->getName() . ' ';
- } else {
- try {
- $class = $parameter->getClass();
- } catch (ReflectionException $e) {
- throw new RuntimeException(
- \sprintf(
- 'Cannot mock %s::%s() because a class or ' .
- 'interface used in the signature is not loaded',
- $method->getDeclaringClass()->getName(),
- $method->getName()
- ),
- 0,
- $e
- );
- }
-
- if ($class !== null) {
- $typeDeclaration = $class->getName() . ' ';
- }
+ if ($type !== null) {
+ if ($typeName !== 'mixed' && $parameter->allowsNull()) {
+ $nullable = '?';
}
- if (!$parameter->isVariadic()) {
- if ($parameter->isDefaultValueAvailable()) {
- try {
- $value = \var_export($parameter->getDefaultValue(), true);
- } catch (\ReflectionException $e) {
- throw new RuntimeException(
- $e->getMessage(),
- (int) $e->getCode(),
- $e
- );
- }
-
- $default = ' = ' . $value;
- } elseif ($parameter->isOptional()) {
- $default = ' = null';
- }
+ if ($typeName === 'self') {
+ $typeDeclaration = $method->getDeclaringClass()->getName() . ' ';
+ } elseif ($typeName !== null) {
+ $typeDeclaration = $typeName . ' ';
}
}
@@ -350,6 +326,53 @@ final class MockMethod
$parameters[] = $nullable . $typeDeclaration . $reference . $name . $default;
}
- return \implode(', ', $parameters);
+ return implode(', ', $parameters);
+ }
+
+ /**
+ * Returns the parameters of a function or method.
+ *
+ * @throws ReflectionException
+ */
+ private static function getMethodParametersForCall(ReflectionMethod $method): string
+ {
+ $parameters = [];
+
+ foreach ($method->getParameters() as $i => $parameter) {
+ $name = '$' . $parameter->getName();
+
+ /* Note: PHP extensions may use empty names for reference arguments
+ * or "..." for methods taking a variable number of arguments.
+ */
+ if ($name === '$' || $name === '$...') {
+ $name = '$arg' . $i;
+ }
+
+ if ($parameter->isVariadic()) {
+ continue;
+ }
+
+ if ($parameter->isPassedByReference()) {
+ $parameters[] = '&' . $name;
+ } else {
+ $parameters[] = $name;
+ }
+ }
+
+ return implode(', ', $parameters);
+ }
+
+
+ /**
+ * Returns the parameters of a function or method.
+ *
+ * @throws RuntimeException
+ */
+ private static function getMethodParameters(ReflectionMethod $method, bool $forCall = false): string
+ {
+ if ($forCall) {
+ return self::getMethodParametersForCall($method);
+ }
+ return self::getMethodParametersForDeclaration($method);
}
}
diff -up ./tests/_files/SingletonClass.php.php8 ./tests/_files/SingletonClass.php
--- ./tests/_files/SingletonClass.php.php8 2020-01-08 09:45:45.000000000 +0100
+++ ./tests/_files/SingletonClass.php 2021-03-26 14:22:46.505856216 +0100
@@ -17,11 +17,11 @@ class SingletonClass
{
}
- private function __sleep()
+ function __sleep()
{
}
- private function __wakeup()
+ function __wakeup()
{
}
diff -up ./tests/unit/Framework/Constraint/IsTypeTest.php.php8 ./tests/unit/Framework/Constraint/IsTypeTest.php
--- ./tests/unit/Framework/Constraint/IsTypeTest.php.php8 2020-01-08 09:45:45.000000000 +0100
+++ ./tests/unit/Framework/Constraint/IsTypeTest.php 2021-03-26 14:22:46.505856216 +0100
@@ -74,7 +74,7 @@ EOF
$this->assertTrue($constraint->evaluate($resource, '', true));
- @\fclose($resource);
+ if (is_resource($resource)) @\fclose($resource);
}
public function resources()
diff -up ./tests/unit/Framework/Constraint/JsonMatchesErrorMessageProviderTest.php.php8 ./tests/unit/Framework/Constraint/JsonMatchesErrorMessageProviderTest.php
--- ./tests/unit/Framework/Constraint/JsonMatchesErrorMessageProviderTest.php.php8 2020-01-08 09:45:45.000000000 +0100
+++ ./tests/unit/Framework/Constraint/JsonMatchesErrorMessageProviderTest.php 2021-03-26 14:22:46.505856216 +0100
@@ -17,7 +17,7 @@ class JsonMatchesErrorMessageProviderTes
{
return [
'JSON_ERROR_NONE' => [
- null, 'json_error_none', '',
+ null, \JSON_ERROR_NONE, '',
],
'JSON_ERROR_DEPTH' => [
'Maximum stack depth exceeded', \JSON_ERROR_DEPTH, '',
diff -up ./src/Util/Configuration.php.old ./src/Util/Configuration.php
--- ./src/Util/Configuration.php.old 2021-09-10 08:26:04.654231054 +0200
+++ ./src/Util/Configuration.php 2021-09-10 08:27:14.019129699 +0200
@@ -567,24 +567,27 @@ final class Configuration
*/
switch ($array) {
case 'var':
- $target = &$GLOBALS;
+ foreach ($configuration[$array] as $name => $data) {
+ $GLOBALS[$name] = $data['value'];
+ }
break;
case 'server':
- $target = &$_SERVER;
+ foreach ($configuration[$array] as $name => $data) {
+ $_SERVER[$name] = $data['value'];
+ }
break;
default:
- $target = &$GLOBALS['_' . \strtoupper($array)];
+ foreach ($configuration[$array] as $name => $data) {
+ $GLOBALS['_' . \strtoupper($array)][$name] = $data['value'];
+ }
break;
}
- foreach ($configuration[$array] as $name => $data) {
- $target[$name] = $data['value'];
- }
}
foreach ($configuration['env'] as $name => $data) {
diff -up ./src/Util/PHP/Template/TestCaseClass.tpl.dist.old ./src/Util/PHP/Template/TestCaseClass.tpl.dist
--- ./src/Util/PHP/Template/TestCaseClass.tpl.dist.old 2021-09-10 08:26:32.213191401 +0200
+++ ./src/Util/PHP/Template/TestCaseClass.tpl.dist 2021-09-10 08:26:55.407157223 +0200
@@ -87,7 +87,7 @@ if ('' !== $configurationFilePath) {
unset($configuration);
}
-function __phpunit_error_handler($errno, $errstr, $errfile, $errline, $errcontext)
+function __phpunit_error_handler($errno, $errstr, $errfile, $errline, $errcontext=null)
{
return true;
}
diff -up ./src/Util/PHP/Template/TestCaseMethod.tpl.dist.old ./src/Util/PHP/Template/TestCaseMethod.tpl.dist
--- ./src/Util/PHP/Template/TestCaseMethod.tpl.dist.old 2021-09-10 08:26:26.609199466 +0200
+++ ./src/Util/PHP/Template/TestCaseMethod.tpl.dist 2021-09-10 08:26:48.235167829 +0200
@@ -89,7 +89,7 @@ if ('' !== $configurationFilePath) {
unset($configuration);
}
-function __phpunit_error_handler($errno, $errstr, $errfile, $errline, $errcontext)
+function __phpunit_error_handler($errno, $errstr, $errfile, $errline, $errcontext=null)
{
return true;
}
|
