Skip to content

Commit 60e02df

Browse files
sebastianbergmannsebastianbergmann
committed
Merge branch '8.5' into 9.6
2 parents 37dcc92 + 00300f1 commit 60e02df

File tree

14 files changed

+25
-25
lines changed

14 files changed

+25
-25
lines changed

‎.phive/phars.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<phive xmlns="https://phar.io/phive">
33
<phar name="phpab" version="^1.25" installed="1.29.0" location="./tools/phpab" copy="true"/>
4-
<phar name="php-cs-fixer" version="^3.0" installed="3.41.1" location="./tools/php-cs-fixer" copy="true"/>
4+
<phar name="php-cs-fixer" version="^3.0" installed="3.42.0" location="./tools/php-cs-fixer" copy="true"/>
55
<phar name="psalm" version="^5.0" installed="5.18.0" location="./tools/psalm" copy="true"/>
66
<phar name="humbug/php-scoper" version="^0.18" installed="0.18.10" location="./tools/php-scoper" copy="true"/>
77
<phar name="composer" version="^2.0.3" installed="2.6.6" location="./tools/composer" copy="true"/>

‎src/Framework/MockObject/Generator.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,11 +141,11 @@ public function __clone()
141141
*
142142
* @param null|array $methods
143143
*
144-
* @throws \PHPUnit\Framework\InvalidArgumentException
145144
* @throws ClassAlreadyExistsException
146145
* @throws ClassIsFinalException
147146
* @throws ClassIsReadonlyException
148147
* @throws DuplicateMethodException
148+
* @throws InvalidArgumentException
149149
* @throws InvalidMethodNameException
150150
* @throws OriginalConstructorInvocationRequiredException
151151
* @throws ReflectionException
@@ -295,11 +295,11 @@ public function getMockForInterfaces(array $interfaces, bool $callAutoload = tru
295295
*
296296
* @psalm-return MockObject&RealInstanceType
297297
*
298-
* @throws \PHPUnit\Framework\InvalidArgumentException
299298
* @throws ClassAlreadyExistsException
300299
* @throws ClassIsFinalException
301300
* @throws ClassIsReadonlyException
302301
* @throws DuplicateMethodException
302+
* @throws InvalidArgumentException
303303
* @throws InvalidMethodNameException
304304
* @throws OriginalConstructorInvocationRequiredException
305305
* @throws ReflectionException
@@ -357,11 +357,11 @@ interface_exists($originalClassName, $callAutoload)) {
357357
*
358358
* @psalm-param trait-string $traitName
359359
*
360-
* @throws \PHPUnit\Framework\InvalidArgumentException
361360
* @throws ClassAlreadyExistsException
362361
* @throws ClassIsFinalException
363362
* @throws ClassIsReadonlyException
364363
* @throws DuplicateMethodException
364+
* @throws InvalidArgumentException
365365
* @throws InvalidMethodNameException
366366
* @throws OriginalConstructorInvocationRequiredException
367367
* @throws ReflectionException

‎src/Framework/MockObject/Rule/ConsecutiveParameters.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ public function apply(BaseInvocation $invocation): void
8080
}
8181

8282
/**
83-
* @throws \PHPUnit\Framework\ExpectationFailedException
8483
* @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
84+
* @throws ExpectationFailedException
8585
*/
8686
public function verify(): void
8787
{

‎src/Framework/TestCase.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T
313313
private $snapshot;
314314

315315
/**
316-
* @var \Prophecy\Prophet
316+
* @var Prophet
317317
*/
318318
private $prophet;
319319

@@ -2185,8 +2185,8 @@ private function handleDependencies(): bool
21852185
}
21862186

21872187
if (isset($passed[$dependencyTarget])) {
2188-
if ($passed[$dependencyTarget]['size'] != \PHPUnit\Util\Test::UNKNOWN &&
2189-
$this->getSize() != \PHPUnit\Util\Test::UNKNOWN &&
2188+
if ($passed[$dependencyTarget]['size'] != TestUtil::UNKNOWN &&
2189+
$this->getSize() != TestUtil::UNKNOWN &&
21902190
$passed[$dependencyTarget]['size'] > $this->getSize()) {
21912191
$this->result->addError(
21922192
$this,

‎src/Framework/TestSuite.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -593,10 +593,10 @@ public function setGroupDetails(array $groups): void
593593
/**
594594
* Runs the tests and collects their result in a TestResult.
595595
*
596-
* @throws \PHPUnit\Framework\CodeCoverageException
597596
* @throws \SebastianBergmann\CodeCoverage\InvalidArgumentException
598597
* @throws \SebastianBergmann\CodeCoverage\UnintentionallyCoveredCodeException
599598
* @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
599+
* @throws CodeCoverageException
600600
* @throws Warning
601601
*/
602602
public function run(TestResult $result = null): TestResult

‎src/TextUI/Command.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -689,7 +689,7 @@ private function handleListGroups(TestSuite $suite, bool $exit): int
689689

690690
/**
691691
* @throws \PHPUnit\Framework\Exception
692-
* @throws \PHPUnit\TextUI\XmlConfiguration\Exception
692+
* @throws XmlConfiguration\Exception
693693
*/
694694
private function handleListSuites(bool $exit): int
695695
{

‎src/TextUI/TestRunner.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ public function __construct(TestSuiteLoader $loader = null, CodeCoverageFilter $
135135

136136
/**
137137
* @throws \PHPUnit\Runner\Exception
138-
* @throws \PHPUnit\TextUI\XmlConfiguration\Exception
139138
* @throws Exception
139+
* @throws XmlConfiguration\Exception
140140
*/
141141
public function run(TestSuite $suite, array $arguments = [], array $warnings = [], bool $exit = true): TestResult
142142
{
@@ -864,8 +864,8 @@ private function write(string $buffer): void
864864
}
865865

866866
/**
867-
* @throws \PHPUnit\TextUI\XmlConfiguration\Exception
868867
* @throws Exception
868+
* @throws XmlConfiguration\Exception
869869
*/
870870
private function handleConfiguration(array &$arguments): void
871871
{

‎src/Util/Json.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ final class Json
2929
/**
3030
* Prettify json string.
3131
*
32-
* @throws \PHPUnit\Framework\Exception
32+
* @throws Exception
3333
*/
3434
public static function prettify(string $json): string
3535
{

‎src/Util/TestDox/XmlResultPrinter.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ static function ($group)
215215
$testNode->appendChild($testDoubleNode);
216216
}
217217

218-
$inlineAnnotations = \PHPUnit\Util\Test::getInlineAnnotations(get_class($test), $test->getName(false));
218+
$inlineAnnotations = TestUtil::getInlineAnnotations(get_class($test), $test->getName(false));
219219

220220
if (isset($inlineAnnotations['given'], $inlineAnnotations['when'], $inlineAnnotations['then'])) {
221221
$testNode->setAttribute('given', $inlineAnnotations['given']['value']);

‎tests/end-to-end/regression/2137/Issue2137Test.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ class Issue2137Test extends PHPUnit\Framework\TestCase
1212
/**
1313
* @dataProvider provideBrandService
1414
*
15-
* @throws \PHPUnit\Framework\ExpectationFailedException
16-
* @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
1715
* @throws Exception
16+
* @throws PHPUnit\Framework\ExpectationFailedException
17+
* @throws SebastianBergmann\RecursionContext\InvalidArgumentException
1818
*/
1919
public function testBrandService($provided, $expected): void
2020
{
@@ -32,9 +32,9 @@ public function provideBrandService()
3232
/**
3333
* @dataProvider provideBrandService
3434
*
35-
* @throws \PHPUnit\Framework\ExpectationFailedException
36-
* @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
3735
* @throws Exception
36+
* @throws PHPUnit\Framework\ExpectationFailedException
37+
* @throws SebastianBergmann\RecursionContext\InvalidArgumentException
3838
*/
3939
public function testSomethingElseInvalid($provided, $expected): void
4040
{

0 commit comments

Comments
 (0)