Prechádzať zdrojové kódy

Merge pull request #8503 from TysonAndre/typo-nit

Fix nits on typos
Jordi Boggiano 5 rokov pred
rodič
commit
ec32c03915

+ 2 - 2
doc/01-basic-usage.md

@@ -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.
 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
 After adding the [`autoload`](04-schema.md#autoload) field, you have to re-run
-this command : 
+this command :
 
 
 ```sh
 ```sh
 php composer.phar dump-autoload
 php composer.phar dump-autoload
 ```
 ```
 
 
 This command will re-generate the `vendor/autoload.php` file.
 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
 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.
 the return value of the include call in a variable and add more namespaces.

+ 3 - 3
src/Composer/Downloader/SvnDownloader.php

@@ -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(sprintf('    <error>The package has modified file%s:</error>', $countChanges === 1 ? '' : 's'));
         $this->io->writeError(array_slice($changes, 0, 10));
         $this->io->writeError(array_slice($changes, 0, 10));
         if ($countChanges > 10) {
         if ($countChanges > 10) {
-            $remaingChanges = $countChanges - 10;
+            $remainingChanges = $countChanges - 10;
             $this->io->writeError(
             $this->io->writeError(
                 sprintf(
                 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'
                 )
                 )
             );
             );
         }
         }

+ 1 - 1
src/Composer/Util/Hg.php

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