Author: ts
Date: Tue Mar 4 11:44:58 2008
New Revision: 7512
Log:
- Fxied issue #12636: ezcConsoleOutput->outputLine() prints EOL always to
STDOUT instead of the defined target.
Modified:
trunk/ConsoleTools/ChangeLog
trunk/ConsoleTools/src/output.php
trunk/ConsoleTools/tests/data/posix/testProgressMonitor1.dat
trunk/ConsoleTools/tests/data/posix/testProgressMonitor2.dat
trunk/ConsoleTools/tests/data/posix/testProgressMonitor3.dat
trunk/ConsoleTools/tests/data/posix/testProgressMonitor4.dat
Modified: trunk/ConsoleTools/ChangeLog
==============================================================================
--- trunk/ConsoleTools/ChangeLog [iso-8859-1] (original)
+++ trunk/ConsoleTools/ChangeLog [iso-8859-1] Tue Mar 4 11:44:58 2008
@@ -15,6 +15,8 @@
- Fixed issue #12625: console tools lacks documentation on targets.
- Fixed issue #12624: Wrong text in documentation of eZConsoleDialogViewer.
- Fixed issue #12623: console menu dialog handles unexisting options wrong.
+- Fxied issue #12636: ezcConsoleOutput->outputLine() prints EOL always to
+ STDOUT instead of the defined target.
1.3.2 - Monday 14 January 2008
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Modified: trunk/ConsoleTools/src/output.php
==============================================================================
--- trunk/ConsoleTools/src/output.php [iso-8859-1] (original)
+++ trunk/ConsoleTools/src/output.php [iso-8859-1] Tue Mar 4 11:44:58 2008
@@ -412,8 +412,7 @@
*/
public function outputLine( $text = '', $format = 'default',
$verbosityLevel = 1 )
{
- $this->outputText( $text, $format, $verbosityLevel );
- $this->outputText( PHP_EOL, null, $verbosityLevel );
+ $this->outputText( $text . PHP_EOL, $format, $verbosityLevel );
}
/**
Modified: trunk/ConsoleTools/tests/data/posix/testProgressMonitor1.dat
==============================================================================
--- trunk/ConsoleTools/tests/data/posix/testProgressMonitor1.dat [iso-8859-1]
(original)
+++ trunk/ConsoleTools/tests/data/posix/testProgressMonitor1.dat [iso-8859-1]
Tue Mar 4 11:44:58 2008
@@ -1,11 +1,11 @@
-[0m 10.0% UPLOAD /var/upload/test.php[0m[m
-[0m[0m 20.0% UPLOAD /var/upload/testing.php[0m[m
-[0m[0m 30.0% UPLOAD /var/upload/foo.php[0m[m
-[0m[0m 40.0% UPLOAD /var/upload/bar.php[0m[m
-[0m[0m 50.0% UPLOAD /var/upload/baz.png[0m[m
-[0m[0m 60.0% UPLOAD /var/upload/image.jpg[0m[m
-[0m[0m 70.0% UPLOAD /var/upload/bar.gif[0m[m
-[0m[0m 80.0% UPLOAD /var/upload/ez-logo.jpg[0m[m
-[0m[0m 90.0% UPLOAD /var/upload/ez-logo.png[0m[m
-[0m[0m 100.0% UPLOAD /var/upload/ez-components.png[0m[m
+[0m 10.0% UPLOAD /var/upload/test.php
+[0m[0m 20.0% UPLOAD /var/upload/testing.php
+[0m[0m 30.0% UPLOAD /var/upload/foo.php
+[0m[0m 40.0% UPLOAD /var/upload/bar.php
+[0m[0m 50.0% UPLOAD /var/upload/baz.png
+[0m[0m 60.0% UPLOAD /var/upload/image.jpg
+[0m[0m 70.0% UPLOAD /var/upload/bar.gif
+[0m[0m 80.0% UPLOAD /var/upload/ez-logo.jpg
+[0m[0m 90.0% UPLOAD /var/upload/ez-logo.png
+[0m[0m 100.0% UPLOAD /var/upload/ez-components.png
[0m
Modified: trunk/ConsoleTools/tests/data/posix/testProgressMonitor2.dat
==============================================================================
--- trunk/ConsoleTools/tests/data/posix/testProgressMonitor2.dat [iso-8859-1]
(original)
+++ trunk/ConsoleTools/tests/data/posix/testProgressMonitor2.dat [iso-8859-1]
Tue Mar 4 11:44:58 2008
@@ -1,8 +1,8 @@
-[0m 14.3% UPLOAD /var/upload/test.php[0m[m
-[0m[0m 28.6% UPLOAD /var/upload/testing.php[0m[m
-[0m[0m 42.9% UPLOAD /var/upload/foo.php[0m[m
-[0m[0m 57.1% UPLOAD /var/upload/bar.php[0m[m
-[0m[0m 71.4% UPLOAD /var/upload/baz.png[0m[m
-[0m[0m 85.7% UPLOAD /var/upload/image.jpg[0m[m
-[0m[0m 100.0% UPLOAD /var/upload/bar.gif[0m[m
+[0m 14.3% UPLOAD /var/upload/test.php
+[0m[0m 28.6% UPLOAD /var/upload/testing.php
+[0m[0m 42.9% UPLOAD /var/upload/foo.php
+[0m[0m 57.1% UPLOAD /var/upload/bar.php
+[0m[0m 71.4% UPLOAD /var/upload/baz.png
+[0m[0m 85.7% UPLOAD /var/upload/image.jpg
+[0m[0m 100.0% UPLOAD /var/upload/bar.gif
[0m
Modified: trunk/ConsoleTools/tests/data/posix/testProgressMonitor3.dat
==============================================================================
--- trunk/ConsoleTools/tests/data/posix/testProgressMonitor3.dat [iso-8859-1]
(original)
+++ trunk/ConsoleTools/tests/data/posix/testProgressMonitor3.dat [iso-8859-1]
Tue Mar 4 11:44:58 2008
@@ -1,8 +1,8 @@
-[0m UPLOAD 14.29% /var/upload/test.php[0m[m
-[0m[0m UPLOAD 28.57% /var/upload/testing.php[0m[m
-[0m[0m UPLOAD 42.86% /var/upload/foo.php[0m[m
-[0m[0m UPLOAD 57.14% /var/upload/bar.php[0m[m
-[0m[0m UPLOAD 71.43% /var/upload/baz.png[0m[m
-[0m[0m UPLOAD 85.71% /var/upload/image.jpg[0m[m
-[0m[0m UPLOAD 100.00% /var/upload/bar.gif[0m[m
+[0m UPLOAD 14.29% /var/upload/test.php
+[0m[0m UPLOAD 28.57% /var/upload/testing.php
+[0m[0m UPLOAD 42.86% /var/upload/foo.php
+[0m[0m UPLOAD 57.14% /var/upload/bar.php
+[0m[0m UPLOAD 71.43% /var/upload/baz.png
+[0m[0m UPLOAD 85.71% /var/upload/image.jpg
+[0m[0m UPLOAD 100.00% /var/upload/bar.gif
[0m
Modified: trunk/ConsoleTools/tests/data/posix/testProgressMonitor4.dat
==============================================================================
--- trunk/ConsoleTools/tests/data/posix/testProgressMonitor4.dat [iso-8859-1]
(original)
+++ trunk/ConsoleTools/tests/data/posix/testProgressMonitor4.dat [iso-8859-1]
Tue Mar 4 11:44:58 2008
@@ -1,8 +1,8 @@
-[0m[31m UPLOAD[0m [34;1m 14.29%[0m [32m/var/upload/test.php[0m[0m[m
-[0m[0m[31m UPLOAD[0m [34;1m 28.57%[0m
[32m/var/upload/testing.php[0m[0m[m
-[0m[0m[31m UPLOAD[0m [34;1m 42.86%[0m
[32m/var/upload/foo.php[0m[0m[m
-[0m[0m[31m UPLOAD[0m [34;1m 57.14%[0m
[32m/var/upload/bar.php[0m[0m[m
-[0m[0m[31m UPLOAD[0m [34;1m 71.43%[0m
[32m/var/upload/baz.png[0m[0m[m
-[0m[0m[31m UPLOAD[0m [34;1m 85.71%[0m
[32m/var/upload/image.jpg[0m[0m[m
-[0m[0m[31m UPLOAD[0m [34;1m100.00%[0m
[32m/var/upload/bar.gif[0m[0m[m
+[0m[31m UPLOAD[0m [34;1m 14.29%[0m [32m/var/upload/test.php[0m
+[0m[0m[31m UPLOAD[0m [34;1m 28.57%[0m [32m/var/upload/testing.php[0m
+[0m[0m[31m UPLOAD[0m [34;1m 42.86%[0m [32m/var/upload/foo.php[0m
+[0m[0m[31m UPLOAD[0m [34;1m 57.14%[0m [32m/var/upload/bar.php[0m
+[0m[0m[31m UPLOAD[0m [34;1m 71.43%[0m [32m/var/upload/baz.png[0m
+[0m[0m[31m UPLOAD[0m [34;1m 85.71%[0m [32m/var/upload/image.jpg[0m
+[0m[0m[31m UPLOAD[0m [34;1m100.00%[0m [32m/var/upload/bar.gif[0m
[0m
--
svn-components mailing list
svn-components@lists.ez.no
http://lists.ez.no/mailman/listinfo/svn-components
