From 554132cffd4fe718e70091259a8f6d0edfe01f59 Mon Sep 17 00:00:00 2001 From: William DURAND Date: Sun, 24 Jun 2012 01:09:07 +0200 Subject: [PATCH] Fixed command output, fixes #161 --- Command/AclInitCommand.php | 3 +-- Command/FixturesLoadCommand.php | 10 ++-------- Command/SqlBuildCommand.php | 10 +++------- Command/SqlInsertCommand.php | 12 ++---------- 4 files changed, 8 insertions(+), 27 deletions(-) diff --git a/Command/AclInitCommand.php b/Command/AclInitCommand.php index c78c36d..3ae861b 100644 --- a/Command/AclInitCommand.php +++ b/Command/AclInitCommand.php @@ -71,8 +71,7 @@ EOT if (true == $result = $this->callPhing('build-sql', array('propel.sql.dir' => $sqlDirectory))) { $this->writeSection( $output, - '1 SQL file has been generated.', - 'bg=black' + '1 SQL file has been generated.' ); } else { $this->writeTaskError($output, 'build-sql'); diff --git a/Command/FixturesLoadCommand.php b/Command/FixturesLoadCommand.php index 4dcb455..88b943d 100644 --- a/Command/FixturesLoadCommand.php +++ b/Command/FixturesLoadCommand.php @@ -197,11 +197,7 @@ EOT return false; } - $this->writeSection( - $output, - sprintf('%s %s fixtures file%s loaded.', $nb, strtoupper($type), $nb > 1 ? 's' : ''), - 'fg=white;bg=black' - ); + $output->writeln(sprintf('%s %s fixtures file%s loaded.', $nb, strtoupper($type), $nb > 1 ? 's' : '')); return true; } @@ -279,9 +275,7 @@ EOT )); if (true === $ret) { - $this->writeSection($output, array( - '', 'All SQL statements have been inserted.' - ), 'fg=green;bg=black'); + $output->writeln('All SQL statements have been inserted.'); } else { $this->writeTaskError($output, 'insert-sql', false); diff --git a/Command/SqlBuildCommand.php b/Command/SqlBuildCommand.php index 729805b..43cdad1 100644 --- a/Command/SqlBuildCommand.php +++ b/Command/SqlBuildCommand.php @@ -79,13 +79,9 @@ EOT } } - $this->writeSection( - $output, - sprintf('%d SQL file%s ha%s been generated.', - $nbFiles, $nbFiles > 1 ? 's' : '', $nbFiles > 1 ? 've' : 's' - ), - 'bg=black' - ); + $output->writeln(sprintf('%d SQL file%s ha%s been generated.', + $nbFiles, $nbFiles > 1 ? 's' : '', $nbFiles > 1 ? 've' : 's' + )); } else { $this->writeSection($output, array( '[Propel] Error', diff --git a/Command/SqlInsertCommand.php b/Command/SqlInsertCommand.php index ceefcdf..f945a81 100644 --- a/Command/SqlInsertCommand.php +++ b/Command/SqlInsertCommand.php @@ -105,17 +105,9 @@ EOT } if (true === $statusCode) { - $this->writeSection( - $output, - 'All SQL statements have been inserted.', - 'bg=black' - ); + $output->writeln('All SQL statements have been inserted.'); } else { - $this->writeSection( - $output, - 'No SQL statements found.', - 'bg=black' - ); + $output->writeln('No SQL statements found.'); } }