Fix PSalm issues

sebastianbergmann · Feb 7, 2023 · 1f7c754 · 1f7c754
1 parent 073956d
commit 1f7c754
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 20 deletions.
diff --git a/.psalm/baseline.xml b/.psalm/baseline.xml
@@ -440,6 +440,18 @@
       <code>\SebastianBergmann\CodeCoverage\CodeCoverage</code>
     </InvalidNullableReturnType>
     <MissingThrowsDocblock>
+      <code>codeCoverageGenerationFailed</code>
+      <code>codeCoverageGenerationFailed</code>
+      <code>codeCoverageGenerationFailed</code>
+      <code>codeCoverageGenerationFailed</code>
+      <code>codeCoverageGenerationFailed</code>
+      <code>codeCoverageGenerationFailed</code>
+      <code>codeCoverageGenerationSucceeded</code>
+      <code>codeCoverageGenerationSucceeded</code>
+      <code>codeCoverageGenerationSucceeded</code>
+      <code>codeCoverageGenerationSucceeded</code>
+      <code>codeCoverageGenerationSucceeded</code>
+      <code>codeCoverageGenerationSucceeded</code>
       <code>coverageCacheDirectory</code>
       <code>coverageClover</code>
       <code>coverageCobertura</code>
@@ -450,22 +462,10 @@
       <code>coverageText</code>
       <code>coverageText</code>
       <code>coverageXml</code>
-      <code>self::codeCoverageGenerationFailed($printer, $e)</code>
-      <code>self::codeCoverageGenerationFailed($printer, $e)</code>
-      <code>self::codeCoverageGenerationFailed($printer, $e)</code>
-      <code>self::codeCoverageGenerationFailed($printer, $e)</code>
-      <code>self::codeCoverageGenerationFailed($printer, $e)</code>
-      <code>self::codeCoverageGenerationFailed($printer, $e)</code>
-      <code>self::codeCoverageGenerationSucceeded($printer)</code>
-      <code>self::codeCoverageGenerationSucceeded($printer)</code>
-      <code>self::codeCoverageGenerationSucceeded($printer)</code>
-      <code>self::codeCoverageGenerationSucceeded($printer)</code>
-      <code>self::codeCoverageGenerationSucceeded($printer)</code>
-      <code>self::codeCoverageGenerationSucceeded($printer)</code>
     </MissingThrowsDocblock>
     <NullableReturnStatement>
-      <code>self::$driver</code>
-      <code>self::$instance</code>
+      <code>$this-&gt;codeCoverage</code>
+      <code>$this-&gt;driver</code>
     </NullableReturnStatement>
     <PossiblyNullReference>
       <code>start</code>

diff --git a/src/Runner/CodeCoverage.php b/src/Runner/CodeCoverage.php
@@ -43,7 +43,7 @@
  */
 final class CodeCoverage
 {
-    private static self $instance;
+    private static ?self $instance                                      = null;
     private ?\SebastianBergmann\CodeCoverage\CodeCoverage $codeCoverage = null;
     private ?Driver $driver                                             = null;
     private bool $collecting                                            = false;
@@ -52,7 +52,7 @@ final class CodeCoverage
 
     public static function instance(): self
     {
-        if (!isset(self::$instance)) {
+        if (self::$instance === null) {
             self::$instance = new self;
         }
 

diff --git a/src/TextUI/Configuration/CodeCoverageFilterRegistry.php b/src/TextUI/Configuration/CodeCoverageFilterRegistry.php
@@ -20,13 +20,13 @@
  */
 final class CodeCoverageFilterRegistry
 {
-    private static self $instance;
-    private ?Filter $filter  = null;
-    private bool $configured = false;
+    private static ?self $instance = null;
+    private ?Filter $filter        = null;
+    private bool $configured       = false;
 
     public static function instance(): self
     {
-        if (!isset(self::$instance)) {
+        if (self::$instance === null) {
             self::$instance = new self;
         }