diff --git a/src/Composer/DependencyResolver/Solver.php b/src/Composer/DependencyResolver/Solver.php index cf9d21243..b06538d40 100644 --- a/src/Composer/DependencyResolver/Solver.php +++ b/src/Composer/DependencyResolver/Solver.php @@ -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); } diff --git a/src/Composer/Package/BasePackage.php b/src/Composer/Package/BasePackage.php index dd31490b0..37479476d 100644 --- a/src/Composer/Package/BasePackage.php +++ b/src/Composer/Package/BasePackage.php @@ -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() { diff --git a/src/Composer/Package/LinkConstraint/MultiConstraint.php b/src/Composer/Package/LinkConstraint/MultiConstraint.php index a6d85bc56..211f0ee71 100644 --- a/src/Composer/Package/LinkConstraint/MultiConstraint.php +++ b/src/Composer/Package/LinkConstraint/MultiConstraint.php @@ -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 */ @@ -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) { diff --git a/src/Composer/Package/PackageInterface.php b/src/Composer/Package/PackageInterface.php index 3a8eceb84..f67213a9c 100644 --- a/src/Composer/Package/PackageInterface.php +++ b/src/Composer/Package/PackageInterface.php @@ -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();