Skip to content

Commit

Permalink
This commit reverts #2678
Browse files Browse the repository at this point in the history
PHPUnit 6.2-ge79069e by Sebastian Bergmann and contributors.

Runtime:       PHP 7.1.5 with Xdebug 2.5.4
Configuration: /usr/local/src/phpunit/phpunit.xml

.............................................................   61 / 1543 (  3%)
.............................................................  122 / 1543 (  7%)
.............................................................  183 / 1543 ( 11%)
.............................................................  244 / 1543 ( 15%)
.............................................................  305 / 1543 ( 19%)
.............................................................  366 / 1543 ( 23%)
.............................................................  427 / 1543 ( 27%)
.............................................................  488 / 1543 ( 31%)
.............................................................  549 / 1543 ( 35%)
.............................................................  610 / 1543 ( 39%)
.............................................................  671 / 1543 ( 43%)
.............................................................  732 / 1543 ( 47%)
.............................................................  793 / 1543 ( 51%)
.............................................................  854 / 1543 ( 55%)
.............................................................  915 / 1543 ( 59%)
.............................................................  976 / 1543 ( 63%)
............................................................. 1037 / 1543 ( 67%)
............................................................. 1098 / 1543 ( 71%)
............................................................. 1159 / 1543 ( 75%)
............................................................. 1220 / 1543 ( 79%)
............................................................. 1281 / 1543 ( 83%)
............................................................. 1342 / 1543 ( 86%)
............................................................. 1403 / 1543 ( 90%)
............................................................. 1464 / 1543 ( 94%)
........................................F.................... 1525 / 1543 ( 98%)
..................                                            1543 / 1543 (100%)

Time: 8.11 seconds, Memory: 14.00MB

There was 1 failure:

1) /usr/local/src/phpunit/tests/Regression/GitHub/1351.phpt
Failed asserting that string matches format description.
--- Expected
+++ Actual
@@ @@
 PHPUnit 6.2-ge79069e by Sebastian Bergmann and contributors.

-F.E.E                                                               5 / 5 (100%)
+F.EFE                                                               5 / 5 (100%)
@@ @@

+/usr/local/src/phpunit/tests/Regression/GitHub/1351/Issue1351Test.php:32
+
 Caused by
 LogicException: Expected exception.
-Caused by

+/usr/local/src/phpunit/tests/Regression/GitHub/1351/Issue1351Test.php:30
+
 2) Issue1351Test::testPhpCoreLanguageException
 PDOException: SQLSTATE[HY000]: General error: 1 no such table: php_wtf

+/usr/local/src/phpunit/tests/Regression/GitHub/1351/Issue1351Test.php:48

 --

-There was 1 failure:
+There were 2 failures:

 1) Issue1351Test::testFailurePre
 Expected failure.
-There were 2 failures:
+Failed asserting that true is false.
+
+/usr/local/src/phpunit/tests/Regression/GitHub/1351/Issue1351Test.php:14
+
+2) Issue1351Test::testExceptionPost
+ChildProcessClass1351 is not loaded.
+Failed asserting that true is false.
+
+/usr/local/src/phpunit/tests/Regression/GitHub/1351/Issue1351Test.php:39
+
 ERRORS!
-Tests: 5, Assertions: 5, Errors: 2, Failures: 1.
+Tests: 5, Assertions: 5, Errors: 2, Failures: 2.

/usr/local/src/phpunit/src/Framework/Constraint/Constraint.php:117
/usr/local/src/phpunit/src/Framework/Constraint/Constraint.php:62
/usr/local/src/phpunit/src/Framework/Assert.php:2116
/usr/local/src/phpunit/src/Framework/Assert.php:1768
/usr/local/src/phpunit/src/Runner/PhptTestCase.php:126
/usr/local/src/phpunit/src/Runner/PhptTestCase.php:204
/usr/local/src/phpunit/src/Framework/TestSuite.php:746
/usr/local/src/phpunit/src/Framework/TestSuite.php:746
/usr/local/src/phpunit/src/TextUI/TestRunner.php:541
/usr/local/src/phpunit/src/TextUI/Command.php:210
/usr/local/src/phpunit/src/TextUI/Command.php:141

FAILURES!
Tests: 1543, Assertions: 2796, Failures: 1.
  • Loading branch information
sebastianbergmann committed Jun 1, 2017
1 parent e79069e commit 29d9acd
Showing 1 changed file with 0 additions and 14 deletions.
14 changes: 0 additions & 14 deletions src/Framework/ExceptionWrapper.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,6 @@ class ExceptionWrapper extends Exception
* @var ExceptionWrapper|null
*/
protected $previous;

/**
* @var Throwable
*/
protected $originalException;

/**
* @param Throwable $t
Expand All @@ -50,7 +45,6 @@ public function __construct(Throwable $t)
$this->className = \get_class($t);
$this->file = $t->getFile();
$this->line = $t->getLine();
$this->originalException = $t;

$this->serializableTrace = $t->getTrace();

Expand All @@ -70,14 +64,6 @@ public function getClassName()
{
return $this->className;
}

/**
* @return Throwable
*/
public function getOriginalException()
{
return $this->originalException;
}

/**
* @return ExceptionWrapper
Expand Down

0 comments on commit 29d9acd

Please sign in to comment.