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

Commit ea77088

Browse files
Merge branch '2.8' into 3.4
* 2.8: Fix Clidumper tests Enable the fixer enforcing fully-qualified calls for compiler-optimized functions Apply fixers Disable the native_constant_invocation fixer until it can be scoped Update the list of excluded files for the CS fixer
1 parent d4c15d1 commit ea77088

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

Command/ServerCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ abstract class ServerCommand extends Command
2727
*/
2828
public function isEnabled()
2929
{
30-
return !defined('HHVM_VERSION') && parent::isEnabled();
30+
return !\defined('HHVM_VERSION') && parent::isEnabled();
3131
}
3232
}

Command/ServerRunCommand.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
9191

9292
// deprecated, logic to be removed in 4.0
9393
// this allows the commands to work out of the box with web/ and public/
94-
if ($this->documentRoot && !is_dir($this->documentRoot) && is_dir(dirname($this->documentRoot).'/web')) {
95-
$this->documentRoot = dirname($this->documentRoot).'/web';
94+
if ($this->documentRoot && !is_dir($this->documentRoot) && is_dir(\dirname($this->documentRoot).'/web')) {
95+
$this->documentRoot = \dirname($this->documentRoot).'/web';
9696
}
9797

9898
if (null === $documentRoot = $input->getOption('docroot')) {

Command/ServerStartCommand.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
8989
{
9090
$io = new SymfonyStyle($input, $output instanceof ConsoleOutputInterface ? $output->getErrorOutput() : $output);
9191

92-
if (!extension_loaded('pcntl')) {
92+
if (!\extension_loaded('pcntl')) {
9393
$io->error(array(
9494
'This command needs the pcntl extension to run.',
9595
'You can either install it or use the "server:run" command instead.',
@@ -104,8 +104,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
104104

105105
// deprecated, logic to be removed in 4.0
106106
// this allows the commands to work out of the box with web/ and public/
107-
if ($this->documentRoot && !is_dir($this->documentRoot) && is_dir(dirname($this->documentRoot).'/web')) {
108-
$this->documentRoot = dirname($this->documentRoot).'/web';
107+
if ($this->documentRoot && !is_dir($this->documentRoot) && is_dir(\dirname($this->documentRoot).'/web')) {
108+
$this->documentRoot = \dirname($this->documentRoot).'/web';
109109
}
110110

111111
if (null === $documentRoot = $input->getOption('docroot')) {

WebServer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ private function createServerProcess(WebServerConfig $config)
154154
$process->setWorkingDirectory($config->getDocumentRoot());
155155
$process->setTimeout(null);
156156

157-
if (in_array('APP_ENV', explode(',', getenv('SYMFONY_DOTENV_VARS')))) {
157+
if (\in_array('APP_ENV', explode(',', getenv('SYMFONY_DOTENV_VARS')))) {
158158
$process->setEnv(array('APP_ENV' => false));
159159
$process->inheritEnvironmentVariables();
160160
}

0 commit comments

Comments
 (0)