Merge branch '8.5' into 9.6

sebastianbergmann · Jul 10, 2023 · d64ea7d · d64ea7d
2 parents a6d3516 + 07d3458
commit d64ea7d
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 45 deletions.
diff --git a/.psalm/baseline.xml b/.psalm/baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.12.0@f90118cdeacd0088e7215e64c0c99ceca819e176">
+<files psalm-version="5.13.1@086b94371304750d1c673315321a55d15fc59015">
   <file src="src/Framework/Assert.php">
     <ArgumentTypeCoercion>
       <code><![CDATA[$actualElement->childNodes->item($i)]]></code>
@@ -485,11 +485,6 @@
       <code>DataProviderTestSuite</code>
     </PropertyNotSetInConstructor>
   </file>
-  <file src="src/Framework/ErrorTestCase.php">
-    <NonInvariantDocblockPropertyType>
-      <code>$backupGlobals</code>
-    </NonInvariantDocblockPropertyType>
-  </file>
   <file src="src/Framework/Exception/Exception.php">
     <MissingParamType>
       <code>$code</code>
@@ -517,11 +512,6 @@
       <code>$parts[1]</code>
     </PossiblyUndefinedArrayOffset>
   </file>
-  <file src="src/Framework/IncompleteTestCase.php">
-    <NonInvariantDocblockPropertyType>
-      <code>$backupGlobals</code>
-    </NonInvariantDocblockPropertyType>
-  </file>
   <file src="src/Framework/MockObject/Builder/Identity.php">
     <MissingReturnType>
       <code>id</code>
@@ -761,11 +751,6 @@
       <code>invoke</code>
     </MissingReturnType>
   </file>
-  <file src="src/Framework/SkippedTestCase.php">
-    <NonInvariantDocblockPropertyType>
-      <code>$backupGlobals</code>
-    </NonInvariantDocblockPropertyType>
-  </file>
   <file src="src/Framework/TestBuilder.php">
     <MissingParamType>
       <code>$data</code>
@@ -800,11 +785,8 @@
       <code><![CDATA[$this->backupStaticAttributesBlacklist]]></code>
     </DeprecatedProperty>
     <DocblockTypeContradiction>
-      <code><![CDATA[$this->backupStaticAttributes === null]]></code>
       <code><![CDATA[$this->mockObjectGenerator === null]]></code>
       <code><![CDATA[$this->prophet === null]]></code>
-      <code><![CDATA[$this->runClassInSeparateProcess === null]]></code>
-      <code><![CDATA[$this->runTestInSeparateProcess === null]]></code>
     </DocblockTypeContradiction>
     <InvalidArgument>
       <code>$header</code>
@@ -940,17 +922,11 @@
       <code>null</code>
     </PossiblyNullPropertyAssignmentValue>
     <PropertyNotSetInConstructor>
-      <code>$backupStaticAttributes</code>
       <code>$mockObjectGenerator</code>
       <code>$outputBufferingLevel</code>
       <code>$prophet</code>
       <code>$result</code>
-      <code>$runClassInSeparateProcess</code>
-      <code>$runTestInSeparateProcess</code>
     </PropertyNotSetInConstructor>
-    <RedundantCastGivenDocblockType>
-      <code><![CDATA[(bool) $this->backupStaticAttributes]]></code>
-    </RedundantCastGivenDocblockType>
     <RedundantCondition>
       <code>$this instanceof PhptTestCase</code>
     </RedundantCondition>
@@ -1089,11 +1065,6 @@
       <code><![CDATA[null === $this->beStrictAboutChangesToGlobalState && is_bool($beStrictAboutChangesToGlobalState)]]></code>
     </RedundantConditionGivenDocblockType>
   </file>
-  <file src="src/Framework/WarningTestCase.php">
-    <NonInvariantDocblockPropertyType>
-      <code>$backupGlobals</code>
-    </NonInvariantDocblockPropertyType>
-  </file>
   <file src="src/Runner/BaseTestRunner.php">
     <DeprecatedClass>
       <code>new StandardTestSuiteLoader</code>

diff --git a/src/Framework/ErrorTestCase.php b/src/Framework/ErrorTestCase.php
@@ -15,17 +15,17 @@
 final class ErrorTestCase extends TestCase
 {
     /**
-     * @var bool
+     * @var ?bool
      */
     protected $backupGlobals = false;
 
     /**
-     * @var bool
+     * @var ?bool
      */
     protected $backupStaticAttributes = false;
 
     /**
-     * @var bool
+     * @var ?bool
      */
     protected $runTestInSeparateProcess = false;
 

diff --git a/src/Framework/IncompleteTestCase.php b/src/Framework/IncompleteTestCase.php
@@ -15,17 +15,17 @@
 final class IncompleteTestCase extends TestCase
 {
     /**
-     * @var bool
+     * @var ?bool
      */
     protected $backupGlobals = false;
 
     /**
-     * @var bool
+     * @var ?bool
      */
     protected $backupStaticAttributes = false;
 
     /**
-     * @var bool
+     * @var ?bool
      */
     protected $runTestInSeparateProcess = false;
 

diff --git a/src/Framework/SkippedTestCase.php b/src/Framework/SkippedTestCase.php
@@ -15,17 +15,17 @@
 final class SkippedTestCase extends TestCase
 {
     /**
-     * @var bool
+     * @var ?bool
      */
     protected $backupGlobals = false;
 
     /**
-     * @var bool
+     * @var ?bool
      */
     protected $backupStaticAttributes = false;
 
     /**
-     * @var bool
+     * @var ?bool
      */
     protected $runTestInSeparateProcess = false;
 

diff --git a/src/Framework/TestCase.php b/src/Framework/TestCase.php
@@ -139,7 +139,7 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T
     protected $backupGlobalsBlacklist = [];
 
     /**
-     * @var bool
+     * @var ?bool
      */
     protected $backupStaticAttributes;
 
@@ -156,7 +156,7 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T
     protected $backupStaticAttributesBlacklist = [];
 
     /**
-     * @var bool
+     * @var ?bool
      */
     protected $runTestInSeparateProcess;
 
@@ -171,7 +171,7 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T
     protected $providedTests = [];
 
     /**
-     * @var bool
+     * @var ?bool
      */
     private $runClassInSeparateProcess;
 

diff --git a/src/Framework/WarningTestCase.php b/src/Framework/WarningTestCase.php
@@ -15,17 +15,17 @@
 final class WarningTestCase extends TestCase
 {
     /**
-     * @var bool
+     * @var ?bool
      */
     protected $backupGlobals = false;
 
     /**
-     * @var bool
+     * @var ?bool
      */
     protected $backupStaticAttributes = false;
 
     /**
-     * @var bool
+     * @var ?bool
      */
     protected $runTestInSeparateProcess = false;