Skip to content
This repository was archived by the owner on Dec 9, 2023. It is now read-only.

Commit 55d7a8c

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 c7e6abc + d4c15d1 commit 55d7a8c

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

Command/ServerLogCommand.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
use Symfony\Bridge\Monolog\Formatter\ConsoleFormatter;
1616
use Symfony\Bridge\Monolog\Handler\ConsoleHandler;
1717
use Symfony\Component\Console\Command\Command;
18+
use Symfony\Component\Console\Exception\LogicException;
19+
use Symfony\Component\Console\Exception\RuntimeException;
1820
use Symfony\Component\Console\Input\InputInterface;
1921
use Symfony\Component\Console\Input\InputOption;
2022
use Symfony\Component\Console\Output\OutputInterface;
@@ -78,7 +80,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
7880
$filter = $input->getOption('filter');
7981
if ($filter) {
8082
if (!class_exists(ExpressionLanguage::class)) {
81-
throw new \LogicException('Package "symfony/expression-language" is required to use the "filter" option.');
83+
throw new LogicException('Package "symfony/expression-language" is required to use the "filter" option.');
8284
}
8385
$this->el = new ExpressionLanguage();
8486
}
@@ -97,7 +99,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
9799
}
98100

99101
if (!$socket = stream_socket_server($host, $errno, $errstr)) {
100-
throw new \RuntimeException(sprintf('Server start failed on "%s": %s %s.', $host, $errstr, $errno));
102+
throw new RuntimeException(sprintf('Server start failed on "%s": %s %s.', $host, $errstr, $errno));
101103
}
102104

103105
foreach ($this->getLogs($socket) as $clientId => $message) {

Command/ServerStatusCommand.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
use Symfony\Bundle\WebServerBundle\WebServer;
1515
use Symfony\Component\Console\Command\Command;
16+
use Symfony\Component\Console\Exception\InvalidArgumentException;
1617
use Symfony\Component\Console\Input\InputInterface;
1718
use Symfony\Component\Console\Input\InputOption;
1819
use Symfony\Component\Console\Output\OutputInterface;
@@ -74,7 +75,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
7475
} elseif ('port' === $filter) {
7576
$output->write($port);
7677
} else {
77-
throw new \InvalidArgumentException(sprintf('"%s" is not a valid filter.', $filter));
78+
throw new InvalidArgumentException(sprintf('"%s" is not a valid filter.', $filter));
7879
}
7980
} else {
8081
return 1;

0 commit comments

Comments
 (0)