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

php-cs-fixer magic

pull/722/merge
Jordi Boggiano 2012-05-22 12:07:08 +02:00
parent 4ea9b33a6c
commit 1bd4ccbd54
90 changed files with 396 additions and 400 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Composer/Autoload/AutoloadGenerator.php
View File

@ -13,9 +13,7 @@
namespace Composer\Autoload;
use Composer\Installer\InstallationManager;
use Composer\Json\JsonFile;
use Composer\Package\AliasPackage;
use Composer\Package\Loader\JsonLoader;
use Composer\Package\PackageInterface;
use Composer\Repository\RepositoryInterface;
use Composer\Util\Filesystem;
@ -104,6 +102,7 @@ EOF;
return false;
}
require_once \$path;
return true;
}
});
@ -278,6 +277,7 @@ EOF;
$path = substr($path, strlen($vendorPath));
$baseDir = '$vendorDir . ';
}
return $baseDir.var_export($path, true);
}

2
src/Composer/Autoload/ClassLoader.php
View File

@ -86,6 +86,7 @@ class ClassLoader
foreach ((array) $paths as $path) {
$this->fallbackDirs[] = $path;
}
return;
}
if (isset($this->prefixes[$prefix])) {
@ -147,6 +148,7 @@ class ClassLoader
{
if ($file = $this->findFile($class)) {
require $file;
return true;
}
}

1
src/Composer/Command/CreateProjectCommand.php
View File

@ -135,6 +135,7 @@ EOT
protected function createDownloadManager(IOInterface $io)
{
$factory = new Factory();
return $factory->createDownloadManager($io);
}
}

1
src/Composer/Command/DependsCommand.php
View File

@ -13,7 +13,6 @@
namespace Composer\Command;
use Composer\Composer;
use Composer\Package\PackageInterface;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputOption;

1
src/Composer/Command/Helper/DialogHelper.php
View File

@ -13,7 +13,6 @@
namespace Composer\Command\Helper;
use Symfony\Component\Console\Helper\DialogHelper as BaseDialogHelper;
use Symfony\Component\Console\Output\OutputInterface;
class DialogHelper extends BaseDialogHelper
{

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

@ -333,6 +333,7 @@ EOT
foreach ($matches as $match) {
$this->gitConfig[$match[1]] = $match[2];
}
return $this->gitConfig;
}

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

@ -89,6 +89,7 @@ EOT
$this->printLinks($input, $output, $package, 'provides');
$this->printLinks($input, $output, $package, 'conflicts');
$this->printLinks($input, $output, $package, 'replaces');
return;
}
@ -192,6 +193,7 @@ EOT
{
if ($input->getArgument('version')) {
$output->writeln('<info>version</info> : ' . $package->getPrettyVersion());
return;
}

2
src/Composer/Config.php
View File

@ -57,6 +57,7 @@ class Config
case 'process-timeout':
// convert foo-bar to COMPOSER_FOO_BAR and check if it exists since it overrides the local config
$env = 'COMPOSER_' . strtoupper(strtr($key, '-', '_'));
return $this->process(getenv($env) ?: $this->config[$key]);
case 'home':
@ -87,6 +88,7 @@ class Config
private function process($value)
{
$config = $this;
return preg_replace_callback('#\{\$(.+)\}#', function ($match) use ($config) {
return $config->get($match[1]);
}, $value);

5
src/Composer/DependencyResolver/DefaultPolicy.php
View File

@ -12,7 +12,6 @@
namespace Composer\DependencyResolver;
use Composer\Repository\RepositoryInterface;
use Composer\Package\PackageInterface;
use Composer\Package\AliasPackage;
use Composer\Package\LinkConstraint\VersionConstraint;
@ -179,7 +178,7 @@ class DefaultPolicy implements PolicyInterface
if ($this->versionCompare($package, $bestPackage, '>')) {
$bestPackage = $package;
$bestLiterals = array($literal);
} else if ($this->versionCompare($package, $bestPackage, '==')) {
} elseif ($this->versionCompare($package, $bestPackage, '==')) {
$bestLiterals[] = $literal;
}
}
@ -199,7 +198,7 @@ class DefaultPolicy implements PolicyInterface
if ($this->versionCompare($literal->getPackage(), $maxPackage, '>')) {
$maxPackage = $literal->getPackage();
$maxLiterals = array($literal);
} else if ($this->versionCompare($literal->getPackage(), $maxPackage, '==')) {
} elseif ($this->versionCompare($literal->getPackage(), $maxPackage, '==')) {
$maxLiterals[] = $literal;
}
}

1
src/Composer/DependencyResolver/Operation/OperationInterface.php
View File

@ -12,7 +12,6 @@
namespace Composer\DependencyResolver\Operation;
use Composer\Package\PackageInterface;
/**
* Solver operation interface.

1
src/Composer/DependencyResolver/PolicyInterface.php
View File

@ -12,7 +12,6 @@
namespace Composer\DependencyResolver;
use Composer\Repository\RepositoryInterface;
use Composer\Package\PackageInterface;
/**

1
src/Composer/DependencyResolver/Pool.php
View File

@ -155,6 +155,7 @@ class Pool
public function literalToPackage($literal)
{
$packageId = abs($literal);
return $this->packageById($packageId);
}

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

@ -65,8 +65,10 @@ class Problem
if (0 === stripos($job['packageName'], 'ext-')) {
$ext = substr($job['packageName'], 4);
$error = extension_loaded($ext) ? 'has the wrong version ('.phpversion($ext).') installed' : 'is missing from your system';
return 'The requested PHP extension "'.$job['packageName'].'" '.$this->constraintToText($job['constraint']).$error.'.';
}
return 'The requested package "'.$job['packageName'].'" '.$this->constraintToText($job['constraint']).'could not be found.';
}
}

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

@ -170,6 +170,7 @@ class Rule
case self::RULE_PACKAGE_CONFLICT:
$package1 = $this->pool->literalToPackage($this->literals[0]);
$package2 = $this->pool->literalToPackage($this->literals[1]);
return 'Package "'.$package1.'" conflicts with "'.$package2.'"';
case self::RULE_PACKAGE_REQUIRES:
@ -188,6 +189,7 @@ class Rule
} else {
$text .= 'No package satisfies this dependency.';
}
return $text;
case self::RULE_PACKAGE_OBSOLETES:

13
src/Composer/DependencyResolver/RuleSet.php
View File

@ -93,16 +93,14 @@ class RuleSet implements \IteratorAggregate, \Countable
public function getIteratorFor($types)
{
if (!is_array($types))
{
if (!is_array($types)) {
$types = array($types);
}
$allRules = $this->getRules();
$rules = array();
foreach ($types as $type)
{
foreach ($types as $type) {
$rules[$type] = $allRules[$type];
}
@ -112,15 +110,13 @@ class RuleSet implements \IteratorAggregate, \Countable
public function getIteratorWithout($types)
{
if (!is_array($types))
{
if (!is_array($types)) {
$types = array($types);
}
$rules = $this->getRules();
foreach ($types as $type)
{
foreach ($types as $type) {
unset($rules[$type]);
}
@ -131,6 +127,7 @@ class RuleSet implements \IteratorAggregate, \Countable
{
$types = self::$types;
unset($types[-1]);
return array_keys($types);
}

5
src/Composer/DependencyResolver/RuleSetGenerator.php
View File

@ -12,10 +12,8 @@
namespace Composer\DependencyResolver;
use Composer\Repository\RepositoryInterface;
use Composer\Package\PackageInterface;
use Composer\Package\AliasPackage;
use Composer\DependencyResolver\Operation;
/**
* @author Nils Adermann <naderman@naderman.de>
@ -134,7 +132,8 @@ class RuleSetGenerator
* @param int $type A TYPE_* constant defining the rule type
* @param Rule $newRule The rule about to be added
*/
private function addRule($type, Rule $newRule = null) {
private function addRule($type, Rule $newRule = null)
{
if ($this->rules->containsEqual($newRule)) {
return;
}

14
src/Composer/DependencyResolver/Solver.php
View File

@ -13,8 +13,6 @@
namespace Composer\DependencyResolver;
use Composer\Repository\RepositoryInterface;
use Composer\Package\AliasPackage;
use Composer\DependencyResolver\Operation;
/**
* @author Nils Adermann <naderman@naderman.de>
@ -202,12 +200,14 @@ class Solver
}
$transaction = new Transaction($this->policy, $this->pool, $this->installedMap, $this->decisionMap, $this->decisionQueue, $this->decisionQueueWhy);
return $transaction->getOperations();
}
protected function literalFromId($id)
{
$package = $this->pool->packageById(abs($id));
return new Literal($package, $id > 0);
}
@ -241,6 +241,7 @@ class Solver
public function decisionsContain($literal)
{
$packageId = abs($literal);
return (
$this->decisionMap[$packageId] > 0 && $literal > 0 ||
$this->decisionMap[$packageId] < 0 && $literal < 0
@ -250,6 +251,7 @@ class Solver
protected function decisionsSatisfy($literal)
{
$packageId = abs($literal);
return (
$literal > 0 && $this->decisionMap[$packageId] > 0 ||
$literal < 0 && $this->decisionMap[$packageId] < 0
@ -259,6 +261,7 @@ class Solver
public function decisionsConflict($literal)
{
$packageId = abs($literal);
return (
($this->decisionMap[$packageId] > 0 && $literal < 0) ||
($this->decisionMap[$packageId] < 0 && $literal > 0)
@ -274,7 +277,8 @@ class Solver
return $this->decisionMap[$packageId] == 0;
}
protected function decidedInstall($packageId) {
protected function decidedInstall($packageId)
{
return $this->decisionMap[$packageId] > 0;
}
@ -433,7 +437,7 @@ class Solver
$this->learnedPool[] = array();
while(true) {
while (true) {
$this->learnedPool[count($this->learnedPool) - 1][] = $rule;
foreach ($rule->getLiterals() as $literal) {
@ -535,6 +539,7 @@ class Solver
foreach ($problemRules as $problemRule) {
$this->analyzeUnsolvableRule($problem, $problemRule);
}
return;
}
@ -600,6 +605,7 @@ class Solver
}
$this->resetSolver();
return 1;
}

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

@ -95,7 +95,7 @@ class Transaction
$package, $this->decisionQueueWhy[$i]
);
}
} else if (!isset($ignoreRemove[$package->getId()])) {
} elseif (!isset($ignoreRemove[$package->getId()])) {
if ($package instanceof AliasPackage) {
$transaction[] = new Operation\MarkAliasInstalledOperation(
$package, $this->decisionQueueWhy[$i]

1
src/Composer/Downloader/ArchiveDownloader.php
View File

@ -12,7 +12,6 @@
namespace Composer\Downloader;
use Composer\IO\IOInterface;
use Composer\Package\PackageInterface;
/**

1
src/Composer/Downloader/DownloadManager.php
View File

@ -175,6 +175,7 @@ class DownloadManager
if ($target->isDev() && 'dist' === $installationSource) {
$downloader->remove($initial, $targetDir);
$this->download($target, $targetDir);
return;
}

1
src/Composer/Downloader/GitDownloader.php
View File

@ -13,7 +13,6 @@
namespace Composer\Downloader;
use Composer\Package\PackageInterface;
use Composer\Util\ProcessExecutor;
/**
* @author Jordi Boggiano <j.boggiano@seld.be>

1
src/Composer/Downloader/HgDownloader.php
View File

@ -13,7 +13,6 @@
namespace Composer\Downloader;
use Composer\Package\PackageInterface;
use Composer\Util\ProcessExecutor;
/**
* @author Per Bernhardt <plb@webfactory.de>

1
src/Composer/Downloader/PearDownloader.php
View File

@ -12,7 +12,6 @@
namespace Composer\Downloader;
use Composer\Package\PackageInterface;
/**
* Downloader for pear packages

1
src/Composer/Downloader/PharDownloader.php
View File

@ -12,7 +12,6 @@
namespace Composer\Downloader;
use Composer\Package\PackageInterface;
/**
* Downloader for phar files

1
src/Composer/Downloader/SvnDownloader.php
View File

@ -13,7 +13,6 @@
namespace Composer\Downloader;
use Composer\Package\PackageInterface;
use Composer\Util\ProcessExecutor;
use Composer\Util\Svn as SvnUtil;
/**

1
src/Composer/Downloader/TarDownloader.php
View File

@ -12,7 +12,6 @@
namespace Composer\Downloader;
use Composer\Package\PackageInterface;
/**
* Downloader for tar files: tar, tar.gz or tar.bz2

1
src/Composer/Downloader/ZipDownloader.php
View File

@ -12,7 +12,6 @@
namespace Composer\Downloader;
use Composer\Package\PackageInterface;
use Composer\Util\ProcessExecutor;
use Composer\IO\IOInterface;
use ZipArchive;

2
src/Composer/IO/ConsoleIO.php
View File

@ -13,9 +13,7 @@
namespace Composer\IO;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputDefinition;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Formatter\OutputFormatterInterface;
use Symfony\Component\Console\Helper\HelperSet;
/**

1
src/Composer/Installer.php
View File

@ -27,7 +27,6 @@ use Composer\Package\Link;
use Composer\Package\LinkConstraint\VersionConstraint;
use Composer\Package\Locker;
use Composer\Package\PackageInterface;
use Composer\Repository\ArrayRepository;
use Composer\Repository\CompositeRepository;
use Composer\Repository\InstalledArrayRepository;
use Composer\Repository\PlatformRepository;

1
src/Composer/Installer/InstallationManager.php
View File

@ -213,6 +213,7 @@ class InstallationManager
public function getInstallPath(PackageInterface $package)
{
$installer = $this->getInstaller($package->getType());
return $installer->getInstallPath($package);
}

1
src/Composer/Installer/InstallerInstaller.php
View File

@ -16,7 +16,6 @@ use Composer\IO\IOInterface;
use Composer\Autoload\AutoloadGenerator;
use Composer\Downloader\DownloadManager;
use Composer\Repository\InstalledRepositoryInterface;
use Composer\DependencyResolver\Operation\OperationInterface;
use Composer\Package\PackageInterface;
/**

1
src/Composer/Installer/InstallerInterface.php
View File

@ -12,7 +12,6 @@
namespace Composer\Installer;
use Composer\DependencyResolver\Operation\OperationInterface;
use Composer\Package\PackageInterface;
use Composer\Repository\InstalledRepositoryInterface;

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

@ -15,7 +15,6 @@ namespace Composer\Installer;
use Composer\IO\IOInterface;
use Composer\Downloader\DownloadManager;
use Composer\Repository\InstalledRepositoryInterface;
use Composer\DependencyResolver\Operation\OperationInterface;
use Composer\Package\PackageInterface;
use Composer\Util\Filesystem;

1
src/Composer/Installer/ProjectInstaller.php
View File

@ -12,7 +12,6 @@
namespace Composer\Installer;
use Composer\DependencyResolver\Operation\OperationInterface;
use Composer\Package\PackageInterface;
use Composer\Downloader\DownloadManager;
use Composer\Repository\InstalledRepositoryInterface;

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

@ -12,11 +12,9 @@
namespace Composer\Json;
use Composer\Repository\RepositoryManager;
use Composer\Composer;
use JsonSchema\Validator;
use Seld\JsonLint\JsonParser;
use Composer\Util\StreamContextFactory;
use Composer\Util\RemoteFilesystem;
use Composer\Downloader\TransportException;

3
src/Composer/Package/AliasPackage.php
View File

@ -12,10 +12,7 @@
namespace Composer\Package;
use Composer\Package\LinkConstraint\LinkConstraintInterface;
use Composer\Package\LinkConstraint\VersionConstraint;
use Composer\Repository\RepositoryInterface;
use Composer\Repository\PlatformRepository;
use Composer\Package\Version\VersionParser;
/**

1
src/Composer/Package/BasePackage.php
View File

@ -187,6 +187,7 @@ abstract class BasePackage implements PackageInterface
if ($package instanceof AliasPackage) {
$package = $package->getAliasOf();
}
return $package === $self;
}

1
src/Composer/Package/LinkConstraint/MultiConstraint.php
View File

@ -48,6 +48,7 @@ class MultiConstraint implements LinkConstraintInterface
foreach ($this->constraints as $constraint) {
$constraints[] = $constraint->__toString();
}
return '['.implode(', ', $constraints).']';
}
}

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

@ -14,7 +14,6 @@ namespace Composer\Package\Loader;
use Composer\Package;
use Composer\Package\Version\VersionParser;
use Composer\Repository\RepositoryManager;
/**
* @author Konstantin Kudryashiv <ever.zet@gmail.com>

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

@ -16,7 +16,6 @@ use Composer\Package\BasePackage;
use Composer\Package\Version\VersionParser;
use Composer\Repository\RepositoryManager;
use Composer\Util\ProcessExecutor;
use Composer\Package\AliasPackage;
/**
* ArrayLoader built for the sole purpose of loading the root package

2
src/Composer/Package/Version/VersionParser.php
View File

@ -139,6 +139,7 @@ class VersionParser
for ($i = 1; $i < 5; $i++) {
$version .= isset($matches[$i]) ? str_replace('*', 'x', $matches[$i]) : '.x';
}
return str_replace('x', '9999999', $version).'-dev';
}
@ -220,6 +221,7 @@ class VersionParser
if (preg_match('{^(>=?|<=?|==?)?\s*(.*)}', $constraint, $matches)) {
try {
$version = $this->normalize($matches[2]);
return array(new VersionConstraint($matches[1] ?: '=', $version));
} catch (\Exception $e) {}
}

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

@ -140,6 +140,7 @@ class ArrayRepository implements RepositoryInterface
if (null === $this->packages) {
$this->initialize();
}
return $this->packages;
}

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

@ -13,7 +13,6 @@
namespace Composer\Repository;
use Composer\Package\Loader\ArrayLoader;
use Composer\Package\LinkConstraint\VersionConstraint;
use Composer\Package\PackageInterface;
use Composer\Json\JsonFile;
use Composer\Cache;

5
src/Composer/Repository/CompositeRepository.php
View File

@ -57,6 +57,7 @@ class CompositeRepository implements RepositoryInterface
return true;
}
}
return false;
}
@ -72,6 +73,7 @@ class CompositeRepository implements RepositoryInterface
return $package;
}
}
return null;
}
@ -85,6 +87,7 @@ class CompositeRepository implements RepositoryInterface
/* @var $repository RepositoryInterface */
$packages[] = $repository->findPackages($name, $version);
}
return call_user_func_array('array_merge', $packages);
}
@ -98,6 +101,7 @@ class CompositeRepository implements RepositoryInterface
/* @var $repository RepositoryInterface */
$packages[] = $repository->getPackages();
}
return call_user_func_array('array_merge', $packages);
}
@ -111,6 +115,7 @@ class CompositeRepository implements RepositoryInterface
/* @var $repository RepositoryInterface */
$total += $repository->count();
}
return $total;
}

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

@ -13,7 +13,6 @@
namespace Composer\Repository;
use Composer\Json\JsonFile;
use Composer\Package\PackageInterface;
use Composer\Package\AliasPackage;
use Composer\Package\Loader\ArrayLoader;
use Composer\Package\Dumper\ArrayDumper;

4
src/Composer/Repository/InstalledArrayRepository.php
View File

@ -12,10 +12,6 @@
namespace Composer\Repository;
use Composer\Json\JsonFile;
use Composer\Package\PackageInterface;
use Composer\Package\Loader\ArrayLoader;
use Composer\Package\Dumper\ArrayDumper;
/**
* Installed array repository.

4
src/Composer/Repository/InstalledFilesystemRepository.php
View File

@ -12,10 +12,6 @@
namespace Composer\Repository;
use Composer\Json\JsonFile;
use Composer\Package\PackageInterface;
use Composer\Package\Loader\ArrayLoader;
use Composer\Package\Dumper\ArrayDumper;
/**
* Installed filesystem repository.

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

@ -12,7 +12,6 @@
namespace Composer\Repository;
use Composer\Package\PackageInterface;
/**
* Installable repository interface.

3
src/Composer/Repository/PackageRepository.php
View File

@ -12,10 +12,7 @@
namespace Composer\Repository;
use Composer\Json\JsonFile;
use Composer\Package\PackageInterface;
use Composer\Package\Loader\ArrayLoader;
use Composer\Package\Dumper\ArrayDumper;
/**
* Package repository.

2
src/Composer/Repository/PearRepository.php
View File

@ -207,6 +207,7 @@ class PearRepository extends ArrayRepository
if (isset($data['max'])) {
$versions[] = '<=' . $data['max'];
}
return implode(',', $versions);
}
@ -251,6 +252,7 @@ class PearRepository extends ArrayRepository
}
}
}
return $data;
}

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

@ -98,6 +98,7 @@ class RepositoryManager
}
$class = $this->repositoryClasses[$type];
return new $class($config, $this->io, $this->config);
}

1
src/Composer/Repository/Vcs/GitBitbucketDriver.php
View File

@ -148,6 +148,7 @@ class GitBitbucketDriver extends VcsDriver implements VcsDriverInterface
if ($io->isVerbose()) {
$io->write('Skipping Bitbucket git driver for '.$url.' because the OpenSSL PHP extension is missing.');
}
return false;
}

7
src/Composer/Repository/Vcs/GitHubDriver.php
View File

@ -16,7 +16,6 @@ use Composer\Downloader\TransportException;
use Composer\Json\JsonFile;
use Composer\Cache;
use Composer\IO\IOInterface;
use Composer\Util\ProcessExecutor;
use Composer\Util\RemoteFilesystem;
/**
@ -62,6 +61,7 @@ class GitHubDriver extends VcsDriver
if ($this->gitDriver) {
return $this->gitDriver->getRootIdentifier();
}
return $this->rootIdentifier;
}
@ -73,6 +73,7 @@ class GitHubDriver extends VcsDriver
if ($this->gitDriver) {
return $this->gitDriver->getUrl();
}
return $this->url;
}
@ -206,6 +207,7 @@ class GitHubDriver extends VcsDriver
if ($io->isVerbose()) {
$io->write('Skipping GitHub driver for '.$url.' because the OpenSSL PHP extension is missing.');
}
return false;
}
@ -245,7 +247,7 @@ class GitHubDriver extends VcsDriver
$this->rootIdentifier = 'master';
}
} catch (TransportException $e) {
switch($e->getCode()) {
switch ($e->getCode()) {
case 401:
case 404:
$this->isPrivate = true;
@ -262,6 +264,7 @@ class GitHubDriver extends VcsDriver
$this->remoteFilesystem
);
$this->gitDriver->initialize();
return;
}
$this->io->write('Authentication required (<info>'.$this->url.'</info>):');

1
src/Composer/Repository/Vcs/HgBitbucketDriver.php
View File

@ -148,6 +148,7 @@ class HgBitbucketDriver extends VcsDriver
if ($io->isVerbose()) {
$io->write('Skipping Bitbucket hg driver for '.$url.' because the OpenSSL PHP extension is missing.');
}
return false;
}

1
src/Composer/Repository/Vcs/HgDriver.php
View File

@ -171,6 +171,7 @@ class HgDriver extends VcsDriver
$processExecutor = new ProcessExecutor();
$exit = $processExecutor->execute(sprintf('cd %s && hg identify %s', escapeshellarg(sys_get_temp_dir()), escapeshellarg($url)), $ignored);
return $exit === 0;
}
}

1
src/Composer/Repository/Vcs/VcsDriver.php
View File

@ -76,6 +76,7 @@ abstract class VcsDriver implements VcsDriverInterface
if (extension_loaded('openssl')) {
return 'https';
}
return 'http';
}

5
src/Composer/Repository/VcsRepository.php
View File

@ -15,8 +15,6 @@ namespace Composer\Repository;
use Composer\Downloader\TransportException;
use Composer\Repository\Vcs\VcsDriverInterface;
use Composer\Package\Version\VersionParser;
use Composer\Package\PackageInterface;
use Composer\Package\AliasPackage;
use Composer\Package\Loader\ArrayLoader;
use Composer\IO\IOInterface;
use Composer\Config;
@ -58,6 +56,7 @@ class VcsRepository extends ArrayRepository
$class = $this->drivers[$this->type];
$driver = new $class($this->url, $this->io, $this->config);
$driver->initialize();
return $driver;
}
@ -65,6 +64,7 @@ class VcsRepository extends ArrayRepository
if ($driver::supports($this->io, $this->url)) {
$driver = new $driver($this->url, $this->io, $this->config);
$driver->initialize();
return $driver;
}
}
@ -73,6 +73,7 @@ class VcsRepository extends ArrayRepository
if ($driver::supports($this->io, $this->url, true)) {
$driver = new $driver($this->url, $this->io, $this->config);
$driver->initialize();
return $driver;
}
}

2
src/Composer/Script/CommandEvent.php
View File

@ -13,8 +13,6 @@
namespace Composer\Script;
use Composer\Composer;
use Composer\IO\IOInterface;
use Composer\Package\PackageInterface;
/**
* The Command Event.

3
src/Composer/Script/EventDispatcher.php
View File

@ -12,10 +12,7 @@
namespace Composer\Script;
use Composer\Json\JsonFile;
use Composer\Repository\FilesystemRepository;
use Composer\Autoload\AutoloadGenerator;
use Composer\Package\PackageInterface;
use Composer\IO\IOInterface;
use Composer\Composer;
use Composer\DependencyResolver\Operation\OperationInterface;

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

@ -90,6 +90,7 @@ class Filesystem
$commonPath = rtrim($commonPath, '/') . '/';
$sourcePathDepth = substr_count(substr($from, strlen($commonPath)), '/');
$commonPathCode = str_repeat('../', $sourcePathDepth);
return ($commonPathCode . substr($to, strlen($commonPath))) ?: './';
}
@ -130,6 +131,7 @@ class Filesystem
$sourcePathDepth = substr_count(substr($from, strlen($commonPath)), '/') + $directories;
$commonPathCode = str_repeat('dirname(', $sourcePathDepth).'__DIR__'.str_repeat(')', $sourcePathDepth);
$relTarget = substr($to, strlen($commonPath));
return $commonPathCode . (strlen($relTarget) ? '.' . var_export('/' . $relTarget, true) : '');
}

3
src/bootstrap.php
View File

@ -10,7 +10,8 @@
* file that was distributed with this source code.
*/
function includeIfExists($file) {
function includeIfExists($file)
{
if (file_exists($file)) {
return include $file;
}

1
tests/Composer/Test/Autoload/Fixtures/autoload_target_dir.php
View File

@ -31,6 +31,7 @@ return call_user_func(function() {
return false;
}
require_once $path;
return true;
}
});