diff --git a/src/Composer/Autoload/ClassMapGenerator.php b/src/Composer/Autoload/ClassMapGenerator.php index 5484b7d41..7f7e7e1eb 100644 --- a/src/Composer/Autoload/ClassMapGenerator.php +++ b/src/Composer/Autoload/ClassMapGenerator.php @@ -1,14 +1,19 @@ + * (c) Nils Adermann + * Jordi Boggiano * * 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. * - * @license MIT + * (c) Fabien Potencier */ namespace Composer\Autoload; diff --git a/src/Composer/DependencyResolver/PolicyInterface.php b/src/Composer/DependencyResolver/PolicyInterface.php index 433478920..b68cfffb8 100644 --- a/src/Composer/DependencyResolver/PolicyInterface.php +++ b/src/Composer/DependencyResolver/PolicyInterface.php @@ -20,6 +20,8 @@ use Composer\Package\PackageInterface; interface PolicyInterface { public function versionCompare(PackageInterface $a, PackageInterface $b, $operator); + public function findUpdatePackages(Pool $pool, array $installedMap, PackageInterface $package); + public function selectPreferredPackages(Pool $pool, array $installedMap, array $literals); } diff --git a/src/Composer/DependencyResolver/Solver.php b/src/Composer/DependencyResolver/Solver.php index 0568a4d2c..0a2644b0b 100644 --- a/src/Composer/DependencyResolver/Solver.php +++ b/src/Composer/DependencyResolver/Solver.php @@ -56,6 +56,7 @@ class Solver } // aka solver_makeruledecisions + private function makeAssertionRuleDecisions() { $decisionStart = count($this->decisions) - 1; @@ -283,6 +284,7 @@ class Solver * returns the new solver level or 0 if unsolvable * */ + private function setPropagateLearn($level, $literal, $disableRules, Rule $rule) { $level++; @@ -569,6 +571,7 @@ class Solver * of our learnt rules except the ones that were learnt from rules that * are now disabled. */ + private function enableDisableLearnedRules() { foreach ($this->rules->getIteratorFor(RuleSet::TYPE_LEARNED) as $rule) { diff --git a/src/Composer/Package/AliasPackage.php b/src/Composer/Package/AliasPackage.php index 8e1bb88fe..9541d3359 100644 --- a/src/Composer/Package/AliasPackage.php +++ b/src/Composer/Package/AliasPackage.php @@ -197,162 +197,202 @@ class AliasPackage extends BasePackage implements CompletePackageInterface { return $this->aliasOf->getType(); } + public function getTargetDir() { return $this->aliasOf->getTargetDir(); } + public function getExtra() { return $this->aliasOf->getExtra(); } + public function setInstallationSource($type) { $this->aliasOf->setInstallationSource($type); } + public function getInstallationSource() { return $this->aliasOf->getInstallationSource(); } + public function getSourceType() { return $this->aliasOf->getSourceType(); } + public function getSourceUrl() { return $this->aliasOf->getSourceUrl(); } + public function getSourceUrls() { return $this->aliasOf->getSourceUrls(); } + public function getSourceReference() { return $this->aliasOf->getSourceReference(); } + public function setSourceReference($reference) { return $this->aliasOf->setSourceReference($reference); } + public function setSourceMirrors($mirrors) { return $this->aliasOf->setSourceMirrors($mirrors); } + public function getSourceMirrors() { return $this->aliasOf->getSourceMirrors(); } + public function getDistType() { return $this->aliasOf->getDistType(); } + public function getDistUrl() { return $this->aliasOf->getDistUrl(); } + public function getDistUrls() { return $this->aliasOf->getDistUrls(); } + public function getDistReference() { return $this->aliasOf->getDistReference(); } + public function setDistReference($reference) { return $this->aliasOf->setDistReference($reference); } + public function getDistSha1Checksum() { return $this->aliasOf->getDistSha1Checksum(); } + public function setTransportOptions(array $options) { return $this->aliasOf->setTransportOptions($options); } + public function getTransportOptions() { return $this->aliasOf->getTransportOptions(); } + public function setDistMirrors($mirrors) { return $this->aliasOf->setDistMirrors($mirrors); } + public function getDistMirrors() { return $this->aliasOf->getDistMirrors(); } + public function getScripts() { return $this->aliasOf->getScripts(); } + public function getLicense() { return $this->aliasOf->getLicense(); } + public function getAutoload() { return $this->aliasOf->getAutoload(); } + public function getDevAutoload() { return $this->aliasOf->getDevAutoload(); } + public function getIncludePaths() { return $this->aliasOf->getIncludePaths(); } + public function getRepositories() { return $this->aliasOf->getRepositories(); } + public function getReleaseDate() { return $this->aliasOf->getReleaseDate(); } + public function getBinaries() { return $this->aliasOf->getBinaries(); } + public function getKeywords() { return $this->aliasOf->getKeywords(); } + public function getDescription() { return $this->aliasOf->getDescription(); } + public function getHomepage() { return $this->aliasOf->getHomepage(); } + public function getSuggests() { return $this->aliasOf->getSuggests(); } + public function getAuthors() { return $this->aliasOf->getAuthors(); } + public function getSupport() { return $this->aliasOf->getSupport(); } + public function getNotificationUrl() { return $this->aliasOf->getNotificationUrl(); } + public function getArchiveExcludes() { return $this->aliasOf->getArchiveExcludes(); } + public function isAbandoned() { return $this->aliasOf->isAbandoned(); } + public function getReplacementPackage() { return $this->aliasOf->getReplacementPackage(); } + public function __toString() { return parent::__toString().' (alias of '.$this->aliasOf->getVersion().')'; diff --git a/src/Composer/Util/ProcessExecutor.php b/src/Composer/Util/ProcessExecutor.php index 38f5bba00..f9499f09f 100644 --- a/src/Composer/Util/ProcessExecutor.php +++ b/src/Composer/Util/ProcessExecutor.php @@ -113,7 +113,6 @@ class ProcessExecutor * * @return string The escaped argument */ - public static function escape($argument) { return ProcessUtils::escapeArgument($argument); diff --git a/tests/Composer/Test/Autoload/ClassLoaderTest.php b/tests/Composer/Test/Autoload/ClassLoaderTest.php index 50772101e..d341b393b 100644 --- a/tests/Composer/Test/Autoload/ClassLoaderTest.php +++ b/tests/Composer/Test/Autoload/ClassLoaderTest.php @@ -1,5 +1,15 @@ + * Jordi Boggiano + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + namespace Composer\Test\Autoload; use Composer\Autoload\ClassLoader; diff --git a/tests/Composer/Test/Autoload/ClassMapGeneratorTest.php b/tests/Composer/Test/Autoload/ClassMapGeneratorTest.php index 468f72378..3b703d8f3 100644 --- a/tests/Composer/Test/Autoload/ClassMapGeneratorTest.php +++ b/tests/Composer/Test/Autoload/ClassMapGeneratorTest.php @@ -1,14 +1,21 @@ + * (c) Nils Adermann + * Jordi Boggiano * * 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. + * + * (c) Fabien Potencier + */ + namespace Composer\Test\Autoload; use Composer\Autoload\ClassMapGenerator; diff --git a/tests/Composer/Test/DependencyResolver/SolverTest.php b/tests/Composer/Test/DependencyResolver/SolverTest.php index 2c67d7464..ed62e3d79 100644 --- a/tests/Composer/Test/DependencyResolver/SolverTest.php +++ b/tests/Composer/Test/DependencyResolver/SolverTest.php @@ -9,6 +9,7 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ + namespace Composer\Test\DependencyResolver; use Composer\Repository\ArrayRepository; diff --git a/tests/Composer/Test/Util/GitHubTest.php b/tests/Composer/Test/Util/GitHubTest.php index 83d18dbe4..a39f3dab9 100644 --- a/tests/Composer/Test/Util/GitHubTest.php +++ b/tests/Composer/Test/Util/GitHubTest.php @@ -1,14 +1,14 @@ -* Jordi Boggiano -* -* For the full copyright and license information, please view the LICENSE -* file that was distributed with this source code. -*/ + * This file is part of Composer. + * + * (c) Nils Adermann + * Jordi Boggiano + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ namespace Composer\Test\Util; diff --git a/tests/Composer/Test/Util/SvnTest.php b/tests/Composer/Test/Util/SvnTest.php index c54c9c504..55a116376 100644 --- a/tests/Composer/Test/Util/SvnTest.php +++ b/tests/Composer/Test/Util/SvnTest.php @@ -1,4 +1,15 @@ + * Jordi Boggiano + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + namespace Composer\Test\Util; use Composer\Config;