public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Merge pull request #8503 from TysonAndre/typo-nit 

Fix nits on typos
pull/8524/head
Jordi Boggiano 2020-01-10 22:50:13 +01:00 committed by GitHub
parent 6034c2af01 6827105a5b
commit ec32c03915
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/01-basic-usage.md
View File

@ -241,14 +241,14 @@ be in your project root, on the same level as `vendor` directory is. An example
filename would be `src/Foo.php` containing an `Acme\Foo` class.
After adding the [`autoload`](04-schema.md#autoload) field, you have to re-run
this command :
this command :
```sh
php composer.phar dump-autoload
```
This command will re-generate the `vendor/autoload.php` file.
See the [`dump-autoload`](03-cli.md#dump-autoload) section for more informations.
See the [`dump-autoload`](03-cli.md#dump-autoload) section for more information.
Including that file will also return the autoloader instance, so you can store
the return value of the include call in a variable and add more namespaces.

6
src/Composer/Downloader/SvnDownloader.php
View File

@ -130,11 +130,11 @@ class SvnDownloader extends VcsDownloader
$this->io->writeError(sprintf(' <error>The package has modified file%s:</error>', $countChanges === 1 ? '' : 's'));
$this->io->writeError(array_slice($changes, 0, 10));
if ($countChanges > 10) {
$remaingChanges = $countChanges - 10;
$remainingChanges = $countChanges - 10;
$this->io->writeError(
sprintf(
' <info>'.$remaingChanges.' more file%s modified, choose "v" to view the full list</info>',
$remaingChanges === 1 ? '' : 's'
' <info>'.$remainingChanges.' more file%s modified, choose "v" to view the full list</info>',
$remainingChanges === 1 ? '' : 's'
)
);
}

2
src/Composer/Util/Hg.php
View File

@ -53,7 +53,7 @@ class Hg
return;
}
// Try with the authentication informations available
// Try with the authentication information available
if (preg_match('{^(https?)://((.+)(?:\:(.+))?@)?([^/]+)(/.*)?}mi', $url, $match) && $this->io->hasAuthentication($match[5])) {
$auth = $this->io->getAuthentication($match[5]);
$authenticatedUrl = $match[1] . '://' . rawurlencode($auth['username']) . ':' . rawurlencode($auth['password']) . '@' . $match[5] . (!empty($match[6]) ? $match[6] : null);