Skip to content

Commit 1351cb1

Browse files
committed
minor #4707 Fix typos (TysonAndre)
This PR was merged into the 2.15 branch. Discussion ---------- Fix typos Commits ------- 95599e4 Fix typos
2 parents 40940df + 95599e4 commit 1351cb1

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

src/DocBlock/Tag.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public function getName()
8080
/**
8181
* Set the tag name.
8282
*
83-
* This will also be persisted to the upsteam line and annotation.
83+
* This will also be persisted to the upstream line and annotation.
8484
*
8585
* @param string $name
8686
*/

src/Event/Event.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
namespace PhpCsFixer\Event;
1414

1515
// Since PHP-CS-FIXER is PHP 5.6 compliant we can't always use Symfony Contracts (currently needs PHP ^7.1.3)
16-
// This conditionnal inheritance will be useless when PHP-CS-FIXER no longer supports PHP versions
16+
// This conditional inheritance will be useless when PHP-CS-FIXER no longer supports PHP versions
1717
// inferior to Symfony/Contracts PHP minimal version
1818
if (class_exists(\Symfony\Contracts\EventDispatcher\Event::class)) {
1919
class Event extends \Symfony\Contracts\EventDispatcher\Event

src/Fixer/PhpUnit/PhpUnitMethodCasingFixer.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ private function updateDocBlock(Tokens $tokens, $docBlockIndex)
238238
$doc = new DocBlock($tokens[$docBlockIndex]->getContent());
239239
$lines = $doc->getLines();
240240

241-
$docBlockNeesUpdate = false;
241+
$docBlockNeedsUpdate = false;
242242
for ($inc = 0; $inc < \count($lines); ++$inc) {
243243
$lineContent = $lines[$inc]->getContent();
244244
if (false === strpos($lineContent, '@depends')) {
@@ -256,11 +256,11 @@ private function updateDocBlock(Tokens $tokens, $docBlockIndex)
256256

257257
if ($newLineContent !== $lineContent) {
258258
$lines[$inc] = new Line($newLineContent);
259-
$docBlockNeesUpdate = true;
259+
$docBlockNeedsUpdate = true;
260260
}
261261
}
262262

263-
if ($docBlockNeesUpdate) {
263+
if ($docBlockNeedsUpdate) {
264264
$lines = implode('', $lines);
265265
$tokens[$docBlockIndex] = new Token([T_DOC_COMMENT, $lines]);
266266
}

src/Fixer/StringNotation/ExplicitStringVariableFixer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public function getDefinition()
4444
."\n".'- When there are two valid ways of doing the same thing, using both is confusing, there should be a coding standard to follow'
4545
."\n".'- PHP manual marks `"$var"` syntax as implicit and `"${var}"` syntax as explicit: explicit code should always be preferred'
4646
."\n".'- Explicit syntax allows word concatenation inside strings, e.g. `"${var}IsAVar"`, implicit doesn\'t'
47-
."\n".'- Explicit syntax is easier to detect for IDE/editors and therefore has colors/hightlight with higher contrast, which is easier to read'
47+
."\n".'- Explicit syntax is easier to detect for IDE/editors and therefore has colors/highlight with higher contrast, which is easier to read'
4848
."\n".'Backtick operator is skipped because it is harder to handle; you can use `backtick_to_shell_exec` fixer to normalize backticks to strings'
4949
);
5050
}

0 commit comments

Comments
 (0)