Преглед изворни кода

Merge pull request #16 from pborreli/fixed-typo

[Composer] Fixed typos
Jordi Boggiano пре 13 година
родитељ
комит
a8f4c2d7c5

+ 3 - 3
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);
             }

+ 2 - 2
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()
     {

+ 2 - 2
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 <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)
     {

+ 1 - 1
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();