@@ -41,10 +41,10 @@ * @since File available since Release 1.0.0 */ +require 'File/Iterator.php'; require 'PHPCPD/Detector.php'; require 'PHPCPD/TextUI/Getopt.php'; require 'PHPCPD/TextUI/ResultPrinter.php'; -require 'PHPCPD/Util/FilterIterator.php'; require 'PHPCPD/Log/XML/PMD.php'; /** @@ -226,7 +226,7 @@ class PHPCPD_TextUI_Command foreach ($paths as $path) { if (is_dir($path)) { - $iterator = new PHPCPD_Util_FilterIterator( + $iterator = new File_Iterator( new RecursiveIteratorIterator( new RecursiveDirectoryIterator($path) ), PHPCPD/TextUI/Command.php @@ -52,11 +52,6 @@ <tasks:replace from="@package_version@" to="version" type="package-info" /> </file> </dir> - <dir name="Util"> - <file baseinstalldir="/" name="FilterIterator.php" role="php"> - <tasks:replace from="@package_version@" to="version" type="package-info" /> - </file> - </dir> <file baseinstalldir="/" name="Clone.php" role="php"> <tasks:replace from="@package_version@" to="version" type="package-info" /> </file> @@ -87,6 +82,11 @@ <pearinstaller> <min>1.7.1</min> </pearinstaller> + <package> + <name>File_Iterator</name> + <channel>pear.phpunit.de</channel> + <min>1.0.0</min> + </package> <extension> <name>tokenizer</name> </extension> package.xml PHPCPD/Util/FilterIterator.php d40a1376152e52c384009e771b46e69e1bd5c5ba Sebastian Bergmann sb@sebastian-bergmann.de http://github.com/sebastianbergmann/phpcpd/commit/873dd09f90728f6bcd7f3663901f1f3bc9ca5050 873dd09f90728f6bcd7f3663901f1f3bc9ca5050 2009-11-04T20:52:42-08:00 2009-11-04T20:52:42-08:00 Use File_Iterator. 4d77b05d8ed39af2d7de1cf09406ca7a2d29799b Sebastian Bergmann sb@sebastian-bergmann.de