Skip to content

Commit

Permalink
Improve codestyle rules
Browse files Browse the repository at this point in the history
  • Loading branch information
@SerafimArts
SerafimArts committed Jun 12, 2024
1 parent e322457 commit 42153f6
Show file tree
Hide file tree
Showing 3 changed files with 234 additions and 4 deletions.
223 changes: 223 additions & 0 deletions .php-cs-fixer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,232 @@
'@PER-CS2.0' => true,
'@PER-CS2.0:risky' => true,
'strict_param' => true,
'align_multiline_comment' => true,
'array_syntax' => [
'syntax' => 'short',
],
'backtick_to_shell_exec' => true,
'binary_operator_spaces' => true,
'blank_line_before_statement' => [
'statements' => [
'return',
],
],
'braces_position' => [
'allow_single_line_anonymous_functions' => true,
'allow_single_line_empty_anonymous_classes' => true,
],
'class_attributes_separation' => [
'elements' => [
'method' => 'one',
],
],
'class_reference_name_casing' => true,
'clean_namespace' => true,
'declare_parentheses' => true,
'echo_tag_syntax' => true,
'empty_loop_body' => ['style' => 'braces'],
'empty_loop_condition' => true,
'fully_qualified_strict_types' => true,
'general_phpdoc_tag_rename' => [
'replacements' => [
'inheritDocs' => 'inheritDoc',
],
],
'global_namespace_import' => [
'import_classes' => false,
'import_constants' => false,
'import_functions' => false,
],
'include' => true,
'increment_style' => true,
'integer_literal_case' => true,
'lambda_not_used_import' => true,
'linebreak_after_opening_tag' => true,
'magic_constant_casing' => true,
'magic_method_casing' => true,
'native_function_casing' => true,
'native_type_declaration_casing' => true,
'no_alias_language_construct_call' => true,
'no_alternative_syntax' => true,
'no_binary_string' => true,
'no_blank_lines_after_phpdoc' => true,
'no_empty_comment' => true,
'no_empty_phpdoc' => true,
'no_empty_statement' => true,
'no_extra_blank_lines' => [
'tokens' => [
'attribute',
'case',
'continue',
'curly_brace_block',
'default',
'extra',
'parenthesis_brace_block',
'square_brace_block',
'switch',
'throw',
'use',
],
],
'no_leading_namespace_whitespace' => true,
'no_mixed_echo_print' => true,
'no_null_property_initialization' => true,
'no_short_bool_cast' => true,
'no_singleline_whitespace_before_semicolons' => true,
'no_spaces_around_offset' => true,
'no_superfluous_phpdoc_tags' => [
'allow_hidden_params' => true,
'remove_inheritdoc' => true,
],
'no_trailing_comma_in_singleline' => true,
'no_unneeded_braces' => [
'namespaces' => true,
],
'no_unneeded_control_parentheses' => [
'statements' => [
'break',
'clone',
'continue',
'echo_print',
'others',
'return',
'switch_case',
'yield',
'yield_from',
],
],
'no_unneeded_import_alias' => true,
'no_unset_cast' => true,
'no_unused_imports' => true,
'no_useless_concat_operator' => true,
'no_useless_nullsafe_operator' => true,
'no_whitespace_before_comma_in_array' => true,
'normalize_index_brace' => true,
'nullable_type_declaration' => true,
'nullable_type_declaration_for_default_null_value' => true,
'object_operator_without_whitespace' => true,
'operator_linebreak' => [
'only_booleans' => true,
],
'ordered_imports' => [
'imports_order' => [
'class',
'function',
'const',
],
'sort_algorithm' => 'alpha',
],
'ordered_types' => [
'null_adjustment' => 'always_last',
'sort_algorithm' => 'none',
],
'php_unit_fqcn_annotation' => true,
'php_unit_method_casing' => true,
'phpdoc_align' => false,
'phpdoc_annotation_without_dot' => true,
'phpdoc_indent' => true,
'phpdoc_inline_tag_normalizer' => true,
'phpdoc_no_access' => true,
'phpdoc_no_alias_tag' => false,
'phpdoc_no_package' => true,
'phpdoc_no_useless_inheritdoc' => true,
'phpdoc_order' => [
'order' => [
'internal',
'psalm-internal',
'template',
'template-extends',
'extends',
'template-implements',
'implements',
'property',
'property-read',
'property-write',
'psalm-require-implements',
'phpstan-require-implements',
'psalm-require-extends',
'phpstan-require-extends',
'mixin',
'readonly',
'psalm-readonly',
'phpstan-readonly',
'param',
'return',
'throws',
'api',
'psalm-suppress',
],
],
'phpdoc_return_self_reference' => true,
'phpdoc_scalar' => true,
'phpdoc_separation' => [
'groups' => [
[
'property',
'property-read',
'property-write',
],
['internal', 'psalm-internal', 'phpstan-internal'],
[
'template',
'template-extends',
'extends',
'template-implements',
'implements',
'psalm-require-implements',
'phpstan-require-implements',
'psalm-require-extends',
'phpstan-require-extends',
],
['psalm-taint-sink', 'param'],
['return', 'throws', 'api'],
['psalm-suppress'],
],
],
'phpdoc_single_line_var_spacing' => true,
'phpdoc_tag_type' => [
'tags' => [
'inheritDoc' => 'inline',
],
],
'phpdoc_to_comment' => false,
'phpdoc_trim' => true,
'phpdoc_trim_consecutive_blank_line_separation' => true,
'phpdoc_types' => true,
'phpdoc_types_order' => [
'null_adjustment' => 'always_last',
'sort_algorithm' => 'none',
],
'phpdoc_var_without_name' => true,
'semicolon_after_instruction' => true,
'simple_to_complex_string_variable' => true,
'single_class_element_per_statement' => true,
'single_import_per_statement' => true,
'single_line_comment_spacing' => true,
'single_line_comment_style' => [
'comment_types' => [
'hash',
],
],
'single_line_throw' => false,
'single_quote' => true,
'space_after_semicolon' => [
'remove_in_empty_for_expressions' => true,
],
'standardize_increment' => true,
'standardize_not_equals' => true,
'statement_indentation' => [
'stick_comment_to_next_continuous_control_statement' => true,
],
'switch_continue_to_break' => true,
'trailing_comma_in_multiline' => true,
'trim_array_spaces' => true,
'type_declaration_spaces' => true,
'types_spaces' => true,
'unary_operator_spaces' => true,
'whitespace_after_comma_in_array' => true,
'yoda_style' => false,
])
->setCacheFile(__DIR__ . '/vendor/.cache.php-cs-fixer')
->setFinder($files);
11 changes: 8 additions & 3 deletions src/PrettyPrinter.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@

namespace TypeLang\Printer;

use TypeLang\Parser\Node\Node;
use TypeLang\Parser\Node\Literal\LiteralNode;
use TypeLang\Parser\Node\Node;
use TypeLang\Parser\Node\Statement;
use TypeLang\Parser\Node\Stmt\Callable\ParameterNode;
use TypeLang\Parser\Node\Stmt\CallableTypeNode;
use TypeLang\Parser\Node\Stmt\ClassConstMaskNode;
Expand All @@ -26,7 +27,6 @@
use TypeLang\Parser\Node\Stmt\Shape\FieldsListNode;
use TypeLang\Parser\Node\Stmt\Shape\NamedFieldNode;
use TypeLang\Parser\Node\Stmt\Shape\NumericFieldNode;
use TypeLang\Parser\Node\Statement;
use TypeLang\Parser\Node\Stmt\Shape\StringNamedFieldNode;
use TypeLang\Parser\Node\Stmt\Template\ArgumentNode as TemplateArgumentNode;
use TypeLang\Parser\Node\Stmt\Template\ArgumentsListNode as TemplateArgumentsListNode;
Expand Down Expand Up @@ -121,6 +121,7 @@ protected function make(Statement $stmt): string

/**
* @param TypesListNode<TypeStatement> $node
*
* @return non-empty-string
* @throws NonPrintableNodeException
*/
Expand Down Expand Up @@ -165,6 +166,7 @@ protected function printCondition(Condition $node): string

/**
* @param NullableTypeNode<TypeStatement> $node
*
* @return non-empty-string
* @throws NonPrintableNodeException
*/
Expand All @@ -191,7 +193,7 @@ protected function printClassConstMaskNode(ClassConstMaskNode $node): string
{
return \vsprintf('%s::%s', [
$node->class->toString(),
(string) ($node->constant?->toString()) . '*',
(string) $node->constant?->toString() . '*',
]);
}

Expand Down Expand Up @@ -308,6 +310,7 @@ protected function printCallableArgumentNode(ParameterNode $node): string

/**
* @param UnionTypeNode<TypeStatement> $node
*
* @return non-empty-string
*/
protected function printUnionTypeNode(UnionTypeNode $node): string
Expand All @@ -327,6 +330,7 @@ protected function printUnionTypeNode(UnionTypeNode $node): string

/**
* @param IntersectionTypeNode<TypeStatement> $node
*
* @return non-empty-string
*/
protected function printIntersectionTypeNode(IntersectionTypeNode $node): string
Expand All @@ -346,6 +350,7 @@ protected function printIntersectionTypeNode(IntersectionTypeNode $node): string

/**
* @param LiteralNode<mixed> $node
*
* @return non-empty-string
*/
protected function printLiteralNode(LiteralNode $node): string
Expand Down
4 changes: 3 additions & 1 deletion src/Printer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ abstract protected function make(Statement $stmt): string;
/**
* @param int<0, max>|null $depth
*/
protected function prefix(int $depth = null): string
protected function prefix(?int $depth = null): string
{
$depth ??= $this->depth;

Expand Down Expand Up @@ -108,7 +108,9 @@ protected function printMap(iterable $stmts): array

/**
* @template T of TypeStatement
*
* @param LogicalTypeNode<T> $logical
*
* @return iterable<array-key, T>
*/
protected function unwrap(LogicalTypeNode $logical): iterable
Expand Down

0 comments on commit 42153f6

Please sign in to comment.