[PHP-CVS] cvs: phpruntests /src rtUtil.php
g2 Mon Jun 22 16:36:26 2009 UTC
Modified files:
/phpruntests/srcrtUtil.php
Log:
phpruntests - alternative parse-method in rtUtil (minor adjustment)
http://cvs.php.net/viewvc.cgi/phpruntests/src/rtUtil.php?r1=1.6&r2=1.7&diff_format=u
Index: phpruntests/src/rtUtil.php
diff -u phpruntests/src/rtUtil.php:1.6 phpruntests/src/rtUtil.php:1.7
--- phpruntests/src/rtUtil.php:1.6 Mon Jun 22 07:56:12 2009
+++ phpruntests/src/rtUtil.php Mon Jun 22 16:36:26 2009
@@ -50,35 +50,37 @@
}
-/**
- * just a test
- *
+ /**
+* returns a list of directories containing a phpt-file
+*
* @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();
+ $found = false;
+
+ 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));
+
+ } elseif ($found === false && strpos($file,
'.phpt') !== false) {
+
+ $list[] = $path.'/';
+ $found = true;
+ }
+ }
+ }
+
+ return $list;
+ }
+
/**
* This is the original version of getDirectoryList which uses
PhptFilterIterator
*/
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src rtUtil.php
zoe Mon Jun 22 07:56:12 2009 UTC
Modified files:
/phpruntests/srcrtUtil.php
Log:
replacing old versions for debug purposes
http://cvs.php.net/viewvc.cgi/phpruntests/src/rtUtil.php?r1=1.5&r2=1.6&diff_format=u
Index: phpruntests/src/rtUtil.php
diff -u phpruntests/src/rtUtil.php:1.5 phpruntests/src/rtUtil.php:1.6
--- phpruntests/src/rtUtil.php:1.5 Mon Jun 22 02:17:17 2009
+++ phpruntests/src/rtUtil.php Mon Jun 22 07:56:12 2009
@@ -17,7 +17,7 @@
public static function getTestList($aDirectory)
{
$result = array();
-$result = glob($aDirectory. "/*.phpt");
+$result = glob($aDirectory. "/*.phpt");
return $result;
}
@@ -35,48 +35,77 @@
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);
+}
+
}
?>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src rtUtil.php
zoe Sun Jun 21 20:29:12 2009 UTC
Modified files:
/phpruntests/srcrtUtil.php
Log:
fixing Olivier's out of memory problem
http://cvs.php.net/viewvc.cgi/phpruntests/src/rtUtil.php?r1=1.3&r2=1.4&diff_format=u
Index: phpruntests/src/rtUtil.php
diff -u phpruntests/src/rtUtil.php:1.3 phpruntests/src/rtUtil.php:1.4
--- phpruntests/src/rtUtil.php:1.3 Mon May 25 12:39:46 2009
+++ phpruntests/src/rtUtil.php Sun Jun 21 20:29:12 2009
@@ -3,7 +3,7 @@
* rtUtil
*
* Static utility methods
- *
+ *
* @category Testing
* @package RUNTESTS
* @authorZoe Slattery
@@ -17,11 +17,7 @@
public static function getTestList($aDirectory)
{
$result = array();
-
-foreach (new rtPhptFilterIterator(new RecursiveIteratorIterator(new
RecursiveDirectoryIterator($aDirectory))) as $item) {
-$result[] = $item->getPathname();
-}
-
+$result = glob($aDirectory. "/*.phpt");
return $result;
}
@@ -35,13 +31,22 @@
*/
public static function getDirectoryList($aDirectory)
{
-$result = array();
-
-foreach (new rtPhptFilterIterator(new RecursiveIteratorIterator(new
RecursiveDirectoryIterator($aDirectory))) as $directory) {
-$result[] = $directory->getPath() . "/";
+$subDirectories = array();
+foreach (new RecursiveIteratorIterator(new
RecursiveDirectoryIterator($aDirectory)) as $directory) {
+$subDirectories[] = $directory->getPath() . "/";
}
-
-return array_unique($result);
+
+$subDirectoriesUnique = array_unique($subDirectories);
+
+$phptDirectories = array();
+
+foreach ($subDirectoriesUnique as $subDir) {
+if(count(self::getTestList($subDir)) > 0) {
+$phptDirectories[] = $subDir;
+}
+}
+
+return $phptDirectories;
}
}
?>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
