Merge branch '6.5' into 7.1

ezpublishlegacy · May 23, 2018 · aa1862e · aa1862e
2 parents 3f836cf + 5635f85
commit aa1862e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/src/Framework/Constraint/IsEqual.php b/src/Framework/Constraint/IsEqual.php
@@ -49,11 +49,6 @@ class IsEqual extends Constraint
      */
     private $ignoreCase = false;
 
-    /**
-     * @var SebastianBergmann\Comparator\ComparisonFailure
-     */
-    private $lastFailure;
-
     public function __construct($value, float $delta = 0.0, int $maxDepth = 10, bool $canonicalize = false, bool $ignoreCase = false)
     {
         parent::__construct();

diff --git a/src/Framework/TestCase.php b/src/Framework/TestCase.php
@@ -221,7 +221,7 @@ abstract class TestCase extends Assert implements Test, SelfDescribing
     private $outputBufferingLevel;
 
     /**
-     * @var SebastianBergmann\GlobalState\Snapshot
+     * @var Snapshot
      */
     private $snapshot;
 

diff --git a/src/TextUI/TestRunner.php b/src/TextUI/TestRunner.php
@@ -48,6 +48,7 @@
 use SebastianBergmann\CodeCoverage\Report\PHP as PhpReport;
 use SebastianBergmann\CodeCoverage\Report\Text as TextReport;
 use SebastianBergmann\CodeCoverage\Report\Xml\Facade as XmlReport;
+use SebastianBergmann\Comparator\Comparator;
 use SebastianBergmann\Environment\Runtime;
 
 /**
@@ -405,7 +406,7 @@ public function doRun(Test $suite, array $arguments = [], bool $exit = true): Te
             );
 
             $codeCoverage->setUnintentionallyCoveredSubclassesWhitelist(
-                [SebastianBergmann\Comparator\Comparator::class]
+                [Comparator::class]
             );
 
             $codeCoverage->setCheckForUnintentionallyCoveredCode(