From e5bdc237ebf430c1229fa705490b4779b83a2dc3 Mon Sep 17 00:00:00 2001 From: Eduardo Gulias Davis Date: Sat, 3 Oct 2020 17:43:06 +0200 Subject: [PATCH] Fixing Psalm erros --- src/EmailLexer.php | 7 +++++++ src/EmailParser.php | 22 ++++++---------------- src/Parser/DomainPart.php | 2 +- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/src/EmailLexer.php b/src/EmailLexer.php index ba93a65..746b175 100644 --- a/src/EmailLexer.php +++ b/src/EmailLexer.php @@ -110,7 +110,14 @@ class EmailLexer extends AbstractLexer 'position' => 0, ]; + /** + * @var string + */ private $accumulator = ''; + + /** + * @var bool + */ private $hasToRecord = false; public function __construct() diff --git a/src/EmailParser.php b/src/EmailParser.php index f886e3f..5259998 100644 --- a/src/EmailParser.php +++ b/src/EmailParser.php @@ -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; } diff --git a/src/Parser/DomainPart.php b/src/Parser/DomainPart.php index 14c9b63..3d682b9 100644 --- a/src/Parser/DomainPart.php +++ b/src/Parser/DomainPart.php @@ -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']);