composer update
This commit is contained in:
-213
@@ -1,213 +0,0 @@
|
||||
<?php
|
||||
|
||||
require __DIR__ . '/tools/php-cs-fixer.d/PhpdocSingleLineVarFixer.php';
|
||||
|
||||
return PhpCsFixer\Config::create()
|
||||
->registerCustomFixers([
|
||||
new \PharIo\CSFixer\PhpdocSingleLineVarFixer()
|
||||
])
|
||||
->setRiskyAllowed(true)
|
||||
->setRules(
|
||||
[
|
||||
'PharIo/phpdoc_single_line_var_fixer' => true,
|
||||
|
||||
'align_multiline_comment' => true,
|
||||
'array_indentation' => true,
|
||||
'array_syntax' => ['syntax' => 'short'],
|
||||
'binary_operator_spaces' => [
|
||||
'operators' => [
|
||||
'=' => 'align_single_space_minimal',
|
||||
'=>' => 'align',
|
||||
],
|
||||
],
|
||||
'blank_line_after_namespace' => true,
|
||||
'blank_line_after_opening_tag' => false,
|
||||
'blank_line_before_statement' => [
|
||||
'statements' => [
|
||||
'break',
|
||||
'continue',
|
||||
'declare',
|
||||
'do',
|
||||
'for',
|
||||
'foreach',
|
||||
'if',
|
||||
'include',
|
||||
'include_once',
|
||||
'require',
|
||||
'require_once',
|
||||
'return',
|
||||
'switch',
|
||||
'throw',
|
||||
'try',
|
||||
'while',
|
||||
'yield',
|
||||
],
|
||||
],
|
||||
'braces' => [
|
||||
'allow_single_line_closure' => false,
|
||||
'position_after_anonymous_constructs' => 'same',
|
||||
'position_after_control_structures' => 'same',
|
||||
'position_after_functions_and_oop_constructs' => 'same'
|
||||
],
|
||||
'cast_spaces' => ['space' => 'none'],
|
||||
|
||||
// This fixer removes the blank line at class start, no way to disable that, so we disable the fixer :(
|
||||
//'class_attributes_separation' => ['elements' => ['const', 'method', 'property']],
|
||||
|
||||
'combine_consecutive_issets' => true,
|
||||
'combine_consecutive_unsets' => true,
|
||||
'compact_nullable_typehint' => true,
|
||||
'concat_space' => ['spacing' => 'one'],
|
||||
'date_time_immutable' => true,
|
||||
'declare_equal_normalize' => ['space' => 'single'],
|
||||
'declare_strict_types' => true,
|
||||
'dir_constant' => true,
|
||||
'elseif' => true,
|
||||
'encoding' => true,
|
||||
'full_opening_tag' => true,
|
||||
'fully_qualified_strict_types' => true,
|
||||
'function_declaration' => [
|
||||
'closure_function_spacing' => 'one'
|
||||
],
|
||||
'header_comment' => false,
|
||||
'indentation_type' => true,
|
||||
'is_null' => true,
|
||||
'line_ending' => true,
|
||||
'list_syntax' => ['syntax' => 'short'],
|
||||
'logical_operators' => true,
|
||||
'lowercase_cast' => true,
|
||||
'lowercase_constants' => true,
|
||||
'lowercase_keywords' => true,
|
||||
'lowercase_static_reference' => true,
|
||||
'magic_constant_casing' => true,
|
||||
'method_argument_space' => ['ensure_fully_multiline' => true],
|
||||
'modernize_types_casting' => true,
|
||||
'multiline_comment_opening_closing' => true,
|
||||
'multiline_whitespace_before_semicolons' => true,
|
||||
'native_constant_invocation' => true,
|
||||
'native_function_casing' => true,
|
||||
'native_function_invocation' => true,
|
||||
'new_with_braces' => false,
|
||||
'no_alias_functions' => true,
|
||||
'no_alternative_syntax' => true,
|
||||
'no_blank_lines_after_class_opening' => false,
|
||||
'no_blank_lines_after_phpdoc' => true,
|
||||
'no_blank_lines_before_namespace' => true,
|
||||
'no_closing_tag' => true,
|
||||
'no_empty_comment' => true,
|
||||
'no_empty_phpdoc' => true,
|
||||
'no_empty_statement' => true,
|
||||
'no_extra_blank_lines' => true,
|
||||
'no_homoglyph_names' => true,
|
||||
'no_leading_import_slash' => true,
|
||||
'no_leading_namespace_whitespace' => true,
|
||||
'no_mixed_echo_print' => ['use' => 'print'],
|
||||
'no_multiline_whitespace_around_double_arrow' => true,
|
||||
'no_null_property_initialization' => true,
|
||||
'no_php4_constructor' => true,
|
||||
'no_short_bool_cast' => true,
|
||||
'no_short_echo_tag' => true,
|
||||
'no_singleline_whitespace_before_semicolons' => true,
|
||||
'no_spaces_after_function_name' => true,
|
||||
'no_spaces_inside_parenthesis' => true,
|
||||
'no_superfluous_elseif' => true,
|
||||
'no_superfluous_phpdoc_tags' => true,
|
||||
'no_trailing_comma_in_list_call' => true,
|
||||
'no_trailing_comma_in_singleline_array' => true,
|
||||
'no_trailing_whitespace' => true,
|
||||
'no_trailing_whitespace_in_comment' => true,
|
||||
'no_unneeded_control_parentheses' => false,
|
||||
'no_unneeded_curly_braces' => false,
|
||||
'no_unneeded_final_method' => true,
|
||||
'no_unreachable_default_argument_value' => true,
|
||||
'no_unset_on_property' => true,
|
||||
'no_unused_imports' => true,
|
||||
'no_useless_else' => true,
|
||||
'no_useless_return' => true,
|
||||
'no_whitespace_before_comma_in_array' => true,
|
||||
'no_whitespace_in_blank_line' => true,
|
||||
'non_printable_character' => true,
|
||||
'normalize_index_brace' => true,
|
||||
'object_operator_without_whitespace' => true,
|
||||
'ordered_class_elements' => [
|
||||
'order' => [
|
||||
'use_trait',
|
||||
'constant_public',
|
||||
'constant_protected',
|
||||
'constant_private',
|
||||
'property_public_static',
|
||||
'property_protected_static',
|
||||
'property_private_static',
|
||||
'property_public',
|
||||
'property_protected',
|
||||
'property_private',
|
||||
'method_public_static',
|
||||
'construct',
|
||||
'destruct',
|
||||
'magic',
|
||||
'phpunit',
|
||||
'method_public',
|
||||
'method_protected',
|
||||
'method_private',
|
||||
'method_protected_static',
|
||||
'method_private_static',
|
||||
],
|
||||
],
|
||||
'ordered_imports' => true,
|
||||
'phpdoc_add_missing_param_annotation' => true,
|
||||
'phpdoc_align' => true,
|
||||
'phpdoc_annotation_without_dot' => true,
|
||||
'phpdoc_indent' => true,
|
||||
'phpdoc_no_access' => true,
|
||||
'phpdoc_no_empty_return' => true,
|
||||
'phpdoc_no_package' => true,
|
||||
'phpdoc_order' => true,
|
||||
'phpdoc_return_self_reference' => true,
|
||||
'phpdoc_scalar' => true,
|
||||
'phpdoc_separation' => true,
|
||||
'phpdoc_single_line_var_spacing' => true,
|
||||
'phpdoc_to_comment' => false,
|
||||
'phpdoc_trim' => true,
|
||||
'phpdoc_trim_consecutive_blank_line_separation' => true,
|
||||
'phpdoc_types' => ['groups' => ['simple', 'meta']],
|
||||
'phpdoc_types_order' => true,
|
||||
'phpdoc_to_return_type' => true,
|
||||
'phpdoc_var_without_name' => true,
|
||||
'pow_to_exponentiation' => true,
|
||||
'protected_to_private' => true,
|
||||
'return_assignment' => true,
|
||||
'return_type_declaration' => ['space_before' => 'none'],
|
||||
'self_accessor' => false,
|
||||
'semicolon_after_instruction' => true,
|
||||
'set_type_to_cast' => true,
|
||||
'short_scalar_cast' => true,
|
||||
'simplified_null_return' => true,
|
||||
'single_blank_line_at_eof' => true,
|
||||
'single_import_per_statement' => true,
|
||||
'single_line_after_imports' => true,
|
||||
'single_quote' => true,
|
||||
'standardize_not_equals' => true,
|
||||
'ternary_to_null_coalescing' => true,
|
||||
'trailing_comma_in_multiline_array' => false,
|
||||
'trim_array_spaces' => true,
|
||||
'unary_operator_spaces' => true,
|
||||
'visibility_required' => [
|
||||
'elements' => [
|
||||
'const',
|
||||
'method',
|
||||
'property',
|
||||
],
|
||||
],
|
||||
'void_return' => true,
|
||||
'whitespace_after_comma_in_array' => true,
|
||||
'yoda_style' => false
|
||||
]
|
||||
)
|
||||
->setFinder(
|
||||
PhpCsFixer\Finder::create()
|
||||
->files()
|
||||
->in(__DIR__ . '/src')
|
||||
->in(__DIR__ . '/tests')
|
||||
->notName('*.phpt')
|
||||
->notName('autoload.php')
|
||||
);
|
||||
+16
@@ -2,6 +2,18 @@
|
||||
|
||||
All notable changes to Tokenizer are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
|
||||
|
||||
## [1.2.3] - 2024-03-03
|
||||
|
||||
### Changed
|
||||
|
||||
* Do not use implicitly nullable parameters
|
||||
|
||||
## [1.2.2] - 2023-11-20
|
||||
|
||||
### Fixed
|
||||
|
||||
* [#18](https://github.com/theseer/tokenizer/issues/18): Tokenizer fails on protobuf metadata files
|
||||
|
||||
|
||||
## [1.2.1] - 2021-07-28
|
||||
|
||||
@@ -64,6 +76,10 @@ This release is now PHP 8.0 compliant.
|
||||
|
||||
Initial Release
|
||||
|
||||
[1.2.3]: https://github.com/theseer/tokenizer/compare/1.2.2...1.2.3
|
||||
[1.2.2]: https://github.com/theseer/tokenizer/compare/1.2.1...1.2.2
|
||||
[1.2.1]: https://github.com/theseer/tokenizer/compare/1.2.0...1.2.1
|
||||
[1.2.0]: https://github.com/theseer/tokenizer/compare/1.1.3...1.2.0
|
||||
[1.1.3]: https://github.com/theseer/tokenizer/compare/1.1.2...1.1.3
|
||||
[1.1.2]: https://github.com/theseer/tokenizer/compare/1.1.1...1.1.2
|
||||
[1.1.1]: https://github.com/theseer/tokenizer/compare/1.1.0...1.1.1
|
||||
|
||||
Vendored
-3
@@ -3,9 +3,6 @@
|
||||
A small library for converting tokenized PHP source code into XML.
|
||||
|
||||
[](https://github.com/theseer/tokenizer/actions/workflows/ci.yml)
|
||||
[](https://scrutinizer-ci.com/g/theseer/tokenizer/?branch=master)
|
||||
[](https://scrutinizer-ci.com/g/theseer/tokenizer/?branch=master)
|
||||
[](https://scrutinizer-ci.com/g/theseer/tokenizer/build-status/master)
|
||||
|
||||
## Installation
|
||||
|
||||
|
||||
+13
-24
@@ -1,38 +1,27 @@
|
||||
<?php declare(strict_types = 1);
|
||||
namespace TheSeer\Tokenizer;
|
||||
|
||||
class TokenCollection implements \ArrayAccess, \Iterator, \Countable {
|
||||
use ArrayAccess;
|
||||
use ArrayIterator;
|
||||
use Countable;
|
||||
use Iterator;
|
||||
use IteratorAggregate;
|
||||
|
||||
/**
|
||||
* @implements IteratorAggregate<int, Token>
|
||||
*/
|
||||
class TokenCollection implements IteratorAggregate, ArrayAccess, Countable {
|
||||
|
||||
/** @var Token[] */
|
||||
private $tokens = [];
|
||||
|
||||
/** @var int */
|
||||
private $pos;
|
||||
|
||||
public function addToken(Token $token): void {
|
||||
$this->tokens[] = $token;
|
||||
}
|
||||
|
||||
public function current(): Token {
|
||||
return \current($this->tokens);
|
||||
}
|
||||
|
||||
public function key(): int {
|
||||
return \key($this->tokens);
|
||||
}
|
||||
|
||||
public function next(): void {
|
||||
\next($this->tokens);
|
||||
$this->pos++;
|
||||
}
|
||||
|
||||
public function valid(): bool {
|
||||
return $this->count() > $this->pos;
|
||||
}
|
||||
|
||||
public function rewind(): void {
|
||||
\reset($this->tokens);
|
||||
$this->pos = 0;
|
||||
public function getIterator(): Iterator
|
||||
{
|
||||
return new ArrayIterator($this->tokens);
|
||||
}
|
||||
|
||||
public function count(): int {
|
||||
|
||||
+24
-17
@@ -8,7 +8,7 @@ class Tokenizer {
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
private $map = [
|
||||
private const MAP = [
|
||||
'(' => 'T_OPEN_BRACKET',
|
||||
')' => 'T_CLOSE_BRACKET',
|
||||
'[' => 'T_OPEN_SQUARE',
|
||||
@@ -58,7 +58,7 @@ class Tokenizer {
|
||||
if (\is_string($tok)) {
|
||||
$token = new Token(
|
||||
$lastToken->getLine(),
|
||||
$this->map[$tok],
|
||||
self::MAP[$tok],
|
||||
$tok
|
||||
);
|
||||
$result->addToken($token);
|
||||
@@ -70,6 +70,18 @@ class Tokenizer {
|
||||
$line = $tok[2];
|
||||
$values = \preg_split('/\R+/Uu', $tok[1]);
|
||||
|
||||
if (!$values) {
|
||||
$result->addToken(
|
||||
new Token(
|
||||
$line,
|
||||
\token_name($tok[0]),
|
||||
'{binary data}'
|
||||
)
|
||||
);
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
foreach ($values as $v) {
|
||||
$token = new Token(
|
||||
$line,
|
||||
@@ -98,45 +110,40 @@ class Tokenizer {
|
||||
);
|
||||
|
||||
$final = new TokenCollection();
|
||||
$prevLine = $prev->getLine();
|
||||
|
||||
foreach ($tokens as $token) {
|
||||
if ($prev === null) {
|
||||
$final->addToken($token);
|
||||
$prev = $token;
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
$gap = $token->getLine() - $prev->getLine();
|
||||
$line = $token->getLine();
|
||||
$gap = $line - $prevLine;
|
||||
|
||||
while ($gap > 1) {
|
||||
$linebreak = new Token(
|
||||
$prev->getLine() + 1,
|
||||
$prevLine + 1,
|
||||
'T_WHITESPACE',
|
||||
''
|
||||
);
|
||||
$final->addToken($linebreak);
|
||||
$prev = $linebreak;
|
||||
$prevLine = $linebreak->getLine();
|
||||
$gap--;
|
||||
}
|
||||
|
||||
$final->addToken($token);
|
||||
$prev = $token;
|
||||
$prevLine = $line;
|
||||
}
|
||||
|
||||
$gap = $maxLine - $prev->getLine();
|
||||
$gap = $maxLine - $prevLine;
|
||||
|
||||
while ($gap > 0) {
|
||||
$linebreak = new Token(
|
||||
$prev->getLine() + 1,
|
||||
$prevLine + 1,
|
||||
'T_WHITESPACE',
|
||||
''
|
||||
);
|
||||
$final->addToken($linebreak);
|
||||
$prev = $linebreak;
|
||||
$prevLine = $linebreak->getLine();
|
||||
$gap--;
|
||||
}
|
||||
|
||||
return $final;
|
||||
}
|
||||
}
|
||||
}
|
||||
+34
-39
@@ -5,12 +5,6 @@ use DOMDocument;
|
||||
|
||||
class XMLSerializer {
|
||||
|
||||
/** @var \XMLWriter */
|
||||
private $writer;
|
||||
|
||||
/** @var Token */
|
||||
private $previousToken;
|
||||
|
||||
/** @var NamespaceUri */
|
||||
private $xmlns;
|
||||
|
||||
@@ -19,7 +13,7 @@ class XMLSerializer {
|
||||
*
|
||||
* @param NamespaceUri $xmlns
|
||||
*/
|
||||
public function __construct(NamespaceUri $xmlns = null) {
|
||||
public function __construct(?NamespaceUri $xmlns = null) {
|
||||
if ($xmlns === null) {
|
||||
$xmlns = new NamespaceUri('https://github.com/theseer/tokenizer');
|
||||
}
|
||||
@@ -35,45 +29,46 @@ class XMLSerializer {
|
||||
}
|
||||
|
||||
public function toXML(TokenCollection $tokens): string {
|
||||
$this->writer = new \XMLWriter();
|
||||
$this->writer->openMemory();
|
||||
$this->writer->setIndent(true);
|
||||
$this->writer->startDocument();
|
||||
$this->writer->startElement('source');
|
||||
$this->writer->writeAttribute('xmlns', $this->xmlns->asString());
|
||||
$writer = new \XMLWriter();
|
||||
$writer->openMemory();
|
||||
$writer->setIndent(true);
|
||||
$writer->startDocument();
|
||||
$writer->startElement('source');
|
||||
$writer->writeAttribute('xmlns', $this->xmlns->asString());
|
||||
|
||||
if (\count($tokens) > 0) {
|
||||
$this->writer->startElement('line');
|
||||
$this->writer->writeAttribute('no', '1');
|
||||
$writer->startElement('line');
|
||||
$writer->writeAttribute('no', '1');
|
||||
|
||||
$this->previousToken = $tokens[0];
|
||||
$iterator = $tokens->getIterator();
|
||||
$previousToken = $iterator->current();
|
||||
$previousLine = $previousToken->getLine();
|
||||
|
||||
foreach ($tokens as $token) {
|
||||
$this->addToken($token);
|
||||
foreach ($iterator as $token) {
|
||||
$line = $token->getLine();
|
||||
if ($previousLine < $line) {
|
||||
$writer->endElement();
|
||||
|
||||
$writer->startElement('line');
|
||||
$writer->writeAttribute('no', (string)$line);
|
||||
$previousLine = $line;
|
||||
}
|
||||
|
||||
$value = $token->getValue();
|
||||
if ($value !== '') {
|
||||
$writer->startElement('token');
|
||||
$writer->writeAttribute('name', $token->getName());
|
||||
$writer->writeRaw(\htmlspecialchars($value, \ENT_NOQUOTES | \ENT_DISALLOWED | \ENT_XML1));
|
||||
$writer->endElement();
|
||||
}
|
||||
}
|
||||
|
||||
$writer->endElement();
|
||||
}
|
||||
|
||||
$this->writer->endElement();
|
||||
$this->writer->endElement();
|
||||
$this->writer->endDocument();
|
||||
$writer->endElement();
|
||||
$writer->endDocument();
|
||||
|
||||
return $this->writer->outputMemory();
|
||||
}
|
||||
|
||||
private function addToken(Token $token): void {
|
||||
if ($this->previousToken->getLine() < $token->getLine()) {
|
||||
$this->writer->endElement();
|
||||
|
||||
$this->writer->startElement('line');
|
||||
$this->writer->writeAttribute('no', (string)$token->getLine());
|
||||
$this->previousToken = $token;
|
||||
}
|
||||
|
||||
if ($token->getValue() !== '') {
|
||||
$this->writer->startElement('token');
|
||||
$this->writer->writeAttribute('name', $token->getName());
|
||||
$this->writer->writeRaw(\htmlspecialchars($token->getValue(), \ENT_NOQUOTES | \ENT_DISALLOWED | \ENT_XML1));
|
||||
$this->writer->endElement();
|
||||
}
|
||||
return $writer->outputMemory();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user