Skip to content

Commit

Permalink
Revert false positives
Browse files Browse the repository at this point in the history
  • Loading branch information
szepeviktor committed May 6, 2024
1 parent 955c880 commit 7e689d5
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion src/Psalm/Internal/Diff/AstDiffer.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*
* Implements the Myers diff algorithm.
*
* Myers, Eugene W. "An O (AND) difference algorithm and its variations."
* Myers, Eugene W. "An O (ND) difference algorithm and its variations."
* Algorithmica 1.1 (1986): 251-266.
*
* @internal
Expand Down
2 changes: 1 addition & 1 deletion src/Psalm/Internal/Diff/FileDiffer.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*
* Implements the Myers diff algorithm.
*
* Myers, Eugene W. "An O (AND) difference algorithm and its variations."
* Myers, Eugene W. "An O (ND) difference algorithm and its variations."
* Algorithmica 1.1 (1986): 251-266.
*
* @internal
Expand Down
4 changes: 2 additions & 2 deletions tests/AssertAnnotationTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -1357,7 +1357,7 @@ function takesAnArray(array $a): void {
* @psalm-assert-if-true string $a
* @psalm-assert-if-true string $b
*/
function assertAndBAreStrings($a, $b): bool {
function assertAandBAreStrings($a, $b): bool {
if (!is_string($a)) { return false;}
if (!is_string($b)) { return false;}
Expand All @@ -1369,7 +1369,7 @@ function assertAndBAreStrings($a, $b): bool {
* @param mixed $b
*/
function test($a, $b): string {
if (!assertAndBAreStrings($a, $b)) {
if (!assertAandBAreStrings($a, $b)) {
throw new \Exception();
}
Expand Down
2 changes: 1 addition & 1 deletion tests/TryCatchTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ function foo(): string {
return "hello";
}',
],
'whereasTheCatch' => [
'wheresTheCatch' => [
'code' => '<?php
function foo() : bool {
try {
Expand Down
10 changes: 5 additions & 5 deletions tests/fixtures/performance/a.test
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ class PHPMailer
public $ConfirmReadingTo = '';

/**
* The hostname to use in the Message-ID header and as default HELLO string.
* The hostname to use in the Message-ID header and as default HELO string.
* If empty, PHPMailer attempts to find one with, in order,
* $_SERVER['SERVER_NAME'], gethostname(), php_uname('n'), or the value
* 'localhost.localdomain'.
Expand Down Expand Up @@ -258,15 +258,15 @@ class PHPMailer
public $Port = 25;

/**
* The SMTP HELLO of the message.
* The SMTP HELO of the message.
* Default is $Hostname. If $Hostname is empty, PHPMailer attempts to find
* one with the same method described above for $Hostname.
*
* @see PHPMailer::$Hostname
*
* @var string
*/
public $Hello = '';
public $Helo = '';

/**
* What kind of encryption to use on the SMTP connection.
Expand Down Expand Up @@ -1911,8 +1911,8 @@ class PHPMailer
}
if ($this->smtp->connect($prefix . $host, $port, $this->Timeout, $options)) {
try {
if ($this->Hello) {
$hello = $this->Hello;
if ($this->Helo) {
$hello = $this->Helo;
} else {
$hello = $this->serverHostname();
}
Expand Down

0 comments on commit 7e689d5

Please sign in to comment.