1
0
Fork 0

ran fixers

pull/4502/head
Rob Bast 2015-10-13 11:34:02 +02:00
parent 7ab192a209
commit b523fc0b7b
10 changed files with 94 additions and 16 deletions

View File

@ -1,14 +1,19 @@
<?php <?php
/*
* This file is part of Composer.
*
* (c) Nils Adermann <naderman@naderman.de>
* Jordi Boggiano <j.boggiano@seld.be>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
/* /*
* This file is copied from the Symfony package. * This file is copied from the Symfony package.
* *
* (c) Fabien Potencier <fabien@symfony.com> * (c) Fabien Potencier <fabien@symfony.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*
* @license MIT
*/ */
namespace Composer\Autoload; namespace Composer\Autoload;

View File

@ -20,6 +20,8 @@ use Composer\Package\PackageInterface;
interface PolicyInterface interface PolicyInterface
{ {
public function versionCompare(PackageInterface $a, PackageInterface $b, $operator); public function versionCompare(PackageInterface $a, PackageInterface $b, $operator);
public function findUpdatePackages(Pool $pool, array $installedMap, PackageInterface $package); public function findUpdatePackages(Pool $pool, array $installedMap, PackageInterface $package);
public function selectPreferredPackages(Pool $pool, array $installedMap, array $literals); public function selectPreferredPackages(Pool $pool, array $installedMap, array $literals);
} }

View File

@ -56,6 +56,7 @@ class Solver
} }
// aka solver_makeruledecisions // aka solver_makeruledecisions
private function makeAssertionRuleDecisions() private function makeAssertionRuleDecisions()
{ {
$decisionStart = count($this->decisions) - 1; $decisionStart = count($this->decisions) - 1;
@ -283,6 +284,7 @@ class Solver
* returns the new solver level or 0 if unsolvable * returns the new solver level or 0 if unsolvable
* *
*/ */
private function setPropagateLearn($level, $literal, $disableRules, Rule $rule) private function setPropagateLearn($level, $literal, $disableRules, Rule $rule)
{ {
$level++; $level++;
@ -569,6 +571,7 @@ class Solver
* of our learnt rules except the ones that were learnt from rules that * of our learnt rules except the ones that were learnt from rules that
* are now disabled. * are now disabled.
*/ */
private function enableDisableLearnedRules() private function enableDisableLearnedRules()
{ {
foreach ($this->rules->getIteratorFor(RuleSet::TYPE_LEARNED) as $rule) { foreach ($this->rules->getIteratorFor(RuleSet::TYPE_LEARNED) as $rule) {

View File

@ -197,162 +197,202 @@ class AliasPackage extends BasePackage implements CompletePackageInterface
{ {
return $this->aliasOf->getType(); return $this->aliasOf->getType();
} }
public function getTargetDir() public function getTargetDir()
{ {
return $this->aliasOf->getTargetDir(); return $this->aliasOf->getTargetDir();
} }
public function getExtra() public function getExtra()
{ {
return $this->aliasOf->getExtra(); return $this->aliasOf->getExtra();
} }
public function setInstallationSource($type) public function setInstallationSource($type)
{ {
$this->aliasOf->setInstallationSource($type); $this->aliasOf->setInstallationSource($type);
} }
public function getInstallationSource() public function getInstallationSource()
{ {
return $this->aliasOf->getInstallationSource(); return $this->aliasOf->getInstallationSource();
} }
public function getSourceType() public function getSourceType()
{ {
return $this->aliasOf->getSourceType(); return $this->aliasOf->getSourceType();
} }
public function getSourceUrl() public function getSourceUrl()
{ {
return $this->aliasOf->getSourceUrl(); return $this->aliasOf->getSourceUrl();
} }
public function getSourceUrls() public function getSourceUrls()
{ {
return $this->aliasOf->getSourceUrls(); return $this->aliasOf->getSourceUrls();
} }
public function getSourceReference() public function getSourceReference()
{ {
return $this->aliasOf->getSourceReference(); return $this->aliasOf->getSourceReference();
} }
public function setSourceReference($reference) public function setSourceReference($reference)
{ {
return $this->aliasOf->setSourceReference($reference); return $this->aliasOf->setSourceReference($reference);
} }
public function setSourceMirrors($mirrors) public function setSourceMirrors($mirrors)
{ {
return $this->aliasOf->setSourceMirrors($mirrors); return $this->aliasOf->setSourceMirrors($mirrors);
} }
public function getSourceMirrors() public function getSourceMirrors()
{ {
return $this->aliasOf->getSourceMirrors(); return $this->aliasOf->getSourceMirrors();
} }
public function getDistType() public function getDistType()
{ {
return $this->aliasOf->getDistType(); return $this->aliasOf->getDistType();
} }
public function getDistUrl() public function getDistUrl()
{ {
return $this->aliasOf->getDistUrl(); return $this->aliasOf->getDistUrl();
} }
public function getDistUrls() public function getDistUrls()
{ {
return $this->aliasOf->getDistUrls(); return $this->aliasOf->getDistUrls();
} }
public function getDistReference() public function getDistReference()
{ {
return $this->aliasOf->getDistReference(); return $this->aliasOf->getDistReference();
} }
public function setDistReference($reference) public function setDistReference($reference)
{ {
return $this->aliasOf->setDistReference($reference); return $this->aliasOf->setDistReference($reference);
} }
public function getDistSha1Checksum() public function getDistSha1Checksum()
{ {
return $this->aliasOf->getDistSha1Checksum(); return $this->aliasOf->getDistSha1Checksum();
} }
public function setTransportOptions(array $options) public function setTransportOptions(array $options)
{ {
return $this->aliasOf->setTransportOptions($options); return $this->aliasOf->setTransportOptions($options);
} }
public function getTransportOptions() public function getTransportOptions()
{ {
return $this->aliasOf->getTransportOptions(); return $this->aliasOf->getTransportOptions();
} }
public function setDistMirrors($mirrors) public function setDistMirrors($mirrors)
{ {
return $this->aliasOf->setDistMirrors($mirrors); return $this->aliasOf->setDistMirrors($mirrors);
} }
public function getDistMirrors() public function getDistMirrors()
{ {
return $this->aliasOf->getDistMirrors(); return $this->aliasOf->getDistMirrors();
} }
public function getScripts() public function getScripts()
{ {
return $this->aliasOf->getScripts(); return $this->aliasOf->getScripts();
} }
public function getLicense() public function getLicense()
{ {
return $this->aliasOf->getLicense(); return $this->aliasOf->getLicense();
} }
public function getAutoload() public function getAutoload()
{ {
return $this->aliasOf->getAutoload(); return $this->aliasOf->getAutoload();
} }
public function getDevAutoload() public function getDevAutoload()
{ {
return $this->aliasOf->getDevAutoload(); return $this->aliasOf->getDevAutoload();
} }
public function getIncludePaths() public function getIncludePaths()
{ {
return $this->aliasOf->getIncludePaths(); return $this->aliasOf->getIncludePaths();
} }
public function getRepositories() public function getRepositories()
{ {
return $this->aliasOf->getRepositories(); return $this->aliasOf->getRepositories();
} }
public function getReleaseDate() public function getReleaseDate()
{ {
return $this->aliasOf->getReleaseDate(); return $this->aliasOf->getReleaseDate();
} }
public function getBinaries() public function getBinaries()
{ {
return $this->aliasOf->getBinaries(); return $this->aliasOf->getBinaries();
} }
public function getKeywords() public function getKeywords()
{ {
return $this->aliasOf->getKeywords(); return $this->aliasOf->getKeywords();
} }
public function getDescription() public function getDescription()
{ {
return $this->aliasOf->getDescription(); return $this->aliasOf->getDescription();
} }
public function getHomepage() public function getHomepage()
{ {
return $this->aliasOf->getHomepage(); return $this->aliasOf->getHomepage();
} }
public function getSuggests() public function getSuggests()
{ {
return $this->aliasOf->getSuggests(); return $this->aliasOf->getSuggests();
} }
public function getAuthors() public function getAuthors()
{ {
return $this->aliasOf->getAuthors(); return $this->aliasOf->getAuthors();
} }
public function getSupport() public function getSupport()
{ {
return $this->aliasOf->getSupport(); return $this->aliasOf->getSupport();
} }
public function getNotificationUrl() public function getNotificationUrl()
{ {
return $this->aliasOf->getNotificationUrl(); return $this->aliasOf->getNotificationUrl();
} }
public function getArchiveExcludes() public function getArchiveExcludes()
{ {
return $this->aliasOf->getArchiveExcludes(); return $this->aliasOf->getArchiveExcludes();
} }
public function isAbandoned() public function isAbandoned()
{ {
return $this->aliasOf->isAbandoned(); return $this->aliasOf->isAbandoned();
} }
public function getReplacementPackage() public function getReplacementPackage()
{ {
return $this->aliasOf->getReplacementPackage(); return $this->aliasOf->getReplacementPackage();
} }
public function __toString() public function __toString()
{ {
return parent::__toString().' (alias of '.$this->aliasOf->getVersion().')'; return parent::__toString().' (alias of '.$this->aliasOf->getVersion().')';

View File

@ -113,7 +113,6 @@ class ProcessExecutor
* *
* @return string The escaped argument * @return string The escaped argument
*/ */
public static function escape($argument) public static function escape($argument)
{ {
return ProcessUtils::escapeArgument($argument); return ProcessUtils::escapeArgument($argument);

View File

@ -1,5 +1,15 @@
<?php <?php
/*
* This file is part of Composer.
*
* (c) Nils Adermann <naderman@naderman.de>
* Jordi Boggiano <j.boggiano@seld.be>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Composer\Test\Autoload; namespace Composer\Test\Autoload;
use Composer\Autoload\ClassLoader; use Composer\Autoload\ClassLoader;

View File

@ -1,14 +1,21 @@
<?php <?php
/* /*
* This file was copied from the Symfony package. * This file is part of Composer.
* *
* (c) Fabien Potencier <fabien@symfony.com> * (c) Nils Adermann <naderman@naderman.de>
* Jordi Boggiano <j.boggiano@seld.be>
* *
* For the full copyright and license information, please view the LICENSE * For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code. * file that was distributed with this source code.
*/ */
/*
* This file is copied from the Symfony package.
*
* (c) Fabien Potencier <fabien@symfony.com>
*/
namespace Composer\Test\Autoload; namespace Composer\Test\Autoload;
use Composer\Autoload\ClassMapGenerator; use Composer\Autoload\ClassMapGenerator;

View File

@ -9,6 +9,7 @@
* For the full copyright and license information, please view the LICENSE * For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code. * file that was distributed with this source code.
*/ */
namespace Composer\Test\DependencyResolver; namespace Composer\Test\DependencyResolver;
use Composer\Repository\ArrayRepository; use Composer\Repository\ArrayRepository;

View File

@ -1,4 +1,15 @@
<?php <?php
/*
* This file is part of Composer.
*
* (c) Nils Adermann <naderman@naderman.de>
* Jordi Boggiano <j.boggiano@seld.be>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Composer\Test\Util; namespace Composer\Test\Util;
use Composer\Config; use Composer\Config;