Skip to content

Commit 9d9f639

Browse files
sebastianbergmannsebastianbergmann
committed
Merge branch '13.1'
* 13.1: Closes #3676
2 parents f5a230f + 2dc923f commit 9d9f639

11 files changed

Lines changed: 61 additions & 32 deletions

File tree

‎src/Framework/MockObject/Generator/Generator.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ public function testDouble(string $type, bool $mockObject, ?array $methods = [],
109109

110110
$object = $this->instantiate(
111111
$mock,
112+
$type,
112113
$callOriginalConstructor,
113114
$arguments,
114115
$returnValueGeneration,
@@ -288,7 +289,7 @@ private function userDefinedInterfaceMethods(string $interfaceName): array
288289
* @throws ReflectionException
289290
* @throws RuntimeException
290291
*/
291-
private function instantiate(DoubledClass $mockClass, bool $callOriginalConstructor, array $arguments, bool $returnValueGeneration, bool $isMockObject): object
292+
private function instantiate(DoubledClass $mockClass, string $type, bool $callOriginalConstructor, array $arguments, bool $returnValueGeneration, bool $isMockObject): object
292293
{
293294
$className = $mockClass->generate();
294295

@@ -311,7 +312,7 @@ private function instantiate(DoubledClass $mockClass, bool $callOriginalConstruc
311312
*/
312313
$reflector->getProperty('__phpunit_state')->setValue(
313314
$object,
314-
new TestDoubleState($mockClass->configurableMethods(), $returnValueGeneration, $isMockObject),
315+
new TestDoubleState($mockClass->configurableMethods(), $type, $returnValueGeneration, $isMockObject),
315316
);
316317

317318
if ($callOriginalConstructor && $reflector->getConstructor() !== null) {

‎src/Framework/MockObject/Runtime/Api/StubApi.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ trait StubApi
2020

2121
public function __phpunit_state(): TestDoubleState
2222
{
23-
return $this->__phpunit_state ?? new TestDoubleState([], true, false);
23+
return $this->__phpunit_state ?? new TestDoubleState([], static::class, true, false);
2424
}
2525

2626
public function __phpunit_getInvocationHandler(): InvocationHandler

‎src/Framework/MockObject/Runtime/Api/TestDoubleState.php‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,23 @@ final class TestDoubleState
2020
* @var list<ConfigurableMethod>
2121
*/
2222
private readonly array $configurableMethods;
23+
24+
/**
25+
* @var class-string
26+
*/
27+
private readonly string $className;
2328
private readonly bool $generateReturnValues;
2429
private readonly bool $isMockObject;
2530
private ?InvocationHandler $invocationHandler = null;
2631

2732
/**
2833
* @param list<ConfigurableMethod> $configurableMethods
34+
* @param class-string $className
2935
*/
30-
public function __construct(array $configurableMethods, bool $generateReturnValues, bool $isMockObject = false)
36+
public function __construct(array $configurableMethods, string $className, bool $generateReturnValues, bool $isMockObject = false)
3137
{
3238
$this->configurableMethods = $configurableMethods;
39+
$this->className = $className;
3340
$this->generateReturnValues = $generateReturnValues;
3441
$this->isMockObject = $isMockObject;
3542
}
@@ -42,6 +49,7 @@ public function invocationHandler(): InvocationHandler
4249

4350
$this->invocationHandler = new InvocationHandler(
4451
$this->configurableMethods,
52+
$this->className,
4553
$this->generateReturnValues,
4654
$this->isMockObject,
4755
);

‎src/Framework/MockObject/Runtime/InvocationHandler.php‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,24 @@ final class InvocationHandler
4242
* @var list<ConfigurableMethod>
4343
*/
4444
private readonly array $configurableMethods;
45+
46+
/**
47+
* @var class-string
48+
*/
49+
private readonly string $className;
4550
private readonly bool $returnValueGeneration;
4651
private readonly bool $isMockObject;
4752
private bool $sealed = false;
4853
private ?AssertionFailedError $assertionFailure = null;
4954

5055
/**
5156
* @param list<ConfigurableMethod> $configurableMethods
57+
* @param class-string $className
5258
*/
53-
public function __construct(array $configurableMethods, bool $returnValueGeneration, bool $isMockObject = false)
59+
public function __construct(array $configurableMethods, string $className, bool $returnValueGeneration, bool $isMockObject = false)
5460
{
5561
$this->configurableMethods = $configurableMethods;
62+
$this->className = $className;
5663
$this->returnValueGeneration = $returnValueGeneration;
5764
$this->isMockObject = $isMockObject;
5865
}
@@ -114,7 +121,7 @@ public function expects(InvocationOrder $rule): InvocationMocker|InvocationStubb
114121
throw new TestDoubleSealedException;
115122
}
116123

117-
$matcher = new Matcher($rule);
124+
$matcher = new Matcher($rule, $this->className);
118125
$this->addMatcher($matcher);
119126

120127
if ($this->isMockObject) {
@@ -210,7 +217,7 @@ public function seal(bool $isMockObject): void
210217

211218
foreach ($this->configurableMethods as $method) {
212219
if (!in_array($method->name(), $configuredMethods, true)) {
213-
$matcher = new Matcher(new InvokedCount(0));
220+
$matcher = new Matcher(new InvokedCount(0), $this->className);
214221

215222
$matcher->setMethodNameRule(new MethodName($method->name()));
216223

‎src/Framework/MockObject/Runtime/Matcher.php‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ final class Matcher
3030
{
3131
private readonly InvocationOrder $invocationRule;
3232

33+
/**
34+
* @var class-string
35+
*/
36+
private readonly string $className;
37+
3338
/**
3439
* @var ?non-empty-string
3540
*/
@@ -38,9 +43,13 @@ final class Matcher
3843
private ?ParametersRule $parametersRule = null;
3944
private ?Stub $stub = null;
4045

41-
public function __construct(InvocationOrder $rule)
46+
/**
47+
* @param class-string $className
48+
*/
49+
public function __construct(InvocationOrder $rule, string $className)
4250
{
4351
$this->invocationRule = $rule;
52+
$this->className = $className;
4453
}
4554

4655
public function hasInvocationCountRule(): bool
@@ -130,7 +139,7 @@ public function invoked(Invocation $invocation): mixed
130139
throw new ExpectationFailedException(
131140
sprintf(
132141
"Expectation for %s failed.\n%s",
133-
$this->methodNameRule->failureDescription(),
142+
$this->methodNameRule->failureDescription($this->className),
134143
$e->getMessage(),
135144
),
136145
$e->getComparisonFailure(),
@@ -182,7 +191,7 @@ public function matches(Invocation $invocation): bool
182191
throw new ExpectationFailedException(
183192
sprintf(
184193
"Expectation for %s failed.\n%s",
185-
$this->methodNameRule->failureDescription(),
194+
$this->methodNameRule->failureDescription($this->className),
186195
$e->getMessage(),
187196
),
188197
$e->getComparisonFailure(),
@@ -221,7 +230,7 @@ public function verify(): void
221230
throw new ExpectationFailedException(
222231
sprintf(
223232
'%s was expected to be %s but was %s.',
224-
$this->methodNameRule->failureDescription(),
233+
$this->methodNameRule->failureDescription($this->className),
225234
$this->invocationRule->toString(),
226235
$invoked,
227236
),
@@ -243,7 +252,7 @@ public function verify(): void
243252
throw new ExpectationFailedException(
244253
sprintf(
245254
"Expectation for %s failed.\n%s",
246-
$this->methodNameRule->failureDescription(),
255+
$this->methodNameRule->failureDescription($this->className),
247256
ThrowableToStringMapper::map($e),
248257
),
249258
);

‎src/Framework/MockObject/Runtime/ReturnValueGenerator.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ private function newInstanceOf(StubInternal $testStub, string $className, string
183183
$object,
184184
new TestDoubleState(
185185
$testStub->__phpunit_state()->configurableMethods(),
186+
$className,
186187
$testStub->__phpunit_state()->generateReturnValues(),
187188
),
188189
);

‎src/Framework/MockObject/Runtime/Rule/MethodName.php‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,13 @@ public function toString(): string
4242
return 'method name ' . $this->constraint->toString();
4343
}
4444

45-
public function failureDescription(): string
45+
/**
46+
* @param class-string $className
47+
*/
48+
public function failureDescription(string $className): string
4649
{
4750
if ($this->constraint instanceof MethodNameConstraint) {
48-
return '"' . $this->constraint->methodName() . '()"';
51+
return $className . '::' . $this->constraint->methodName() . '()';
4952
}
5053

5154
return $this->toString();

‎tests/end-to-end/event/failed-mock-expectation.phpt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Test Preparation Started (PHPUnit\TestFixture\Event\FailedExpectationTest::testO
2323
Test Prepared (PHPUnit\TestFixture\Event\FailedExpectationTest::testOne)
2424
Mock Object Created (PHPUnit\TestFixture\MockObject\AnInterface)
2525
Test Failed (PHPUnit\TestFixture\Event\FailedExpectationTest::testOne)
26-
"doSomething()" was expected to be invoked once but was never invoked.
26+
PHPUnit\TestFixture\MockObject\AnInterface::doSomething() was expected to be invoked once but was never invoked.
2727
Test Finished (PHPUnit\TestFixture\Event\FailedExpectationTest::testOne)
2828
Test Suite Finished (PHPUnit\TestFixture\Event\FailedExpectationTest, 1 test)
2929
Test Runner Execution Finished

‎tests/end-to-end/regression/6138.phpt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Time: %s, Memory: %s
2121
There was 1 failure:
2222

2323
1) PHPUnit\TestFixture\Issue6138\Issue6138Test::testOne
24-
Expectation for "m()" failed.
24+
Expectation for PHPUnit\TestFixture\Issue6138\I::m() failed.
2525
Parameter $c for invocation PHPUnit\TestFixture\Issue6138\I::m(PHPUnit\TestFixture\Issue6138\C Object (...)): void does not match expected value.
2626
Failed asserting that two objects are equal.
2727
--- Expected

‎tests/unit/Framework/MockObject/MockObjectTest.php‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public function testExpectationThatMethodIsCalledOnceFailsWhenMethodIsNeverCalle
9494
$double->expects($this->once())->method('doSomething');
9595

9696
$this->assertThatMockObjectExpectationFails(
97-
'"doSomething()" was expected to be invoked once but was never invoked.',
97+
AnInterface::class . '::doSomething() was expected to be invoked once but was never invoked.',
9898
$double,
9999
);
100100
}
@@ -161,7 +161,7 @@ public function testExpectationThatMethodIsCalledAtLeastOnceFailsWhenMethodIsNot
161161
$double->expects($this->atLeastOnce())->method('doSomething');
162162

163163
$this->assertThatMockObjectExpectationFails(
164-
'"doSomething()" was expected to be invoked at least once but was never invoked.',
164+
AnInterface::class . '::doSomething() was expected to be invoked at least once but was never invoked.',
165165
$double,
166166
);
167167
}
@@ -175,7 +175,7 @@ public function testExpectationThatMethodIsCalledAtLeastTwiceFailsWhenMethodIsCa
175175
$double->doSomething();
176176

177177
$this->assertThatMockObjectExpectationFails(
178-
'"doSomething()" was expected to be invoked at least 2 times but was invoked once.',
178+
AnInterface::class . '::doSomething() was expected to be invoked at least 2 times but was invoked once.',
179179
$double,
180180
);
181181
}
@@ -197,7 +197,7 @@ public function testExpectationThatMethodIsCalledTwiceFailsWhenMethodIsNeverCall
197197
$double->expects($this->exactly(2))->method('doSomething');
198198

199199
$this->assertThatMockObjectExpectationFails(
200-
'"doSomething()" was expected to be invoked 2 times but was never invoked.',
200+
AnInterface::class . '::doSomething() was expected to be invoked 2 times but was never invoked.',
201201
$double,
202202
);
203203
}
@@ -211,7 +211,7 @@ public function testExpectationThatMethodIsCalledTwiceFailsWhenMethodIsCalledOnc
211211
$double->doSomething();
212212

213213
$this->assertThatMockObjectExpectationFails(
214-
'"doSomething()" was expected to be invoked 2 times but was invoked once.',
214+
AnInterface::class . '::doSomething() was expected to be invoked 2 times but was invoked once.',
215215
$double,
216216
);
217217
}
@@ -258,7 +258,7 @@ public function testExpectationThatMethodIsCalledAtMostOnceFailsWhenMethodIsCall
258258
$double->doSomething();
259259

260260
$this->assertThatMockObjectExpectationFails(
261-
'"doSomething()" was expected to be invoked at most once but was invoked 2 times.',
261+
AnInterface::class . '::doSomething() was expected to be invoked at most once but was invoked 2 times.',
262262
$double,
263263
);
264264
}
@@ -274,7 +274,7 @@ public function testExpectationThatMethodIsCalledAtMostTwoTimesFailsWhenMethodIs
274274
$double->doSomething();
275275

276276
$this->assertThatMockObjectExpectationFails(
277-
'"doSomething()" was expected to be invoked at most 2 times but was invoked 3 times.',
277+
AnInterface::class . '::doSomething() was expected to be invoked at most 2 times but was invoked 3 times.',
278278
$double,
279279
);
280280
}
@@ -305,7 +305,7 @@ public function testExpectationThatMethodIsCalledWithParameterFailsWhenMethodIsC
305305

306306
$this->assertThatMockObjectExpectationFails(
307307
<<<'EOT'
308-
Expectation for "doSomethingElse()" failed.
308+
Expectation for PHPUnit\TestFixture\MockObject\InterfaceWithReturnTypeDeclaration::doSomethingElse() failed.
309309
Parameter $x for invocation PHPUnit\TestFixture\MockObject\InterfaceWithReturnTypeDeclaration::doSomethingElse(0): int does not match expected value.
310310
Failed asserting that 0 matches expected 1.
311311
EOT,
@@ -334,7 +334,7 @@ public function testExpectationThatMethodIsCalledWithConsecutiveParameterSetsFai
334334
$double->doSomethingElse(1);
335335
$this->assertThatMockObjectExpectationFails(
336336
<<<'EOT'
337-
Expectation for "doSomethingElse()" failed.
337+
Expectation for PHPUnit\TestFixture\MockObject\InterfaceWithReturnTypeDeclaration::doSomethingElse() failed.
338338
Parameter $x for invocation PHPUnit\TestFixture\MockObject\InterfaceWithReturnTypeDeclaration::doSomethingElse(3): int does not match expected value.
339339
Failed asserting that 3 matches expected 2.
340340
EOT,
@@ -368,7 +368,7 @@ public function testExpectationThatMethodIsCalledWithConsecutiveParameterSetsFai
368368
$double->doSomethingElse(2);
369369
$this->assertThatMockObjectExpectationFails(
370370
<<<'EOT'
371-
Expectation for "doSomethingElse()" failed.
371+
Expectation for PHPUnit\TestFixture\MockObject\InterfaceWithReturnTypeDeclaration::doSomethingElse() failed.
372372
Too many parameter sets given, 2 out of 3 expected parameter sets have been called.
373373

374374
EOT,
@@ -396,7 +396,7 @@ public function testExpectationThatMethodIsCalledWithParameterSetsInAnyOrderFail
396396
$double->doSomethingElse(1);
397397
$this->assertThatMockObjectExpectationFails(
398398
<<<'EOT'
399-
Expectation for "doSomethingElse()" failed.
399+
Expectation for PHPUnit\TestFixture\MockObject\InterfaceWithReturnTypeDeclaration::doSomethingElse() failed.
400400
1 out of 2 expected parameter sets was called, index [1] was not called.
401401

402402
EOT,
@@ -414,7 +414,7 @@ public function testExpectationThatMethodIsCalledWithParameterSetsInAnyOrderFail
414414
$double->doSomethingElse(2);
415415
$this->assertThatMockObjectExpectationFails(
416416
<<<'EOT'
417-
Expectation for "doSomethingElse()" failed.
417+
Expectation for PHPUnit\TestFixture\MockObject\InterfaceWithReturnTypeDeclaration::doSomethingElse() failed.
418418
2 out of 3 expected parameter sets were called, index [0] was not called.
419419

420420
EOT,
@@ -496,7 +496,7 @@ public function testContingentExpectationsAreEvaluatedWhenTheirConditionIsMet():
496496
$double->one();
497497

498498
$this->assertThatMockObjectExpectationFails(
499-
'"two()" was expected to be invoked once but was never invoked.',
499+
InterfaceWithImplicitProtocol::class . '::two() was expected to be invoked once but was never invoked.',
500500
$double,
501501
);
502502
}

0 commit comments

Comments
 (0)