Skip to content

Commit 6cf9705

Browse files
sebastianbergmannsebastianbergmann
committed
Merge branch '9.5'
2 parents 4b1edef + 58b7d87 commit 6cf9705

File tree

3 files changed

+50
-42
lines changed

3 files changed

+50
-42
lines changed

‎tests/unit/Framework/ExecutionOrderDependencyTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
* For the full copyright and license information, please view the LICENSE
88
* file that was distributed with this source code.
99
*/
10+
namespace PHPUnit\Framework;
11+
1012
use PHPUnit\Framework\Attributes\CoversClass;
1113
use PHPUnit\Framework\Attributes\DataProvider;
12-
use PHPUnit\Framework\ExecutionOrderDependency;
13-
use PHPUnit\Framework\TestCase;
1414

1515
#[CoversClass(ExecutionOrderDependency::class)]
1616
class ExecutionOrderDependencyTest extends TestCase

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@
77
* For the full copyright and license information, please view the LICENSE
88
* file that was distributed with this source code.
99
*/
10+
namespace PHPUnit\Framework\MockObject;
11+
1012
use PHPUnit\Framework\Attributes\Small;
11-
use PHPUnit\Framework\MockObject\CannotUseAddMethodsException;
12-
use PHPUnit\Framework\MockObject\CannotUseOnlyMethodsException;
13-
use PHPUnit\Framework\MockObject\MockBuilder;
1413
use PHPUnit\Framework\TestCase;
1514
use PHPUnit\TestFixture\Mockable;
1615

@@ -135,7 +134,7 @@ public function testMockClassNameCanBeSpecified(): void
135134
->setMockClassName('ACustomClassName')
136135
->getMock();
137136

138-
$this->assertInstanceOf(ACustomClassName::class, $mock);
137+
$this->assertInstanceOf('ACustomClassName', $mock);
139138
}
140139

141140
public function testConstructorArgumentsCanBeSpecified(): void

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

Lines changed: 45 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,20 @@
77
* For the full copyright and license information, please view the LICENSE
88
* file that was distributed with this source code.
99
*/
10+
namespace PHPUnit\Framework\MockObject;
11+
12+
use function class_uses;
13+
use function func_get_args;
14+
use function get_class;
15+
use function get_parent_class;
16+
use Exception;
17+
use Foo;
1018
use PHPUnit\Framework\Attributes\DataProvider;
1119
use PHPUnit\Framework\Attributes\DoesNotPerformAssertions;
1220
use PHPUnit\Framework\Attributes\RequiresPhp;
1321
use PHPUnit\Framework\Attributes\RequiresPhpExtension;
1422
use PHPUnit\Framework\Attributes\Small;
1523
use PHPUnit\Framework\ExpectationFailedException;
16-
use PHPUnit\Framework\MockObject\MockObject;
17-
use PHPUnit\Framework\MockObject\ReturnValueNotConfiguredException;
18-
use PHPUnit\Framework\MockObject\Stub;
1924
use PHPUnit\Framework\TestCase;
2025
use PHPUnit\TestFixture\AbstractTrait;
2126
use PHPUnit\TestFixture\MockObject\AbstractMockTestClass;
@@ -39,6 +44,10 @@
3944
use PHPUnit\TestFixture\MockObject\TraversableMockTestInterface;
4045
use PHPUnit\TestFixture\PartialMockTestClass;
4146
use PHPUnit\TestFixture\SomeClass;
47+
use ReflectionObject;
48+
use RuntimeException;
49+
use stdClass;
50+
use Traversable;
4251

4352
#[Small]
4453
final class MockObjectTest extends TestCase
@@ -194,9 +203,9 @@ public function testStubbedException(): void
194203
->getMock();
195204

196205
$mock->method('doSomething')
197-
->will($this->throwException(new \Exception));
206+
->will($this->throwException(new Exception));
198207

199-
$this->expectException(\Exception::class);
208+
$this->expectException(Exception::class);
200209

201210
$mock->doSomething();
202211
}
@@ -207,9 +216,9 @@ public function testStubbedWillThrowException(): void
207216
->getMock();
208217

209218
$mock->method('doSomething')
210-
->willThrowException(new \Exception);
219+
->willThrowException(new Exception);
211220

212-
$this->expectException(\Exception::class);
221+
$this->expectException(Exception::class);
213222

214223
$mock->doSomething();
215224
}
@@ -356,7 +365,7 @@ public function testMockClassOnlyGeneratedOnce(): void
356365
$mock2 = $this->getMockBuilder(AnInterface::class)
357366
->getMock();
358367

359-
$this->assertEquals(\get_class($mock1), \get_class($mock2));
368+
$this->assertEquals(get_class($mock1), get_class($mock2));
360369
}
361370

362371
public function testMockClassDifferentForPartialMocks(): void
@@ -380,14 +389,14 @@ public function testMockClassDifferentForPartialMocks(): void
380389
->onlyMethods(['doAnotherThing'])
381390
->getMock();
382391

383-
$this->assertNotEquals(\get_class($mock1), \get_class($mock2));
384-
$this->assertNotEquals(\get_class($mock1), \get_class($mock3));
385-
$this->assertNotEquals(\get_class($mock1), \get_class($mock4));
386-
$this->assertNotEquals(\get_class($mock1), \get_class($mock5));
387-
$this->assertEquals(\get_class($mock2), \get_class($mock3));
388-
$this->assertNotEquals(\get_class($mock2), \get_class($mock4));
389-
$this->assertNotEquals(\get_class($mock2), \get_class($mock5));
390-
$this->assertEquals(\get_class($mock4), \get_class($mock5));
392+
$this->assertNotEquals(get_class($mock1), get_class($mock2));
393+
$this->assertNotEquals(get_class($mock1), get_class($mock3));
394+
$this->assertNotEquals(get_class($mock1), get_class($mock4));
395+
$this->assertNotEquals(get_class($mock1), get_class($mock5));
396+
$this->assertEquals(get_class($mock2), get_class($mock3));
397+
$this->assertNotEquals(get_class($mock2), get_class($mock4));
398+
$this->assertNotEquals(get_class($mock2), get_class($mock5));
399+
$this->assertEquals(get_class($mock4), get_class($mock5));
391400
}
392401

393402
public function testMockClassStoreOverrulable(): void
@@ -411,15 +420,15 @@ public function testMockClassStoreOverrulable(): void
411420
->setMockClassName('MyMockClassNameForPartialMockTestClass2')
412421
->getMock();
413422

414-
$this->assertNotEquals(\get_class($mock1), \get_class($mock2));
415-
$this->assertEquals(\get_class($mock1), \get_class($mock3));
416-
$this->assertNotEquals(\get_class($mock1), \get_class($mock4));
417-
$this->assertNotEquals(\get_class($mock2), \get_class($mock3));
418-
$this->assertNotEquals(\get_class($mock2), \get_class($mock4));
419-
$this->assertNotEquals(\get_class($mock2), \get_class($mock5));
420-
$this->assertNotEquals(\get_class($mock3), \get_class($mock4));
421-
$this->assertNotEquals(\get_class($mock3), \get_class($mock5));
422-
$this->assertNotEquals(\get_class($mock4), \get_class($mock5));
423+
$this->assertNotEquals(get_class($mock1), get_class($mock2));
424+
$this->assertEquals(get_class($mock1), get_class($mock3));
425+
$this->assertNotEquals(get_class($mock1), get_class($mock4));
426+
$this->assertNotEquals(get_class($mock2), get_class($mock3));
427+
$this->assertNotEquals(get_class($mock2), get_class($mock4));
428+
$this->assertNotEquals(get_class($mock2), get_class($mock5));
429+
$this->assertNotEquals(get_class($mock3), get_class($mock4));
430+
$this->assertNotEquals(get_class($mock3), get_class($mock5));
431+
$this->assertNotEquals(get_class($mock4), get_class($mock5));
423432
}
424433

425434
public function testGetMockWithFixedClassNameCanProduceTheSameMockTwice(): void
@@ -450,7 +459,7 @@ public function testOriginalCloneSettingConsidered(): void
450459
->disableOriginalClone()
451460
->getMock();
452461

453-
$this->assertNotEquals(\get_class($mock1), \get_class($mock2));
462+
$this->assertNotEquals(get_class($mock1), get_class($mock2));
454463
}
455464

456465
public function testGetMockForAbstractClass(): void
@@ -481,8 +490,8 @@ public function testGetMockForTrait(): void
481490
$mock->expects($this->never())
482491
->method('doSomething');
483492

484-
$parent = \get_parent_class($mock);
485-
$traits = \class_uses($parent, false);
493+
$parent = get_parent_class($mock);
494+
$traits = class_uses($parent, false);
486495

487496
$this->assertContains(AbstractTrait::class, $traits);
488497
}
@@ -571,7 +580,7 @@ public function testObjectMethodCallWithArgumentCloningEnabled(): void
571580
$this->returnCallback(
572581
static function () use (&$actualArguments): void
573582
{
574-
$actualArguments = \func_get_args();
583+
$actualArguments = func_get_args();
575584
}
576585
)
577586
);
@@ -599,7 +608,7 @@ public function testObjectMethodCallWithArgumentCloningDisabled(): void
599608
$this->returnCallback(
600609
static function () use (&$actualArguments): void
601610
{
602-
$actualArguments = \func_get_args();
611+
$actualArguments = func_get_args();
603612
}
604613
)
605614
);
@@ -887,7 +896,7 @@ public function testCreateMockFromWsdl(): void
887896

888897
$this->assertStringStartsWith(
889898
'Mock_WsdlMock_',
890-
\get_class($mock)
899+
get_class($mock)
891900
);
892901
}
893902

@@ -898,7 +907,7 @@ public function testCreateNamespacedMockFromWsdl(): void
898907

899908
$this->assertStringStartsWith(
900909
'Mock_WsdlMock_',
901-
\get_class($mock)
910+
get_class($mock)
902911
);
903912
}
904913

@@ -908,16 +917,16 @@ public function testCreateTwoMocksOfOneWsdlFile(): void
908917
$a = $this->getMockFromWsdl(TEST_FILES_PATH . 'GoogleSearch.wsdl');
909918
$b = $this->getMockFromWsdl(TEST_FILES_PATH . 'GoogleSearch.wsdl');
910919

911-
$this->assertStringStartsWith('Mock_GoogleSearch_', \get_class($a));
912-
$this->assertEquals(\get_class($a), \get_class($b));
920+
$this->assertStringStartsWith('Mock_GoogleSearch_', get_class($a));
921+
$this->assertEquals(get_class($a), get_class($b));
913922
}
914923

915924
#[RequiresPhpExtension('soap')]
916925
public function testCreateMockOfWsdlFileWithSpecialChars(): void
917926
{
918927
$mock = $this->getMockFromWsdl(TEST_FILES_PATH . 'Go ogle-Sea.rch.wsdl');
919928

920-
$this->assertStringStartsWith('Mock_GoogleSearch_', \get_class($mock));
929+
$this->assertStringStartsWith('Mock_GoogleSearch_', get_class($mock));
921930
}
922931

923932
public function testInterfaceWithStaticMethodCanBeStubbed(): void
@@ -1028,7 +1037,7 @@ public function testDisableAutomaticReturnValueGeneration(): void
10281037

10291038
public function testDisableAutomaticReturnValueGenerationWithToString(): void
10301039
{
1031-
/** @var PHPUnit\Framework\MockObject\MockObject|StringableClass $mock */
1040+
/** @var \PHPUnit\Framework\MockObject\MockObject|StringableClass $mock */
10321041
$mock = $this->getMockBuilder(StringableClass::class)
10331042
->disableAutoReturnValueGeneration()
10341043
->getMock();

0 commit comments

Comments
 (0)