Skip to content

Commit bf94249

Browse files
Merge branch '4.3' into 4.4
* 4.3: cs fix Fix return statements [TwigBridge] add missing dep Add false type to ChoiceListFactoryInterface::createView $label argument Update UPGRADE guide of 4.3 for EventDispatcher [SecurityBundle] display the correct class name on the deprecated notice
2 parents 330af5f + 5bb2308 commit bf94249

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Loader/AnnotationFileLoader.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public function __construct(FileLocatorInterface $locator, AnnotationClassLoader
4646
* @param string $file A PHP file path
4747
* @param string|null $type The resource type
4848
*
49-
* @return RouteCollection A RouteCollection instance
49+
* @return RouteCollection|null A RouteCollection instance
5050
*
5151
* @throws \InvalidArgumentException When the file does not exist or its routes cannot be parsed
5252
*/
@@ -58,7 +58,7 @@ public function load($file, $type = null)
5858
if ($class = $this->findClass($path)) {
5959
$refl = new \ReflectionClass($class);
6060
if ($refl->isAbstract()) {
61-
return;
61+
return null;
6262
}
6363

6464
$collection->addResource(new FileResource($path));

0 commit comments

Comments
 (0)