From c81b770a0d0f2e31aa6ba853d2f1f267f95a3e61 Mon Sep 17 00:00:00 2001 From: "Jonathan H. Wage" Date: Tue, 13 Apr 2010 14:10:12 -0400 Subject: [PATCH] Fixing issue with orm:clear-cache:result command after the migration to Symfony console --- .../Console/Command/ClearCache/ResultCommand.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/Doctrine/ORM/Tools/Console/Command/ClearCache/ResultCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/ClearCache/ResultCommand.php index 947cac9fb..9bd82c36c 100644 --- a/lib/Doctrine/ORM/Tools/Console/Command/ClearCache/ResultCommand.php +++ b/lib/Doctrine/ORM/Tools/Console/Command/ClearCache/ResultCommand.php @@ -95,9 +95,9 @@ EOT $deleted = $cacheDriver->delete($id); if (is_array($deleted)) { - $this->_printDeleted($deleted); + $this->_printDeleted($output, $deleted); } else if (is_bool($deleted) && $deleted) { - $this->_printDeleted(array($id)); + $this->_printDeleted($output, array($id)); } $outputed = true; @@ -105,12 +105,12 @@ EOT } // Removing based on --regex - if (($regex = $input->getOption('regex')) !== null && $regexps) { + if (($regexps = $input->getOption('regex')) !== null && $regexps) { foreach($regexps as $regex) { $output->write($outputed ? PHP_EOL : ''); $output->write(sprintf('Clearing Result cache entries that match the regular expression "%s"', $regex) . PHP_EOL); - $this->_printDeleted($cacheDriver->deleteByRegex('/' . $regex. '/')); + $this->_printDeleted($output, $cacheDriver->deleteByRegex('/' . $regex. '/')); $outputed = true; } @@ -122,7 +122,7 @@ EOT $output->write($outputed ? PHP_EOL : ''); $output->write(sprintf('Clearing Result cache entries that have the prefix "%s"', $prefix) . PHP_EOL); - $this->_printDeleted($cacheDriver->deleteByPrefix($prefix)); + $this->_printDeleted($output, $cacheDriver->deleteByPrefix($prefix)); $outputed = true; } @@ -134,7 +134,7 @@ EOT $output->write($outputed ? PHP_EOL : ''); $output->write(sprintf('Clearing Result cache entries that have the suffix "%s"', $suffix) . PHP_EOL); - $this->_printDeleted($cacheDriver->deleteBySuffix($suffix)); + $this->_printDeleted($output, $cacheDriver->deleteBySuffix($suffix)); $outputed = true; } @@ -143,9 +143,9 @@ EOT // Removing ALL entries if ( ! $ids && ! $regexps && ! $prefixes && ! $suffixes) { $output->write($outputed ? PHP_EOL : ''); - $output->write('Clearing ALL Result cache entries'); + $output->write('Clearing ALL Result cache entries' . PHP_EOL); - $this->_printDeleted($cacheDriver->deleteAll()); + $this->_printDeleted($output, $cacheDriver->deleteAll()); $outputed = true; }