Commitc5b9c1a

committed

[Config] Allow empty globs

1 parentadc39a2 commitc5b9c1aCopy full SHA for c5b9c1a

File tree

+27

-6

lines changed

src/Symfony/Component/Config
- Loader
  - FileLoader.php
- Tests/Loader
  - FileLoaderTest.php

+27

-6

lines changed

Lines changed: 11 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -83,13 +83,18 @@ public function getLocator()`
`83`	`83`	`*/`
`84`	`84`	`publicfunctionimport($resource,$type =null,$ignoreErrors =false,$sourceResource =null)`
`85`	`85`	`{`
`86`		`-if (is_string($resource) &&false !==strpbrk($resource,'*?{[')) {`
	`86`	`+if (is_string($resource) &&strlen($resource) !==$i =strcspn($resource,'*?{[')) {`
`87`	`87`	`$ret =array();`
`88`		`-foreach ($this->glob($resource,false,$_,true)as$path =>$info) {`
`89`		`-$ret[] =$this->doImport($path,$type,$ignoreErrors,$sourceResource);`
	`88`	`+$isSubpath =0 !==$i &&false !==strpos(substr($resource,0,$i),'/');`
	`89`	`+foreach ($this->glob($resource,false,$_,$ignoreErrors \|\| !$isSubpath)as$path =>$info) {`
	`90`	`+if (null !==$res =$this->doImport($path,$type,$ignoreErrors,$sourceResource)) {`
	`91`	`+$ret[] =$res;`
	`92`	`+ }`
	`93`	`+$isSubpath =true;`
`90`	`94`	`}`
`91`		`-if ($ret) {`
`92`		`-returncount($ret) >1 ?$ret :$ret[0];`
	`95`	`+`
	`96`	`+if ($isSubpath) {`
	`97`	`+returnisset($ret[1]) ?$ret : (isset($ret[0]) ?$ret[0] :null);`
`93`	`98`	`}`
`94`	`99`	`}`
`95`	`100`
`@@ -104,7 +109,7 @@ protected function glob($pattern, $recursive, &$resource = null, $ignoreErrors =`
`104`	`109`	`if (strlen($pattern) ===$i =strcspn($pattern,'*?{[')) {`
`105`	`110`	`$prefix =$pattern;`
`106`	`111`	`$pattern ='';`
`107`		`- }elseif (0 ===$i) {`
	`112`	`+ }elseif (0 ===$i \|\|false ===strpos(substr($pattern,0,$i),'/')) {`
`108`	`113`	`$prefix ='.';`
`109`	`114`	`$pattern ='/'.$pattern;`
`110`	`115`	`}else {`

Lines changed: 16 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`namespaceSymfony\Component\Config\Tests\Loader;`
`13`	`13`
`14`	`14`	`usePHPUnit\Framework\TestCase;`
	`15`	`+useSymfony\Component\Config\FileLocator;`
`15`	`16`	`useSymfony\Component\Config\Loader\FileLoader;`
`16`	`17`	`useSymfony\Component\Config\Loader\LoaderResolver;`
`17`	`18`
`@@ -74,6 +75,21 @@ public function testImportWithGlobLikeResource()`
`74`	`75`
`75`	`76`	`$this->assertSame('[foo]',$loader->import('[foo]'));`
`76`	`77`	`}`
	`78`	`+`
	`79`	`+publicfunctiontestImportWithNoGlobMatch()`
	`80`	`+ {`
	`81`	`+$locatorMock =$this->getMockBuilder('Symfony\Component\Config\FileLocatorInterface')->getMock();`
	`82`	`+$loader =newTestFileLoader($locatorMock);`
	`83`	`+`
	`84`	`+$this->assertNull($loader->import('./*.abc'));`
	`85`	`+ }`
	`86`	`+`
	`87`	`+publicfunctiontestImportWithSimpleGlob()`
	`88`	`+ {`
	`89`	`+$loader =newTestFileLoader(newFileLocator(__DIR__));`
	`90`	`+`
	`91`	`+$this->assertSame(__FILE__,strtr($loader->import('FileLoaderTest.*'),'/',DIRECTORY_SEPARATOR));`
	`92`	`+ }`
`77`	`93`	`}`
`78`	`94`
`79`	`95`	`class TestFileLoaderextends FileLoader`

Comments

(0)