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

Commit 1dedc2a

Browse files
committedSep 2, 2020
Merge branch '3.4' into 4.4
* 3.4: Enable "native_constant_invocation" CS rule Make AbstractPhpFileCacheWarmer public
2 parents d617765 + b982767 commit 1dedc2a

7 files changed

+10
-10
lines changed
 

‎Command/ServerLogCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ protected function configure()
8080

8181
protected function execute(InputInterface $input, OutputInterface $output)
8282
{
83-
@trigger_error('Using the WebserverBundle is deprecated since Symfony 4.4. Use the DebugBundle combined with MonologBridge instead.', E_USER_DEPRECATED);
83+
@trigger_error('Using the WebserverBundle is deprecated since Symfony 4.4. Use the DebugBundle combined with MonologBridge instead.', \E_USER_DEPRECATED);
8484

8585
$filter = $input->getOption('filter');
8686
if ($filter) {

‎Command/ServerRunCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ protected function configure()
9292
*/
9393
protected function execute(InputInterface $input, OutputInterface $output)
9494
{
95-
@trigger_error('Using the WebserverBundle is deprecated since Symfony 4.4. The new Symfony local server has more features, you can use it instead.', E_USER_DEPRECATED);
95+
@trigger_error('Using the WebserverBundle is deprecated since Symfony 4.4. The new Symfony local server has more features, you can use it instead.', \E_USER_DEPRECATED);
9696

9797
$io = new SymfonyStyle($input, $output instanceof ConsoleOutputInterface ? $output->getErrorOutput() : $output);
9898

‎Command/ServerStartCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ protected function configure()
9292
*/
9393
protected function execute(InputInterface $input, OutputInterface $output)
9494
{
95-
@trigger_error('Using the WebserverBundle is deprecated since Symfony 4.4. The new Symfony local server has more features, you can use it instead.', E_USER_DEPRECATED);
95+
@trigger_error('Using the WebserverBundle is deprecated since Symfony 4.4. The new Symfony local server has more features, you can use it instead.', \E_USER_DEPRECATED);
9696

9797
$io = new SymfonyStyle($input, $output instanceof ConsoleOutputInterface ? $output->getErrorOutput() : $output);
9898

‎Command/ServerStatusCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ protected function configure()
7474
*/
7575
protected function execute(InputInterface $input, OutputInterface $output)
7676
{
77-
@trigger_error('Using the WebserverBundle is deprecated since Symfony 4.4. The new Symfony local server has more features, you can use it instead.', E_USER_DEPRECATED);
77+
@trigger_error('Using the WebserverBundle is deprecated since Symfony 4.4. The new Symfony local server has more features, you can use it instead.', \E_USER_DEPRECATED);
7878

7979
$io = new SymfonyStyle($input, $output instanceof ConsoleOutputInterface ? $output->getErrorOutput() : $output);
8080
$server = new WebServer($this->pidFileDirectory);

‎Command/ServerStopCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ protected function configure()
6363
*/
6464
protected function execute(InputInterface $input, OutputInterface $output)
6565
{
66-
@trigger_error('Using the WebserverBundle is deprecated since Symfony 4.4. The new Symfony local server has more features, you can use it instead.', E_USER_DEPRECATED);
66+
@trigger_error('Using the WebserverBundle is deprecated since Symfony 4.4. The new Symfony local server has more features, you can use it instead.', \E_USER_DEPRECATED);
6767

6868
$io = new SymfonyStyle($input, $output instanceof ConsoleOutputInterface ? $output->getErrorOutput() : $output);
6969

‎Resources/router.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,18 @@
2626
require ini_get('auto_prepend_file');
2727
}
2828

29-
if (is_file($_SERVER['DOCUMENT_ROOT'].DIRECTORY_SEPARATOR.$_SERVER['SCRIPT_NAME'])) {
29+
if (is_file($_SERVER['DOCUMENT_ROOT'].\DIRECTORY_SEPARATOR.$_SERVER['SCRIPT_NAME'])) {
3030
return false;
3131
}
3232

3333
$script = isset($_ENV['APP_FRONT_CONTROLLER']) ? $_ENV['APP_FRONT_CONTROLLER'] : 'index.php';
3434

3535
$_SERVER = array_merge($_SERVER, $_ENV);
36-
$_SERVER['SCRIPT_FILENAME'] = $_SERVER['DOCUMENT_ROOT'].DIRECTORY_SEPARATOR.$script;
36+
$_SERVER['SCRIPT_FILENAME'] = $_SERVER['DOCUMENT_ROOT'].\DIRECTORY_SEPARATOR.$script;
3737

3838
// Since we are rewriting to app_dev.php, adjust SCRIPT_NAME and PHP_SELF accordingly
39-
$_SERVER['SCRIPT_NAME'] = DIRECTORY_SEPARATOR.$script;
40-
$_SERVER['PHP_SELF'] = DIRECTORY_SEPARATOR.$script;
39+
$_SERVER['SCRIPT_NAME'] = \DIRECTORY_SEPARATOR.$script;
40+
$_SERVER['PHP_SELF'] = \DIRECTORY_SEPARATOR.$script;
4141

4242
require $script;
4343

‎WebServerBundle.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ class WebServerBundle extends Bundle
2020
{
2121
public function boot()
2222
{
23-
@trigger_error('Using the WebserverBundle is deprecated since Symfony 4.4. The new Symfony local server has more features, you can use it instead.', E_USER_DEPRECATED);
23+
@trigger_error('Using the WebserverBundle is deprecated since Symfony 4.4. The new Symfony local server has more features, you can use it instead.', \E_USER_DEPRECATED);
2424
}
2525
}

0 commit comments

Comments
 (0)