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

Merge pull request #16 from pborreli/fixed-typo 

[Composer] Fixed typos
pull/12/merge
Jordi Boggiano 2011-09-15 00:33:32 -07:00
parent b6ec172997 f7735c396f
commit a8f4c2d7c5
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -343,7 +343,7 @@ class Solver
continue;
}
// obsolete same packages even when noObsletes
// obsolete same packages even when noObsoletes
if ($noObsoletes && (!$package->equals($provider))) {
continue;
}
@ -1567,7 +1567,7 @@ class Solver
$seen = array();
$literals = $conflictRule->getLiterals();
/* unecessary because unlike rule.d, watch2 == 2nd literal, unless watch2 changed
/* unnecessary because unlike rule.d, watch2 == 2nd literal, unless watch2 changed
if (sizeof($literals) == 2) {
$literals[1] = $this->literalFromId($conflictRule->watch2);
}
@ -1599,7 +1599,7 @@ class Solver
$this->analyzeUnsolvableRule($why, $lastWeakWhy);
$literals = $why->getLiterals();
/* unecessary because unlike rule.d, watch2 == 2nd literal, unless watch2 changed
/* unnecessary because unlike rule.d, watch2 == 2nd literal, unless watch2 changed
if (sizeof($literals) == 2) {
$literals[1] = $this->literalFromId($why->watch2);
}

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

@ -28,7 +28,7 @@ abstract class BasePackage implements PackageInterface
protected $id;
/**
* All descendents' constructors should call this parent constructor
* All descendants' constructors should call this parent constructor
*
* @param string $name The package's name
*/
@ -54,7 +54,7 @@ abstract class BasePackage implements PackageInterface
* No version or release type information should be included in any of the
* names. Provided or replaced package names need to be returned as well.
*
* @return array An array of strings refering to this package
* @return array An array of strings referring to this package
*/
public function getNames()
{

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

@ -13,7 +13,7 @@
namespace Composer\Package\LinkConstraint;
/**
* Defines a conjuctive set of constraints on the target of a package link
* Defines a conjunctive set of constraints on the target of a package link
*
* @author Nils Adermann <naderman@naderman.de>
*/
@ -24,7 +24,7 @@ class MultiConstraint implements LinkConstraintInterface
/**
* Sets operator and version to compare a package with
*
* @param array $constraints A conjuctive set of constraints
* @param array $constraints A conjunctive set of constraints
*/
public function __construct(array $constraints)
{

2
src/Composer/Package/PackageInterface.php
View File

@ -33,7 +33,7 @@ interface PackageInterface
* No version or release type information should be included in any of the
* names. Provided or replaced package names need to be returned as well.
*
* @return array An array of strings refering to this package
* @return array An array of strings referring to this package
*/
function getNames();