Skip to content

Commit d64ea7d

Browse files
Merge branch '8.5' into 9.6
2 parents a6d3516 + 07d3458 commit d64ea7d

File tree

6 files changed

+16
-45
lines changed

6 files changed

+16
-45
lines changed

.psalm/baseline.xml

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<files psalm-version="5.12.0@f90118cdeacd0088e7215e64c0c99ceca819e176">
2+
<files psalm-version="5.13.1@086b94371304750d1c673315321a55d15fc59015">
33
<file src="src/Framework/Assert.php">
44
<ArgumentTypeCoercion>
55
<code><![CDATA[$actualElement->childNodes->item($i)]]></code>
@@ -485,11 +485,6 @@
485485
<code>DataProviderTestSuite</code>
486486
</PropertyNotSetInConstructor>
487487
</file>
488-
<file src="src/Framework/ErrorTestCase.php">
489-
<NonInvariantDocblockPropertyType>
490-
<code>$backupGlobals</code>
491-
</NonInvariantDocblockPropertyType>
492-
</file>
493488
<file src="src/Framework/Exception/Exception.php">
494489
<MissingParamType>
495490
<code>$code</code>
@@ -517,11 +512,6 @@
517512
<code>$parts[1]</code>
518513
</PossiblyUndefinedArrayOffset>
519514
</file>
520-
<file src="src/Framework/IncompleteTestCase.php">
521-
<NonInvariantDocblockPropertyType>
522-
<code>$backupGlobals</code>
523-
</NonInvariantDocblockPropertyType>
524-
</file>
525515
<file src="src/Framework/MockObject/Builder/Identity.php">
526516
<MissingReturnType>
527517
<code>id</code>
@@ -761,11 +751,6 @@
761751
<code>invoke</code>
762752
</MissingReturnType>
763753
</file>
764-
<file src="src/Framework/SkippedTestCase.php">
765-
<NonInvariantDocblockPropertyType>
766-
<code>$backupGlobals</code>
767-
</NonInvariantDocblockPropertyType>
768-
</file>
769754
<file src="src/Framework/TestBuilder.php">
770755
<MissingParamType>
771756
<code>$data</code>
@@ -800,11 +785,8 @@
800785
<code><![CDATA[$this->backupStaticAttributesBlacklist]]></code>
801786
</DeprecatedProperty>
802787
<DocblockTypeContradiction>
803-
<code><![CDATA[$this->backupStaticAttributes === null]]></code>
804788
<code><![CDATA[$this->mockObjectGenerator === null]]></code>
805789
<code><![CDATA[$this->prophet === null]]></code>
806-
<code><![CDATA[$this->runClassInSeparateProcess === null]]></code>
807-
<code><![CDATA[$this->runTestInSeparateProcess === null]]></code>
808790
</DocblockTypeContradiction>
809791
<InvalidArgument>
810792
<code>$header</code>
@@ -940,17 +922,11 @@
940922
<code>null</code>
941923
</PossiblyNullPropertyAssignmentValue>
942924
<PropertyNotSetInConstructor>
943-
<code>$backupStaticAttributes</code>
944925
<code>$mockObjectGenerator</code>
945926
<code>$outputBufferingLevel</code>
946927
<code>$prophet</code>
947928
<code>$result</code>
948-
<code>$runClassInSeparateProcess</code>
949-
<code>$runTestInSeparateProcess</code>
950929
</PropertyNotSetInConstructor>
951-
<RedundantCastGivenDocblockType>
952-
<code><![CDATA[(bool) $this->backupStaticAttributes]]></code>
953-
</RedundantCastGivenDocblockType>
954930
<RedundantCondition>
955931
<code>$this instanceof PhptTestCase</code>
956932
</RedundantCondition>
@@ -1089,11 +1065,6 @@
10891065
<code><![CDATA[null === $this->beStrictAboutChangesToGlobalState && is_bool($beStrictAboutChangesToGlobalState)]]></code>
10901066
</RedundantConditionGivenDocblockType>
10911067
</file>
1092-
<file src="src/Framework/WarningTestCase.php">
1093-
<NonInvariantDocblockPropertyType>
1094-
<code>$backupGlobals</code>
1095-
</NonInvariantDocblockPropertyType>
1096-
</file>
10971068
<file src="src/Runner/BaseTestRunner.php">
10981069
<DeprecatedClass>
10991070
<code>new StandardTestSuiteLoader</code>

src/Framework/ErrorTestCase.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@
1515
final class ErrorTestCase extends TestCase
1616
{
1717
/**
18-
* @var bool
18+
* @var ?bool
1919
*/
2020
protected $backupGlobals = false;
2121

2222
/**
23-
* @var bool
23+
* @var ?bool
2424
*/
2525
protected $backupStaticAttributes = false;
2626

2727
/**
28-
* @var bool
28+
* @var ?bool
2929
*/
3030
protected $runTestInSeparateProcess = false;
3131

src/Framework/IncompleteTestCase.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@
1515
final class IncompleteTestCase extends TestCase
1616
{
1717
/**
18-
* @var bool
18+
* @var ?bool
1919
*/
2020
protected $backupGlobals = false;
2121

2222
/**
23-
* @var bool
23+
* @var ?bool
2424
*/
2525
protected $backupStaticAttributes = false;
2626

2727
/**
28-
* @var bool
28+
* @var ?bool
2929
*/
3030
protected $runTestInSeparateProcess = false;
3131

src/Framework/SkippedTestCase.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@
1515
final class SkippedTestCase extends TestCase
1616
{
1717
/**
18-
* @var bool
18+
* @var ?bool
1919
*/
2020
protected $backupGlobals = false;
2121

2222
/**
23-
* @var bool
23+
* @var ?bool
2424
*/
2525
protected $backupStaticAttributes = false;
2626

2727
/**
28-
* @var bool
28+
* @var ?bool
2929
*/
3030
protected $runTestInSeparateProcess = false;
3131

src/Framework/TestCase.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T
139139
protected $backupGlobalsBlacklist = [];
140140

141141
/**
142-
* @var bool
142+
* @var ?bool
143143
*/
144144
protected $backupStaticAttributes;
145145

@@ -156,7 +156,7 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T
156156
protected $backupStaticAttributesBlacklist = [];
157157

158158
/**
159-
* @var bool
159+
* @var ?bool
160160
*/
161161
protected $runTestInSeparateProcess;
162162

@@ -171,7 +171,7 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T
171171
protected $providedTests = [];
172172

173173
/**
174-
* @var bool
174+
* @var ?bool
175175
*/
176176
private $runClassInSeparateProcess;
177177

src/Framework/WarningTestCase.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@
1515
final class WarningTestCase extends TestCase
1616
{
1717
/**
18-
* @var bool
18+
* @var ?bool
1919
*/
2020
protected $backupGlobals = false;
2121

2222
/**
23-
* @var bool
23+
* @var ?bool
2424
*/
2525
protected $backupStaticAttributes = false;
2626

2727
/**
28-
* @var bool
28+
* @var ?bool
2929
*/
3030
protected $runTestInSeparateProcess = false;
3131

0 commit comments

Comments
 (0)