Skip to content

Commit

Permalink
Merge branch '4.1'
Browse files Browse the repository at this point in the history
* 4.1:
  [HttpKernel] fix PHP 5.4 compat
  Fix surrogate not using original request
  [Finder] Update RealIteratorTestCase
  [Routing] remove unneeded dev dep on doctrine/common
  [minor] SCA
  [Validator] Remove BOM in some xlf files
  Ensure updateTimestamp returns a boolean
  Fix #27378: Error when rendering a DateIntervalType form with exactly 0 weeks
  [HttpKernel] fix session tracking in surrogate master requests
  • Loading branch information
nicolas-grekas committed Jun 19, 2018
2 parents f724bab + bb3cf38 commit bb65c4d
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions Tests/DependencyInjection/DoctrineExtensionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -204,9 +204,7 @@ public function testLoadBasicCacheDriver(string $class, array $config, array $ex
$definition = $container->getDefinition('doctrine.orm.default_metadata_cache');
$defCalls = $definition->getMethodCalls();
$expectedCalls[] = 'setNamespace';
$actualCalls = array_map(function (array $call) {
return $call[0];
}, $defCalls);
$actualCalls = array_column($defCalls, 0);

$this->assertFalse($definition->isPublic());
$this->assertEquals("%$class%", $definition->getClass());
Expand Down

0 comments on commit bb65c4d

Please sign in to comment.