public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Merge pull request #6921 from carusogabriel/add-no_useless_else-phpcs 

Add no_useless_else in phpcs
pull/6926/head
Jordi Boggiano 2017-12-19 13:56:56 +01:00 committed by GitHub
parent 02fbbd5a42 50045a7536
commit 6d4a8574da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.php_cs
View File

@ -39,6 +39,7 @@ return PhpCsFixer\Config::create()
'no_leading_namespace_whitespace' => true, 'no_leading_namespace_whitespace' => true,
'no_trailing_comma_in_singleline_array' => true, 'no_trailing_comma_in_singleline_array' => true,
'no_unused_imports' => true, 'no_unused_imports' => true,
'no_useless_else' => true,
'no_whitespace_in_blank_line' => true, 'no_whitespace_in_blank_line' => true,
'object_operator_without_whitespace' => true, 'object_operator_without_whitespace' => true,
'phpdoc_align' => true, 'phpdoc_align' => true,

4
src/Composer/Util/Perforce.php
View File

@ -243,14 +243,14 @@ class Perforce
} }
return null; return null;
} else { }
$command = 'echo $' . $name; $command = 'echo $' . $name;
$this->executeCommand($command); $this->executeCommand($command);
$result = trim($this->commandResult); $result = trim($this->commandResult);
return $result; return $result;
} }
}
public function queryP4Password() public function queryP4Password()
{ {