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

Run cs fixer and update config to latest master

pull/5202/merge
Jordi Boggiano 2016-04-11 15:06:57 +01:00
parent b9ce06f46b
commit 3b0a1c6f70
25 changed files with 76 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.php_cs
View File

@ -10,7 +10,7 @@ For the full copyright and license information, please view the LICENSE
file that was distributed with this source code.
EOF;
$finder = Symfony\CS\Finder::create()
$finder = PhpCsFixer\Finder::create()
->files()
->name('*.php')
->exclude('Fixtures')
@ -18,7 +18,7 @@ $finder = Symfony\CS\Finder::create()
->in(__DIR__.'/tests')
;
return Symfony\CS\Config::create()
return PhpCsFixer\Config::create()
->setUsingCache(true)
//->setUsingLinter(false)
->setRiskyAllowed(true)
@ -26,6 +26,7 @@ return Symfony\CS\Config::create()
'@PSR2' => true,
'binary_operator_spaces' => true,
'blank_line_before_return' => true,
'cast_spaces' => true,
'header_comment' => array('header' => $header),
'include' => true,
'long_array_syntax' => true,
@ -39,6 +40,7 @@ return Symfony\CS\Config::create()
'no_leading_namespace_whitespace' => true,
'no_trailing_comma_in_singleline_array' => true,
'no_unused_imports' => true,
'no_whitespace_in_blank_lines' => true,
'object_operator_without_whitespace' => true,
'phpdoc_align' => true,
'phpdoc_indent' => true,
@ -50,11 +52,9 @@ return Symfony\CS\Config::create()
'phpdoc_type_to_var' => true,
'psr0' => true,
'single_blank_line_before_namespace' => true,
'spaces_cast' => true,
'standardize_not_equals' => true,
'ternary_operator_spaces' => true,
'trailing_comma_in_multiline_array' => true,
'whitespacy_lines' => true,
))
->finder($finder)
;

6
src/Composer/Command/LicensesCommand.php
View File

@ -112,9 +112,9 @@ EOT
/**
* Find package requires and child requires
*
* @param RepositoryInterface $repo
* @param PackageInterface $package
* @param array $bucket
* @param RepositoryInterface $repo
* @param PackageInterface $package
* @param array $bucket
* @return array
*/
private function filterRequiredPackages(RepositoryInterface $repo, PackageInterface $package, $bucket = array())

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

@ -117,7 +117,7 @@ EOT
->setClassMapAuthoritative($authoritative)
->setUpdate(true)
->setUpdateWhitelist($packages)
->setWhitelistDependencies( ! $input->getOption('no-update-with-dependencies'))
->setWhitelistDependencies(!$input->getOption('no-update-with-dependencies'))
->setIgnorePlatformRequirements($input->getOption('ignore-platform-reqs'))
;

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

@ -302,11 +302,11 @@ TAGSPUBKEY
}
/**
* @param string $localFilename
* @param string $newFilename
* @param string $backupTarget
* @return \UnexpectedValueException|\PharException|null
* @param string $localFilename
* @param string $newFilename
* @param string $backupTarget
* @throws \Exception
* @return \UnexpectedValueException|\PharException|null
*/
protected function setLocalPhar($localFilename, $newFilename, $backupTarget = null)
{
@ -325,6 +325,7 @@ TAGSPUBKEY
}
rename($newFilename, $localFilename);
return null;
} catch (\Exception $e) {
if (!$e instanceof \UnexpectedValueException && !$e instanceof \PharException) {

4
src/Composer/Config.php
View File

@ -80,8 +80,8 @@ class Config
private $useEnvironment;
/**
* @param bool $useEnvironment Use COMPOSER_ environment variables to replace config settings
* @param string $baseDir Optional base directory of the config
* @param bool $useEnvironment Use COMPOSER_ environment variables to replace config settings
* @param string $baseDir Optional base directory of the config
*/
public function __construct($useEnvironment = true, $baseDir = null)
{

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

@ -46,8 +46,8 @@ class Request
*
* These jobs will not be tempered with by the solver
*
* @param string $packageName
* @param ConstraintInterface|null $constraint
* @param string $packageName
* @param ConstraintInterface|null $constraint
*/
public function fix($packageName, ConstraintInterface $constraint = null)
{

4
src/Composer/Downloader/PathDownloader.php
View File

@ -80,11 +80,11 @@ class PathDownloader extends FileDownloader
$this->io->writeError(sprintf(' Junctioned from %s', $url));
} else {
$absolutePath = $path;
if ( ! $this->filesystem->isAbsolutePath($absolutePath)) {
if (!$this->filesystem->isAbsolutePath($absolutePath)) {
$absolutePath = getcwd() . DIRECTORY_SEPARATOR . $path;
}
$shortestPath = $this->filesystem->findShortestPath($absolutePath, $realUrl);
$path = rtrim($path,"/");
$path = rtrim($path, "/");
$fileSystem->symlink($shortestPath, $path);
$this->io->writeError(sprintf(' Symlinked from %s', $url));
}

6
src/Composer/EventDispatcher/EventDispatcher.php
View File

@ -136,10 +136,10 @@ class EventDispatcher
/**
* Triggers the listeners of an event.
*
* @param Event $event The event object to pass to the event handlers/listeners.
* @return int return code of the executed script if any, for php scripts a false return
* value is changed to 1, anything else to 0
* @param Event $event The event object to pass to the event handlers/listeners.
* @throws \RuntimeException|\Exception
* @return int return code of the executed script if any, for php scripts a false return
* value is changed to 1, anything else to 0
*/
protected function doDispatch(Event $event)
{

2
src/Composer/Installer.php
View File

@ -1488,7 +1488,7 @@ class Installer
}
/**
* @param SuggestedPackagesReporter $suggestedPackagesReporter
* @param SuggestedPackagesReporter $suggestedPackagesReporter
* @return Installer
*/
public function setSuggestedPackagesReporter(SuggestedPackagesReporter $suggestedPackagesReporter)

6
src/Composer/Installer/BinaryInstaller.php
View File

@ -35,9 +35,9 @@ class BinaryInstaller
/**
* @param IOInterface $io
* @param string $binDir
* @param string $binCompat
* @param Filesystem $filesystem
* @param string $binDir
* @param string $binCompat
* @param Filesystem $filesystem
*/
public function __construct(IOInterface $io, $binDir, $binCompat, Filesystem $filesystem = null)
{

10
src/Composer/Installer/LibraryInstaller.php
View File

@ -40,11 +40,11 @@ class LibraryInstaller implements InstallerInterface
/**
* Initializes library installer.
*
* @param IOInterface $io
* @param Composer $composer
* @param string $type
* @param Filesystem $filesystem
* @param BinaryInstaller $binaryInstaller
* @param IOInterface $io
* @param Composer $composer
* @param string $type
* @param Filesystem $filesystem
* @param BinaryInstaller $binaryInstaller
*/
public function __construct(IOInterface $io, Composer $composer, $type = 'library', Filesystem $filesystem = null, BinaryInstaller $binaryInstaller = null)
{

2
src/Composer/Installer/PluginInstaller.php
View File

@ -61,7 +61,7 @@ class PluginInstaller extends LibraryInstaller
parent::install($repo, $package);
try {
$this->composer->getPluginManager()->registerPackage($package, true);
} catch(\Exception $e) {
} catch (\Exception $e) {
// Rollback installation
$this->io->writeError('Plugin installation failed, rolling back');
parent::uninstall($repo, $package);

10
src/Composer/Installer/SuggestedPackagesReporter.php
View File

@ -52,9 +52,9 @@ class SuggestedPackagesReporter
* Could be used to add suggested packages both from the installer
* or from CreateProjectCommand.
*
* @param string $source Source package which made the suggestion
* @param string $target Target package to be suggested
* @param string $reason Reason the target package to be suggested
* @param string $source Source package which made the suggestion
* @param string $target Target package to be suggested
* @param string $reason Reason the target package to be suggested
* @return SuggestedPackagesReporter
*/
public function addPackage($source, $target, $reason)
@ -71,7 +71,7 @@ class SuggestedPackagesReporter
/**
* Add all suggestions from a package.
*
* @param PackageInterface $package
* @param PackageInterface $package
* @return SuggestedPackagesReporter
*/
public function addSuggestionsFromPackage(PackageInterface $package)
@ -92,7 +92,7 @@ class SuggestedPackagesReporter
* Output suggested packages.
* Do not list the ones already installed if installed repository provided.
*
* @param RepositoryInterface $installedRepo Installed packages
* @param RepositoryInterface $installedRepo Installed packages
* @return SuggestedPackagesReporter
*/
public function output(RepositoryInterface $installedRepo = null)

4
src/Composer/Json/JsonFile.php
View File

@ -104,8 +104,8 @@ class JsonFile
/**
* Writes json file.
*
* @param array $hash writes hash into json file
* @param int $options json_encode options (defaults to JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE)
* @param array $hash writes hash into json file
* @param int $options json_encode options (defaults to JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE)
* @throws \UnexpectedValueException|\Exception
*/
public function write(array $hash, $options = 448)

1
src/Composer/Package/Archiver/ArchivableFilesFinder.php
View File

@ -94,6 +94,7 @@ class ArchivableFilesFinder extends \FilterIterator
}
$iterator = new FilesystemIterator($current, FilesystemIterator::SKIP_DOTS);
return !$iterator->valid();
}
}

1
src/Composer/Package/Archiver/GitExcludeFilter.php
View File

@ -72,6 +72,7 @@ class GitExcludeFilter extends BaseExcludeFilter
if (count($parts) == 2 && $parts[1] === 'export-ignore') {
return $this->generatePattern($parts[0]);
}
return null;
}
}

6
src/Composer/Package/Loader/RootPackageLoader.php
View File

@ -56,9 +56,9 @@ class RootPackageLoader extends ArrayLoader
}
/**
* @param array $config package data
* @param string $class FQCN to be instantiated
* @param string $cwd cwd of the root package to be used to guess the version if it is not provided
* @param array $config package data
* @param string $class FQCN to be instantiated
* @param string $cwd cwd of the root package to be used to guess the version if it is not provided
* @return RootPackageInterface
*/
public function load(array $config, $class = 'Composer\Package\RootPackage', $cwd = null)

1
src/Composer/Repository/ArrayRepository.php
View File

@ -56,6 +56,7 @@ class ArrayRepository extends BaseRepository
}
}
}
return null;
}

6
src/Composer/Repository/ComposerRepository.php
View File

@ -269,9 +269,9 @@ class ComposerRepository extends ArrayRepository implements ConfigurableReposito
}
/**
* @param Pool $pool
* @param string $name package name
* @param bool $bypassFilters If set to true, this bypasses the stability filtering, and forces a recompute without cache
* @param Pool $pool
* @param string $name package name
* @param bool $bypassFilters If set to true, this bypasses the stability filtering, and forces a recompute without cache
* @return array|mixed
*/
public function whatProvides(Pool $pool, $name, $bypassFilters = false)

28
src/Composer/Repository/RepositoryFactory.php
View File

@ -25,10 +25,10 @@ use Composer\Json\JsonFile;
class RepositoryFactory
{
/**
* @param IOInterface $io
* @param Config $config
* @param string $repository
* @param bool $allowFilesystem
* @param IOInterface $io
* @param Config $config
* @param string $repository
* @param bool $allowFilesystem
* @return array|mixed
*/
public static function configFromString(IOInterface $io, Config $config, $repository, $allowFilesystem = false)
@ -56,10 +56,10 @@ class RepositoryFactory
}
/**
* @param IOInterface $io
* @param Config $config
* @param string $repository
* @param bool $allowFilesystem
* @param IOInterface $io
* @param Config $config
* @param string $repository
* @param bool $allowFilesystem
* @return RepositoryInterface
*/
public static function fromString(IOInterface $io, Config $config, $repository, $allowFilesystem = false)
@ -70,9 +70,9 @@ class RepositoryFactory
}
/**
* @param IOInterface $io
* @param Config $config
* @param array $repoConfig
* @param IOInterface $io
* @param Config $config
* @param array $repoConfig
* @return RepositoryInterface
*/
public static function createRepo(IOInterface $io, Config $config, array $repoConfig)
@ -84,9 +84,9 @@ class RepositoryFactory
}
/**
* @param IOInterface|null $io
* @param Config|null $config
* @param RepositoryManager|null $rm
* @param IOInterface|null $io
* @param Config|null $config
* @param RepositoryManager|null $rm
* @return RepositoryInterface[]
*/
public static function defaultRepos(IOInterface $io = null, Config $config = null, RepositoryManager $rm = null)

1
src/Composer/Repository/RepositoryManager.php
View File

@ -58,6 +58,7 @@ class RepositoryManager
return $package;
}
}
return null;
}

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

@ -75,7 +75,7 @@ class Bitbucket
}
/**
* @param string $originUrl
* @param string $originUrl
* @return bool
*/
private function requestAccessToken($originUrl)
@ -88,7 +88,7 @@ class Bitbucket
'http' => array(
'method' => 'POST',
'content' => 'grant_type=client_credentials',
)
),
));
$this->token = json_decode($json, true);
@ -150,7 +150,7 @@ class Bitbucket
$consumer = array(
"consumer-key" => $consumerKey,
"consumer-secret" => $consumerSecret
"consumer-secret" => $consumerSecret,
);
$this->config->getAuthConfigSource()->addConfigSetting('bitbucket-oauth.'.$originUrl, $consumer);
@ -162,9 +162,9 @@ class Bitbucket
/**
* Retrieves an access token from Bitbucket.
*
* @param string $originUrl
* @param string $consumerKey
* @param string $consumerSecret
* @param string $originUrl
* @param string $consumerKey
* @param string $consumerSecret
* @return array
*/
public function requestToken($originUrl, $consumerKey, $consumerSecret)

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

@ -127,7 +127,7 @@ class Git
$auth = $this->io->getAuthentication($match[1]);
//We already have an access_token from a previous request.
if($auth['username'] !== 'x-token-auth') {
if ($auth['username'] !== 'x-token-auth') {
$token = $bitbucketUtil->requestToken($match[1], $auth['username'], $auth['password']);
$this->io->setAuthentication($match[1], 'x-token-auth', $token['access_token']);
}

1
src/Composer/Util/TlsHelper.php
View File

@ -82,6 +82,7 @@ final class TlsHelper
if (0 === strpos($name, 'DNS:')) {
return strtolower(ltrim(substr($name, 4)));
}
return null;
}, $subjectAltNames));
$subjectAltNames = array_values($subjectAltNames);

9
tests/Composer/Test/ConfigTest.php
View File

@ -13,7 +13,6 @@
namespace Composer\Test;
use Composer\Config;
use Composer\Downloader\TransportException;
class ConfigTest extends \PHPUnit_Framework_TestCase
{
@ -252,7 +251,8 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
'file://myserver.localhost/mygit.git',
'file://example.org/mygit.git',
);
return array_combine($urls, array_map(function($e) { return array($e); }, $urls));
return array_combine($urls, array_map(function ($e) { return array($e); }, $urls));
}
/**
@ -270,9 +270,10 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
'svn://1.2.3.4/trunk',
'git://5.6.7.8/git.git',
);
return array_combine($urls, array_map(function($e) { return array($e); }, $urls));
return array_combine($urls, array_map(function ($e) { return array($e); }, $urls));
}
/**
* @group TLS
*/