geckon01/EmailValidator
1
0
Fork 0
mirror of https://github.com/egulias/EmailValidator.git synced 2026-08-24 19:08:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing Psalm erros

Browse Source
This commit is contained in:
Eduardo Gulias Davis
2020-10-03 17:43:06 +02:00
parent 73dc53df0d
commit e5bdc237eb
3 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/EmailLexer.php
+7
View File
@@ -110,7 +110,14 @@ class EmailLexer extends AbstractLexer
'position' => 0,
];
/**
* @var string
*/
private $accumulator = '';
/**
* @var bool
*/
private $hasToRecord = false;
public function __construct()
src/EmailParser.php
+6 -16
View File
@@ -35,16 +35,6 @@ class EmailParser
*/
protected $lexer;
/**
* @var LocalPart
*/
protected $localPartParser;
/**
* @var DomainPart
*/
protected $domainPartParser;
public function __construct(EmailLexer $lexer)
{
$this->lexer = $lexer;
@@ -86,11 +76,11 @@ class EmailParser
private function processLocalPart() : Result
{
$this->lexer->startRecording();
$this->localPartParser = new LocalPart($this->lexer);
$localPartResult = $this->localPartParser->parse();
$localPartParser = new LocalPart($this->lexer);
$localPartResult = $localPartParser->parse();
$this->lexer->stopRecording();
$this->localPart = rtrim($this->lexer->getAccumulatedValues(), '@');
$this->warnings = array_merge($this->localPartParser->getWarnings(), $this->warnings);
$this->warnings = array_merge($localPartParser->getWarnings(), $this->warnings);
return $localPartResult;
}
@@ -99,11 +89,11 @@ class EmailParser
{
$this->lexer->clearRecorded();
$this->lexer->startRecording();
$this->domainPartParser = new DomainPart($this->lexer);
$domainPartResult = $this->domainPartParser->parse();
$domainPartParser = new DomainPart($this->lexer);
$domainPartResult = $domainPartParser->parse();
$this->lexer->stopRecording();
$this->domainPart = $this->lexer->getAccumulatedValues();
$this->warnings = array_merge($this->domainPartParser->getWarnings(), $this->warnings);
$this->warnings = array_merge($domainPartParser->getWarnings(), $this->warnings);
return $domainPartResult;
}
src/Parser/DomainPart.php
+1 -1
View File
@@ -184,7 +184,7 @@ class DomainPart extends Parser
$domain .= $this->lexer->token['value'];
$this->lexer->moveNext();
if ($this->lexer->token['type'] === EmailLexer::S_SP) {
return new InvalidEmail(new CharNotAllowed(), $this->lexer->token['type']);
return new InvalidEmail(new CharNotAllowed(), $this->lexer->token['value']);
}
} while (null !== $this->lexer->token['type']);