Skip to content

Commit 2eb4122

Browse files
sebastianbergmannsebastianbergmann
committed
Replace phpunit/File_Iterator with symfony/Finder.
1 parent 7e1e357 commit 2eb4122

File tree

6 files changed

+77
-39
lines changed

6 files changed

+77
-39
lines changed

‎ChangeLog.markdown

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ PHP_CodeCoverage 1.2.0
88

99
* The new `@coversDefaultClass` annotation enables short `@covers` annotations when working with long class names or namespaces.
1010
* When `processUncoveredFilesFromWhitelist=FALSE` is set then files that are whitelisted and uncovered are now included in the code coverage but with all lines, including those that are not executable, counted as not executed.
11+
* The [Finder](http://symfony.com/doc/2.0/components/finder.html) component of the Symfony project is now used to find files.
1112
* PHP_CodeCoverage 1.2 is only supported on PHP 5.3.3 (or later) and PHP 5.4.0 (or later) is highly recommended.

‎PHP/CodeCoverage/Autoload.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,13 @@
4343
* @since File available since Release 1.1.0
4444
*/
4545

46-
require_once 'File/Iterator/Autoload.php';
46+
require_once 'Symfony/Component/Finder/Finder.php';
47+
require_once 'Symfony/Component/Finder/Glob.php';
48+
require_once 'Symfony/Component/Finder/Iterator/FileTypeFilterIterator.php';
49+
require_once 'Symfony/Component/Finder/Iterator/FilenameFilterIterator.php';
50+
require_once 'Symfony/Component/Finder/Iterator/RecursiveDirectoryIterator.php';
51+
require_once 'Symfony/Component/Finder/Iterator/ExcludeDirectoryFilterIterator.php';
52+
require_once 'Symfony/Component/Finder/SplFileInfo.php';
4753
require_once 'PHP/Token/Stream/Autoload.php';
4854
require_once 'Text/Template/Autoload.php';
4955

‎PHP/CodeCoverage/Autoload.php.in

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,13 @@
4343
* @since File available since Release 1.1.0
4444
*/
4545

46-
require_once 'File/Iterator/Autoload.php';
46+
require_once 'Symfony/Component/Finder/Finder.php';
47+
require_once 'Symfony/Component/Finder/Glob.php';
48+
require_once 'Symfony/Component/Finder/Iterator/FileTypeFilterIterator.php';
49+
require_once 'Symfony/Component/Finder/Iterator/FilenameFilterIterator.php';
50+
require_once 'Symfony/Component/Finder/Iterator/RecursiveDirectoryIterator.php';
51+
require_once 'Symfony/Component/Finder/Iterator/ExcludeDirectoryFilterIterator.php';
52+
require_once 'Symfony/Component/Finder/SplFileInfo.php';
4753
require_once 'PHP/Token/Stream/Autoload.php';
4854
require_once 'Text/Template/Autoload.php';
4955

‎PHP/CodeCoverage/Filter.php

Lines changed: 33 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,7 @@ public function __construct()
123123
*/
124124
public function addDirectoryToBlacklist($directory, $suffix = '.php', $prefix = '')
125125
{
126-
$facade = new File_Iterator_Facade;
127-
$files = $facade->getFilesAsArray(
128-
$directory, $suffix, $prefix
129-
);
130-
131-
foreach ($files as $file) {
126+
foreach ($this->findFiles($directory, $prefix, $suffix) as $file) {
132127
$this->addFileToBlacklist($file);
133128
}
134129
}
@@ -164,12 +159,7 @@ public function addFilesToBlacklist(array $files)
164159
*/
165160
public function removeDirectoryFromBlacklist($directory, $suffix = '.php', $prefix = '')
166161
{
167-
$facade = new File_Iterator_Facade;
168-
$files = $facade->getFilesAsArray(
169-
$directory, $suffix, $prefix
170-
);
171-
172-
foreach ($files as $file) {
162+
foreach ($this->findFiles($directory, $prefix, $suffix) as $file) {
173163
$this->removeFileFromBlacklist($file);
174164
}
175165
}
@@ -197,12 +187,7 @@ public function removeFileFromBlacklist($filename)
197187
*/
198188
public function addDirectoryToWhitelist($directory, $suffix = '.php', $prefix = '')
199189
{
200-
$facade = new File_Iterator_Facade;
201-
$files = $facade->getFilesAsArray(
202-
$directory, $suffix, $prefix
203-
);
204-
205-
foreach ($files as $file) {
190+
foreach ($this->findFiles($directory, $prefix, $suffix) as $file) {
206191
$this->addFileToWhitelist($file);
207192
}
208193
}
@@ -241,12 +226,7 @@ public function addFilesToWhitelist(array $files)
241226
*/
242227
public function removeDirectoryFromWhitelist($directory, $suffix = '.php', $prefix = '')
243228
{
244-
$facade = new File_Iterator_Facade;
245-
$files = $facade->getFilesAsArray(
246-
$directory, $suffix, $prefix
247-
);
248-
249-
foreach ($files as $file) {
229+
foreach ($this->findFiles($directory, $prefix, $suffix) as $file) {
250230
$this->removeFileFromWhitelist($file);
251231
}
252232
}
@@ -341,4 +321,33 @@ public function hasWhitelist()
341321
{
342322
return !empty($this->whitelistedFiles);
343323
}
324+
325+
/**
326+
* @param string $directory
327+
* @param string $prefix
328+
* @param string $suffix
329+
* @return array
330+
* @since Method available since Release 1.2.0
331+
*/
332+
protected function findFiles($directory, $prefix, $suffix)
333+
{
334+
$finder = new Symfony\Component\Finder\Finder;
335+
$finder->in($directory);
336+
337+
if (!empty($prefix)) {
338+
$finder->name($prefix . '*');
339+
}
340+
341+
if (!empty($suffix)) {
342+
$finder->name('*' . $suffix);
343+
}
344+
345+
$files = array();
346+
347+
foreach ($finder as $file) {
348+
$files[] = $file->getRealpath();
349+
}
350+
351+
return $files;
352+
}
344353
}

‎Tests/PHP/CodeCoverage/FilterTest.php

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -157,13 +157,10 @@ public function testAddingADirectoryToTheBlacklistWorks()
157157
*/
158158
public function testAddingFilesToTheBlacklistWorks()
159159
{
160-
$facade = new File_Iterator_Facade;
161-
$files = $facade->getFilesAsArray(
162-
TEST_FILES_PATH, $suffixes = '.php'
160+
$this->filter->addFilesToBlacklist(
161+
$this->findFiles(TEST_FILES_PATH, '', '.php')
163162
);
164163

165-
$this->filter->addFilesToBlacklist($files);
166-
167164
$blacklist = $this->filter->getBlacklist();
168165
sort($blacklist);
169166

@@ -229,13 +226,10 @@ public function testAddingADirectoryToTheWhitelistWorks()
229226
*/
230227
public function testAddingFilesToTheWhitelistWorks()
231228
{
232-
$facade = new File_Iterator_Facade;
233-
$files = $facade->getFilesAsArray(
234-
TEST_FILES_PATH, $suffixes = '.php'
229+
$this->filter->addFilesToWhitelist(
230+
$this->findFiles(TEST_FILES_PATH, '', '.php')
235231
);
236232

237-
$this->filter->addFilesToWhitelist($files);
238-
239233
$whitelist = $this->filter->getWhitelist();
240234
sort($whitelist);
241235

@@ -302,4 +296,26 @@ public function testIsFilteredThrowsExceptionForInvalidArgument()
302296
{
303297
$this->filter->isFiltered('foo', array(), NULL);
304298
}
299+
300+
protected function findFiles($directory, $prefix, $suffix)
301+
{
302+
$finder = new Symfony\Component\Finder\Finder;
303+
$finder->in($directory);
304+
305+
if (!empty($prefix)) {
306+
$finder->name($prefix . '*');
307+
}
308+
309+
if (!empty($suffix)) {
310+
$finder->name('*' . $suffix);
311+
}
312+
313+
$files = array();
314+
315+
foreach ($finder as $file) {
316+
$files[] = $file->getRealpath();
317+
}
318+
319+
return $files;
320+
}
305321
}

‎package.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,9 @@
142142
<min>1.9.4</min>
143143
</pearinstaller>
144144
<package>
145-
<name>File_Iterator</name>
146-
<channel>pear.phpunit.de</channel>
147-
<min>1.3.0</min>
145+
<name>Finder</name>
146+
<channel>pear.symfony.com</channel>
147+
<min>2.0.9</min>
148148
</package>
149149
<package>
150150
<name>PHP_TokenStream</name>

0 commit comments

Comments
 (0)