Skip to content

Commit ae573e4

Browse files
committed
Merge branch '2.4' into 2.5
* 2.4: Update validators.eu.xlf fixed CS remove unused imports [Routing] simplify the XML schema file Unify null comparisons [EventDispatcher] don't count empty listeners [Process] Fix unit tests in sigchild environment [Process] fix signal handling in wait() [BrowserKit] refactor code and fix unquoted regex Fixed server HTTP_HOST port uri conversion [MonologBridge] fixed Console handler priorities Bring code into standard [Process] Add test to verify fix for issue #11421 [Process] Fixes issue #11421 [DependencyInjection] Pass a Scope instance instead of a scope name. Conflicts: src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php src/Symfony/Component/DependencyInjection/Tests/Dumper/GraphvizDumperTest.php src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTest.php
2 parents 9f09786 + 1eaf576 commit ae573e4

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Loader/PhpFileLoader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public function load($resource, $locale, $domain = 'messages')
3939
throw new NotFoundResourceException(sprintf('File "%s" not found.', $resource));
4040
}
4141

42-
$messages = require($resource);
42+
$messages = require $resource;
4343

4444
$catalogue = parent::load($messages, $locale, $domain);
4545
$catalogue->addResource(new FileResource($resource));

0 commit comments

Comments
 (0)