From c26463ff9241f27907112fbcd0c86fa670cfef98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= Date: Fri, 17 May 2019 00:02:54 +0200 Subject: [PATCH] Fix class name and parameter types (#200) * Fix class name and paramtere types * HHVM is not a thing anymore --- .travis.yml | 7 +++---- EmailValidator/EmailLexer.php | 6 +++--- EmailValidator/EmailParser.php | 2 +- EmailValidator/EmailValidator.php | 2 +- EmailValidator/Exception/ExpectingQPair.php | 2 +- EmailValidator/Exception/NoDNSRecord.php | 2 -- EmailValidator/Parser/Parser.php | 4 ++-- 7 files changed, 11 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index ece02c3..650525c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,6 @@ php: - 7.1 - 7.2 - 7.3 - - hhvm env: global: @@ -29,8 +28,8 @@ install: - if [ "$deps" = "high" ]; then composer update; fi script: - - mkdir -p build/logs - - vendor/bin/phpunit --coverage-clover build/logs/clover.xml + - mkdir -p build/logs + - vendor/bin/phpunit --coverage-clover build/logs/clover.xml after_script: - - php vendor/bin/coveralls + - php vendor/bin/coveralls diff --git a/EmailValidator/EmailLexer.php b/EmailValidator/EmailLexer.php index 882c968..38e4714 100644 --- a/EmailValidator/EmailLexer.php +++ b/EmailValidator/EmailLexer.php @@ -89,7 +89,7 @@ public function hasInvalidTokens() } /** - * @param $type + * @param string $type * @throws \UnexpectedValueException * @return boolean */ @@ -189,7 +189,7 @@ protected function isValid($value) } /** - * @param $value + * @param string $value * @return bool */ protected function isNullType($value) @@ -202,7 +202,7 @@ protected function isNullType($value) } /** - * @param $value + * @param string $value * @return bool */ protected function isUTF8Invalid($value) diff --git a/EmailValidator/EmailParser.php b/EmailValidator/EmailParser.php index d0627d8..5bf605a 100644 --- a/EmailValidator/EmailParser.php +++ b/EmailValidator/EmailParser.php @@ -33,7 +33,7 @@ public function __construct(EmailLexer $lexer) } /** - * @param $str + * @param string $str * @return array */ public function parse($str) diff --git a/EmailValidator/EmailValidator.php b/EmailValidator/EmailValidator.php index 44b4b93..1c27707 100644 --- a/EmailValidator/EmailValidator.php +++ b/EmailValidator/EmailValidator.php @@ -28,7 +28,7 @@ public function __construct() } /** - * @param $email + * @param string $email * @param EmailValidation $emailValidation * @return bool */ diff --git a/EmailValidator/Exception/ExpectingQPair.php b/EmailValidator/Exception/ExpectingQPair.php index 2502811..a738eeb 100644 --- a/EmailValidator/Exception/ExpectingQPair.php +++ b/EmailValidator/Exception/ExpectingQPair.php @@ -2,7 +2,7 @@ namespace Egulias\EmailValidator\Exception; -class ExpectedQPair extends InvalidEmail +class ExpectingQPair extends InvalidEmail { const CODE = 136; const REASON = "Expecting QPAIR"; diff --git a/EmailValidator/Exception/NoDNSRecord.php b/EmailValidator/Exception/NoDNSRecord.php index 86ca21d..0aa5fa7 100644 --- a/EmailValidator/Exception/NoDNSRecord.php +++ b/EmailValidator/Exception/NoDNSRecord.php @@ -2,8 +2,6 @@ namespace Egulias\EmailValidator\Exception; -use Egulias\EmailValidator\Exception\InvalidEmail; - class NoDNSRecord extends InvalidEmail { const CODE = 5; diff --git a/EmailValidator/Parser/Parser.php b/EmailValidator/Parser/Parser.php index e5042e1..fa7bd44 100644 --- a/EmailValidator/Parser/Parser.php +++ b/EmailValidator/Parser/Parser.php @@ -8,7 +8,7 @@ use Egulias\EmailValidator\Exception\CRLFAtTheEnd; use Egulias\EmailValidator\Exception\CRLFX2; use Egulias\EmailValidator\Exception\CRNoLF; -use Egulias\EmailValidator\Exception\ExpectedQPair; +use Egulias\EmailValidator\Exception\ExpectingQPair; use Egulias\EmailValidator\Exception\ExpectingATEXT; use Egulias\EmailValidator\Exception\ExpectingCTEXT; use Egulias\EmailValidator\Exception\UnclosedComment; @@ -50,7 +50,7 @@ protected function validateQuotedPair() { if (!($this->lexer->token['type'] === EmailLexer::INVALID || $this->lexer->token['type'] === EmailLexer::C_DEL)) { - throw new ExpectedQPair(); + throw new ExpectingQPair(); } $this->warnings[QuotedPart::CODE] =