spriebsch Fri Apr 24 08:52:22 2009 UTC
Modified files:
/phpruntests/src rtText.php
/phpruntests/src/testgroup rtPhpTestGroup.php
/phpruntests/src/testrun rtPhpTestRun.php
/phpruntests/src/texts invalidTestFileName.txt
Log:
Added optional placeholder replacement to rtText.
Modified invalidTestFileName error message to include filename as placeholder.
http://cvs.php.net/viewvc.cgi/phpruntests/src/rtText.php?r1=1.3&r2=1.4&diff_format=u
Index: phpruntests/src/rtText.php
diff -u phpruntests/src/rtText.php:1.3 phpruntests/src/rtText.php:1.4
--- phpruntests/src/rtText.php:1.3 Fri Apr 24 08:41:25 2009
+++ phpruntests/src/rtText.php Fri Apr 24 08:52:21 2009
@@ -1,17 +1,18 @@
<?php
-
/**
* rtText reads named texts from texts/ subdirectory.
*/
class rtText
{
/**
- * Get a named text from texts/ subdirectory.
+ * Get a named text from texts/ subdirectory
+ * and optionally replace placeholders %1 ... %n.
*
- * @param string $name Text name to return
+ * @param string $name Text name to return
+ * @param array $replacements Placeholder replacements
* @return string
*/
- public static function get($name)
+ public static function get($name, array $replacements = array())
{
$filename = dirname(__FILE__) . '/texts/' . $name . '.txt';
@@ -19,7 +20,14 @@
throw new LogicException('The text ' . $name . ' does not exist');
}
- return file_get_contents($filename);
+ $text = file_get_contents($filename);
+
+ // Replace %1 ... %n by the elements in replacements
+ for ($i = 0; $i < count($replacements); $i++) {
+ $text = str_replace('%' . ($i + 1), $replacements[$i], $text);
+ }
+
+ return $text;
}
}
?>
http://cvs.php.net/viewvc.cgi/phpruntests/src/testgroup/rtPhpTestGroup.php?r1=1.3&r2=1.4&diff_format=u
Index: phpruntests/src/testgroup/rtPhpTestGroup.php
diff -u phpruntests/src/testgroup/rtPhpTestGroup.php:1.3
phpruntests/src/testgroup/rtPhpTestGroup.php:1.4
--- phpruntests/src/testgroup/rtPhpTestGroup.php:1.3 Fri Apr 24 08:41:26 2009
+++ phpruntests/src/testgroup/rtPhpTestGroup.php Fri Apr 24 08:52:21 2009
@@ -22,8 +22,7 @@
foreach ($this->testFiles as $testName) {
if (!file_exists($testName)) {
- echo $testName . " ";
- echo rtText::get('invalidTestFileName');
+ echo rtText::get('invalidTestFileName', array($testName));
exit();
}
http://cvs.php.net/viewvc.cgi/phpruntests/src/testrun/rtPhpTestRun.php?r1=1.3&r2=1.4&diff_format=u
Index: phpruntests/src/testrun/rtPhpTestRun.php
diff -u phpruntests/src/testrun/rtPhpTestRun.php:1.3
phpruntests/src/testrun/rtPhpTestRun.php:1.4
--- phpruntests/src/testrun/rtPhpTestRun.php:1.3 Fri Apr 24 08:41:26 2009
+++ phpruntests/src/testrun/rtPhpTestRun.php Fri Apr 24 08:52:21 2009
@@ -1,4 +1,4 @@
-i<?php
+<?php
/**
* Main class for a test run
*
@@ -64,8 +64,7 @@
foreach ($runConfiguration->getSetting('TestFiles') as
$testName) {
if (!file_exists($testName)) {
- echo $testName . " ";
- echo rtText::get('invalidTestFileName');
+ echo rtText::get('invalidTestFileName',
array($testName));
exit();
}
http://cvs.php.net/viewvc.cgi/phpruntests/src/texts/invalidTestFileName.txt?r1=1.2&r2=1.3&diff_format=u
Index: phpruntests/src/texts/invalidTestFileName.txt
diff -u phpruntests/src/texts/invalidTestFileName.txt:1.2
phpruntests/src/texts/invalidTestFileName.txt:1.3
--- phpruntests/src/texts/invalidTestFileName.txt:1.2 Fri Apr 24 08:40:54 2009
+++ phpruntests/src/texts/invalidTestFileName.txt Fri Apr 24 08:52:22 2009
@@ -1 +1 @@
-The test file supplied is not a valid phpt test file.
+The test file %1 is not a valid phpt test file.
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
