Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #239 from auss/1.2

Support for --verbose option and error handling in generate-diff command
  • Loading branch information...
commit 4d24642ac25b7338af9c35fdac91b59d562a4346 2 parents fbeb29e + 6c2a2bf
@willdurand willdurand authored
View
4 Command/AbstractCommand.php
@@ -95,6 +95,10 @@ protected function getPackagePrefix(Bundle $bundle, $baseDirectory = '')
protected function initialize(InputInterface $input, OutputInterface $output)
{
parent::initialize($input, $output);
+
+ if ($input->getOption('verbose')) {
+ $this->additionalPhingArgs[] = 'verbose';
+ }
$this->input = $input;
View
14 Command/MigrationGenerateDiffCommand.php
@@ -47,8 +47,16 @@ protected function configure()
*/
protected function execute(InputInterface $input, OutputInterface $output)
{
- $this->callPhing('diff');
-
- $this->writeSummary($output, 'propel-sql-diff');
+ if (true === $this->callPhing('diff')) {
+ $this->writeSummary($output, 'propel-sql-diff');
+ } elseif ( strpos( $this->buffer, 'Uncommitted migrations have been found' ) ) {
+ $this->writeSection($output, array(
+ '[Propel] Error',
+ '',
+ 'Uncommitted migrations have been found. You should either execute or delete them before rerunning the propel:migration:generate-diff command.'
+ ), 'fg=white;bg=red');
+ } else {
+ $this->writeTaskError($output, 'propel-sql-diff');
+ }
}
}
Please sign in to comment.
Something went wrong with that request. Please try again.