From f3ffae7d869b077a41bd0e3d1b85e8a6d636c56c Mon Sep 17 00:00:00 2001 From: Ivan Dmitriev <28255085+zKoz210@users.noreply.github.com> Date: Tue, 16 May 2023 13:14:07 +0300 Subject: [PATCH 1/4] Fixed tests for PHP 8.2 --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 7dea842..1090a5c 100644 --- a/composer.json +++ b/composer.json @@ -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" }, @@ -54,4 +54,4 @@ }, "minimum-stability": "dev", "prefer-stable": true -} \ No newline at end of file +} From a9ea164d617cb980370c9f5218281615ec3d9833 Mon Sep 17 00:00:00 2001 From: Ivan Dmitriev <28255085+zKoz210@users.noreply.github.com> Date: Tue, 16 May 2023 13:15:31 +0300 Subject: [PATCH 2/4] Fixed for 8.2 --- .github/workflows/run-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index f8a9760..c3ca994 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -9,7 +9,7 @@ jobs: fail-fast: true matrix: os: [ubuntu-latest] - php: [8.1, 8.0] + php: [8.2, 8.1, 8.0] stability: [prefer-lowest, prefer-stable] name: P${{ matrix.php }} - ${{ matrix.stability }} - ${{ matrix.os }} From 375a41378553a7ba149051ca8cb733345bb19515 Mon Sep 17 00:00:00 2001 From: Ivan Dmitriev <28255085+zKoz210@users.noreply.github.com> Date: Tue, 16 May 2023 13:20:15 +0300 Subject: [PATCH 3/4] Fixed php-cs-fixer --- .php-cs-fixer.cache | 2 +- composer.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache index 66db98c..436fc65 100644 --- a/.php-cs-fixer.cache +++ b/.php-cs-fixer.cache @@ -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"}} \ No newline at end of file +{"php":"8.2.6","version":"3.16.0:v3.16.0#d40f9436e1c448d309fa995ab9c14c5c7a96f2dc","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\/Connection.php":"2cfcaf4c3df1c8488f448badfdcfaad0","src\/Exceptions\/CouldNotManageTask.php":"ff4093a3769e440abb4f1d59e502a85e","src\/Task.php":"3876dd1bc99af211f5eeb4e96289b17b","src\/Fork.php":"f444751dc017eb3510967f46bbdb219c","tests\/ForkTest.php":"743fe8646b4edf28801062c5ef806e1c","tests\/Pest.php":"d505920f050280f3fd9432b355daa382"}} \ No newline at end of file diff --git a/composer.json b/composer.json index 7dea842..eb52b22 100644 --- a/composer.json +++ b/composer.json @@ -25,6 +25,7 @@ "ext-pcntl": "*" }, "require-dev": { + "friendsofphp/php-cs-fixer": "^3.16", "nesbot/carbon": "^2.47", "pestphp/pest": "^1.22", "phpunit/phpunit": "^9.5", @@ -41,10 +42,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, @@ -54,4 +54,4 @@ }, "minimum-stability": "dev", "prefer-stable": true -} \ No newline at end of file +} From d40d6261dc39afa3d61db7cf4577a27d55a0d6f8 Mon Sep 17 00:00:00 2001 From: freekmurze Date: Tue, 16 May 2023 15:16:21 +0000 Subject: [PATCH 4/4] Fix styling --- .php-cs-fixer.cache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache index 436fc65..7207b6c 100644 --- a/.php-cs-fixer.cache +++ b/.php-cs-fixer.cache @@ -1 +1 @@ -{"php":"8.2.6","version":"3.16.0:v3.16.0#d40f9436e1c448d309fa995ab9c14c5c7a96f2dc","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\/Connection.php":"2cfcaf4c3df1c8488f448badfdcfaad0","src\/Exceptions\/CouldNotManageTask.php":"ff4093a3769e440abb4f1d59e502a85e","src\/Task.php":"3876dd1bc99af211f5eeb4e96289b17b","src\/Fork.php":"f444751dc017eb3510967f46bbdb219c","tests\/ForkTest.php":"743fe8646b4edf28801062c5ef806e1c","tests\/Pest.php":"d505920f050280f3fd9432b355daa382"}} \ No newline at end of file +{"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"}} \ No newline at end of file