Dolibarr / dolibarr

htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/SpoofCheckValidation.php

Indentation +39 added lines, -39 removed lines

@@ -9,43 +9,43 @@
 
 class SpoofCheckValidation implements EmailValidation
 {
-    /**
-     * @var InvalidEmail|null
-     */
-    private $error;
-
-    public function __construct()
-    {
-        if (!extension_loaded('intl')) {
-            throw new \LogicException(sprintf('The %s class requires the Intl extension.', __CLASS__));
-        }
-    }
-
-    /**
-     * @psalm-suppress InvalidArgument
-     */
-    public function isValid($email, EmailLexer $emailLexer)
-    {
-        $checker = new Spoofchecker();
-        $checker->setChecks(Spoofchecker::SINGLE_SCRIPT);
-
-        if ($checker->isSuspicious($email)) {
-            $this->error = new SpoofEmail();
-        }
-
-        return $this->error === null;
-    }
-
-    /**
-     * @return InvalidEmail|null
-     */
-    public function getError()
-    {
-        return $this->error;
-    }
-
-    public function getWarnings()
-    {
-        return [];
-    }
+	/**
+	 * @var InvalidEmail|null
+	 */
+	private $error;
+
+	public function __construct()
+	{
+		if (!extension_loaded('intl')) {
+			throw new \LogicException(sprintf('The %s class requires the Intl extension.', __CLASS__));
+		}
+	}
+
+	/**
+	 * @psalm-suppress InvalidArgument
+	 */
+	public function isValid($email, EmailLexer $emailLexer)
+	{
+		$checker = new Spoofchecker();
+		$checker->setChecks(Spoofchecker::SINGLE_SCRIPT);
+
+		if ($checker->isSuspicious($email)) {
+			$this->error = new SpoofEmail();
+		}
+
+		return $this->error === null;
+	}
+
+	/**
+	 * @return InvalidEmail|null
+	 */
+	public function getError()
+	{
+		return $this->error;
+	}
+
+	public function getWarnings()
+	{
+		return [];
+	}
 }

htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/NoRFCWarningsValidation.php

Indentation +30 added lines, -30 removed lines

@@ -8,34 +8,34 @@
 
 class NoRFCWarningsValidation extends RFCValidation
 {
-    /**
-     * @var InvalidEmail|null
-     */
-    private $error;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isValid($email, EmailLexer $emailLexer)
-    {
-        if (!parent::isValid($email, $emailLexer)) {
-            return false;
-        }
-
-        if (empty($this->getWarnings())) {
-            return true;
-        }
-
-        $this->error = new RFCWarnings();
-
-        return false;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getError()
-    {
-        return $this->error ?: parent::getError();
-    }
+	/**
+	 * @var InvalidEmail|null
+	 */
+	private $error;
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function isValid($email, EmailLexer $emailLexer)
+	{
+		if (!parent::isValid($email, $emailLexer)) {
+			return false;
+		}
+
+		if (empty($this->getWarnings())) {
+			return true;
+		}
+
+		$this->error = new RFCWarnings();
+
+		return false;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getError()
+	{
+		return $this->error ?: parent::getError();
+	}
 }

htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/MultipleErrors.php

Indentation +21 added lines, -21 removed lines

@@ -6,27 +6,27 @@
 
 class MultipleErrors extends InvalidEmail
 {
-    const CODE = 999;
-    const REASON = "Accumulated errors for multiple validations";
-    /**
-     * @var InvalidEmail[]
-     */
-    private $errors = [];
+	const CODE = 999;
+	const REASON = "Accumulated errors for multiple validations";
+	/**
+	 * @var InvalidEmail[]
+	 */
+	private $errors = [];
 
-    /**
-     * @param InvalidEmail[] $errors
-     */
-    public function __construct(array $errors)
-    {
-        $this->errors = $errors;
-        parent::__construct();
-    }
+	/**
+	 * @param InvalidEmail[] $errors
+	 */
+	public function __construct(array $errors)
+	{
+		$this->errors = $errors;
+		parent::__construct();
+	}
 
-    /**
-     * @return InvalidEmail[]
-     */
-    public function getErrors()
-    {
-        return $this->errors;
-    }
+	/**
+	 * @return InvalidEmail[]
+	 */
+	public function getErrors()
+	{
+		return $this->errors;
+	}
 }

htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Parser/Parser.php

Indentation +225 added lines, -225 removed lines

@@ -21,229 +21,229 @@
 
 abstract class Parser
 {
-    /**
-     * @var array
-     */
-    protected $warnings = [];
-
-    /**
-     * @var EmailLexer
-     */
-    protected $lexer;
-
-    /**
-     * @var int
-     */
-    protected $openedParenthesis = 0;
-
-    public function __construct(EmailLexer $lexer)
-    {
-        $this->lexer = $lexer;
-    }
-
-    /**
-     * @return \Egulias\EmailValidator\Warning\Warning[]
-     */
-    public function getWarnings()
-    {
-        return $this->warnings;
-    }
-
-    /**
-     * @param string $str
-     */
-    abstract public function parse($str);
-
-    /** @return int */
-    public function getOpenedParenthesis()
-    {
-        return $this->openedParenthesis;
-    }
-
-    /**
-     * validateQuotedPair
-     */
-    protected function validateQuotedPair()
-    {
-        if (!($this->lexer->token['type'] === EmailLexer::INVALID
-            || $this->lexer->token['type'] === EmailLexer::C_DEL)) {
-            throw new ExpectingQPair();
-        }
-
-        $this->warnings[QuotedPart::CODE] =
-            new QuotedPart($this->lexer->getPrevious()['type'], $this->lexer->token['type']);
-    }
-
-    protected function parseComments()
-    {
-        $this->openedParenthesis = 1;
-        $this->isUnclosedComment();
-        $this->warnings[Comment::CODE] = new Comment();
-        while (!$this->lexer->isNextToken(EmailLexer::S_CLOSEPARENTHESIS)) {
-            if ($this->lexer->isNextToken(EmailLexer::S_OPENPARENTHESIS)) {
-                $this->openedParenthesis++;
-            }
-            $this->warnEscaping();
-            $this->lexer->moveNext();
-        }
-
-        $this->lexer->moveNext();
-        if ($this->lexer->isNextTokenAny(array(EmailLexer::GENERIC, EmailLexer::S_EMPTY))) {
-            throw new ExpectingATEXT();
-        }
-
-        if ($this->lexer->isNextToken(EmailLexer::S_AT)) {
-            $this->warnings[CFWSNearAt::CODE] = new CFWSNearAt();
-        }
-    }
-
-    /**
-     * @return bool
-     */
-    protected function isUnclosedComment()
-    {
-        try {
-            $this->lexer->find(EmailLexer::S_CLOSEPARENTHESIS);
-            return true;
-        } catch (\RuntimeException $e) {
-            throw new UnclosedComment();
-        }
-    }
-
-    protected function parseFWS()
-    {
-        $previous = $this->lexer->getPrevious();
-
-        $this->checkCRLFInFWS();
-
-        if ($this->lexer->token['type'] === EmailLexer::S_CR) {
-            throw new CRNoLF();
-        }
-
-        if ($this->lexer->isNextToken(EmailLexer::GENERIC) && $previous['type']  !== EmailLexer::S_AT) {
-            throw new AtextAfterCFWS();
-        }
-
-        if ($this->lexer->token['type'] === EmailLexer::S_LF || $this->lexer->token['type'] === EmailLexer::C_NUL) {
-            throw new ExpectingCTEXT();
-        }
-
-        if ($this->lexer->isNextToken(EmailLexer::S_AT) || $previous['type']  === EmailLexer::S_AT) {
-            $this->warnings[CFWSNearAt::CODE] = new CFWSNearAt();
-        } else {
-            $this->warnings[CFWSWithFWS::CODE] = new CFWSWithFWS();
-        }
-    }
-
-    protected function checkConsecutiveDots()
-    {
-        if ($this->lexer->token['type'] === EmailLexer::S_DOT && $this->lexer->isNextToken(EmailLexer::S_DOT)) {
-            throw new ConsecutiveDot();
-        }
-    }
-
-    /**
-     * @return bool
-     */
-    protected function isFWS()
-    {
-        if ($this->escaped()) {
-            return false;
-        }
-
-        if ($this->lexer->token['type'] === EmailLexer::S_SP ||
-            $this->lexer->token['type'] === EmailLexer::S_HTAB ||
-            $this->lexer->token['type'] === EmailLexer::S_CR ||
-            $this->lexer->token['type'] === EmailLexer::S_LF ||
-            $this->lexer->token['type'] === EmailLexer::CRLF
-        ) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * @return bool
-     */
-    protected function escaped()
-    {
-        $previous = $this->lexer->getPrevious();
-
-        if ($previous && $previous['type'] === EmailLexer::S_BACKSLASH
-            &&
-            $this->lexer->token['type'] !== EmailLexer::GENERIC
-        ) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * @return bool
-     */
-    protected function warnEscaping()
-    {
-        if ($this->lexer->token['type'] !== EmailLexer::S_BACKSLASH) {
-            return false;
-        }
-
-        if ($this->lexer->isNextToken(EmailLexer::GENERIC)) {
-            throw new ExpectingATEXT();
-        }
-
-        if (!$this->lexer->isNextTokenAny(array(EmailLexer::S_SP, EmailLexer::S_HTAB, EmailLexer::C_DEL))) {
-            return false;
-        }
-
-        $this->warnings[QuotedPart::CODE] =
-            new QuotedPart($this->lexer->getPrevious()['type'], $this->lexer->token['type']);
-        return true;
-
-    }
-
-    /**
-     * @param bool $hasClosingQuote
-     *
-     * @return bool
-     */
-    protected function checkDQUOTE($hasClosingQuote)
-    {
-        if ($this->lexer->token['type'] !== EmailLexer::S_DQUOTE) {
-            return $hasClosingQuote;
-        }
-        if ($hasClosingQuote) {
-            return $hasClosingQuote;
-        }
-        $previous = $this->lexer->getPrevious();
-        if ($this->lexer->isNextToken(EmailLexer::GENERIC) && $previous['type'] === EmailLexer::GENERIC) {
-            throw new ExpectingATEXT();
-        }
-
-        try {
-            $this->lexer->find(EmailLexer::S_DQUOTE);
-            $hasClosingQuote = true;
-        } catch (\Exception $e) {
-            throw new UnclosedQuotedString();
-        }
-        $this->warnings[QuotedString::CODE] = new QuotedString($previous['value'], $this->lexer->token['value']);
-
-        return $hasClosingQuote;
-    }
-
-    protected function checkCRLFInFWS()
-    {
-        if ($this->lexer->token['type'] !== EmailLexer::CRLF) {
-            return;
-        }
-
-        if (!$this->lexer->isNextTokenAny(array(EmailLexer::S_SP, EmailLexer::S_HTAB))) {
-            throw new CRLFX2();
-        }
-
-        if (!$this->lexer->isNextTokenAny(array(EmailLexer::S_SP, EmailLexer::S_HTAB))) {
-            throw new CRLFAtTheEnd();
-        }
-    }
+	/**
+	 * @var array
+	 */
+	protected $warnings = [];
+
+	/**
+	 * @var EmailLexer
+	 */
+	protected $lexer;
+
+	/**
+	 * @var int
+	 */
+	protected $openedParenthesis = 0;
+
+	public function __construct(EmailLexer $lexer)
+	{
+		$this->lexer = $lexer;
+	}
+
+	/**
+	 * @return \Egulias\EmailValidator\Warning\Warning[]
+	 */
+	public function getWarnings()
+	{
+		return $this->warnings;
+	}
+
+	/**
+	 * @param string $str
+	 */
+	abstract public function parse($str);
+
+	/** @return int */
+	public function getOpenedParenthesis()
+	{
+		return $this->openedParenthesis;
+	}
+
+	/**
+	 * validateQuotedPair
+	 */
+	protected function validateQuotedPair()
+	{
+		if (!($this->lexer->token['type'] === EmailLexer::INVALID
+			|| $this->lexer->token['type'] === EmailLexer::C_DEL)) {
+			throw new ExpectingQPair();
+		}
+
+		$this->warnings[QuotedPart::CODE] =
+			new QuotedPart($this->lexer->getPrevious()['type'], $this->lexer->token['type']);
+	}
+
+	protected function parseComments()
+	{
+		$this->openedParenthesis = 1;
+		$this->isUnclosedComment();
+		$this->warnings[Comment::CODE] = new Comment();
+		while (!$this->lexer->isNextToken(EmailLexer::S_CLOSEPARENTHESIS)) {
+			if ($this->lexer->isNextToken(EmailLexer::S_OPENPARENTHESIS)) {
+				$this->openedParenthesis++;
+			}
+			$this->warnEscaping();
+			$this->lexer->moveNext();
+		}
+
+		$this->lexer->moveNext();
+		if ($this->lexer->isNextTokenAny(array(EmailLexer::GENERIC, EmailLexer::S_EMPTY))) {
+			throw new ExpectingATEXT();
+		}
+
+		if ($this->lexer->isNextToken(EmailLexer::S_AT)) {
+			$this->warnings[CFWSNearAt::CODE] = new CFWSNearAt();
+		}
+	}
+
+	/**
+	 * @return bool
+	 */
+	protected function isUnclosedComment()
+	{
+		try {
+			$this->lexer->find(EmailLexer::S_CLOSEPARENTHESIS);
+			return true;
+		} catch (\RuntimeException $e) {
+			throw new UnclosedComment();
+		}
+	}
+
+	protected function parseFWS()
+	{
+		$previous = $this->lexer->getPrevious();
+
+		$this->checkCRLFInFWS();
+
+		if ($this->lexer->token['type'] === EmailLexer::S_CR) {
+			throw new CRNoLF();
+		}
+
+		if ($this->lexer->isNextToken(EmailLexer::GENERIC) && $previous['type']  !== EmailLexer::S_AT) {
+			throw new AtextAfterCFWS();
+		}
+
+		if ($this->lexer->token['type'] === EmailLexer::S_LF || $this->lexer->token['type'] === EmailLexer::C_NUL) {
+			throw new ExpectingCTEXT();
+		}
+
+		if ($this->lexer->isNextToken(EmailLexer::S_AT) || $previous['type']  === EmailLexer::S_AT) {
+			$this->warnings[CFWSNearAt::CODE] = new CFWSNearAt();
+		} else {
+			$this->warnings[CFWSWithFWS::CODE] = new CFWSWithFWS();
+		}
+	}
+
+	protected function checkConsecutiveDots()
+	{
+		if ($this->lexer->token['type'] === EmailLexer::S_DOT && $this->lexer->isNextToken(EmailLexer::S_DOT)) {
+			throw new ConsecutiveDot();
+		}
+	}
+
+	/**
+	 * @return bool
+	 */
+	protected function isFWS()
+	{
+		if ($this->escaped()) {
+			return false;
+		}
+
+		if ($this->lexer->token['type'] === EmailLexer::S_SP ||
+			$this->lexer->token['type'] === EmailLexer::S_HTAB ||
+			$this->lexer->token['type'] === EmailLexer::S_CR ||
+			$this->lexer->token['type'] === EmailLexer::S_LF ||
+			$this->lexer->token['type'] === EmailLexer::CRLF
+		) {
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * @return bool
+	 */
+	protected function escaped()
+	{
+		$previous = $this->lexer->getPrevious();
+
+		if ($previous && $previous['type'] === EmailLexer::S_BACKSLASH
+			&&
+			$this->lexer->token['type'] !== EmailLexer::GENERIC
+		) {
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * @return bool
+	 */
+	protected function warnEscaping()
+	{
+		if ($this->lexer->token['type'] !== EmailLexer::S_BACKSLASH) {
+			return false;
+		}
+
+		if ($this->lexer->isNextToken(EmailLexer::GENERIC)) {
+			throw new ExpectingATEXT();
+		}
+
+		if (!$this->lexer->isNextTokenAny(array(EmailLexer::S_SP, EmailLexer::S_HTAB, EmailLexer::C_DEL))) {
+			return false;
+		}
+
+		$this->warnings[QuotedPart::CODE] =
+			new QuotedPart($this->lexer->getPrevious()['type'], $this->lexer->token['type']);
+		return true;
+
+	}
+
+	/**
+	 * @param bool $hasClosingQuote
+	 *
+	 * @return bool
+	 */
+	protected function checkDQUOTE($hasClosingQuote)
+	{
+		if ($this->lexer->token['type'] !== EmailLexer::S_DQUOTE) {
+			return $hasClosingQuote;
+		}
+		if ($hasClosingQuote) {
+			return $hasClosingQuote;
+		}
+		$previous = $this->lexer->getPrevious();
+		if ($this->lexer->isNextToken(EmailLexer::GENERIC) && $previous['type'] === EmailLexer::GENERIC) {
+			throw new ExpectingATEXT();
+		}
+
+		try {
+			$this->lexer->find(EmailLexer::S_DQUOTE);
+			$hasClosingQuote = true;
+		} catch (\Exception $e) {
+			throw new UnclosedQuotedString();
+		}
+		$this->warnings[QuotedString::CODE] = new QuotedString($previous['value'], $this->lexer->token['value']);
+
+		return $hasClosingQuote;
+	}
+
+	protected function checkCRLFInFWS()
+	{
+		if ($this->lexer->token['type'] !== EmailLexer::CRLF) {
+			return;
+		}
+
+		if (!$this->lexer->isNextTokenAny(array(EmailLexer::S_SP, EmailLexer::S_HTAB))) {
+			throw new CRLFX2();
+		}
+
+		if (!$this->lexer->isNextTokenAny(array(EmailLexer::S_SP, EmailLexer::S_HTAB))) {
+			throw new CRLFAtTheEnd();
+		}
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -120,7 +120,7 @@ 
             throw new CRNoLF();
         }
 
-        if ($this->lexer->isNextToken(EmailLexer::GENERIC) && $previous['type']  !== EmailLexer::S_AT) {
+        if ($this->lexer->isNextToken(EmailLexer::GENERIC) && $previous['type'] !== EmailLexer::S_AT) {
             throw new AtextAfterCFWS();
         }
 
@@ -128,7 +128,7 @@ 
             throw new ExpectingCTEXT();
         }
 
-        if ($this->lexer->isNextToken(EmailLexer::S_AT) || $previous['type']  === EmailLexer::S_AT) {
+        if ($this->lexer->isNextToken(EmailLexer::S_AT) || $previous['type'] === EmailLexer::S_AT) {
             $this->warnings[CFWSNearAt::CODE] = new CFWSNearAt();
         } else {
             $this->warnings[CFWSWithFWS::CODE] = new CFWSWithFWS();

htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Parser/LocalPart.php

Indentation +128 added lines, -128 removed lines

@@ -14,132 +14,132 @@
 
 class LocalPart extends Parser
 {
-    public function parse($localPart)
-    {
-        $parseDQuote = true;
-        $closingQuote = false;
-        $openedParenthesis = 0;
-        $totalLength = 0;
-
-        while ($this->lexer->token['type'] !== EmailLexer::S_AT && null !== $this->lexer->token['type']) {
-            if ($this->lexer->token['type'] === EmailLexer::S_DOT && null === $this->lexer->getPrevious()['type']) {
-                throw new DotAtStart();
-            }
-
-            $closingQuote = $this->checkDQUOTE($closingQuote);
-            if ($closingQuote && $parseDQuote) {
-                $parseDQuote = $this->parseDoubleQuote();
-            }
-
-            if ($this->lexer->token['type'] === EmailLexer::S_OPENPARENTHESIS) {
-                $this->parseComments();
-                $openedParenthesis += $this->getOpenedParenthesis();
-            }
-
-            if ($this->lexer->token['type'] === EmailLexer::S_CLOSEPARENTHESIS) {
-                if ($openedParenthesis === 0) {
-                    throw new UnopenedComment();
-                }
-
-                $openedParenthesis--;
-            }
-
-            $this->checkConsecutiveDots();
-
-            if ($this->lexer->token['type'] === EmailLexer::S_DOT &&
-                $this->lexer->isNextToken(EmailLexer::S_AT)
-            ) {
-                throw new DotAtEnd();
-            }
-
-            $this->warnEscaping();
-            $this->isInvalidToken($this->lexer->token, $closingQuote);
-
-            if ($this->isFWS()) {
-                $this->parseFWS();
-            }
-
-            $totalLength += strlen($this->lexer->token['value']);
-            $this->lexer->moveNext();
-        }
-
-        if ($totalLength > LocalTooLong::LOCAL_PART_LENGTH) {
-            $this->warnings[LocalTooLong::CODE] = new LocalTooLong();
-        }
-    }
-
-    /**
-     * @return bool
-     */
-    protected function parseDoubleQuote()
-    {
-        $parseAgain = true;
-        $special = array(
-            EmailLexer::S_CR => true,
-            EmailLexer::S_HTAB => true,
-            EmailLexer::S_LF => true
-        );
-
-        $invalid = array(
-            EmailLexer::C_NUL => true,
-            EmailLexer::S_HTAB => true,
-            EmailLexer::S_CR => true,
-            EmailLexer::S_LF => true
-        );
-        $setSpecialsWarning = true;
-
-        $this->lexer->moveNext();
-
-        while ($this->lexer->token['type'] !== EmailLexer::S_DQUOTE && null !== $this->lexer->token['type']) {
-            $parseAgain = false;
-            if (isset($special[$this->lexer->token['type']]) && $setSpecialsWarning) {
-                $this->warnings[CFWSWithFWS::CODE] = new CFWSWithFWS();
-                $setSpecialsWarning = false;
-            }
-            if ($this->lexer->token['type'] === EmailLexer::S_BACKSLASH && $this->lexer->isNextToken(EmailLexer::S_DQUOTE)) {
-                $this->lexer->moveNext();
-            }
-
-            $this->lexer->moveNext();
-
-            if (!$this->escaped() && isset($invalid[$this->lexer->token['type']])) {
-                throw new ExpectingATEXT();
-            }
-        }
-
-        $prev = $this->lexer->getPrevious();
-
-        if ($prev['type'] === EmailLexer::S_BACKSLASH) {
-            if (!$this->checkDQUOTE(false)) {
-                throw new UnclosedQuotedString();
-            }
-        }
-
-        if (!$this->lexer->isNextToken(EmailLexer::S_AT) && $prev['type'] !== EmailLexer::S_BACKSLASH) {
-            throw new ExpectingAT();
-        }
-
-        return $parseAgain;
-    }
-
-    /**
-     * @param bool $closingQuote
-     */
-    protected function isInvalidToken(array $token, $closingQuote)
-    {
-        $forbidden = array(
-            EmailLexer::S_COMMA,
-            EmailLexer::S_CLOSEBRACKET,
-            EmailLexer::S_OPENBRACKET,
-            EmailLexer::S_GREATERTHAN,
-            EmailLexer::S_LOWERTHAN,
-            EmailLexer::S_COLON,
-            EmailLexer::S_SEMICOLON,
-            EmailLexer::INVALID
-        );
-
-        if (in_array($token['type'], $forbidden) && !$closingQuote) {
-            throw new ExpectingATEXT();
-        }
-    }
+	public function parse($localPart)
+	{
+		$parseDQuote = true;
+		$closingQuote = false;
+		$openedParenthesis = 0;
+		$totalLength = 0;
+
+		while ($this->lexer->token['type'] !== EmailLexer::S_AT && null !== $this->lexer->token['type']) {
+			if ($this->lexer->token['type'] === EmailLexer::S_DOT && null === $this->lexer->getPrevious()['type']) {
+				throw new DotAtStart();
+			}
+
+			$closingQuote = $this->checkDQUOTE($closingQuote);
+			if ($closingQuote && $parseDQuote) {
+				$parseDQuote = $this->parseDoubleQuote();
+			}
+
+			if ($this->lexer->token['type'] === EmailLexer::S_OPENPARENTHESIS) {
+				$this->parseComments();
+				$openedParenthesis += $this->getOpenedParenthesis();
+			}
+
+			if ($this->lexer->token['type'] === EmailLexer::S_CLOSEPARENTHESIS) {
+				if ($openedParenthesis === 0) {
+					throw new UnopenedComment();
+				}
+
+				$openedParenthesis--;
+			}
+
+			$this->checkConsecutiveDots();
+
+			if ($this->lexer->token['type'] === EmailLexer::S_DOT &&
+				$this->lexer->isNextToken(EmailLexer::S_AT)
+			) {
+				throw new DotAtEnd();
+			}
+
+			$this->warnEscaping();
+			$this->isInvalidToken($this->lexer->token, $closingQuote);
+
+			if ($this->isFWS()) {
+				$this->parseFWS();
+			}
+
+			$totalLength += strlen($this->lexer->token['value']);
+			$this->lexer->moveNext();
+		}
+
+		if ($totalLength > LocalTooLong::LOCAL_PART_LENGTH) {
+			$this->warnings[LocalTooLong::CODE] = new LocalTooLong();
+		}
+	}
+
+	/**
+	 * @return bool
+	 */
+	protected function parseDoubleQuote()
+	{
+		$parseAgain = true;
+		$special = array(
+			EmailLexer::S_CR => true,
+			EmailLexer::S_HTAB => true,
+			EmailLexer::S_LF => true
+		);
+
+		$invalid = array(
+			EmailLexer::C_NUL => true,
+			EmailLexer::S_HTAB => true,
+			EmailLexer::S_CR => true,
+			EmailLexer::S_LF => true
+		);
+		$setSpecialsWarning = true;
+
+		$this->lexer->moveNext();
+
+		while ($this->lexer->token['type'] !== EmailLexer::S_DQUOTE && null !== $this->lexer->token['type']) {
+			$parseAgain = false;
+			if (isset($special[$this->lexer->token['type']]) && $setSpecialsWarning) {
+				$this->warnings[CFWSWithFWS::CODE] = new CFWSWithFWS();
+				$setSpecialsWarning = false;
+			}
+			if ($this->lexer->token['type'] === EmailLexer::S_BACKSLASH && $this->lexer->isNextToken(EmailLexer::S_DQUOTE)) {
+				$this->lexer->moveNext();
+			}
+
+			$this->lexer->moveNext();
+
+			if (!$this->escaped() && isset($invalid[$this->lexer->token['type']])) {
+				throw new ExpectingATEXT();
+			}
+		}
+
+		$prev = $this->lexer->getPrevious();
+
+		if ($prev['type'] === EmailLexer::S_BACKSLASH) {
+			if (!$this->checkDQUOTE(false)) {
+				throw new UnclosedQuotedString();
+			}
+		}
+
+		if (!$this->lexer->isNextToken(EmailLexer::S_AT) && $prev['type'] !== EmailLexer::S_BACKSLASH) {
+			throw new ExpectingAT();
+		}
+
+		return $parseAgain;
+	}
+
+	/**
+	 * @param bool $closingQuote
+	 */
+	protected function isInvalidToken(array $token, $closingQuote)
+	{
+		$forbidden = array(
+			EmailLexer::S_COMMA,
+			EmailLexer::S_CLOSEBRACKET,
+			EmailLexer::S_OPENBRACKET,
+			EmailLexer::S_GREATERTHAN,
+			EmailLexer::S_LOWERTHAN,
+			EmailLexer::S_COLON,
+			EmailLexer::S_SEMICOLON,
+			EmailLexer::INVALID
+		);
+
+		if (in_array($token['type'], $forbidden) && !$closingQuote) {
+			throw new ExpectingATEXT();
+		}
+	}
 }

htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Parser/DomainPart.php

Indentation +406 added lines, -406 removed lines

@@ -34,410 +34,410 @@
 
 class DomainPart extends Parser
 {
-    const DOMAIN_MAX_LENGTH = 254;
-    const LABEL_MAX_LENGTH = 63;
-
-    /**
-     * @var string
-     */
-    protected $domainPart = '';
-
-    public function parse($domainPart)
-    {
-        $this->lexer->moveNext();
-
-        $this->performDomainStartChecks();
-
-        $domain = $this->doParseDomainPart();
-
-        $prev = $this->lexer->getPrevious();
-        $length = strlen($domain);
-
-        if ($prev['type'] === EmailLexer::S_DOT) {
-            throw new DotAtEnd();
-        }
-        if ($prev['type'] === EmailLexer::S_HYPHEN) {
-            throw new DomainHyphened();
-        }
-        if ($length > self::DOMAIN_MAX_LENGTH) {
-            $this->warnings[DomainTooLong::CODE] = new DomainTooLong();
-        }
-        if ($prev['type'] === EmailLexer::S_CR) {
-            throw new CRLFAtTheEnd();
-        }
-        $this->domainPart = $domain;
-    }
-
-    private function performDomainStartChecks()
-    {
-        $this->checkInvalidTokensAfterAT();
-        $this->checkEmptyDomain();
-
-        if ($this->lexer->token['type'] === EmailLexer::S_OPENPARENTHESIS) {
-            $this->warnings[DeprecatedComment::CODE] = new DeprecatedComment();
-            $this->parseDomainComments();
-        }
-    }
-
-    private function checkEmptyDomain()
-    {
-        $thereIsNoDomain = $this->lexer->token['type'] === EmailLexer::S_EMPTY ||
-            ($this->lexer->token['type'] === EmailLexer::S_SP &&
-            !$this->lexer->isNextToken(EmailLexer::GENERIC));
-
-        if ($thereIsNoDomain) {
-            throw new NoDomainPart();
-        }
-    }
-
-    private function checkInvalidTokensAfterAT()
-    {
-        if ($this->lexer->token['type'] === EmailLexer::S_DOT) {
-            throw new DotAtStart();
-        }
-        if ($this->lexer->token['type'] === EmailLexer::S_HYPHEN) {
-            throw new DomainHyphened();
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function getDomainPart()
-    {
-        return $this->domainPart;
-    }
-
-    /**
-     * @param string $addressLiteral
-     * @param int $maxGroups
-     */
-    public function checkIPV6Tag($addressLiteral, $maxGroups = 8)
-    {
-        $prev = $this->lexer->getPrevious();
-        if ($prev['type'] === EmailLexer::S_COLON) {
-            $this->warnings[IPV6ColonEnd::CODE] = new IPV6ColonEnd();
-        }
-
-        $IPv6       = substr($addressLiteral, 5);
-        //Daniel Marschall's new IPv6 testing strategy
-        $matchesIP  = explode(':', $IPv6);
-        $groupCount = count($matchesIP);
-        $colons     = strpos($IPv6, '::');
-
-        if (count(preg_grep('/^[0-9A-Fa-f]{0,4}$/', $matchesIP, PREG_GREP_INVERT)) !== 0) {
-            $this->warnings[IPV6BadChar::CODE] = new IPV6BadChar();
-        }
-
-        if ($colons === false) {
-            // We need exactly the right number of groups
-            if ($groupCount !== $maxGroups) {
-                $this->warnings[IPV6GroupCount::CODE] = new IPV6GroupCount();
-            }
-            return;
-        }
-
-        if ($colons !== strrpos($IPv6, '::')) {
-            $this->warnings[IPV6DoubleColon::CODE] = new IPV6DoubleColon();
-            return;
-        }
-
-        if ($colons === 0 || $colons === (strlen($IPv6) - 2)) {
-            // RFC 4291 allows :: at the start or end of an address
-            //with 7 other groups in addition
-            ++$maxGroups;
-        }
-
-        if ($groupCount > $maxGroups) {
-            $this->warnings[IPV6MaxGroups::CODE] = new IPV6MaxGroups();
-        } elseif ($groupCount === $maxGroups) {
-            $this->warnings[IPV6Deprecated::CODE] = new IPV6Deprecated();
-        }
-    }
-
-    /**
-     * @return string
-     */
-    protected function doParseDomainPart()
-    {
-        $domain = '';
-        $label = '';
-        $openedParenthesis = 0;
-        do {
-            $prev = $this->lexer->getPrevious();
-
-            $this->checkNotAllowedChars($this->lexer->token);
-
-            if ($this->lexer->token['type'] === EmailLexer::S_OPENPARENTHESIS) {
-                $this->parseComments();
-                $openedParenthesis += $this->getOpenedParenthesis();
-                $this->lexer->moveNext();
-                $tmpPrev = $this->lexer->getPrevious();
-                if ($tmpPrev['type'] === EmailLexer::S_CLOSEPARENTHESIS) {
-                    $openedParenthesis--;
-                }
-            }
-            if ($this->lexer->token['type'] === EmailLexer::S_CLOSEPARENTHESIS) {
-                if ($openedParenthesis === 0) {
-                    throw new UnopenedComment();
-                } else {
-                    $openedParenthesis--;
-                }
-            }
-
-            $this->checkConsecutiveDots();
-            $this->checkDomainPartExceptions($prev);
-
-            if ($this->hasBrackets()) {
-                $this->parseDomainLiteral();
-            }
-
-            if ($this->lexer->token['type'] === EmailLexer::S_DOT) {
-                $this->checkLabelLength($label);
-                $label = '';
-            } else {
-                $label .= $this->lexer->token['value'];
-            }
-
-            if ($this->isFWS()) {
-                $this->parseFWS();
-            }
-
-            $domain .= $this->lexer->token['value'];
-            $this->lexer->moveNext();
-            if ($this->lexer->token['type'] === EmailLexer::S_SP) {
-                throw new CharNotAllowed();
-            }
-        } while (null !== $this->lexer->token['type']);
-
-        $this->checkLabelLength($label);
-
-        return $domain;
-    }
-
-    private function checkNotAllowedChars(array $token)
-    {
-        $notAllowed = [EmailLexer::S_BACKSLASH => true, EmailLexer::S_SLASH=> true];
-        if (isset($notAllowed[$token['type']])) {
-            throw new CharNotAllowed();
-        }
-    }
-
-    /**
-     * @return string|false
-     */
-    protected function parseDomainLiteral()
-    {
-        if ($this->lexer->isNextToken(EmailLexer::S_COLON)) {
-            $this->warnings[IPV6ColonStart::CODE] = new IPV6ColonStart();
-        }
-        if ($this->lexer->isNextToken(EmailLexer::S_IPV6TAG)) {
-            $lexer = clone $this->lexer;
-            $lexer->moveNext();
-            if ($lexer->isNextToken(EmailLexer::S_DOUBLECOLON)) {
-                $this->warnings[IPV6ColonStart::CODE] = new IPV6ColonStart();
-            }
-        }
-
-        return $this->doParseDomainLiteral();
-    }
-
-    /**
-     * @return string|false
-     */
-    protected function doParseDomainLiteral()
-    {
-        $IPv6TAG = false;
-        $addressLiteral = '';
-        do {
-            if ($this->lexer->token['type'] === EmailLexer::C_NUL) {
-                throw new ExpectingDTEXT();
-            }
-
-            if ($this->lexer->token['type'] === EmailLexer::INVALID ||
-                $this->lexer->token['type'] === EmailLexer::C_DEL   ||
-                $this->lexer->token['type'] === EmailLexer::S_LF
-            ) {
-                $this->warnings[ObsoleteDTEXT::CODE] = new ObsoleteDTEXT();
-            }
-
-            if ($this->lexer->isNextTokenAny(array(EmailLexer::S_OPENQBRACKET, EmailLexer::S_OPENBRACKET))) {
-                throw new ExpectingDTEXT();
-            }
-
-            if ($this->lexer->isNextTokenAny(
-                array(EmailLexer::S_HTAB, EmailLexer::S_SP, $this->lexer->token['type'] === EmailLexer::CRLF)
-            )) {
-                $this->warnings[CFWSWithFWS::CODE] = new CFWSWithFWS();
-                $this->parseFWS();
-            }
-
-            if ($this->lexer->isNextToken(EmailLexer::S_CR)) {
-                throw new CRNoLF();
-            }
-
-            if ($this->lexer->token['type'] === EmailLexer::S_BACKSLASH) {
-                $this->warnings[ObsoleteDTEXT::CODE] = new ObsoleteDTEXT();
-                $addressLiteral .= $this->lexer->token['value'];
-                $this->lexer->moveNext();
-                $this->validateQuotedPair();
-            }
-            if ($this->lexer->token['type'] === EmailLexer::S_IPV6TAG) {
-                $IPv6TAG = true;
-            }
-            if ($this->lexer->token['type'] === EmailLexer::S_CLOSEQBRACKET) {
-                break;
-            }
-
-            $addressLiteral .= $this->lexer->token['value'];
-
-        } while ($this->lexer->moveNext());
-
-        $addressLiteral = str_replace('[', '', $addressLiteral);
-        $addressLiteral = $this->checkIPV4Tag($addressLiteral);
-
-        if (false === $addressLiteral) {
-            return $addressLiteral;
-        }
-
-        if (!$IPv6TAG) {
-            $this->warnings[DomainLiteral::CODE] = new DomainLiteral();
-            return $addressLiteral;
-        }
-
-        $this->warnings[AddressLiteral::CODE] = new AddressLiteral();
-
-        $this->checkIPV6Tag($addressLiteral);
-
-        return $addressLiteral;
-    }
-
-    /**
-     * @param string $addressLiteral
-     *
-     * @return string|false
-     */
-    protected function checkIPV4Tag($addressLiteral)
-    {
-        $matchesIP  = array();
-
-        // Extract IPv4 part from the end of the address-literal (if there is one)
-        if (preg_match(
-            '/\\b(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/',
-            $addressLiteral,
-            $matchesIP
-        ) > 0
-        ) {
-            $index = strrpos($addressLiteral, $matchesIP[0]);
-            if ($index === 0) {
-                $this->warnings[AddressLiteral::CODE] = new AddressLiteral();
-                return false;
-            }
-            // Convert IPv4 part to IPv6 format for further testing
-            $addressLiteral = substr($addressLiteral, 0, (int) $index) . '0:0';
-        }
-
-        return $addressLiteral;
-    }
-
-    protected function checkDomainPartExceptions(array $prev)
-    {
-        $invalidDomainTokens = array(
-            EmailLexer::S_DQUOTE => true,
-            EmailLexer::S_SQUOTE => true,
-            EmailLexer::S_BACKTICK => true,
-            EmailLexer::S_SEMICOLON => true,
-            EmailLexer::S_GREATERTHAN => true,
-            EmailLexer::S_LOWERTHAN => true,
-        );
-
-        if (isset($invalidDomainTokens[$this->lexer->token['type']])) {
-            throw new ExpectingATEXT();
-        }
-
-        if ($this->lexer->token['type'] === EmailLexer::S_COMMA) {
-            throw new CommaInDomain();
-        }
-
-        if ($this->lexer->token['type'] === EmailLexer::S_AT) {
-            throw new ConsecutiveAt();
-        }
-
-        if ($this->lexer->token['type'] === EmailLexer::S_OPENQBRACKET && $prev['type'] !== EmailLexer::S_AT) {
-            throw new ExpectingATEXT();
-        }
-
-        if ($this->lexer->token['type'] === EmailLexer::S_HYPHEN && $this->lexer->isNextToken(EmailLexer::S_DOT)) {
-            throw new DomainHyphened();
-        }
-
-        if ($this->lexer->token['type'] === EmailLexer::S_BACKSLASH
-            && $this->lexer->isNextToken(EmailLexer::GENERIC)) {
-            throw new ExpectingATEXT();
-        }
-    }
-
-    /**
-     * @return bool
-     */
-    protected function hasBrackets()
-    {
-        if ($this->lexer->token['type'] !== EmailLexer::S_OPENBRACKET) {
-            return false;
-        }
-
-        try {
-            $this->lexer->find(EmailLexer::S_CLOSEBRACKET);
-        } catch (\RuntimeException $e) {
-            throw new ExpectingDomainLiteralClose();
-        }
-
-        return true;
-    }
-
-    /**
-     * @param string $label
-     */
-    protected function checkLabelLength($label)
-    {
-        if ($this->isLabelTooLong($label)) {
-            $this->warnings[LabelTooLong::CODE] = new LabelTooLong();
-        }
-    }
-
-    /**
-     * @param string $label
-     * @return bool
-     */
-    private function isLabelTooLong($label)
-    {
-        if (preg_match('/[^\x00-\x7F]/', $label)) {
-            idn_to_ascii($label, IDNA_DEFAULT, INTL_IDNA_VARIANT_UTS46, $idnaInfo);
-
-            return (bool) ($idnaInfo['errors'] & IDNA_ERROR_LABEL_TOO_LONG);
-        }
-
-        return strlen($label) > self::LABEL_MAX_LENGTH;
-    }
-
-    protected function parseDomainComments()
-    {
-        $this->isUnclosedComment();
-        while (!$this->lexer->isNextToken(EmailLexer::S_CLOSEPARENTHESIS)) {
-            $this->warnEscaping();
-            $this->lexer->moveNext();
-        }
-
-        $this->lexer->moveNext();
-        if ($this->lexer->isNextToken(EmailLexer::S_DOT)) {
-            throw new ExpectingATEXT();
-        }
-    }
-
-    protected function addTLDWarnings()
-    {
-        if ($this->warnings[DomainLiteral::CODE]) {
-            $this->warnings[TLD::CODE] = new TLD();
-        }
-    }
+	const DOMAIN_MAX_LENGTH = 254;
+	const LABEL_MAX_LENGTH = 63;
+
+	/**
+	 * @var string
+	 */
+	protected $domainPart = '';
+
+	public function parse($domainPart)
+	{
+		$this->lexer->moveNext();
+
+		$this->performDomainStartChecks();
+
+		$domain = $this->doParseDomainPart();
+
+		$prev = $this->lexer->getPrevious();
+		$length = strlen($domain);
+
+		if ($prev['type'] === EmailLexer::S_DOT) {
+			throw new DotAtEnd();
+		}
+		if ($prev['type'] === EmailLexer::S_HYPHEN) {
+			throw new DomainHyphened();
+		}
+		if ($length > self::DOMAIN_MAX_LENGTH) {
+			$this->warnings[DomainTooLong::CODE] = new DomainTooLong();
+		}
+		if ($prev['type'] === EmailLexer::S_CR) {
+			throw new CRLFAtTheEnd();
+		}
+		$this->domainPart = $domain;
+	}
+
+	private function performDomainStartChecks()
+	{
+		$this->checkInvalidTokensAfterAT();
+		$this->checkEmptyDomain();
+
+		if ($this->lexer->token['type'] === EmailLexer::S_OPENPARENTHESIS) {
+			$this->warnings[DeprecatedComment::CODE] = new DeprecatedComment();
+			$this->parseDomainComments();
+		}
+	}
+
+	private function checkEmptyDomain()
+	{
+		$thereIsNoDomain = $this->lexer->token['type'] === EmailLexer::S_EMPTY ||
+			($this->lexer->token['type'] === EmailLexer::S_SP &&
+			!$this->lexer->isNextToken(EmailLexer::GENERIC));
+
+		if ($thereIsNoDomain) {
+			throw new NoDomainPart();
+		}
+	}
+
+	private function checkInvalidTokensAfterAT()
+	{
+		if ($this->lexer->token['type'] === EmailLexer::S_DOT) {
+			throw new DotAtStart();
+		}
+		if ($this->lexer->token['type'] === EmailLexer::S_HYPHEN) {
+			throw new DomainHyphened();
+		}
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getDomainPart()
+	{
+		return $this->domainPart;
+	}
+
+	/**
+	 * @param string $addressLiteral
+	 * @param int $maxGroups
+	 */
+	public function checkIPV6Tag($addressLiteral, $maxGroups = 8)
+	{
+		$prev = $this->lexer->getPrevious();
+		if ($prev['type'] === EmailLexer::S_COLON) {
+			$this->warnings[IPV6ColonEnd::CODE] = new IPV6ColonEnd();
+		}
+
+		$IPv6       = substr($addressLiteral, 5);
+		//Daniel Marschall's new IPv6 testing strategy
+		$matchesIP  = explode(':', $IPv6);
+		$groupCount = count($matchesIP);
+		$colons     = strpos($IPv6, '::');
+
+		if (count(preg_grep('/^[0-9A-Fa-f]{0,4}$/', $matchesIP, PREG_GREP_INVERT)) !== 0) {
+			$this->warnings[IPV6BadChar::CODE] = new IPV6BadChar();
+		}
+
+		if ($colons === false) {
+			// We need exactly the right number of groups
+			if ($groupCount !== $maxGroups) {
+				$this->warnings[IPV6GroupCount::CODE] = new IPV6GroupCount();
+			}
+			return;
+		}
+
+		if ($colons !== strrpos($IPv6, '::')) {
+			$this->warnings[IPV6DoubleColon::CODE] = new IPV6DoubleColon();
+			return;
+		}
+
+		if ($colons === 0 || $colons === (strlen($IPv6) - 2)) {
+			// RFC 4291 allows :: at the start or end of an address
+			//with 7 other groups in addition
+			++$maxGroups;
+		}
+
+		if ($groupCount > $maxGroups) {
+			$this->warnings[IPV6MaxGroups::CODE] = new IPV6MaxGroups();
+		} elseif ($groupCount === $maxGroups) {
+			$this->warnings[IPV6Deprecated::CODE] = new IPV6Deprecated();
+		}
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function doParseDomainPart()
+	{
+		$domain = '';
+		$label = '';
+		$openedParenthesis = 0;
+		do {
+			$prev = $this->lexer->getPrevious();
+
+			$this->checkNotAllowedChars($this->lexer->token);
+
+			if ($this->lexer->token['type'] === EmailLexer::S_OPENPARENTHESIS) {
+				$this->parseComments();
+				$openedParenthesis += $this->getOpenedParenthesis();
+				$this->lexer->moveNext();
+				$tmpPrev = $this->lexer->getPrevious();
+				if ($tmpPrev['type'] === EmailLexer::S_CLOSEPARENTHESIS) {
+					$openedParenthesis--;
+				}
+			}
+			if ($this->lexer->token['type'] === EmailLexer::S_CLOSEPARENTHESIS) {
+				if ($openedParenthesis === 0) {
+					throw new UnopenedComment();
+				} else {
+					$openedParenthesis--;
+				}
+			}
+
+			$this->checkConsecutiveDots();
+			$this->checkDomainPartExceptions($prev);
+
+			if ($this->hasBrackets()) {
+				$this->parseDomainLiteral();
+			}
+
+			if ($this->lexer->token['type'] === EmailLexer::S_DOT) {
+				$this->checkLabelLength($label);
+				$label = '';
+			} else {
+				$label .= $this->lexer->token['value'];
+			}
+
+			if ($this->isFWS()) {
+				$this->parseFWS();
+			}
+
+			$domain .= $this->lexer->token['value'];
+			$this->lexer->moveNext();
+			if ($this->lexer->token['type'] === EmailLexer::S_SP) {
+				throw new CharNotAllowed();
+			}
+		} while (null !== $this->lexer->token['type']);
+
+		$this->checkLabelLength($label);
+
+		return $domain;
+	}
+
+	private function checkNotAllowedChars(array $token)
+	{
+		$notAllowed = [EmailLexer::S_BACKSLASH => true, EmailLexer::S_SLASH=> true];
+		if (isset($notAllowed[$token['type']])) {
+			throw new CharNotAllowed();
+		}
+	}
+
+	/**
+	 * @return string|false
+	 */
+	protected function parseDomainLiteral()
+	{
+		if ($this->lexer->isNextToken(EmailLexer::S_COLON)) {
+			$this->warnings[IPV6ColonStart::CODE] = new IPV6ColonStart();
+		}
+		if ($this->lexer->isNextToken(EmailLexer::S_IPV6TAG)) {
+			$lexer = clone $this->lexer;
+			$lexer->moveNext();
+			if ($lexer->isNextToken(EmailLexer::S_DOUBLECOLON)) {
+				$this->warnings[IPV6ColonStart::CODE] = new IPV6ColonStart();
+			}
+		}
+
+		return $this->doParseDomainLiteral();
+	}
+
+	/**
+	 * @return string|false
+	 */
+	protected function doParseDomainLiteral()
+	{
+		$IPv6TAG = false;
+		$addressLiteral = '';
+		do {
+			if ($this->lexer->token['type'] === EmailLexer::C_NUL) {
+				throw new ExpectingDTEXT();
+			}
+
+			if ($this->lexer->token['type'] === EmailLexer::INVALID ||
+				$this->lexer->token['type'] === EmailLexer::C_DEL   ||
+				$this->lexer->token['type'] === EmailLexer::S_LF
+			) {
+				$this->warnings[ObsoleteDTEXT::CODE] = new ObsoleteDTEXT();
+			}
+
+			if ($this->lexer->isNextTokenAny(array(EmailLexer::S_OPENQBRACKET, EmailLexer::S_OPENBRACKET))) {
+				throw new ExpectingDTEXT();
+			}
+
+			if ($this->lexer->isNextTokenAny(
+				array(EmailLexer::S_HTAB, EmailLexer::S_SP, $this->lexer->token['type'] === EmailLexer::CRLF)
+			)) {
+				$this->warnings[CFWSWithFWS::CODE] = new CFWSWithFWS();
+				$this->parseFWS();
+			}
+
+			if ($this->lexer->isNextToken(EmailLexer::S_CR)) {
+				throw new CRNoLF();
+			}
+
+			if ($this->lexer->token['type'] === EmailLexer::S_BACKSLASH) {
+				$this->warnings[ObsoleteDTEXT::CODE] = new ObsoleteDTEXT();
+				$addressLiteral .= $this->lexer->token['value'];
+				$this->lexer->moveNext();
+				$this->validateQuotedPair();
+			}
+			if ($this->lexer->token['type'] === EmailLexer::S_IPV6TAG) {
+				$IPv6TAG = true;
+			}
+			if ($this->lexer->token['type'] === EmailLexer::S_CLOSEQBRACKET) {
+				break;
+			}
+
+			$addressLiteral .= $this->lexer->token['value'];
+
+		} while ($this->lexer->moveNext());
+
+		$addressLiteral = str_replace('[', '', $addressLiteral);
+		$addressLiteral = $this->checkIPV4Tag($addressLiteral);
+
+		if (false === $addressLiteral) {
+			return $addressLiteral;
+		}
+
+		if (!$IPv6TAG) {
+			$this->warnings[DomainLiteral::CODE] = new DomainLiteral();
+			return $addressLiteral;
+		}
+
+		$this->warnings[AddressLiteral::CODE] = new AddressLiteral();
+
+		$this->checkIPV6Tag($addressLiteral);
+
+		return $addressLiteral;
+	}
+
+	/**
+	 * @param string $addressLiteral
+	 *
+	 * @return string|false
+	 */
+	protected function checkIPV4Tag($addressLiteral)
+	{
+		$matchesIP  = array();
+
+		// Extract IPv4 part from the end of the address-literal (if there is one)
+		if (preg_match(
+			'/\\b(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/',
+			$addressLiteral,
+			$matchesIP
+		) > 0
+		) {
+			$index = strrpos($addressLiteral, $matchesIP[0]);
+			if ($index === 0) {
+				$this->warnings[AddressLiteral::CODE] = new AddressLiteral();
+				return false;
+			}
+			// Convert IPv4 part to IPv6 format for further testing
+			$addressLiteral = substr($addressLiteral, 0, (int) $index) . '0:0';
+		}
+
+		return $addressLiteral;
+	}
+
+	protected function checkDomainPartExceptions(array $prev)
+	{
+		$invalidDomainTokens = array(
+			EmailLexer::S_DQUOTE => true,
+			EmailLexer::S_SQUOTE => true,
+			EmailLexer::S_BACKTICK => true,
+			EmailLexer::S_SEMICOLON => true,
+			EmailLexer::S_GREATERTHAN => true,
+			EmailLexer::S_LOWERTHAN => true,
+		);
+
+		if (isset($invalidDomainTokens[$this->lexer->token['type']])) {
+			throw new ExpectingATEXT();
+		}
+
+		if ($this->lexer->token['type'] === EmailLexer::S_COMMA) {
+			throw new CommaInDomain();
+		}
+
+		if ($this->lexer->token['type'] === EmailLexer::S_AT) {
+			throw new ConsecutiveAt();
+		}
+
+		if ($this->lexer->token['type'] === EmailLexer::S_OPENQBRACKET && $prev['type'] !== EmailLexer::S_AT) {
+			throw new ExpectingATEXT();
+		}
+
+		if ($this->lexer->token['type'] === EmailLexer::S_HYPHEN && $this->lexer->isNextToken(EmailLexer::S_DOT)) {
+			throw new DomainHyphened();
+		}
+
+		if ($this->lexer->token['type'] === EmailLexer::S_BACKSLASH
+			&& $this->lexer->isNextToken(EmailLexer::GENERIC)) {
+			throw new ExpectingATEXT();
+		}
+	}
+
+	/**
+	 * @return bool
+	 */
+	protected function hasBrackets()
+	{
+		if ($this->lexer->token['type'] !== EmailLexer::S_OPENBRACKET) {
+			return false;
+		}
+
+		try {
+			$this->lexer->find(EmailLexer::S_CLOSEBRACKET);
+		} catch (\RuntimeException $e) {
+			throw new ExpectingDomainLiteralClose();
+		}
+
+		return true;
+	}
+
+	/**
+	 * @param string $label
+	 */
+	protected function checkLabelLength($label)
+	{
+		if ($this->isLabelTooLong($label)) {
+			$this->warnings[LabelTooLong::CODE] = new LabelTooLong();
+		}
+	}
+
+	/**
+	 * @param string $label
+	 * @return bool
+	 */
+	private function isLabelTooLong($label)
+	{
+		if (preg_match('/[^\x00-\x7F]/', $label)) {
+			idn_to_ascii($label, IDNA_DEFAULT, INTL_IDNA_VARIANT_UTS46, $idnaInfo);
+
+			return (bool) ($idnaInfo['errors'] & IDNA_ERROR_LABEL_TOO_LONG);
+		}
+
+		return strlen($label) > self::LABEL_MAX_LENGTH;
+	}
+
+	protected function parseDomainComments()
+	{
+		$this->isUnclosedComment();
+		while (!$this->lexer->isNextToken(EmailLexer::S_CLOSEPARENTHESIS)) {
+			$this->warnEscaping();
+			$this->lexer->moveNext();
+		}
+
+		$this->lexer->moveNext();
+		if ($this->lexer->isNextToken(EmailLexer::S_DOT)) {
+			throw new ExpectingATEXT();
+		}
+	}
+
+	protected function addTLDWarnings()
+	{
+		if ($this->warnings[DomainLiteral::CODE]) {
+			$this->warnings[TLD::CODE] = new TLD();
+		}
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -255,7 +255,7 @@ 
             }
 
             if ($this->lexer->token['type'] === EmailLexer::INVALID ||
-                $this->lexer->token['type'] === EmailLexer::C_DEL   ||
+                $this->lexer->token['type'] === EmailLexer::C_DEL ||
                 $this->lexer->token['type'] === EmailLexer::S_LF
             ) {
                 $this->warnings[ObsoleteDTEXT::CODE] = new ObsoleteDTEXT();
@@ -319,7 +319,7 @@ 
      */
     protected function checkIPV4Tag($addressLiteral)
     {
-        $matchesIP  = array();
+        $matchesIP = array();
 
         // Extract IPv4 part from the end of the address-literal (if there is one)
         if (preg_match(
@@ -334,7 +334,7 @@ 
                 return false;
             }
             // Convert IPv4 part to IPv6 format for further testing
-            $addressLiteral = substr($addressLiteral, 0, (int) $index) . '0:0';
+            $addressLiteral = substr($addressLiteral, 0, (int) $index).'0:0';
         }
 
         return $addressLiteral;

htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/EmailValidator.php

Indentation +49 added lines, -49 removed lines

@@ -7,61 +7,61 @@
 
 class EmailValidator
 {
-    /**
-     * @var EmailLexer
-     */
-    private $lexer;
+	/**
+	 * @var EmailLexer
+	 */
+	private $lexer;
 
-    /**
-     * @var Warning\Warning[]
-     */
-    protected $warnings = [];
+	/**
+	 * @var Warning\Warning[]
+	 */
+	protected $warnings = [];
 
-    /**
-     * @var InvalidEmail|null
-     */
-    protected $error;
+	/**
+	 * @var InvalidEmail|null
+	 */
+	protected $error;
 
-    public function __construct()
-    {
-        $this->lexer = new EmailLexer();
-    }
+	public function __construct()
+	{
+		$this->lexer = new EmailLexer();
+	}
 
-    /**
-     * @param string          $email
-     * @param EmailValidation $emailValidation
-     * @return bool
-     */
-    public function isValid($email, EmailValidation $emailValidation)
-    {
-        $isValid = $emailValidation->isValid($email, $this->lexer);
-        $this->warnings = $emailValidation->getWarnings();
-        $this->error = $emailValidation->getError();
+	/**
+	 * @param string          $email
+	 * @param EmailValidation $emailValidation
+	 * @return bool
+	 */
+	public function isValid($email, EmailValidation $emailValidation)
+	{
+		$isValid = $emailValidation->isValid($email, $this->lexer);
+		$this->warnings = $emailValidation->getWarnings();
+		$this->error = $emailValidation->getError();
 
-        return $isValid;
-    }
+		return $isValid;
+	}
 
-    /**
-     * @return boolean
-     */
-    public function hasWarnings()
-    {
-        return !empty($this->warnings);
-    }
+	/**
+	 * @return boolean
+	 */
+	public function hasWarnings()
+	{
+		return !empty($this->warnings);
+	}
 
-    /**
-     * @return array
-     */
-    public function getWarnings()
-    {
-        return $this->warnings;
-    }
+	/**
+	 * @return array
+	 */
+	public function getWarnings()
+	{
+		return $this->warnings;
+	}
 
-    /**
-     * @return InvalidEmail|null
-     */
-    public function getError()
-    {
-        return $this->error;
-    }
+	/**
+	 * @return InvalidEmail|null
+	 */
+	public function getError()
+	{
+		return $this->error;
+	}
 }

htdocs/includes/swiftmailer/egulias/email-validator/AutoLoader.php

Indentation +64 added lines, -64 removed lines

@@ -9,74 +9,74 @@
  */
 class EguliasAutoLoader
 {
-    /**
-     * @var string The namespace prefix for this instance.
-     */
-    protected $namespace = '';
+	/**
+	 * @var string The namespace prefix for this instance.
+	 */
+	protected $namespace = '';
 
-    /**
-     * @var string The filesystem prefix to use for this instance
-     */
-    protected $path = '';
+	/**
+	 * @var string The filesystem prefix to use for this instance
+	 */
+	protected $path = '';
 
-    /**
-     * Build the instance of the autoloader
-     *
-     * @param string $namespace The prefixed namespace this instance will load
-     * @param string $path      The filesystem path to the root of the namespace
-     */
-    public function __construct($namespace, $path)
-    {
-        $this->namespace = ltrim($namespace, '\\');
-        $this->path = rtrim($path, '/\\') . DIRECTORY_SEPARATOR;
-    }
+	/**
+	 * Build the instance of the autoloader
+	 *
+	 * @param string $namespace The prefixed namespace this instance will load
+	 * @param string $path      The filesystem path to the root of the namespace
+	 */
+	public function __construct($namespace, $path)
+	{
+		$this->namespace = ltrim($namespace, '\\');
+		$this->path = rtrim($path, '/\\') . DIRECTORY_SEPARATOR;
+	}
 
-    /**
-     * Try to load a class
-     *
-     * @param string $class The class name to load
-     *
-     * @return boolean If the loading was successful
-     */
-    public function load($class)
-    {
-        $class = ltrim($class, '\\');
-        if (strpos($class, $this->namespace) === 0) {
-            $nsparts = explode('\\', $class);
-            $class = array_pop($nsparts);
-            $path = $this->path . 'swiftmailer/egulias/email-validator/EmailValidator/';
-            $max=count($nsparts);
-            for ($i=2; $i<$max;$i++) {
-                $path .= $nsparts[$i].'/';
-            }
-            $nsparts = array();
-            $path .= str_replace('_', DIRECTORY_SEPARATOR, $class) . '.php';
-            if (file_exists($path)) {
-                require $path;
-                return true;
-            }
-        }
+	/**
+	 * Try to load a class
+	 *
+	 * @param string $class The class name to load
+	 *
+	 * @return boolean If the loading was successful
+	 */
+	public function load($class)
+	{
+		$class = ltrim($class, '\\');
+		if (strpos($class, $this->namespace) === 0) {
+			$nsparts = explode('\\', $class);
+			$class = array_pop($nsparts);
+			$path = $this->path . 'swiftmailer/egulias/email-validator/EmailValidator/';
+			$max=count($nsparts);
+			for ($i=2; $i<$max;$i++) {
+				$path .= $nsparts[$i].'/';
+			}
+			$nsparts = array();
+			$path .= str_replace('_', DIRECTORY_SEPARATOR, $class) . '.php';
+			if (file_exists($path)) {
+				require $path;
+				return true;
+			}
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    /**
-     * Register the autoloader to PHP
-     *
-     * @return boolean The status of the registration
-     */
-    public function register()
-    {
-        return spl_autoload_register(array($this, 'load'));
-    }
+	/**
+	 * Register the autoloader to PHP
+	 *
+	 * @return boolean The status of the registration
+	 */
+	public function register()
+	{
+		return spl_autoload_register(array($this, 'load'));
+	}
 
-    /**
-     * Unregister the autoloader to PHP
-     *
-     * @return boolean The status of the unregistration
-     */
-    public function unregister()
-    {
-        return spl_autoload_unregister(array($this, 'load'));
-    }
+	/**
+	 * Unregister the autoloader to PHP
+	 *
+	 * @return boolean The status of the unregistration
+	 */
+	public function unregister()
+	{
+		return spl_autoload_unregister(array($this, 'load'));
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -28,7 +28,7 @@ 
     public function __construct($namespace, $path)
     {
         $this->namespace = ltrim($namespace, '\\');
-        $this->path = rtrim($path, '/\\') . DIRECTORY_SEPARATOR;
+        $this->path = rtrim($path, '/\\').DIRECTORY_SEPARATOR;
     }
 
     /**
@@ -44,13 +44,13 @@ 
         if (strpos($class, $this->namespace) === 0) {
             $nsparts = explode('\\', $class);
             $class = array_pop($nsparts);
-            $path = $this->path . 'swiftmailer/egulias/email-validator/EmailValidator/';
-            $max=count($nsparts);
-            for ($i=2; $i<$max;$i++) {
+            $path = $this->path.'swiftmailer/egulias/email-validator/EmailValidator/';
+            $max = count($nsparts);
+            for ($i = 2; $i < $max; $i++) {
                 $path .= $nsparts[$i].'/';
             }
             $nsparts = array();
-            $path .= str_replace('_', DIRECTORY_SEPARATOR, $class) . '.php';
+            $path .= str_replace('_', DIRECTORY_SEPARATOR, $class).'.php';
             if (file_exists($path)) {
                 require $path;
                 return true;

htdocs/includes/swiftmailer/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php

Indentation +300 added lines, -300 removed lines

@@ -29,304 +29,304 @@
  */
 abstract class AbstractLexer
 {
-    /**
-     * Lexer original input string.
-     *
-     * @var string
-     */
-    private $input;
-
-    /**
-     * Array of scanned tokens.
-     *
-     * Each token is an associative array containing three items:
-     *  - 'value'    : the string value of the token in the input string
-     *  - 'type'     : the type of the token (identifier, numeric, string, input
-     *                 parameter, none)
-     *  - 'position' : the position of the token in the input string
-     *
-     * @var array
-     */
-    private $tokens = array();
-
-    /**
-     * Current lexer position in input string.
-     *
-     * @var integer
-     */
-    private $position = 0;
-
-    /**
-     * Current peek of current lexer position.
-     *
-     * @var integer
-     */
-    private $peek = 0;
-
-    /**
-     * The next token in the input.
-     *
-     * @var array
-     */
-    public $lookahead;
-
-    /**
-     * The last matched/seen token.
-     *
-     * @var array
-     */
-    public $token;
-
-    /**
-     * Sets the input data to be tokenized.
-     *
-     * The Lexer is immediately reset and the new input tokenized.
-     * Any unprocessed tokens from any previous input are lost.
-     *
-     * @param string $input The input to be tokenized.
-     *
-     * @return void
-     */
-    public function setInput($input)
-    {
-        $this->input  = $input;
-        $this->tokens = array();
-
-        $this->reset();
-        $this->scan($input);
-    }
-
-    /**
-     * Resets the lexer.
-     *
-     * @return void
-     */
-    public function reset()
-    {
-        $this->lookahead = null;
-        $this->token = null;
-        $this->peek = 0;
-        $this->position = 0;
-    }
-
-    /**
-     * Resets the peek pointer to 0.
-     *
-     * @return void
-     */
-    public function resetPeek()
-    {
-        $this->peek = 0;
-    }
-
-    /**
-     * Resets the lexer position on the input to the given position.
-     *
-     * @param integer $position Position to place the lexical scanner.
-     *
-     * @return void
-     */
-    public function resetPosition($position = 0)
-    {
-        $this->position = $position;
-    }
-
-    /**
-     * Retrieve the original lexer's input until a given position. 
-     *
-     * @param integer $position
-     *
-     * @return string
-     */
-    public function getInputUntilPosition($position)
-    {
-        return substr($this->input, 0, $position);
-    }
-
-    /**
-     * Checks whether a given token matches the current lookahead.
-     *
-     * @param integer|string $token
-     *
-     * @return boolean
-     */
-    public function isNextToken($token)
-    {
-        return null !== $this->lookahead && $this->lookahead['type'] === $token;
-    }
-
-    /**
-     * Checks whether any of the given tokens matches the current lookahead.
-     *
-     * @param array $tokens
-     *
-     * @return boolean
-     */
-    public function isNextTokenAny(array $tokens)
-    {
-        return null !== $this->lookahead && in_array($this->lookahead['type'], $tokens, true);
-    }
-
-    /**
-     * Moves to the next token in the input string.
-     *
-     * @return boolean
-     */
-    public function moveNext()
-    {
-        $this->peek = 0;
-        $this->token = $this->lookahead;
-        $this->lookahead = (isset($this->tokens[$this->position]))
-            ? $this->tokens[$this->position++] : null;
-
-        return $this->lookahead !== null;
-    }
-
-    /**
-     * Tells the lexer to skip input tokens until it sees a token with the given value.
-     *
-     * @param string $type The token type to skip until.
-     *
-     * @return void
-     */
-    public function skipUntil($type)
-    {
-        while ($this->lookahead !== null && $this->lookahead['type'] !== $type) {
-            $this->moveNext();
-        }
-    }
-
-    /**
-     * Checks if given value is identical to the given token.
-     *
-     * @param mixed   $value
-     * @param integer $token
-     *
-     * @return boolean
-     */
-    public function isA($value, $token)
-    {
-        return $this->getType($value) === $token;
-    }
-
-    /**
-     * Moves the lookahead token forward.
-     *
-     * @return array|null The next token or NULL if there are no more tokens ahead.
-     */
-    public function peek()
-    {
-        if (isset($this->tokens[$this->position + $this->peek])) {
-            return $this->tokens[$this->position + $this->peek++];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Peeks at the next token, returns it and immediately resets the peek.
-     *
-     * @return array|null The next token or NULL if there are no more tokens ahead.
-     */
-    public function glimpse()
-    {
-        $peek = $this->peek();
-        $this->peek = 0;
-        return $peek;
-    }
-
-    /**
-     * Scans the input string for tokens.
-     *
-     * @param string $input A query string.
-     *
-     * @return void
-     */
-    protected function scan($input)
-    {
-        static $regex;
-
-        if ( ! isset($regex)) {
-            $regex = sprintf(
-                '/(%s)|%s/%s',
-                implode(')|(', $this->getCatchablePatterns()),
-                implode('|', $this->getNonCatchablePatterns()),
-                $this->getModifiers()
-            );
-        }
-
-        $flags = PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_OFFSET_CAPTURE;
-        $matches = preg_split($regex, $input, -1, $flags);
-
-        if (false === $matches) {
-            // Work around https://bugs.php.net/78122
-            $matches = array(array($input, 0));
-        }
-
-        foreach ($matches as $match) {
-            // Must remain before 'value' assignment since it can change content
-            $type = $this->getType($match[0]);
-
-            $this->tokens[] = array(
-                'value' => $match[0],
-                'type'  => $type,
-                'position' => $match[1],
-            );
-        }
-    }
-
-    /**
-     * Gets the literal for a given token.
-     *
-     * @param integer $token
-     *
-     * @return string
-     */
-    public function getLiteral($token)
-    {
-        $className = get_class($this);
-        $reflClass = new \ReflectionClass($className);
-        $constants = $reflClass->getConstants();
-
-        foreach ($constants as $name => $value) {
-            if ($value === $token) {
-                return $className . '::' . $name;
-            }
-        }
-
-        return $token;
-    }
-
-    /**
-     * Regex modifiers
-     *
-     * @return string
-     */
-    protected function getModifiers()
-    {
-        return 'i';
-    }
-
-    /**
-     * Lexical catchable patterns.
-     *
-     * @return array
-     */
-    abstract protected function getCatchablePatterns();
-
-    /**
-     * Lexical non-catchable patterns.
-     *
-     * @return array
-     */
-    abstract protected function getNonCatchablePatterns();
-
-    /**
-     * Retrieve token type. Also processes the token value if necessary.
-     *
-     * @param string $value
-     *
-     * @return integer
-     */
-    abstract protected function getType(&$value);
+	/**
+	 * Lexer original input string.
+	 *
+	 * @var string
+	 */
+	private $input;
+
+	/**
+	 * Array of scanned tokens.
+	 *
+	 * Each token is an associative array containing three items:
+	 *  - 'value'    : the string value of the token in the input string
+	 *  - 'type'     : the type of the token (identifier, numeric, string, input
+	 *                 parameter, none)
+	 *  - 'position' : the position of the token in the input string
+	 *
+	 * @var array
+	 */
+	private $tokens = array();
+
+	/**
+	 * Current lexer position in input string.
+	 *
+	 * @var integer
+	 */
+	private $position = 0;
+
+	/**
+	 * Current peek of current lexer position.
+	 *
+	 * @var integer
+	 */
+	private $peek = 0;
+
+	/**
+	 * The next token in the input.
+	 *
+	 * @var array
+	 */
+	public $lookahead;
+
+	/**
+	 * The last matched/seen token.
+	 *
+	 * @var array
+	 */
+	public $token;
+
+	/**
+	 * Sets the input data to be tokenized.
+	 *
+	 * The Lexer is immediately reset and the new input tokenized.
+	 * Any unprocessed tokens from any previous input are lost.
+	 *
+	 * @param string $input The input to be tokenized.
+	 *
+	 * @return void
+	 */
+	public function setInput($input)
+	{
+		$this->input  = $input;
+		$this->tokens = array();
+
+		$this->reset();
+		$this->scan($input);
+	}
+
+	/**
+	 * Resets the lexer.
+	 *
+	 * @return void
+	 */
+	public function reset()
+	{
+		$this->lookahead = null;
+		$this->token = null;
+		$this->peek = 0;
+		$this->position = 0;
+	}
+
+	/**
+	 * Resets the peek pointer to 0.
+	 *
+	 * @return void
+	 */
+	public function resetPeek()
+	{
+		$this->peek = 0;
+	}
+
+	/**
+	 * Resets the lexer position on the input to the given position.
+	 *
+	 * @param integer $position Position to place the lexical scanner.
+	 *
+	 * @return void
+	 */
+	public function resetPosition($position = 0)
+	{
+		$this->position = $position;
+	}
+
+	/**
+	 * Retrieve the original lexer's input until a given position. 
+	 *
+	 * @param integer $position
+	 *
+	 * @return string
+	 */
+	public function getInputUntilPosition($position)
+	{
+		return substr($this->input, 0, $position);
+	}
+
+	/**
+	 * Checks whether a given token matches the current lookahead.
+	 *
+	 * @param integer|string $token
+	 *
+	 * @return boolean
+	 */
+	public function isNextToken($token)
+	{
+		return null !== $this->lookahead && $this->lookahead['type'] === $token;
+	}
+
+	/**
+	 * Checks whether any of the given tokens matches the current lookahead.
+	 *
+	 * @param array $tokens
+	 *
+	 * @return boolean
+	 */
+	public function isNextTokenAny(array $tokens)
+	{
+		return null !== $this->lookahead && in_array($this->lookahead['type'], $tokens, true);
+	}
+
+	/**
+	 * Moves to the next token in the input string.
+	 *
+	 * @return boolean
+	 */
+	public function moveNext()
+	{
+		$this->peek = 0;
+		$this->token = $this->lookahead;
+		$this->lookahead = (isset($this->tokens[$this->position]))
+			? $this->tokens[$this->position++] : null;
+
+		return $this->lookahead !== null;
+	}
+
+	/**
+	 * Tells the lexer to skip input tokens until it sees a token with the given value.
+	 *
+	 * @param string $type The token type to skip until.
+	 *
+	 * @return void
+	 */
+	public function skipUntil($type)
+	{
+		while ($this->lookahead !== null && $this->lookahead['type'] !== $type) {
+			$this->moveNext();
+		}
+	}
+
+	/**
+	 * Checks if given value is identical to the given token.
+	 *
+	 * @param mixed   $value
+	 * @param integer $token
+	 *
+	 * @return boolean
+	 */
+	public function isA($value, $token)
+	{
+		return $this->getType($value) === $token;
+	}
+
+	/**
+	 * Moves the lookahead token forward.
+	 *
+	 * @return array|null The next token or NULL if there are no more tokens ahead.
+	 */
+	public function peek()
+	{
+		if (isset($this->tokens[$this->position + $this->peek])) {
+			return $this->tokens[$this->position + $this->peek++];
+		} else {
+			return null;
+		}
+	}
+
+	/**
+	 * Peeks at the next token, returns it and immediately resets the peek.
+	 *
+	 * @return array|null The next token or NULL if there are no more tokens ahead.
+	 */
+	public function glimpse()
+	{
+		$peek = $this->peek();
+		$this->peek = 0;
+		return $peek;
+	}
+
+	/**
+	 * Scans the input string for tokens.
+	 *
+	 * @param string $input A query string.
+	 *
+	 * @return void
+	 */
+	protected function scan($input)
+	{
+		static $regex;
+
+		if ( ! isset($regex)) {
+			$regex = sprintf(
+				'/(%s)|%s/%s',
+				implode(')|(', $this->getCatchablePatterns()),
+				implode('|', $this->getNonCatchablePatterns()),
+				$this->getModifiers()
+			);
+		}
+
+		$flags = PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_OFFSET_CAPTURE;
+		$matches = preg_split($regex, $input, -1, $flags);
+
+		if (false === $matches) {
+			// Work around https://bugs.php.net/78122
+			$matches = array(array($input, 0));
+		}
+
+		foreach ($matches as $match) {
+			// Must remain before 'value' assignment since it can change content
+			$type = $this->getType($match[0]);
+
+			$this->tokens[] = array(
+				'value' => $match[0],
+				'type'  => $type,
+				'position' => $match[1],
+			);
+		}
+	}
+
+	/**
+	 * Gets the literal for a given token.
+	 *
+	 * @param integer $token
+	 *
+	 * @return string
+	 */
+	public function getLiteral($token)
+	{
+		$className = get_class($this);
+		$reflClass = new \ReflectionClass($className);
+		$constants = $reflClass->getConstants();
+
+		foreach ($constants as $name => $value) {
+			if ($value === $token) {
+				return $className . '::' . $name;
+			}
+		}
+
+		return $token;
+	}
+
+	/**
+	 * Regex modifiers
+	 *
+	 * @return string
+	 */
+	protected function getModifiers()
+	{
+		return 'i';
+	}
+
+	/**
+	 * Lexical catchable patterns.
+	 *
+	 * @return array
+	 */
+	abstract protected function getCatchablePatterns();
+
+	/**
+	 * Lexical non-catchable patterns.
+	 *
+	 * @return array
+	 */
+	abstract protected function getNonCatchablePatterns();
+
+	/**
+	 * Retrieve token type. Also processes the token value if necessary.
+	 *
+	 * @param string $value
+	 *
+	 * @return integer
+	 */
+	abstract protected function getType(&$value);
 }

Spacing +2 added lines, -2 removed lines

@@ -246,7 +246,7 @@ 
     {
         static $regex;
 
-        if ( ! isset($regex)) {
+        if (!isset($regex)) {
             $regex = sprintf(
                 '/(%s)|%s/%s',
                 implode(')|(', $this->getCatchablePatterns()),
@@ -290,7 +290,7 @@ 
 
         foreach ($constants as $name => $value) {
             if ($value === $token) {
-                return $className . '::' . $name;
+                return $className.'::'.$name;
             }
         }