Fix the translation commands when a template contains a syntax error

fabpot · fabpot · commit f63e8433cff3 · 2019-11-29T13:21:45.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php
@@ -204,7 +204,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         // Extract used messages
-        $extractedCatalogue = $this->extractMessages($locale, $viewsPaths);
+        $extractedCatalogue = $this->extractMessages($io->getErrorStyle(), $locale, $viewsPaths);
 
         // Load defined messages
         $currentCatalogue = $this->loadCurrentMessages($locale, $transPaths);
@@ -330,12 +330,16 @@ private function sanitizeString($string, $length = 40)
      *
      * @return MessageCatalogue
      */
-    private function extractMessages($locale, $transPaths)
+    private function extractMessages(SymfonyStyle $errorIo, $locale, $transPaths)
     {
         $extractedCatalogue = new MessageCatalogue($locale);
         foreach ($transPaths as $path) {
             if (is_dir($path)) {
-                $this->extractor->extract($path, $extractedCatalogue);
+                try {
+                    $this->extractor->extract($path, $extractedCatalogue);
+                } catch (\Exception $e) {
+                    $errorIo->warning($e->getMessage());
+                }
             }
         }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
@@ -215,7 +215,11 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $this->extractor->setPrefix($prefix);
         foreach ($viewsPaths as $path) {
             if (is_dir($path)) {
-                $this->extractor->extract($path, $extractedCatalogue);
+                try {
+                    $this->extractor->extract($path, $extractedCatalogue);
+                } catch (\Exception $e) {
+                    $errorIo->warning($e->getMessage());
+                }
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`204`	`204`	`}`
`205`	`205`
`206`	`206`	`// Extract used messages`
`207`		`- $extractedCatalogue = $this->extractMessages($locale, $viewsPaths);`
	`207`	`+ $extractedCatalogue = $this->extractMessages($io->getErrorStyle(), $locale, $viewsPaths);`
`208`	`208`
`209`	`209`	`// Load defined messages`
`210`	`210`	`$currentCatalogue = $this->loadCurrentMessages($locale, $transPaths);`
`@@ -330,12 +330,16 @@ private function sanitizeString($string, $length = 40)`
`330`	`330`	`*`
`331`	`331`	`* @return MessageCatalogue`
`332`	`332`	`*/`
`333`		`- private function extractMessages($locale, $transPaths)`
	`333`	`+ private function extractMessages(SymfonyStyle $errorIo, $locale, $transPaths)`
`334`	`334`	`{`
`335`	`335`	`$extractedCatalogue = new MessageCatalogue($locale);`
`336`	`336`	`foreach ($transPaths as $path) {`
`337`	`337`	`if (is_dir($path)) {`
`338`		`- $this->extractor->extract($path, $extractedCatalogue);`
	`338`	`+ try {`
	`339`	`+ $this->extractor->extract($path, $extractedCatalogue);`
	`340`	`+ } catch (\Exception $e) {`
	`341`	`+ $errorIo->warning($e->getMessage());`
	`342`	`+ }`
`339`	`343`	`}`
`340`	`344`	`}`
`341`	`345`
Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,11 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`215`	`215`	`$this->extractor->setPrefix($prefix);`
`216`	`216`	`foreach ($viewsPaths as $path) {`
`217`	`217`	`if (is_dir($path)) {`
`218`		`- $this->extractor->extract($path, $extractedCatalogue);`
	`218`	`+ try {`
	`219`	`+ $this->extractor->extract($path, $extractedCatalogue);`
	`220`	`+ } catch (\Exception $e) {`
	`221`	`+ $errorIo->warning($e->getMessage());`
	`222`	`+ }`
`219`	`223`	`}`
`220`	`224`	`}`
`221`	`225`