Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit c8d6c60

Browse filesBrowse files
committed
merged branch sonata-project/fix_directory_resource (PR #2057)
Commits ------- 74cbf96 fix directory resource Discussion ---------- fix directory resource fix regression introduces by 0eae562#diff-15
2 parents 053b421 + 74cbf96 commit c8d6c60
Copy full SHA for c8d6c60

File tree

Expand file treeCollapse file tree

1 file changed

+4
-3
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+4
-3
lines changed

‎src/Symfony/Bundle/DoctrineAbstractBundle/DependencyInjection/AbstractDoctrineExtension.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/DoctrineAbstractBundle/DependencyInjection/AbstractDoctrineExtension.php
+4-3Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
use Symfony\Component\DependencyInjection\ContainerBuilder;
1616
use Symfony\Component\DependencyInjection\Definition;
1717
use Symfony\Component\DependencyInjection\Reference;
18-
use Symfony\Component\Config\Resource\FileResource;
18+
use Symfony\Component\Config\Resource\DirectoryResource;
1919

2020
/**
2121
* This abstract classes groups common code that Doctrine Object Manager extensions (ORM, MongoDB, CouchDB) need.
@@ -263,7 +263,8 @@ protected function detectMetadataDriver($dir, ContainerBuilder $container)
263263
while (!is_dir($resource)) {
264264
$resource = dirname($resource);
265265
}
266-
$container->addResource(new FileResource($resource));
266+
267+
$container->addResource(new DirectoryResource($resource));
267268

268269
$extension = $this->getMappingResourceExtension();
269270
if (($files = glob($dir.'/'.$configPath.'/*.'.$extension.'.xml')) && count($files)) {
@@ -275,7 +276,7 @@ protected function detectMetadataDriver($dir, ContainerBuilder $container)
275276
}
276277

277278
// add the directory itself as a resource
278-
$container->addResource(new FileResource($dir));
279+
$container->addResource(new DirectoryResource($dir));
279280

280281
if (is_dir($dir.'/'.$this->getMappingObjectDefaultName())) {
281282
return 'annotation';

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.