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

Typofixes (#11096) 

* Fixing typo in private method name

* Various comment-related typofixes
pull/11115/head
JT Smith 2022-10-12 08:45:10 -06:00 committed by GitHub
parent 05aecfbe8b
commit 08c04d2c9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Composer/Advisory/Auditor.php
View File

@ -98,7 +98,7 @@ class Auditor
if (!($io instanceof ConsoleIO)) { if (!($io instanceof ConsoleIO)) {
throw new InvalidArgumentException('Cannot use table format with ' . get_class($io)); throw new InvalidArgumentException('Cannot use table format with ' . get_class($io));
} }
$this->outputAvisoriesTable($io, $advisories); $this->outputAdvisoriesTable($io, $advisories);
return; return;
case self::FORMAT_PLAIN: case self::FORMAT_PLAIN:
@ -118,7 +118,7 @@ class Auditor
/** /**
* @param array<string, array<SecurityAdvisory>> $advisories * @param array<string, array<SecurityAdvisory>> $advisories
*/ */
private function outputAvisoriesTable(ConsoleIO $io, array $advisories): void private function outputAdvisoriesTable(ConsoleIO $io, array $advisories): void
{ {
foreach ($advisories as $packageAdvisories) { foreach ($advisories as $packageAdvisories) {
foreach ($packageAdvisories as $advisory) { foreach ($packageAdvisories as $advisory) {

2
src/Composer/DependencyResolver/RuleSetGenerator.php
View File

@ -214,7 +214,7 @@ class RuleSetGenerator
/** @var BasePackage $package */ /** @var BasePackage $package */
foreach ($this->addedMap as $package) { foreach ($this->addedMap as $package) {
foreach ($package->getConflicts() as $link) { foreach ($package->getConflicts() as $link) {
// even if conlict ends up being with an alias, there would be at least one actual package by this name // even if conflict ends up being with an alias, there would be at least one actual package by this name
if (!isset($this->addedPackagesByNames[$link->getTarget()])) { if (!isset($this->addedPackagesByNames[$link->getTarget()])) {
continue; continue;
} }

2
tests/Composer/Test/Fixtures/installer/github-issues-7051.test
View File

@ -1,5 +1,5 @@
--TEST-- --TEST--
Solver Bug Exception caused by analyze on mutli conflict rule reported in GitHub issue 7051 https://github.com/composer/composer/issues/7051 Solver Bug Exception caused by analyze on multi conflict rule reported in GitHub issue 7051 https://github.com/composer/composer/issues/7051
--COMPOSER-- --COMPOSER--
{ {
"require": { "require": {

2
tests/Composer/Test/InstallerTest.php
View File

@ -335,7 +335,7 @@ class InstallerTest extends TestCase
->method('write') ->method('write')
->will($this->returnCallback(static function ($hash, $options) use (&$actualLock): void { ->will($this->returnCallback(static function ($hash, $options) use (&$actualLock): void {
// need to do assertion outside of mock for nice phpunit output // need to do assertion outside of mock for nice phpunit output
// so store value temporarily in reference for later assetion // so store value temporarily in reference for later assertion
$actualLock = $hash; $actualLock = $hash;
})); }));
} elseif ($expectLock === false) { } elseif ($expectLock === false) {

4
tests/Composer/Test/Util/ProcessExecutorTest.php
View File

@ -180,10 +180,10 @@ class ProcessExecutorTest extends TestCase
// double-quotes must be backslash-escaped // double-quotes must be backslash-escaped
'dq' => ['a"bc', 'a\^"bc', "'a\"bc'"], 'dq' => ['a"bc', 'a\^"bc', "'a\"bc'"],
// double-quotes must be backslash-escaped with preceeding backslashes doubled // double-quotes must be backslash-escaped with preceding backslashes doubled
'dq-bslash' => ['a\\"bc', 'a\\\\\^"bc', "'a\\\"bc'"], 'dq-bslash' => ['a\\"bc', 'a\\\\\^"bc', "'a\\\"bc'"],
// backslashes not preceeding a double-quote are treated as literal // backslashes not preceding a double-quote are treated as literal
'bslash' => ['ab\\\\c\\', 'ab\\\\c\\', "'ab\\\\c\\'"], 'bslash' => ['ab\\\\c\\', 'ab\\\\c\\', "'ab\\\\c\\'"],
// trailing backslashes must be doubled up when the argument is quoted // trailing backslashes must be doubled up when the argument is quoted