Skip to content

Commit 66c160d

Browse files
sebastianbergmannsebastianbergmann
committed
Merge branch '8.5' into 9.6
2 parents 541b7e3 + 03894bd commit 66c160d

File tree

72 files changed

+487
-301
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+487
-301
lines changed

‎.php-cs-fixer.dist.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
'explicit_string_variable' => true,
100100
'fopen_flag_order' => true,
101101
'full_opening_tag' => true,
102-
'fully_qualified_strict_types' => true,
102+
'fully_qualified_strict_types' => ['import_symbols' => true],
103103
'function_declaration' => true,
104104
'function_to_constant' => true,
105105
'global_namespace_import' => [

‎.psalm/baseline.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1009,10 +1009,10 @@
10091009
<UndefinedDocblockClass>
10101010
<code><![CDATA[$this->prophet]]></code>
10111011
<code><![CDATA[$this->prophet]]></code>
1012+
<code><![CDATA[ClassNotFoundException]]></code>
1013+
<code><![CDATA[DoubleException]]></code>
1014+
<code><![CDATA[InterfaceNotFoundException]]></code>
10121015
<code><![CDATA[Prophet]]></code>
1013-
<code><![CDATA[\Prophecy\Exception\Doubler\ClassNotFoundException]]></code>
1014-
<code><![CDATA[\Prophecy\Exception\Doubler\DoubleException]]></code>
1015-
<code><![CDATA[\Prophecy\Exception\Doubler\InterfaceNotFoundException]]></code>
10161016
</UndefinedDocblockClass>
10171017
</file>
10181018
<file src="src/Framework/TestResult.php">
@@ -1895,7 +1895,7 @@
18951895
<code><![CDATA[self::SPINNER_ICONS[$id]]]></code>
18961896
</InvalidArrayOffset>
18971897
<MissingThrowsDocblock>
1898-
<code><![CDATA[\PHPUnit\Util\Filter::getFilteredStacktrace($t)]]></code>
1898+
<code><![CDATA[Filter::getFilteredStacktrace($t)]]></code>
18991899
<code><![CDATA[stop]]></code>
19001900
</MissingThrowsDocblock>
19011901
<PossiblyInvalidArrayOffset>
@@ -1971,7 +1971,7 @@
19711971
<code><![CDATA[TestDoxPrinter]]></code>
19721972
</DeprecatedInterface>
19731973
<MissingThrowsDocblock>
1974-
<code><![CDATA[\PHPUnit\Util\Filter::getFilteredStacktrace($t)]]></code>
1974+
<code><![CDATA[Filter::getFilteredStacktrace($t)]]></code>
19751975
</MissingThrowsDocblock>
19761976
<PropertyNotSetInConstructor>
19771977
<code><![CDATA[TestDoxPrinter]]></code>

‎src/Framework/Assert/Functions.php

Lines changed: 138 additions & 137 deletions
Large diffs are not rendered by default.

‎src/Framework/Constraint/Cardinality/GreaterThan.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
*/
1010
namespace PHPUnit\Framework\Constraint;
1111

12+
use SebastianBergmann\RecursionContext\InvalidArgumentException;
13+
1214
/**
1315
* @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
1416
*/
@@ -30,7 +32,7 @@ public function __construct($value)
3032
/**
3133
* Returns a string representation of the constraint.
3234
*
33-
* @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
35+
* @throws InvalidArgumentException
3436
*/
3537
public function toString(): string
3638
{

‎src/Framework/Constraint/Cardinality/LessThan.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
*/
1010
namespace PHPUnit\Framework\Constraint;
1111

12+
use SebastianBergmann\RecursionContext\InvalidArgumentException;
13+
1214
/**
1315
* @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
1416
*/
@@ -30,7 +32,7 @@ public function __construct($value)
3032
/**
3133
* Returns a string representation of the constraint.
3234
*
33-
* @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
35+
* @throws InvalidArgumentException
3436
*/
3537
public function toString(): string
3638
{

‎src/Framework/Constraint/Constraint.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
use PHPUnit\Framework\SelfDescribing;
1616
use SebastianBergmann\Comparator\ComparisonFailure;
1717
use SebastianBergmann\Exporter\Exporter;
18+
use SebastianBergmann\RecursionContext\InvalidArgumentException;
1819

1920
/**
2021
* @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
@@ -36,8 +37,8 @@ abstract class Constraint implements Countable, SelfDescribing
3637
* a boolean value instead: true in case of success, false in case of a
3738
* failure.
3839
*
39-
* @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
4040
* @throws ExpectationFailedException
41+
* @throws InvalidArgumentException
4142
*/
4243
public function evaluate($other, string $description = '', bool $returnResult = false): ?bool
4344
{
@@ -96,8 +97,8 @@ protected function matches($other): bool
9697
* @param mixed $other evaluated value or object
9798
* @param string $description Additional information about the test
9899
*
99-
* @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
100100
* @throws ExpectationFailedException
101+
* @throws InvalidArgumentException
101102
*
102103
* @psalm-return never-return
103104
*/
@@ -148,7 +149,7 @@ protected function additionalFailureDescription($other): string
148149
*
149150
* @param mixed $other evaluated value or object
150151
*
151-
* @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
152+
* @throws InvalidArgumentException
152153
*/
153154
protected function failureDescription($other): string
154155
{

‎src/Framework/Constraint/Equality/IsEqual.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
use PHPUnit\Framework\ExpectationFailedException;
1717
use SebastianBergmann\Comparator\ComparisonFailure;
1818
use SebastianBergmann\Comparator\Factory as ComparatorFactory;
19+
use SebastianBergmann\RecursionContext\InvalidArgumentException;
1920

2021
/**
2122
* @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
@@ -103,7 +104,7 @@ public function evaluate($other, string $description = '', bool $returnResult =
103104
/**
104105
* Returns a string representation of the constraint.
105106
*
106-
* @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
107+
* @throws InvalidArgumentException
107108
*/
108109
public function toString(): string
109110
{

‎src/Framework/Constraint/Equality/IsEqualCanonicalizing.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
use PHPUnit\Framework\ExpectationFailedException;
1717
use SebastianBergmann\Comparator\ComparisonFailure;
1818
use SebastianBergmann\Comparator\Factory as ComparatorFactory;
19+
use SebastianBergmann\RecursionContext\InvalidArgumentException;
1920

2021
/**
2122
* @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
@@ -85,7 +86,7 @@ public function evaluate($other, string $description = '', bool $returnResult =
8586
/**
8687
* Returns a string representation of the constraint.
8788
*
88-
* @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
89+
* @throws InvalidArgumentException
8990
*/
9091
public function toString(): string
9192
{

‎src/Framework/Constraint/Equality/IsEqualIgnoringCase.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
use PHPUnit\Framework\ExpectationFailedException;
1717
use SebastianBergmann\Comparator\ComparisonFailure;
1818
use SebastianBergmann\Comparator\Factory as ComparatorFactory;
19+
use SebastianBergmann\RecursionContext\InvalidArgumentException;
1920

2021
/**
2122
* @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
@@ -85,7 +86,7 @@ public function evaluate($other, string $description = '', bool $returnResult =
8586
/**
8687
* Returns a string representation of the constraint.
8788
*
88-
* @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
89+
* @throws InvalidArgumentException
8990
*/
9091
public function toString(): string
9192
{

‎src/Framework/Constraint/Equality/IsEqualWithDelta.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use PHPUnit\Framework\ExpectationFailedException;
1515
use SebastianBergmann\Comparator\ComparisonFailure;
1616
use SebastianBergmann\Comparator\Factory as ComparatorFactory;
17+
use SebastianBergmann\RecursionContext\InvalidArgumentException;
1718

1819
/**
1920
* @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
@@ -87,7 +88,7 @@ public function evaluate($other, string $description = '', bool $returnResult =
8788
/**
8889
* Returns a string representation of the constraint.
8990
*
90-
* @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
91+
* @throws InvalidArgumentException
9192
*/
9293
public function toString(): string
9394
{

0 commit comments

Comments
 (0)