From da67f5dc348791fa94ac40ff56b938b410af0264 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Brikou=20Carr=C3=A9?= Date: Thu, 5 Dec 2013 13:44:41 +0100 Subject: [PATCH 1/3] [Finder] Added GLOB_BRACE support in Finder::in() method --- src/Symfony/Component/Finder/Finder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/Finder/Finder.php b/src/Symfony/Component/Finder/Finder.php index c075e0ff851b8..b02a71124ebbc 100644 --- a/src/Symfony/Component/Finder/Finder.php +++ b/src/Symfony/Component/Finder/Finder.php @@ -661,7 +661,7 @@ public function in($dirs) foreach ((array) $dirs as $dir) { if (is_dir($dir)) { $resolvedDirs[] = $dir; - } elseif ($glob = glob($dir, GLOB_ONLYDIR)) { + } elseif ($glob = glob($dir, GLOB_BRACE | GLOB_ONLYDIR)) { $resolvedDirs = array_merge($resolvedDirs, $glob); } else { throw new \InvalidArgumentException(sprintf('The "%s" directory does not exist.', $dir)); From 30814d384662408b59b0efeca52e8419d720489c Mon Sep 17 00:00:00 2001 From: Jakub Zalas Date: Wed, 1 Jan 2014 15:42:58 +0000 Subject: [PATCH 2/3] [Finder] Added a test case for the GLOB_BRACE in Finder:in(). --- src/Symfony/Component/Finder/Tests/FinderTest.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/Symfony/Component/Finder/Tests/FinderTest.php b/src/Symfony/Component/Finder/Tests/FinderTest.php index 86cb1d3cf992d..92eea024a5052 100644 --- a/src/Symfony/Component/Finder/Tests/FinderTest.php +++ b/src/Symfony/Component/Finder/Tests/FinderTest.php @@ -333,6 +333,17 @@ public function testInWithNonDirectoryGlob($adapter) $finder->in(__DIR__.'/Fixtures/A/a*'); } + /** + * @dataProvider getAdaptersTestData + */ + public function testInWithGlobBrace($adapter) + { + $finder = $this->buildFinder($adapter); + $finder->in(array(__DIR__.'/Fixtures/{A,copy/A}/B/C'))->getIterator(); + + $this->assertIterator($this->toAbsoluteFixtures(array('A/B/C/abc.dat', 'copy/A/B/C/abc.dat.copy')), $finder); + } + /** * @dataProvider getAdaptersTestData */ From e2698fc398279975d6f2794eafcd160e6adb8ee9 Mon Sep 17 00:00:00 2001 From: Jakub Zalas Date: Wed, 1 Jan 2014 15:45:37 +0000 Subject: [PATCH 3/3] [Finder] Included GLOB_BRACE support in the CHANGELOG. --- src/Symfony/Component/Finder/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Symfony/Component/Finder/CHANGELOG.md b/src/Symfony/Component/Finder/CHANGELOG.md index 7ad230813241b..f1dd7d526b288 100644 --- a/src/Symfony/Component/Finder/CHANGELOG.md +++ b/src/Symfony/Component/Finder/CHANGELOG.md @@ -1,6 +1,10 @@ CHANGELOG ========= +2.5.0 +----- + * added support for GLOB_BRACE in the paths passed to Finder::in() + 2.3.0 ----- pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy