Skip to content

Extract tokenization #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 1, 2020
Merged

Extract tokenization #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
292bb6d
Extract tokenization responsability
greg0ire Mar 29, 2020
a5fd889
Remove variable used for debugging code
greg0ire Mar 29, 2020
705a800
Use Token as a value object
greg0ire Mar 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions examples/cli.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,6 @@
require_once __DIR__ . '/../vendor/autoload.php';

use Doctrine\SqlFormatter\SqlFormatter;
use Doctrine\SqlFormatter\Tokenizer;

echo (new SqlFormatter())->format($sql);
24 changes: 12 additions & 12 deletions src/CliHighlighter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ final class CliHighlighter implements Highlighter

public function highlightToken(int $type, string $value) : string
{
if ($type === SqlFormatter::TOKEN_TYPE_BOUNDARY && ($value==='(' || $value===')')) {
if ($type === Token::TOKEN_TYPE_BOUNDARY && ($value==='(' || $value===')')) {
return $value;
}

Expand All @@ -53,24 +53,24 @@ public function highlightToken(int $type, string $value) : string
private function prefix(int $type) : ?string
{
switch ($type) {
case SqlFormatter::TOKEN_TYPE_BOUNDARY:
case Token::TOKEN_TYPE_BOUNDARY:
return $this->cliBoundary;
case SqlFormatter::TOKEN_TYPE_WORD:
case Token::TOKEN_TYPE_WORD:
return $this->cliWord;
case SqlFormatter::TOKEN_TYPE_BACKTICK_QUOTE:
case Token::TOKEN_TYPE_BACKTICK_QUOTE:
return $this->cliBacktickQuote;
case SqlFormatter::TOKEN_TYPE_QUOTE:
case Token::TOKEN_TYPE_QUOTE:
return $this->cliQuote;
case SqlFormatter::TOKEN_TYPE_RESERVED:
case SqlFormatter::TOKEN_TYPE_RESERVED_TOPLEVEL:
case SqlFormatter::TOKEN_TYPE_RESERVED_NEWLINE:
case Token::TOKEN_TYPE_RESERVED:
case Token::TOKEN_TYPE_RESERVED_TOPLEVEL:
case Token::TOKEN_TYPE_RESERVED_NEWLINE:
return $this->cliReserved;
case SqlFormatter::TOKEN_TYPE_NUMBER:
case Token::TOKEN_TYPE_NUMBER:
return $this->cliNumber;
case SqlFormatter::TOKEN_TYPE_VARIABLE:
case Token::TOKEN_TYPE_VARIABLE:
return $this->cliVariable;
case SqlFormatter::TOKEN_TYPE_COMMENT:
case SqlFormatter::TOKEN_TYPE_BLOCK_COMMENT:
case Token::TOKEN_TYPE_COMMENT:
case Token::TOKEN_TYPE_BLOCK_COMMENT:
return $this->cliComment;
default:
return null;
Expand Down
24 changes: 12 additions & 12 deletions src/HtmlHighlighter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public function highlightToken(int $type, string $value) : string
{
$value = htmlentities($value, ENT_COMPAT | ENT_IGNORE, 'UTF-8');

if ($type === SqlFormatter::TOKEN_TYPE_BOUNDARY && ($value==='(' || $value===')')) {
if ($type === Token::TOKEN_TYPE_BOUNDARY && ($value==='(' || $value===')')) {
return $value;
}

Expand All @@ -68,24 +68,24 @@ public function highlightToken(int $type, string $value) : string
public function attributes(int $type) : ?string
{
switch ($type) {
case SqlFormatter::TOKEN_TYPE_BOUNDARY:
case Token::TOKEN_TYPE_BOUNDARY:
return $this->boundaryAttributes;
case SqlFormatter::TOKEN_TYPE_WORD:
case Token::TOKEN_TYPE_WORD:
return $this->wordAttributes;
case SqlFormatter::TOKEN_TYPE_BACKTICK_QUOTE:
case Token::TOKEN_TYPE_BACKTICK_QUOTE:
return $this->backtickQuoteAttributes;
case SqlFormatter::TOKEN_TYPE_QUOTE:
case Token::TOKEN_TYPE_QUOTE:
return $this->quoteAttributes;
case SqlFormatter::TOKEN_TYPE_RESERVED:
case SqlFormatter::TOKEN_TYPE_RESERVED_TOPLEVEL:
case SqlFormatter::TOKEN_TYPE_RESERVED_NEWLINE:
case Token::TOKEN_TYPE_RESERVED:
case Token::TOKEN_TYPE_RESERVED_TOPLEVEL:
case Token::TOKEN_TYPE_RESERVED_NEWLINE:
return $this->reservedAttributes;
case SqlFormatter::TOKEN_TYPE_NUMBER:
case Token::TOKEN_TYPE_NUMBER:
return $this->numberAttributes;
case SqlFormatter::TOKEN_TYPE_VARIABLE:
case Token::TOKEN_TYPE_VARIABLE:
return $this->variableAttributes;
case SqlFormatter::TOKEN_TYPE_COMMENT:
case SqlFormatter::TOKEN_TYPE_BLOCK_COMMENT:
case Token::TOKEN_TYPE_COMMENT:
case Token::TOKEN_TYPE_BLOCK_COMMENT:
return $this->commentAttributes;
default:
return null;
Expand Down
Loading