Merge branch 'main' into security-ci-pull_request_target-1

auth0 · Oct 4, 2024 · e758a1a · e758a1a
2 parents 0b84467 + 24ae10f
commit e758a1a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -13,7 +13,8 @@
         'blank_line_after_opening_tag' => true,
         'blank_line_before_statement' => true,
         'blank_line_between_import_groups' => true,
-        'braces' => true,
+        'single_space_around_construct' => true,
+        'control_structure_braces' => true,
         'cast_spaces' => true,
         'class_attributes_separation' => ['elements' => ['const' => 'one', 'method' => 'one', 'property' => 'one', 'trait_import' => 'one', 'case' => 'one']],
         'class_definition' => ['multi_line_extends_each_single_line' => true, 'single_line' => true, 'single_item_single_line' => true, 'space_before_parenthesis' => false, 'inline_constructor_arguments' => false],
@@ -23,10 +24,10 @@
         'combine_consecutive_unsets' => true,
         'combine_nested_dirname' => true,
         'comment_to_phpdoc' => ['ignored_tags' => ['codeCoverageIgnoreStart', 'codeCoverageIgnoreEnd', 'phpstan-ignore-next-line']],
-        'compact_nullable_typehint' => true,
+        'compact_nullable_type_declaration' => true,
         'concat_space' => ['spacing' => 'one'],
         'constant_case' => ['case' => 'lower'],
-        'curly_braces_position' => ['control_structures_opening_brace' => 'same_line', 'functions_opening_brace' => 'next_line_unless_newline_at_signature_end', 'anonymous_functions_opening_brace' => 'same_line', 'classes_opening_brace' => 'next_line_unless_newline_at_signature_end', 'anonymous_classes_opening_brace' => 'same_line', 'allow_single_line_empty_anonymous_classes' => true, 'allow_single_line_anonymous_functions' => true],
+        'braces_position' => ['control_structures_opening_brace' => 'same_line', 'functions_opening_brace' => 'next_line_unless_newline_at_signature_end', 'anonymous_functions_opening_brace' => 'same_line', 'classes_opening_brace' => 'next_line_unless_newline_at_signature_end', 'anonymous_classes_opening_brace' => 'same_line', 'allow_single_line_empty_anonymous_classes' => true, 'allow_single_line_anonymous_functions' => true],
         'date_time_create_from_format_call' => true,
         'date_time_immutable' => true,
         'declare_equal_normalize' => ['space' => 'none'],
@@ -44,7 +45,7 @@
         'encoding' => true,
         'ereg_to_preg' => true,
         'error_suppression' => true,
-        'escape_implicit_backslashes' => true,
+        'string_implicit_backslashes' => true,
         'explicit_indirect_variable' => true,
         'explicit_string_variable' => true,
         // 'final_class' => true,
@@ -56,7 +57,7 @@
         'fully_qualified_strict_types' => true,
         'function_declaration' => true,
         'function_to_constant' => true,
-        'function_typehint_space' => true,
+        'type_declaration_spaces' => true,
         'general_phpdoc_annotation_remove' => true,
         'general_phpdoc_tag_rename' => true,
         'get_class_to_class_keyword' => true,
@@ -89,8 +90,8 @@
         'multiline_whitespace_before_semicolons' => true,
         'native_function_casing' => true,
         'native_function_invocation' => true,
-        'native_function_type_declaration_casing' => true,
-        'new_with_braces' => true,
+        'native_type_declaration_casing' => true,
+        'new_with_parentheses' => true,
         'no_alias_functions' => true,
         'no_alias_language_construct_call' => true,
         'no_alternative_syntax' => true,
@@ -115,14 +116,14 @@
         'no_space_around_double_colon' => true,
         'no_spaces_after_function_name' => true,
         'no_spaces_around_offset' => true,
-        'no_spaces_inside_parenthesis' => true,
+        'spaces_inside_parentheses' => true,
         'no_superfluous_elseif' => true,
         'no_trailing_comma_in_singleline' => true,
         'no_trailing_whitespace_in_comment' => true,
         'no_trailing_whitespace_in_string' => true,
         'no_trailing_whitespace' => true,
         'no_unneeded_control_parentheses' => true,
-        'no_unneeded_curly_braces' => true,
+        'no_unneeded_braces' => true,
         'no_unneeded_final_method' => true,
         'no_unneeded_import_alias' => true,
         'no_unreachable_default_argument_value' => true,
@@ -187,14 +188,13 @@
         'simple_to_complex_string_variable' => true,
         'simplified_if_return' => true,
         'single_blank_line_at_eof' => true,
-        'single_blank_line_before_namespace' => true,
+        'blank_lines_before_namespace' => true,
         'single_class_element_per_statement' => true,
         'single_line_after_imports' => true,
         'single_line_comment_spacing' => true,
         'single_line_comment_style' => ['comment_types' => ['hash']],
         'single_line_throw' => true,
         'single_quote' => true,
-        'single_space_after_construct' => true,
         'single_space_around_construct' => true,
         'single_trait_insert_per_statement' => true,
         'space_after_semicolon' => true,

diff --git a/src/Exceptions/UnsupportedUserException.php b/src/Exceptions/UnsupportedUserException.php
@@ -8,6 +8,8 @@
 use Exception;
 use Throwable;
 
+use function sprintf;
+
 final class UnsupportedUserException extends Exception implements ExceptionInterface
 {
     public const MSG_CLASS_NOT_SUPPORTED = 'Instances of `%s` are not supported.';

diff --git a/src/Exceptions/UserNotFoundException.php b/src/Exceptions/UserNotFoundException.php
@@ -8,6 +8,8 @@
 use Exception;
 use Throwable;
 
+use function sprintf;
+
 final class UserNotFoundException extends Exception implements ExceptionInterface
 {
     public const MSG_CANNOT_LOAD_BY_USERNAME = '%1$s cannot load user "%2$s" by username. Use %1$s::loadUserByJWT instead.';