Improve type declarations

Author: sebastianbergmann

.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>
@@ -679,11 +679,6 @@
       <code><![CDATA[$t->getPrevious()]]></code>
     </PossiblyNullArgument>
   </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>
@@ -969,11 +964,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>
@@ -1003,12 +993,9 @@
       <code>setMethods</code>
     </DeprecatedMethod>
     <DocblockTypeContradiction>
-      <code><![CDATA[$this->backupStaticAttributes === null]]></code>
       <code><![CDATA[$this->mockObjectGenerator === null]]></code>
       <code><![CDATA[$this->name === null]]></code>
       <code><![CDATA[$this->prophet === null]]></code>
-      <code><![CDATA[$this->runClassInSeparateProcess === null]]></code>
-      <code><![CDATA[$this->runTestInSeparateProcess === null]]></code>
       <code><![CDATA['']]></code>
       <code><![CDATA[is_int($this->dataName)]]></code>
     </DocblockTypeContradiction>
@@ -1196,20 +1183,14 @@
       <code>$categories</code>
     </PossiblyUndefinedVariable>
     <PropertyNotSetInConstructor>
-      <code>$backupStaticAttributes</code>
       <code>$mockObjectGenerator</code>
       <code>$outputBufferingLevel</code>
       <code>$outputExpectedRegex</code>
       <code>$outputExpectedString</code>
       <code>$prophet</code>
       <code>$result</code>
-      <code>$runClassInSeparateProcess</code>
-      <code>$runTestInSeparateProcess</code>
       <code>$snapshot</code>
     </PropertyNotSetInConstructor>
-    <RedundantCastGivenDocblockType>
-      <code><![CDATA[(bool) $this->backupStaticAttributes]]></code>
-    </RedundantCastGivenDocblockType>
     <RedundantCondition>
       <code>$this instanceof PhptTestCase</code>
     </RedundantCondition>
@@ -1400,11 +1381,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/Filter/Factory.php">
     <MissingParamType>
       <code>$args</code>

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;
 

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;
 

src/Framework/TestCase.php

@@ -127,7 +127,7 @@ abstract class TestCase extends Assert implements SelfDescribing, Test
     protected $backupGlobalsBlacklist = [];
 
     /**
-     * @var bool
+     * @var ?bool
      */
     protected $backupStaticAttributes;
 
@@ -137,7 +137,7 @@ abstract class TestCase extends Assert implements SelfDescribing, Test
     protected $backupStaticAttributesBlacklist = [];
 
     /**
-     * @var bool
+     * @var ?bool
      */
     protected $runTestInSeparateProcess;
 
@@ -147,7 +147,7 @@ abstract class TestCase extends Assert implements SelfDescribing, Test
     protected $preserveGlobalState = true;
 
     /**
-     * @var bool
+     * @var ?bool
      */
     private $runClassInSeparateProcess;
 
@@ -167,17 +167,17 @@ abstract class TestCase extends Assert implements SelfDescribing, Test
     private $dataName;
 
     /**
-     * @var null|string
+     * @var ?string
      */
     private $expectedException;
 
     /**
-     * @var null|string
+     * @var ?string
      */
     private $expectedExceptionMessage;
 
     /**
-     * @var null|string
+     * @var ?string
      */
     private $expectedExceptionMessageRegExp;
 
@@ -1961,7 +1961,7 @@ protected function getObjectForTrait($traitName, array $arguments = [], $traitCl
     }
 
     /**
-     * @param null|string $classOrInterface
+     * @param ?string $classOrInterface
      *
      * @throws \Prophecy\Exception\Doubler\ClassNotFoundException
      * @throws \Prophecy\Exception\Doubler\DoubleException

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;