Skip to content

Commit

Permalink
Merge branch 'main' into fixed-terminating-php82
Browse files Browse the repository at this point in the history
  • Loading branch information
zKoz210 committed May 16, 2023
2 parents cbb83ea + 575df36 commit 4ec939c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .php-cs-fixer.cache
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"php":"8.1.12","version":"3.13.0","indent":" ","lineEnding":"\n","rules":{"blank_line_after_namespace":true,"braces":true,"class_definition":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_import_per_statement":true,"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"visibility_required":{"elements":["method","property"]},"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"ordered_imports":{"sort_algorithm":"alpha"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"single_trait_insert_per_statement":true},"hashes":{"src\/Exceptions\/CouldNotManageTask.php":"ff4093a3769e440abb4f1d59e502a85e","src\/Task.php":"3876dd1bc99af211f5eeb4e96289b17b","src\/Connection.php":"2cfcaf4c3df1c8488f448badfdcfaad0","src\/Fork.php":"f444751dc017eb3510967f46bbdb219c","tests\/ForkTest.php":"743fe8646b4edf28801062c5ef806e1c","tests\/Pest.php":"d505920f050280f3fd9432b355daa382"}}
{"php":"8.2.4","version":"3.16.0","indent":" ","lineEnding":"\n","rules":{"blank_line_after_namespace":true,"class_definition":true,"constant_case":true,"control_structure_braces":true,"control_structure_continuation_position":true,"curly_braces_position":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":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_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_import_per_statement":true,"single_line_after_imports":true,"statement_indentation":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"visibility_required":{"elements":["method","property"]},"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"ordered_imports":{"sort_algorithm":"alpha"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"single_trait_insert_per_statement":true},"hashes":{"src\/Task.php":"3876dd1bc99af211f5eeb4e96289b17b","src\/Exceptions\/CouldNotManageTask.php":"ff4093a3769e440abb4f1d59e502a85e","src\/Fork.php":"f444751dc017eb3510967f46bbdb219c","src\/Connection.php":"2cfcaf4c3df1c8488f448badfdcfaad0","tests\/Pest.php":"d505920f050280f3fd9432b355daa382","tests\/ForkTest.php":"743fe8646b4edf28801062c5ef806e1c"}}
9 changes: 4 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
"ext-pcntl": "*"
},
"require-dev": {
"nesbot/carbon": "^2.47",
"pestphp/pest": "^1.22",
"nesbot/carbon": "^2.66",
"pestphp/pest": "^1.23",
"phpunit/phpunit": "^9.5",
"spatie/ray": "^1.10"
},
Expand All @@ -41,10 +41,9 @@
}
},
"scripts": {
"psalm": "vendor/bin/psalm",
"test": "vendor/bin/pest",
"test-coverage": "vendor/bin/pest --coverage-html coverage",
"format": "vendor/bin/php-cs-fixer fix --allow-risky=yes --config=.php_cs.dist.php"
"format": "vendor/bin/php-cs-fixer fix --allow-risky=yes --config=.php_cs.php"
},
"config": {
"sort-packages": true,
Expand All @@ -54,4 +53,4 @@
},
"minimum-stability": "dev",
"prefer-stable": true
}
}

0 comments on commit 4ec939c

Please sign in to comment.