From 8728a75930805b56b623f9d4dab6ce3c66bf5a76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= Date: Wed, 2 Oct 2024 12:28:32 +0200 Subject: [PATCH] Fix typos (#12133) --- CHANGELOG.md | 4 ++-- doc/articles/authentication-for-private-packages.md | 2 +- src/Composer/Command/ConfigCommand.php | 2 +- src/Composer/Command/DiagnoseCommand.php | 2 +- src/Composer/Repository/Vcs/GitLabDriver.php | 2 +- tests/Composer/Test/Command/InitCommandTest.php | 6 +++--- tests/Composer/Test/Console/HtmlOutputFormatterTest.php | 4 ++-- .../Test/Fixtures/installer/github-issues-4319.test | 2 +- .../Test/Fixtures/installer/github-issues-4795-2.test | 2 +- .../Test/Fixtures/installer/github-issues-4795.test | 2 +- .../Test/Fixtures/installer/github-issues-8902.test | 2 +- .../Test/Fixtures/installer/github-issues-8903.test | 2 +- .../Test/Fixtures/installer/github-issues-9012.test | 2 +- .../Test/Fixtures/installer/github-issues-9290.test | 2 +- .../Fixtures/installer/update-with-all-dependencies.test | 2 +- 15 files changed, 19 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f46d54f05..0e9899be7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -721,7 +721,7 @@ * UX Change: Packages from `path` repositories which are symlinked in the vendor dir will always be updated in partial updates to avoid mistakes when the original composer.json changes but the symlinked package is not explicitly updated (#9765) * Added `reinstall` command that takes one or more package names, including wildcard (`*`) support, and removes then reinstalls them in the exact same version they had (#9915) * Added support for parallel package installs on Windows via [7-Zip](https://www.7-zip.org/) if it is installed (#9875) - * Added detection of invalid composer.lock files that do not fullfil the composer.json requirements to `validate` command (#9899) + * Added detection of invalid composer.lock files that do not fulfill the composer.json requirements to `validate` command (#9899) * Added `InstalledVersions::getInstalledPackagesByType(string $type)` to retrieve installed plugins for example, [read more](https://getcomposer.org/doc/07-runtime.md#knowing-which-packages-of-a-given-type-are-installed) (#9699) * Added `InstalledVersions::getInstalledPath(string $packageName)` to retrieve the install path of a given package, [read more](https://getcomposer.org/doc/07-runtime.md#knowing-the-path-in-which-a-package-is-installed) (#9699) * Added flag to `InstalledVersions::isInstalled()` to allow excluding dev requirements from that check (#9682) @@ -1150,7 +1150,7 @@ * Added a `--no-cache` flag available on all commands to run with the cache disabled * Added PHP_BINARY as env var pointing to the PHP process when executing Composer scripts as shell scripts * Added a `use-github-api` config option which can set the `no-api` flag on all GitHub VCS repositories declared - * Added a static helper you can preprend to a script to avoid process timeouts, `"Composer\\Config::disableProcessTimeout"` + * Added a static helper you can prepend to a script to avoid process timeouts, `"Composer\\Config::disableProcessTimeout"` * Added Event::getOriginatingEvent to retrieve an event's original event when a script handler forwards to another one * Added support for autoloading directly from a phar file * Fixed loading order of plugins to always initialize them in order of dependencies diff --git a/doc/articles/authentication-for-private-packages.md b/doc/articles/authentication-for-private-packages.md index c1c186b3c..b81cd636e 100644 --- a/doc/articles/authentication-for-private-packages.md +++ b/doc/articles/authentication-for-private-packages.md @@ -296,7 +296,7 @@ php composer.phar config [--global] --editor --auth ## github-oauth -To create a new access token, head to your [token settings section on Github](https://github.com/settings/tokens) and [generate a new token](https://github.com/settings/tokens/new). +To create a new access token, head to your [token settings section on GitHub](https://github.com/settings/tokens) and [generate a new token](https://github.com/settings/tokens/new). For public repositories when rate limited, a token *without* any particular scope is sufficient (see `(no scope)` in the [scopes documentation](https://docs.github.com/en/developers/apps/building-oauth-apps/scopes-for-oauth-apps)). Such tokens grant read-only access to public information. diff --git a/src/Composer/Command/ConfigCommand.php b/src/Composer/Command/ConfigCommand.php index 6dc487574..de3bd367e 100644 --- a/src/Composer/Command/ConfigCommand.php +++ b/src/Composer/Command/ConfigCommand.php @@ -1025,7 +1025,7 @@ EOT } /** - * Suggest setting-keys, while taking given options in acount. + * Suggest setting-keys, while taking given options in account. */ private function suggestSettingKeys(): \Closure { diff --git a/src/Composer/Command/DiagnoseCommand.php b/src/Composer/Command/DiagnoseCommand.php index d06ad4497..263ee0644 100644 --- a/src/Composer/Command/DiagnoseCommand.php +++ b/src/Composer/Command/DiagnoseCommand.php @@ -175,7 +175,7 @@ EOT } elseif (10 > $rate['remaining']) { $io->write('WARNING'); $io->write(sprintf( - 'Github has a rate limit on their API. ' + 'GitHub has a rate limit on their API. ' . 'You currently have %u ' . 'out of %u requests left.' . PHP_EOL . 'See https://developer.github.com/v3/#rate-limiting and also' . PHP_EOL diff --git a/src/Composer/Repository/Vcs/GitLabDriver.php b/src/Composer/Repository/Vcs/GitLabDriver.php index 75304f46b..09fb4258c 100644 --- a/src/Composer/Repository/Vcs/GitLabDriver.php +++ b/src/Composer/Repository/Vcs/GitLabDriver.php @@ -107,7 +107,7 @@ class GitLabDriver extends VcsDriver ; $origin = self::determineOrigin($configuredDomains, $guessedDomain, $urlParts, $match['port']); if (false === $origin) { - throw new \LogicException('It should not be possible to create a gitlab driver with an unparseable origin URL ('.$this->url.')'); + throw new \LogicException('It should not be possible to create a gitlab driver with an unparsable origin URL ('.$this->url.')'); } $this->originUrl = $origin; diff --git a/tests/Composer/Test/Command/InitCommandTest.php b/tests/Composer/Test/Command/InitCommandTest.php index 67b1fd169..3e50fbdb4 100644 --- a/tests/Composer/Test/Command/InitCommandTest.php +++ b/tests/Composer/Test/Command/InitCommandTest.php @@ -707,11 +707,11 @@ class InitCommandTest extends TestCase $appTester->setInputs([ 'vendor/pkg', // Pkg name - 'my desciption', // Description + 'my description', // Description 'Mr. Test ', // Author 'stable', // Minimum stability 'library', // Type - 'AGPL-3.0-only', // License + 'AGPL-3.0-only', // License 'no', // Define dependencies 'no', // Define dev dependencies 'n', // Add PSR-4 autoload mapping @@ -724,7 +724,7 @@ class InitCommandTest extends TestCase $expected = [ 'name' => 'vendor/pkg', - 'description' => 'my desciption', + 'description' => 'my description', 'type' => 'library', 'license' => 'AGPL-3.0-only', 'authors' => [['name' => 'Mr. Test', 'email' => 'test@example.org']], diff --git a/tests/Composer/Test/Console/HtmlOutputFormatterTest.php b/tests/Composer/Test/Console/HtmlOutputFormatterTest.php index 4337fcf60..0d8032410 100644 --- a/tests/Composer/Test/Console/HtmlOutputFormatterTest.php +++ b/tests/Composer/Test/Console/HtmlOutputFormatterTest.php @@ -25,8 +25,8 @@ class HtmlOutputFormatterTest extends TestCase ]); self::assertEquals( - 'text green yellow black w/ yello bg', - $formatter->format('text green yellow black w/ yello bg') + 'text green yellow black w/ yellow bg', + $formatter->format('text green yellow black w/ yellow bg') ); } } diff --git a/tests/Composer/Test/Fixtures/installer/github-issues-4319.test b/tests/Composer/Test/Fixtures/installer/github-issues-4319.test index dcc94dff2..513e80067 100644 --- a/tests/Composer/Test/Fixtures/installer/github-issues-4319.test +++ b/tests/Composer/Test/Fixtures/installer/github-issues-4319.test @@ -1,6 +1,6 @@ --TEST-- -See Github issue #4319 ( github.com/composer/composer/issues/4319 ). +See GitHub issue #4319 ( github.com/composer/composer/issues/4319 ). Present a clear error message when config.platform.php version results in a conflict rule. diff --git a/tests/Composer/Test/Fixtures/installer/github-issues-4795-2.test b/tests/Composer/Test/Fixtures/installer/github-issues-4795-2.test index a0c8452b9..fa8e4529f 100644 --- a/tests/Composer/Test/Fixtures/installer/github-issues-4795-2.test +++ b/tests/Composer/Test/Fixtures/installer/github-issues-4795-2.test @@ -1,6 +1,6 @@ --TEST-- -See Github issue #4795 ( github.com/composer/composer/issues/4795 ). +See GitHub issue #4795 ( github.com/composer/composer/issues/4795 ). Composer\Installer::allowListUpdateDependencies should not output a warning for dependencies that need to be updated that are also a root package, when that root package is also explicitly allowed. diff --git a/tests/Composer/Test/Fixtures/installer/github-issues-4795.test b/tests/Composer/Test/Fixtures/installer/github-issues-4795.test index 4e97d804b..9044481a3 100644 --- a/tests/Composer/Test/Fixtures/installer/github-issues-4795.test +++ b/tests/Composer/Test/Fixtures/installer/github-issues-4795.test @@ -1,6 +1,6 @@ --TEST-- -See Github issue #4795 ( github.com/composer/composer/issues/4795 ). +See GitHub issue #4795 ( github.com/composer/composer/issues/4795 ). Composer\Installer::allowListUpdateDependencies intentionally ignores root requirements even if said package is also a dependency of one the requirements that is allowed for update. diff --git a/tests/Composer/Test/Fixtures/installer/github-issues-8902.test b/tests/Composer/Test/Fixtures/installer/github-issues-8902.test index bc2515525..56b4299d0 100644 --- a/tests/Composer/Test/Fixtures/installer/github-issues-8902.test +++ b/tests/Composer/Test/Fixtures/installer/github-issues-8902.test @@ -1,6 +1,6 @@ --TEST-- -See Github issue #8902 ( https://github.com/composer/composer/issues/8902 ). +See GitHub issue #8902 ( https://github.com/composer/composer/issues/8902 ). Avoid installing packages twice if they are required in different versions and one is matched by a dev package. diff --git a/tests/Composer/Test/Fixtures/installer/github-issues-8903.test b/tests/Composer/Test/Fixtures/installer/github-issues-8903.test index f2c8c9f20..90ef85ef4 100644 --- a/tests/Composer/Test/Fixtures/installer/github-issues-8903.test +++ b/tests/Composer/Test/Fixtures/installer/github-issues-8903.test @@ -1,6 +1,6 @@ --TEST-- -See Github issue #8903 ( https://github.com/composer/composer/issues/8903 ). +See GitHub issue #8903 ( https://github.com/composer/composer/issues/8903 ). Recursive output of learnt rules can lead to infinite loop. diff --git a/tests/Composer/Test/Fixtures/installer/github-issues-9012.test b/tests/Composer/Test/Fixtures/installer/github-issues-9012.test index f118584d1..69d1f51e9 100644 --- a/tests/Composer/Test/Fixtures/installer/github-issues-9012.test +++ b/tests/Composer/Test/Fixtures/installer/github-issues-9012.test @@ -1,6 +1,6 @@ --TEST-- -See Github issue #9012 ( https://github.com/composer/composer/issues/9012 and https://gist.github.com/Seldaek/4e2dbc2cea4b4fd7a8207bb310ec8e34). +See GitHub issue #9012 ( https://github.com/composer/composer/issues/9012 and https://gist.github.com/Seldaek/4e2dbc2cea4b4fd7a8207bb310ec8e34). Recursive analysis of the same learnt rules can lead to infinite recursion in solver. diff --git a/tests/Composer/Test/Fixtures/installer/github-issues-9290.test b/tests/Composer/Test/Fixtures/installer/github-issues-9290.test index 8c1122b14..af9ea4596 100644 --- a/tests/Composer/Test/Fixtures/installer/github-issues-9290.test +++ b/tests/Composer/Test/Fixtures/installer/github-issues-9290.test @@ -1,6 +1,6 @@ --TEST-- -See Github issue #9290 ( https://github.com/composer/composer/issues/9290 ). +See GitHub issue #9290 ( https://github.com/composer/composer/issues/9290 ). MultiConflictRule with a level 1 decision needs to exit correctly. --COMPOSER-- diff --git a/tests/Composer/Test/Fixtures/installer/update-with-all-dependencies.test b/tests/Composer/Test/Fixtures/installer/update-with-all-dependencies.test index e63d3daab..2a0cc5222 100644 --- a/tests/Composer/Test/Fixtures/installer/update-with-all-dependencies.test +++ b/tests/Composer/Test/Fixtures/installer/update-with-all-dependencies.test @@ -1,6 +1,6 @@ --TEST-- -See Github issue #6661 ( github.com/composer/composer/issues/6661 ). +See GitHub issue #6661 ( github.com/composer/composer/issues/6661 ). When `--with-all-dependencies` is used, Composer should update the dependencies of all allowed packages, even if the dependency is a root requirement.