Skip to content

Commit cc0b8c7

Browse files
Merge branch '4.4'
* 4.4: [Debug] disable new DebugClassLoader when testing the legacy one - updated AbstractToken to compare Roles - Updated isEqualTo method to match roles as default User implements EquatableInterface - added test case - bumped symfony/security-core to 4.4 typos bis typos Fix more bad tests Fix test fixtures with deprecated method signatures. Fix 4.3 tests forward compat [Messenger] fix empty amqp body returned as false [Mailer] Added messenger to dev dependencies. [Validator] Update "suggest" section in composer.json. Fix routing cache broken when using generator_class
2 parents 249c5d6 + e226482 commit cc0b8c7

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

DeprecationErrorHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ public function shutdown()
174174
return;
175175
}
176176

177-
if (method_exists(DebugClassLoader::class, 'checkClasses')) {
177+
if (class_exists(DebugClassLoader::class, false)) {
178178
DebugClassLoader::checkClasses();
179179
}
180180
$currErrorHandler = set_error_handler('var_dump');

Legacy/SymfonyTestsListenerTrait.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,10 @@ public function addWarning($test, $e, $time)
245245

246246
public function endTest($test, $time)
247247
{
248+
if (class_exists(DebugClassLoader::class, false)) {
249+
DebugClassLoader::checkClasses();
250+
}
251+
248252
$className = \get_class($test);
249253
$groups = Test::getGroups($className, $test->getName(false));
250254

bin/simple-phpunit.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*/
1111

1212
// Please update when phpunit needs to be reinstalled with fresh deps:
13-
// Cache-Id: 2019-09-02 16:00 UTC
13+
// Cache-Id: 2019-09-06 15:00 UTC
1414

1515
error_reporting(-1);
1616

0 commit comments

Comments
 (0)