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

Commit

Permalink
Merge branch '2.8' into 3.4
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
nicolas-grekas committed Jul 26, 2018
1 parent d4c15d1 commit ea77088
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Command/ServerCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ abstract class ServerCommand extends Command
*/
public function isEnabled()
{
return !defined('HHVM_VERSION') && parent::isEnabled();
return !\defined('HHVM_VERSION') && parent::isEnabled();
}
}
4 changes: 2 additions & 2 deletions Command/ServerRunCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ protected function execute(InputInterface $input, OutputInterface $output)

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

if (null === $documentRoot = $input->getOption('docroot')) {
Expand Down
6 changes: 3 additions & 3 deletions Command/ServerStartCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
{
$io = new SymfonyStyle($input, $output instanceof ConsoleOutputInterface ? $output->getErrorOutput() : $output);

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

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

if (null === $documentRoot = $input->getOption('docroot')) {
Expand Down
2 changes: 1 addition & 1 deletion WebServer.php
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ private function createServerProcess(WebServerConfig $config)
$process->setWorkingDirectory($config->getDocumentRoot());
$process->setTimeout(null);

if (in_array('APP_ENV', explode(',', getenv('SYMFONY_DOTENV_VARS')))) {
if (\in_array('APP_ENV', explode(',', getenv('SYMFONY_DOTENV_VARS')))) {
$process->setEnv(array('APP_ENV' => false));
$process->inheritEnvironmentVariables();
}
Expand Down

0 comments on commit ea77088

Please # to comment.