Skip to content

Commit 60539d9

Browse files
committed
Merge branch '3.4' into 4.3
* 3.4: chown and chgrp should also accept int as owner and group Fix RememberMe with null password [Validator] Fix plurals for sr_Latn (Serbian language written in latin script) validation messages [PhpUnitBridge][SymfonyTestsListenerTrait] Remove some unneeded code fix PHP const mapping keys using the inline notation Fix that no-cache requires positive validation with the origin, even for fresh responses
2 parents dac81ac + ebfd1b4 commit 60539d9

File tree

1 file changed

+0
-10
lines changed

1 file changed

+0
-10
lines changed

Legacy/SymfonyTestsListenerTrait.php

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ class SymfonyTestsListenerTrait
3737
private $expectedDeprecations = array();
3838
private $gatheredDeprecations = array();
3939
private $previousErrorHandler;
40-
private $reportUselessTests;
4140
private $error;
4241
private $runsInSeparateProcess = false;
4342

@@ -196,10 +195,6 @@ public function addSkippedTest($test, \Exception $e, $time)
196195
public function startTest($test)
197196
{
198197
if (-2 < $this->state && ($test instanceof \PHPUnit\Framework\TestCase || $test instanceof TestCase)) {
199-
if (null !== $test->getTestResultObject()) {
200-
$this->reportUselessTests = $test->getTestResultObject()->isStrictAboutTestsThatDoNotTestAnything();
201-
}
202-
203198
// This event is triggered before the test is re-run in isolation
204199
if ($this->willBeIsolated($test)) {
205200
$this->runsInSeparateProcess = tempnam(sys_get_temp_dir(), 'deprec');
@@ -255,11 +250,6 @@ public function endTest($test, $time)
255250
$className = \get_class($test);
256251
$groups = $Test::getGroups($className, $test->getName(false));
257252

258-
if (null !== $this->reportUselessTests) {
259-
$test->getTestResultObject()->beStrictAboutTestsThatDoNotTestAnything($this->reportUselessTests);
260-
$this->reportUselessTests = null;
261-
}
262-
263253
if ($errored = null !== $this->error) {
264254
$test->getTestResultObject()->addError($test, $this->error, 0);
265255
$this->error = null;

0 commit comments

Comments
 (0)