Skip to content

Commit c968b60

Browse files
committed
Merge branch '3.4' into 4.0
* 3.4: use brace-style regex delimiters Fixed typo RecursiveIterator -> RecursiveIteratorIterator [Cache] fix logic for fetching tag versions on TagAwareAdapter [FrameworkBundle] Use the correct service id for CachePoolPruneCommand in its compiler pass Hide short exception trace by default [Doctrine Bridge] fix priority for doctrine event listeners [Validator] make phpdoc of ObjectInitializerInterface interface more accurate [Validator] fixes phpdoc reference to an interface that was removed in Symfony 3.0
2 parents fc1258b + a83975f commit c968b60

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

Command/LintCommand.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
namespace Symfony\Bridge\Twig\Command;
1313

1414
use Symfony\Component\Console\Command\Command;
15+
use Symfony\Component\Console\Exception\InvalidArgumentException;
16+
use Symfony\Component\Console\Exception\RuntimeException;
1517
use Symfony\Component\Console\Input\InputArgument;
1618
use Symfony\Component\Console\Input\InputInterface;
1719
use Symfony\Component\Console\Input\InputOption;
@@ -77,7 +79,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
7779

7880
if (0 === count($filenames)) {
7981
if (0 !== ftell(STDIN)) {
80-
throw new \RuntimeException('Please provide a filename or pipe template content to STDIN.');
82+
throw new RuntimeException('Please provide a filename or pipe template content to STDIN.');
8183
}
8284

8385
$template = '';
@@ -113,7 +115,7 @@ protected function findFiles($filename)
113115
return Finder::create()->files()->in($filename)->name('*.twig');
114116
}
115117

116-
throw new \RuntimeException(sprintf('File or directory "%s" is not readable', $filename));
118+
throw new RuntimeException(sprintf('File or directory "%s" is not readable', $filename));
117119
}
118120

119121
private function validate($template, $file)
@@ -142,7 +144,7 @@ private function display(InputInterface $input, OutputInterface $output, Symfony
142144
case 'json':
143145
return $this->displayJson($output, $files);
144146
default:
145-
throw new \InvalidArgumentException(sprintf('The format "%s" is not supported.', $input->getOption('format')));
147+
throw new InvalidArgumentException(sprintf('The format "%s" is not supported.', $input->getOption('format')));
146148
}
147149
}
148150

0 commit comments

Comments
 (0)