Bläddra i källkod

Tweak problem wording slightly

Jordi Boggiano 4 år sedan
förälder
incheckning
34801239f1

+ 1 - 1
src/Composer/DependencyResolver/Problem.php

@@ -260,7 +260,7 @@ class Problem
                 return array("- Root composer.json requires $packageName".self::constraintToText($constraint) . ', it is ', 'satisfiable by '.self::getPackageList($nextRepoPackages, $isVerbose).' from '.$nextRepo->getRepoName().' but '.self::getPackageList($higherRepoPackages, $isVerbose).' from '.reset($higherRepoPackages)->getRepository()->getRepoName().' has higher repository priority. The packages with higher priority do not match your constraint and are therefore not installable. See https://getcomposer.org/repoprio for details and assistance.');
             }
 
-            return array("- Root composer.json requires $packageName".self::constraintToText($constraint) . ', ', 'found '.self::getPackageList($packages, $isVerbose).' but '.(self::hasMultipleNames($packages) ? 'these do' : 'it does').' not match your constraint.');
+            return array("- Root composer.json requires $packageName".self::constraintToText($constraint) . ', ', 'found '.self::getPackageList($packages, $isVerbose).' but '.(self::hasMultipleNames($packages) ? 'these do' : 'it does').' not match the constraint.');
         }
 
         if (!preg_match('{^[A-Za-z0-9_./-]+$}', $packageName)) {

+ 1 - 1
tests/Composer/Test/DependencyResolver/SolverTest.php

@@ -684,7 +684,7 @@ class SolverTest extends TestCase
             $msg = "\n";
             $msg .= "  Problem 1\n";
             $msg .= "    - Root composer.json requires a -> satisfiable by A[1.0].\n";
-            $msg .= "    - A 1.0 requires b >= 2.0 -> found B[1.0] but it does not match your constraint.\n";
+            $msg .= "    - A 1.0 requires b >= 2.0 -> found B[1.0] but it does not match the constraint.\n";
             $this->assertEquals($msg, $e->getPrettyString($this->repoSet, $this->request, $this->pool, false));
         }
     }

+ 1 - 1
tests/Composer/Test/Fixtures/installer/root-alias-change-with-circular-dep.test

@@ -60,7 +60,7 @@ Your lock file does not contain a compatible set of packages. Please run compose
 
   Problem 1
     - b/requirer is locked to version 1.0.0 and an update of this package was not requested.
-    - b/requirer 1.0.0 requires root/pkg ^1 -> found root/pkg[2.x-dev] but it does not match your constraint.
+    - b/requirer 1.0.0 requires root/pkg ^1 -> found root/pkg[2.x-dev] but it does not match the constraint.
 
 Use the option --with-all-dependencies to allow updates and removals for packages currently locked to specific versions.
 

+ 1 - 1
tests/Composer/Test/Fixtures/installer/solver-problems.test

@@ -140,7 +140,7 @@ Your requirements could not be resolved to an installable set of packages.
     - package/found4 2.0.0 requires non-existent/pkg2 1.* -> could not be found in any version, there may be a typo in the package name.
   Problem 13
     - Root composer.json requires package/found6 2.* -> satisfiable by package/found6[2.0.0].
-    - package/found6 2.0.0 requires stable-requiree-excluded/pkg2 1.0.1 -> found stable-requiree-excluded/pkg2[1.0.0] but it does not match your constraint.
+    - package/found6 2.0.0 requires stable-requiree-excluded/pkg2 1.0.1 -> found stable-requiree-excluded/pkg2[1.0.0] but it does not match the constraint.
   Problem 14
     - Root composer.json requires package/found7 2.* -> satisfiable by package/found7[2.0.0].
     - package/found7 2.0.0 requires php-64bit 1.0.1 -> your php-64bit version (%s) does not satisfy that requirement.