Skip to content

Commit

Permalink
Add PHP CS Fixer
Browse files Browse the repository at this point in the history
  • Loading branch information
Huluti committed Nov 24, 2024
1 parent 6260547 commit 7e3b3d9
Show file tree
Hide file tree
Showing 7 changed files with 35 additions and 15 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
vendor
.idea
composer.lock
composer.lock
tools/
1 change: 1 addition & 0 deletions .php-cs-fixer.cache
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"php":"8.3.14","version":"3.64.0:v3.64.0#58dd9c931c785a79739310aef5178928305ffa67","indent":" ","lineEnding":"\n","rules":{"align_multiline_comment":true,"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_definition":{"single_line":true},"class_reference_name_casing":true,"clean_namespace":true,"concat_space":true,"declare_parentheses":true,"echo_tag_syntax":true,"empty_loop_body":{"style":"braces"},"empty_loop_condition":true,"fully_qualified_strict_types":true,"function_declaration":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,"method_argument_space":{"on_multiline":"ignore"},"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_multiline_whitespace_around_double_arrow":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":true,"phpdoc_annotation_without_dot":true,"phpdoc_indent":true,"phpdoc_inline_tag_normalizer":true,"phpdoc_no_access":true,"phpdoc_no_alias_tag":true,"phpdoc_no_package":true,"phpdoc_no_useless_inheritdoc":true,"phpdoc_order":{"order":["param","return","throws"]},"phpdoc_return_self_reference":true,"phpdoc_scalar":true,"phpdoc_separation":{"groups":[["Annotation","NamedArgumentConstructor","Target"],["author","copyright","license"],["category","package","subpackage"],["property","property-read","property-write"],["deprecated","link","see","since"]]},"phpdoc_single_line_var_spacing":true,"phpdoc_summary":true,"phpdoc_tag_type":{"tags":{"inheritDoc":"inline"}},"phpdoc_to_comment":true,"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":true,"single_quote":true,"single_space_around_construct":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":{"after_heredoc":true,"elements":["array_destructuring","arrays","match","parameters"]},"trim_array_spaces":true,"type_declaration_spaces":true,"types_spaces":true,"unary_operator_spaces":true,"whitespace_after_comma_in_array":true,"yoda_style":true,"array_indentation":true,"array_syntax":true,"cast_spaces":true,"new_with_parentheses":{"anonymous_class":false},"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"blank_lines_before_namespace":true,"compact_nullable_type_declaration":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"return_type_declaration":true,"short_scalar_cast":true,"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"control_structure_braces":true,"control_structure_continuation_position":true,"elseif":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"no_break_comment":true,"no_closing_tag":true,"no_multiple_statements_per_line":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_line_after_imports":true,"spaces_inside_parentheses":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true},"hashes":{"src\/Type\/AltchaType.php":"f60157dd4e89f23fe33d6387d569ec92","src\/Validator\/Altcha.php":"75b4f723895eea117697f267ae6a6cf1","src\/Validator\/AltchaValidator.php":"5f06e19abbb7b8d5010ed3734219ec92","src\/Controller\/HulutiAltchaChallengeController.php":"4130615878df0a10ccfe117045480073","src\/HulutiAltchaBundleCompilerPass.php":"28ce5049900a05d77004e03ce04c083b","src\/DependencyInjection\/Configuration.php":"7f8eadb1436a1a8edf9ca595faace66a","src\/DependencyInjection\/HulutiAltchaExtension.php":"e5b7813a45749bd1df1f3e66bc69f226","src\/HulutiAltchaBundle.php":"de127cbf42982b00c553f35b76962859"}}
12 changes: 12 additions & 0 deletions .php-cs-fixer.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?php

$finder = (new PhpCsFixer\Finder())
->in(__DIR__)
;

return (new PhpCsFixer\Config())
->setRules([
'@Symfony' => true,
])
->setFinder($finder)
;
6 changes: 6 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
init:
mkdir -p tools/php-cs-fixer
composer require --dev --working-dir=tools/php-cs-fixer friendsofphp/php-cs-fixer

format:
tools/php-cs-fixer/vendor/bin/php-cs-fixer fix src
6 changes: 3 additions & 3 deletions src/Controller/HulutiAltchaChallengeController.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ public function __construct(private readonly string $hmacKey)
public function challenge(): JsonResponse
{
$options = new ChallengeOptions([
'hmacKey' => $this->hmacKey,
'hmacKey' => $this->hmacKey,
'maxNumber' => 100000,
'expires' => (new \DateTime())->modify('+15 minute')
'expires' => (new \DateTime())->modify('+15 minute'),
]);

$challenge = Altcha::createChallenge($options);

return new JsonResponse($challenge);
}
}
}
5 changes: 2 additions & 3 deletions src/HulutiAltchaBundle.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

namespace Huluti\AltchaBundle;

use Huluti\AltchaBundle\HulutiAltchaBundleCompilerPass;
use Symfony\Component\Config\Definition\Configurator\DefinitionConfigurator;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
Expand All @@ -19,7 +18,7 @@ public function build(ContainerBuilder $container): void
parent::build($container);
$container->addCompilerPass(new HulutiAltchaBundleCompilerPass());
}

public function configure(DefinitionConfigurator $definition): void
{
// @phpstan-ignore-next-line
Expand All @@ -33,7 +32,7 @@ public function configure(DefinitionConfigurator $definition): void
}

/**
* @param array<mixed> $config The configuration array.
* @param array<mixed> $config the configuration array
*/
public function loadExtension(array $config, ContainerConfigurator $container, ContainerBuilder $builder): void
{
Expand Down
16 changes: 9 additions & 7 deletions src/Validator/AltchaValidator.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,21 @@
final class AltchaValidator extends ConstraintValidator
{
public function __construct(
private readonly bool $enable,
private readonly string $hmacKey,
private readonly RequestStack $requestStack
private readonly bool $enable,
private readonly string $hmacKey,
private readonly RequestStack $requestStack,
) {
}

/**
* Checks if the passed value is valid.
*
* @param mixed $value The value that should be validated
* @param mixed $value The value that should be validated
* @param Constraint $constraint The constraint for the validation
*/
public function validate($value, Constraint $constraint): void
{
if ($this->enable === false) {
if (false === $this->enable) {
return;
}

Expand All @@ -35,13 +35,15 @@ public function validate($value, Constraint $constraint): void
if (!is_string($altchaEncoded)) {
$this->context->buildViolation($constraint->message)
->addviolation();
return;

return;
}
$altchaJson = base64_decode($altchaEncoded, true);
if (!is_string($altchaJson)) {
$this->context->buildViolation($constraint->message)
->addviolation();
return;

return;
}
$payload = json_decode($altchaJson, true, 512, JSON_THROW_ON_ERROR);

Expand Down

0 comments on commit 7e3b3d9

Please sign in to comment.