com phpruntests: replacing old versions for debug purposes: src/rtUtil.php
| From: | David Soria Parra | Date: | Mon, 22 Jun 2009 07:56:12 +0000 |
| Subject: | com phpruntests: replacing old versions for debug purposes: src/rtUtil.php | ||
| Groups: | php.qa | ||
| Request: | Send a blank email to php-qa+get-66405@lists.php.net to get a copy of this message | ||
Commit: 005edcbf7eb46af893b0786a6d036715275ffbfe
Author: Zoe Slattery <zoe@php.net> Mon, 22 Jun 2009 07:56:12 +0000
Parents: 03df5c497232c551820e45bead073a25519640a3
Branches: master
Link: http://git.php.net/?p=phpruntests.git;a=commitdiff;h=005edcbf7eb46af893b0786a6d036715275ffbfe
Log:
replacing old versions for debug purposes
Changed paths:
M src/rtUtil.php
Diff:
diff --git a/src/rtUtil.php b/src/rtUtil.php
index 3faf008..6be0400 100644
--- a/src/rtUtil.php
+++ b/src/rtUtil.php
@@ -17,7 +17,7 @@ class rtUtil
public static function getTestList($aDirectory)
{
$result = array();
- $result = glob($aDirectory. "/*.phpt");
+ $result = glob($aDirectory. "/*.phpt");
return $result;
}
@@ -35,48 +35,77 @@ class rtUtil
foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($aDirectory)) as
$directory) {
$subDirectories[] = $directory->getPath() . "/";
}
-
+
$subDirectoriesUnique = array_unique($subDirectories);
-
+
$phptDirectories = array();
-
+
foreach ($subDirectoriesUnique as $subDir) {
if(count(self::getTestList($subDir)) > 0) {
$phptDirectories[] = $subDir;
}
}
-
+
return $phptDirectories;
}
-
-
- /**
- * just a test
- *
+
+
+ /**
+ * just a test
+ *
* @param $path
* @return array
- */
- public static function parseDir($path) {
-
- $list = array();
-
- if (sizeof(glob($path."/*.phpt")) > 0) {
-
- $list[] = $path.'/';
- }
-
- foreach (scandir($path) as $file) {
-
- if (substr($file, 0, 1) != '.' && $file != 'CVS') {
-
- if (is_dir($path.'/'.$file)) {
-
- $list = array_merge($list, rtUtil::parseDir($path.'/'.$file));
- }
- }
- }
-
- return $list;
- }
+ */
+ public static function parseDir($path) {
+
+ $list = array();
+
+ if (sizeof(glob($path."/*.phpt")) > 0) {
+
+ $list[] = $path.'/';
+ }
+
+ foreach (scandir($path) as $file) {
+
+ if (substr($file, 0, 1) != '.' && $file != 'CVS') {
+
+ if (is_dir($path.'/'.$file)) {
+
+ $list = array_merge($list, rtUtil::parseDir($path.'/'.$file));
+ }
+ }
+ }
+
+ return $list;
+ }
+
+ /**
+ * This is the original version of getDirectoryList which uses PhptFilterIterator
+ */
+ public static function getTestListOld($aDirectory)
+ {
+ $result = array();
+
+ foreach (new rtPhptFilterIterator(new RecursiveIteratorIterator(new
RecursiveDirectoryIterator($aDirectory))) as $item) {
+ $result[] = $item->getPathname();
+ }
+
+ return $result;
+ }
+
+ /**
+ * This is the original version of getDirectoryList which uses PhptFilterIterator
+ */
+ public static function getDirectoryListOld($aDirectory)
+ {
+ $result = array();
+
+ foreach (new rtPhptFilterIterator(new RecursiveIteratorIterator(new
RecursiveDirectoryIterator($aDirectory))) as $directory) {
+ $result[] = $directory->getPath() . "/";
+ }
+
+ return array_unique($result);
+ }
+
}
?>