diff --git a/CHANGELOG.md b/CHANGELOG.md index ebe9dc189..abe41bbc4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1567,7 +1567,7 @@ ### [1.0.0-alpha6] - 2012-10-23 * Schema: Added ability to pass additional options to repositories (i.e. ssh keys/client certificates to secure private repos) - * Schema: Added a new `~` operator that should be preferred over `>=`, see https://getcomposer.org/doc/01-basic-usage.md#package-versions + * Schema: Added a new `~` operator that should be preferred over `>=`, see https://getcomposer.org/doc/01-basic-usage.md#package-version-constraints * Schema: Version constraints `php composer.phar depends composer/composer -Read more at https://getcomposer.org/doc/03-cli.md#depends-why- +Read more at https://getcomposer.org/doc/03-cli.md#depends-why EOT ) ; diff --git a/src/Composer/Command/DumpAutoloadCommand.php b/src/Composer/Command/DumpAutoloadCommand.php index c53c966a6..a6c6a5ae4 100644 --- a/src/Composer/Command/DumpAutoloadCommand.php +++ b/src/Composer/Command/DumpAutoloadCommand.php @@ -47,7 +47,7 @@ class DumpAutoloadCommand extends BaseCommand <<php composer.phar dump-autoload -Read more at https://getcomposer.org/doc/03-cli.md#dump-autoload-dumpautoload- +Read more at https://getcomposer.org/doc/03-cli.md#dump-autoload-dumpautoload EOT ) ; diff --git a/src/Composer/Command/ProhibitsCommand.php b/src/Composer/Command/ProhibitsCommand.php index 06d03a8ce..49e06694e 100644 --- a/src/Composer/Command/ProhibitsCommand.php +++ b/src/Composer/Command/ProhibitsCommand.php @@ -46,7 +46,7 @@ Displays detailed information about why a package cannot be installed. php composer.phar prohibits composer/composer -Read more at https://getcomposer.org/doc/03-cli.md#prohibits-why-not- +Read more at https://getcomposer.org/doc/03-cli.md#prohibits-why-not EOT ) ; diff --git a/src/Composer/Command/RequireCommand.php b/src/Composer/Command/RequireCommand.php index 08b4c5958..14fb1ef95 100644 --- a/src/Composer/Command/RequireCommand.php +++ b/src/Composer/Command/RequireCommand.php @@ -120,7 +120,7 @@ If you do not specify a version constraint, composer will choose a suitable one If you do not want to install the new dependencies immediately you can call it with --no-update -Read more at https://getcomposer.org/doc/03-cli.md#require +Read more at https://getcomposer.org/doc/03-cli.md#require-r EOT ) ; diff --git a/src/Composer/Command/RunScriptCommand.php b/src/Composer/Command/RunScriptCommand.php index 871579c69..8283dbef4 100644 --- a/src/Composer/Command/RunScriptCommand.php +++ b/src/Composer/Command/RunScriptCommand.php @@ -66,7 +66,7 @@ The run-script command runs scripts defined in composer.json: php composer.phar run-script post-update-cmd -Read more at https://getcomposer.org/doc/03-cli.md#run-script +Read more at https://getcomposer.org/doc/03-cli.md#run-script-run EOT ) ; diff --git a/src/Composer/Command/ScriptAliasCommand.php b/src/Composer/Command/ScriptAliasCommand.php index 303aab452..b773f235d 100644 --- a/src/Composer/Command/ScriptAliasCommand.php +++ b/src/Composer/Command/ScriptAliasCommand.php @@ -54,7 +54,7 @@ The run-script command runs scripts defined in composer.json: php composer.phar run-script post-update-cmd -Read more at https://getcomposer.org/doc/03-cli.md#run-script +Read more at https://getcomposer.org/doc/03-cli.md#run-script-run EOT ) ; diff --git a/src/Composer/Command/SelfUpdateCommand.php b/src/Composer/Command/SelfUpdateCommand.php index 00cac75e0..c9a417669 100644 --- a/src/Composer/Command/SelfUpdateCommand.php +++ b/src/Composer/Command/SelfUpdateCommand.php @@ -66,7 +66,7 @@ versions of composer and if found, installs the latest. php composer.phar self-update -Read more at https://getcomposer.org/doc/03-cli.md#self-update-selfupdate- +Read more at https://getcomposer.org/doc/03-cli.md#self-update-selfupdate EOT ) ; diff --git a/src/Composer/Command/ShowCommand.php b/src/Composer/Command/ShowCommand.php index f81ba27e0..5c07b4605 100644 --- a/src/Composer/Command/ShowCommand.php +++ b/src/Composer/Command/ShowCommand.php @@ -110,7 +110,7 @@ class ShowCommand extends BaseCommand The show command displays detailed information about a package, or lists all packages available. -Read more at https://getcomposer.org/doc/03-cli.md#show +Read more at https://getcomposer.org/doc/03-cli.md#show-info EOT ) ; diff --git a/src/Composer/Command/UpdateCommand.php b/src/Composer/Command/UpdateCommand.php index 92e0f200a..7b6948004 100644 --- a/src/Composer/Command/UpdateCommand.php +++ b/src/Composer/Command/UpdateCommand.php @@ -106,7 +106,7 @@ To run a partial update with more restrictive constraints you can use the shorth To select packages names interactively with auto-completion use -i. -Read more at https://getcomposer.org/doc/03-cli.md#update-u +Read more at https://getcomposer.org/doc/03-cli.md#update-u-upgrade EOT ) ; diff --git a/src/Composer/Package/Locker.php b/src/Composer/Package/Locker.php index 34a0ed306..b46a798bd 100644 --- a/src/Composer/Package/Locker.php +++ b/src/Composer/Package/Locker.php @@ -534,7 +534,7 @@ class Locker if ($missingRequirements) { $missingRequirementInfo[] = 'This usually happens when composer files are incorrectly merged or the composer.json file is manually edited.'; $missingRequirementInfo[] = 'Read more about correctly resolving merge conflicts https://getcomposer.org/doc/articles/resolving-merge-conflicts.md'; - $missingRequirementInfo[] = 'and prefer using the "require" command over editing the composer.json file directly https://getcomposer.org/doc/03-cli.md#require'; + $missingRequirementInfo[] = 'and prefer using the "require" command over editing the composer.json file directly https://getcomposer.org/doc/03-cli.md#require-r'; } return $missingRequirementInfo; diff --git a/tests/Composer/Test/Command/ValidateCommandTest.php b/tests/Composer/Test/Command/ValidateCommandTest.php index 25a49dbd9..58d204364 100644 --- a/tests/Composer/Test/Command/ValidateCommandTest.php +++ b/tests/Composer/Test/Command/ValidateCommandTest.php @@ -58,7 +58,7 @@ class ValidateCommandTest extends TestCase - Required package "root/req" is not present in the lock file. This usually happens when composer files are incorrectly merged or the composer.json file is manually edited. Read more about correctly resolving merge conflicts https://getcomposer.org/doc/articles/resolving-merge-conflicts.md -and prefer using the "require" command over editing the composer.json file directly https://getcomposer.org/doc/03-cli.md#require +and prefer using the "require" command over editing the composer.json file directly https://getcomposer.org/doc/03-cli.md#require-r OUTPUT; $this->assertSame(trim($expected), trim($appTester->getDisplay(true))); diff --git a/tests/Composer/Test/Fixtures/installer/install-from-incomplete-lock.test b/tests/Composer/Test/Fixtures/installer/install-from-incomplete-lock.test index b794832b8..0bbef6ace 100644 --- a/tests/Composer/Test/Fixtures/installer/install-from-incomplete-lock.test +++ b/tests/Composer/Test/Fixtures/installer/install-from-incomplete-lock.test @@ -36,7 +36,7 @@ Verifying lock file contents can be installed on current platform. - Required package "newly-required/pkg" is not present in the lock file. This usually happens when composer files are incorrectly merged or the composer.json file is manually edited. Read more about correctly resolving merge conflicts https://getcomposer.org/doc/articles/resolving-merge-conflicts.md -and prefer using the "require" command over editing the composer.json file directly https://getcomposer.org/doc/03-cli.md#require +and prefer using the "require" command over editing the composer.json file directly https://getcomposer.org/doc/03-cli.md#require-r --EXPECT-EXIT-CODE-- 4 --EXPECT-- diff --git a/tests/Composer/Test/Fixtures/installer/root-requirements-do-not-affect-locked-versions.test b/tests/Composer/Test/Fixtures/installer/root-requirements-do-not-affect-locked-versions.test index 23cf41532..2b05f49e1 100644 --- a/tests/Composer/Test/Fixtures/installer/root-requirements-do-not-affect-locked-versions.test +++ b/tests/Composer/Test/Fixtures/installer/root-requirements-do-not-affect-locked-versions.test @@ -43,7 +43,7 @@ Verifying lock file contents can be installed on current platform. - Required package "foo/bar" is in the lock file as "1.0.0" but that does not satisfy your constraint "2.0.0". This usually happens when composer files are incorrectly merged or the composer.json file is manually edited. Read more about correctly resolving merge conflicts https://getcomposer.org/doc/articles/resolving-merge-conflicts.md -and prefer using the "require" command over editing the composer.json file directly https://getcomposer.org/doc/03-cli.md#require +and prefer using the "require" command over editing the composer.json file directly https://getcomposer.org/doc/03-cli.md#require-r --EXPECT-EXIT-CODE-- 4 --EXPECT--