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

Merged isset, unset and str_replace calls

pull/9204/head
Simon Berger 2020-09-11 23:51:55 +02:00
parent 974e7ba296
commit 80d71ccb3f
16 changed files with 31 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Composer/Command/InitCommand.php
View File

@ -277,7 +277,7 @@ EOT
$author_email = $git['user.email']; $author_email = $git['user.email'];
} }
if (isset($author_name) && isset($author_email)) { if (isset($author_name, $author_email)) {
$author = sprintf('%s <%s>', $author_name, $author_email); $author = sprintf('%s <%s>', $author_name, $author_email);
} }
} }

2
src/Composer/Command/SelfUpdateCommand.php
View File

@ -124,7 +124,7 @@ EOT
if (function_exists('posix_getpwuid') && function_exists('posix_geteuid')) { if (function_exists('posix_getpwuid') && function_exists('posix_geteuid')) {
$composeUser = posix_getpwuid(posix_geteuid()); $composeUser = posix_getpwuid(posix_geteuid());
$homeOwner = posix_getpwuid(fileowner($home)); $homeOwner = posix_getpwuid(fileowner($home));
if (isset($composeUser['name']) && isset($homeOwner['name']) && $composeUser['name'] !== $homeOwner['name']) { if (isset($composeUser['name'], $homeOwner['name']) && $composeUser['name'] !== $homeOwner['name']) {
$io->writeError('<warning>You are running composer as "'.$composeUser['name'].'", while "'.$home.'" is owned by "'.$homeOwner['name'].'"</warning>'); $io->writeError('<warning>You are running composer as "'.$composeUser['name'].'", while "'.$home.'" is owned by "'.$homeOwner['name'].'"</warning>');
} }
} }

11
src/Composer/Compiler.php
View File

@ -199,9 +199,14 @@ class Compiler
} }
if ($path === 'src/Composer/Composer.php') { if ($path === 'src/Composer/Composer.php') {
$content = str_replace('@package_version@', $this->version, $content); $content = strtr(
$content = str_replace('@package_branch_alias_version@', $this->branchAliasVersion, $content); $content,
$content = str_replace('@release_date@', $this->versionDate->format('Y-m-d H:i:s'), $content); array(
'@package_version@' => $this->version,
'@package_branch_alias_version@' => $this->branchAliasVersion,
'@release_date@' => $this->versionDate->format('Y-m-d H:i:s')
)
);
$content = preg_replace('{SOURCE_VERSION = \'[^\']+\';}', 'SOURCE_VERSION = \'\';', $content); $content = preg_replace('{SOURCE_VERSION = \'[^\']+\';}', 'SOURCE_VERSION = \'\';', $content);
} }

6
src/Composer/DependencyResolver/PoolBuilder.php
View File

@ -399,7 +399,7 @@ class PoolBuilder
if ($propagateUpdate && $request->getUpdateAllowTransitiveDependencies()) { if ($propagateUpdate && $request->getUpdateAllowTransitiveDependencies()) {
foreach ($package->getReplaces() as $link) { foreach ($package->getReplaces() as $link) {
$replace = $link->getTarget(); $replace = $link->getTarget();
if (isset($this->loadedPackages[$replace]) && isset($this->skippedLoad[$replace])) { if (isset($this->loadedPackages[$replace], $this->skippedLoad[$replace])) {
if ($request->getUpdateAllowTransitiveRootDependencies() || !$this->isRootRequire($request, $this->skippedLoad[$replace])) { if ($request->getUpdateAllowTransitiveRootDependencies() || !$this->isRootRequire($request, $this->skippedLoad[$replace])) {
$this->unfixPackage($request, $replace); $this->unfixPackage($request, $replace);
$this->markPackageNameForLoading($request, $replace, $link->getConstraint()); $this->markPackageNameForLoading($request, $replace, $link->getConstraint());
@ -488,9 +488,7 @@ class PoolBuilder
$this->unfixPackage($request, $this->skippedLoad[$name]); $this->unfixPackage($request, $this->skippedLoad[$name]);
} }
unset($this->skippedLoad[$name]); unset($this->skippedLoad[$name], $this->loadedPackages[$name], $this->maxExtendedReqs[$name]);
unset($this->loadedPackages[$name]);
unset($this->maxExtendedReqs[$name]);
} }
private function removeLoadedPackage(Request $request, PackageInterface $package, $index) private function removeLoadedPackage(Request $request, PackageInterface $package, $index)

2
src/Composer/DependencyResolver/Problem.php
View File

@ -331,7 +331,7 @@ class Problem
} }
foreach ($prepared as $name => $package) { foreach ($prepared as $name => $package) {
// remove the implicit default branch alias to avoid cruft in the display // remove the implicit default branch alias to avoid cruft in the display
if (isset($package['versions'][VersionParser::DEFAULT_BRANCH_ALIAS]) && isset($hasDefaultBranch[$name])) { if (isset($package['versions'][VersionParser::DEFAULT_BRANCH_ALIAS], $hasDefaultBranch[$name])) {
unset($package['versions'][VersionParser::DEFAULT_BRANCH_ALIAS]); unset($package['versions'][VersionParser::DEFAULT_BRANCH_ALIAS]);
} }

3
src/Composer/DependencyResolver/Request.php
View File

@ -82,8 +82,7 @@ class Request
public function unfixPackage(PackageInterface $package) public function unfixPackage(PackageInterface $package)
{ {
unset($this->fixedPackages[spl_object_hash($package)]); unset($this->fixedPackages[spl_object_hash($package)], $this->unlockables[spl_object_hash($package)]);
unset($this->unlockables[spl_object_hash($package)]);
} }
public function setUpdateAllowList($updateAllowList, $updateAllowTransitiveDependencies) public function setUpdateAllowList($updateAllowList, $updateAllowTransitiveDependencies)

3
src/Composer/DependencyResolver/RuleSetIterator.php
View File

@ -88,7 +88,6 @@ class RuleSetIterator implements \Iterator
public function valid() public function valid()
{ {
return isset($this->rules[$this->currentType]) return isset($this->rules[$this->currentType], $this->rules[$this->currentType][$this->currentOffset]);
&& isset($this->rules[$this->currentType][$this->currentOffset]);
} }
} }

5
src/Composer/Package/Loader/ArrayLoader.php
View File

@ -129,7 +129,7 @@ class ArrayLoader implements LoaderInterface
} }
if (isset($config['source'])) { if (isset($config['source'])) {
if (!isset($config['source']['type']) || !isset($config['source']['url']) || !isset($config['source']['reference'])) { if (!isset($config['source']['type'], $config['source']['url'], $config['source']['reference'])) {
throw new \UnexpectedValueException(sprintf( throw new \UnexpectedValueException(sprintf(
"Package %s's source key should be specified as {\"type\": ..., \"url\": ..., \"reference\": ...},\n%s given.", "Package %s's source key should be specified as {\"type\": ..., \"url\": ..., \"reference\": ...},\n%s given.",
$config['name'], $config['name'],
@ -145,8 +145,7 @@ class ArrayLoader implements LoaderInterface
} }
if (isset($config['dist'])) { if (isset($config['dist'])) {
if (!isset($config['dist']['type']) if (!isset($config['dist']['type'], $config['dist']['url'])) {
|| !isset($config['dist']['url'])) {
throw new \UnexpectedValueException(sprintf( throw new \UnexpectedValueException(sprintf(
"Package %s's dist key should be specified as ". "Package %s's dist key should be specified as ".
"{\"type\": ..., \"url\": ..., \"reference\": ..., \"shasum\": ...},\n%s given.", "{\"type\": ..., \"url\": ..., \"reference\": ..., \"shasum\": ...},\n%s given.",

6
src/Composer/Repository/Vcs/SvnDriver.php
View File

@ -225,7 +225,7 @@ class SvnDriver extends VcsDriver
foreach ($this->process->splitLines($output) as $line) { foreach ($this->process->splitLines($output) as $line) {
$line = trim($line); $line = trim($line);
if ($line && preg_match('{^\s*(\S+).*?(\S+)\s*$}', $line, $match)) { if ($line && preg_match('{^\s*(\S+).*?(\S+)\s*$}', $line, $match)) {
if (isset($match[1]) && isset($match[2]) && $match[2] !== './') { if (isset($match[1], $match[2]) && $match[2] !== './') {
$this->tags[rtrim($match[2], '/')] = $this->buildIdentifier( $this->tags[rtrim($match[2], '/')] = $this->buildIdentifier(
'/' . $this->tagsPath . '/' . $match[2], '/' . $this->tagsPath . '/' . $match[2],
$match[1] $match[1]
@ -259,7 +259,7 @@ class SvnDriver extends VcsDriver
foreach ($this->process->splitLines($output) as $line) { foreach ($this->process->splitLines($output) as $line) {
$line = trim($line); $line = trim($line);
if ($line && preg_match('{^\s*(\S+).*?(\S+)\s*$}', $line, $match)) { if ($line && preg_match('{^\s*(\S+).*?(\S+)\s*$}', $line, $match)) {
if (isset($match[1]) && isset($match[2]) && $match[2] === './') { if (isset($match[1], $match[2]) && $match[2] === './') {
$this->branches['trunk'] = $this->buildIdentifier( $this->branches['trunk'] = $this->buildIdentifier(
'/' . $this->trunkPath, '/' . $this->trunkPath,
$match[1] $match[1]
@ -278,7 +278,7 @@ class SvnDriver extends VcsDriver
foreach ($this->process->splitLines(trim($output)) as $line) { foreach ($this->process->splitLines(trim($output)) as $line) {
$line = trim($line); $line = trim($line);
if ($line && preg_match('{^\s*(\S+).*?(\S+)\s*$}', $line, $match)) { if ($line && preg_match('{^\s*(\S+).*?(\S+)\s*$}', $line, $match)) {
if (isset($match[1]) && isset($match[2]) && $match[2] !== './') { if (isset($match[1], $match[2]) && $match[2] !== './') {
$this->branches[rtrim($match[2], '/')] = $this->buildIdentifier( $this->branches[rtrim($match[2], '/')] = $this->buildIdentifier(
'/' . $this->branchesPath . '/' . $match[2], '/' . $this->branchesPath . '/' . $match[2],
$match[1] $match[1]

3
src/Composer/Util/Bitbucket.php
View File

@ -236,8 +236,7 @@ class Bitbucket
$authConfig = $this->config->get('bitbucket-oauth'); $authConfig = $this->config->get('bitbucket-oauth');
if ( if (
!isset($authConfig[$originUrl]['access-token']) !isset($authConfig[$originUrl]['access-token'], $authConfig[$originUrl]['access-token-expiration'])
|| !isset($authConfig[$originUrl]['access-token-expiration'])
|| time() > $authConfig[$originUrl]['access-token-expiration'] || time() > $authConfig[$originUrl]['access-token-expiration']
) { ) {
return false; return false;

2
src/Composer/Util/ConfigValidator.php
View File

@ -132,7 +132,7 @@ class ConfigValidator
} }
// check for require-dev overrides // check for require-dev overrides
if (isset($manifest['require']) && isset($manifest['require-dev'])) { if (isset($manifest['require'], $manifest['require-dev'])) {
$requireOverrides = array_intersect_key($manifest['require'], $manifest['require-dev']); $requireOverrides = array_intersect_key($manifest['require'], $manifest['require-dev']);
if (!empty($requireOverrides)) { if (!empty($requireOverrides)) {

2
src/Composer/Util/Http/CurlDownloader.php
View File

@ -220,7 +220,7 @@ class CurlDownloader
public function abortRequest($id) public function abortRequest($id)
{ {
if (isset($this->jobs[$id]) && isset($this->jobs[$id]['handle'])) { if (isset($this->jobs[$id], $this->jobs[$id]['handle'])) {
$job = $this->jobs[$id]; $job = $this->jobs[$id];
curl_multi_remove_handle($this->multiHandle, $job['handle']); curl_multi_remove_handle($this->multiHandle, $job['handle']);
curl_close($job['handle']); curl_close($job['handle']);

5
tests/Composer/Test/InstallerTest.php
View File

@ -347,10 +347,7 @@ class InstallerTest extends TestCase
$output = str_replace("\r", '', $io->getOutput()); $output = str_replace("\r", '', $io->getOutput());
$this->assertEquals($expectResult, $result, $output . stream_get_contents($appOutput)); $this->assertEquals($expectResult, $result, $output . stream_get_contents($appOutput));
if ($expectLock && isset($actualLock)) { if ($expectLock && isset($actualLock)) {
unset($actualLock['hash']); unset($actualLock['hash'], $actualLock['content-hash'], $actualLock['_readme'], $actualLock['plugin-api-version']);
unset($actualLock['content-hash']);
unset($actualLock['_readme']);
unset($actualLock['plugin-api-version']);
$this->assertEquals($expectLock, $actualLock); $this->assertEquals($expectLock, $actualLock);
} }

3
tests/Composer/Test/Json/ComposerSchemaTest.php
View File

@ -120,8 +120,7 @@ class ComposerSchemaTest extends TestCase
// remove justinrainbow/json-schema 3.0/5.2 props so it works with all versions // remove justinrainbow/json-schema 3.0/5.2 props so it works with all versions
foreach ($errors as &$err) { foreach ($errors as &$err) {
unset($err['pointer']); unset($err['pointer'], $err['context']);
unset($err['context']);
} }
return $errors; return $errors;

5
tests/Composer/Test/Util/RemoteFilesystemTest.php
View File

@ -82,7 +82,10 @@ class RemoteFilesystemTest extends TestCase
)); ));
$res = $this->callGetOptionsForUrl($io, array('https://example.org', array()), $streamOptions); $res = $this->callGetOptionsForUrl($io, array('https://example.org', array()), $streamOptions);
$this->assertTrue(isset($res['ssl']) && isset($res['ssl']['allow_self_signed']) && true === $res['ssl']['allow_self_signed'], 'getOptions must return an array with a allow_self_signed set to true'); $this->assertTrue(
isset($res['ssl'], $res['ssl']['allow_self_signed']) && true === $res['ssl']['allow_self_signed'],
'getOptions must return an array with a allow_self_signed set to true'
);
} }
public function testGetOptionsForUrlWithCallOptionsKeepsHeader() public function testGetOptionsForUrlWithCallOptionsKeepsHeader()

14
tests/Composer/Test/Util/StreamContextFactoryTest.php
View File

@ -19,22 +19,12 @@ class StreamContextFactoryTest extends TestCase
{ {
protected function setUp() protected function setUp()
{ {
unset($_SERVER['HTTP_PROXY']); unset($_SERVER['HTTP_PROXY'], $_SERVER['http_proxy'], $_SERVER['HTTPS_PROXY'], $_SERVER['https_proxy'], $_SERVER['NO_PROXY'], $_SERVER['no_proxy']);
unset($_SERVER['http_proxy']);
unset($_SERVER['HTTPS_PROXY']);
unset($_SERVER['https_proxy']);
unset($_SERVER['NO_PROXY']);
unset($_SERVER['no_proxy']);
} }
protected function tearDown() protected function tearDown()
{ {
unset($_SERVER['HTTP_PROXY']); unset($_SERVER['HTTP_PROXY'], $_SERVER['http_proxy'], $_SERVER['HTTPS_PROXY'], $_SERVER['https_proxy'], $_SERVER['NO_PROXY'], $_SERVER['no_proxy']);
unset($_SERVER['http_proxy']);
unset($_SERVER['HTTPS_PROXY']);
unset($_SERVER['https_proxy']);
unset($_SERVER['NO_PROXY']);
unset($_SERVER['no_proxy']);
} }
/** /**