From 12be3c7e9b84ed0b7ffc51effbb1d4b30c991f89 Mon Sep 17 00:00:00 2001 From: Giso Stallenberg Date: Fri, 19 May 2023 15:22:18 +0200 Subject: [PATCH 1/8] Allow Nova 4 Ran tests against Nova 4.22.2, this works fine --- composer.json | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index d269c63..671ea1c 100644 --- a/composer.json +++ b/composer.json @@ -14,10 +14,11 @@ } ], "require": { - "php": ">=7.4||^8.0.2", - "illuminate/http": "^8.0||^9.0", - "illuminate/support": "^8.0||^9.0", - "laravel/nova": "^3.0" + "php": "^8.0.2", + "illuminate/http": "^9.0||^10.0", + "illuminate/support": "^9.0||^10.0", + "laravel/nova": "^3.0||^4.0", + "cakephp/chronos": "^2.0" }, "autoload": { "psr-4": { @@ -30,7 +31,8 @@ } }, "require-dev": { - "orchestra/testbench": "^6.0||^7.0" + "phpunit/phpunit": "^9.0", + "orchestra/testbench": "^7.0||^8.0" }, "minimum-stability": "dev", "prefer-stable": true, From 2f27af5282b139996b3b23f2f401a99de1a4ef75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krishan=20K=C3=B6nig?= Date: Mon, 29 May 2023 09:02:07 +0200 Subject: [PATCH 2/8] Update run-tests.yml --- .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 da875fa..bd6e145 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -32,7 +32,7 @@ jobs: - name: Install dependencies run: | composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update - composer config "http-basic.nova.laravel.com" "${{ secrets.NOVA_USERNAME }}" "${{ secrets.NOVA_PASSWORD }}" + composer config "http-basic.nova.laravel.com" "${{ secrets.NOVA_USERNAME }}" "${{ secrets.NOVA_LICENSE_KEY }}" composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction env: COMPOSER_AUTH: ${{ secrets.COMPOSER_AUTH }} From 76e748876a88874d33283087a69651be0d973055 Mon Sep 17 00:00:00 2001 From: Naoray Date: Mon, 29 May 2023 07:02:22 +0000 Subject: [PATCH 3/8] 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 ec3df34..e501413 100644 --- a/.php-cs-fixer.cache +++ b/.php-cs-fixer.cache @@ -1 +1 @@ -{"php":"8.1.1","version":"3.5.0","indent":" ","lineEnding":"\n","rules":{"binary_operator_spaces":{"default":"single_space","operators":{"=>":null}},"blank_line_after_namespace":true,"blank_line_after_opening_tag":true,"blank_line_before_statement":{"statements":["return"]},"braces":true,"cast_spaces":true,"class_attributes_separation":{"elements":{"method":"one"}},"class_definition":true,"concat_space":{"spacing":"none"},"declare_equal_normalize":true,"elseif":true,"encoding":true,"full_opening_tag":true,"fully_qualified_strict_types":true,"function_declaration":true,"function_typehint_space":true,"heredoc_to_nowdoc":true,"include":true,"increment_style":{"style":"post"},"indentation_type":true,"linebreak_after_opening_tag":true,"line_ending":true,"lowercase_cast":true,"constant_case":true,"lowercase_keywords":true,"lowercase_static_reference":true,"magic_method_casing":true,"magic_constant_casing":true,"method_argument_space":true,"native_function_casing":true,"no_alias_functions":true,"no_extra_blank_lines":{"tokens":["extra","throw","use","use_trait"]},"no_blank_lines_after_class_opening":true,"no_blank_lines_after_phpdoc":true,"no_closing_tag":true,"no_empty_phpdoc":true,"no_empty_statement":true,"no_leading_import_slash":true,"no_leading_namespace_whitespace":true,"no_mixed_echo_print":{"use":"echo"},"no_multiline_whitespace_around_double_arrow":true,"multiline_whitespace_before_semicolons":{"strategy":"no_multi_line"},"no_short_bool_cast":true,"no_singleline_whitespace_before_semicolons":true,"no_spaces_after_function_name":true,"no_spaces_around_offset":true,"no_spaces_inside_parenthesis":true,"no_trailing_comma_in_list_call":true,"no_trailing_comma_in_singleline_array":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"no_unneeded_control_parentheses":true,"no_unreachable_default_argument_value":true,"no_useless_return":true,"no_whitespace_before_comma_in_array":true,"no_whitespace_in_blank_line":true,"normalize_index_brace":true,"not_operator_with_successor_space":true,"object_operator_without_whitespace":true,"ordered_imports":{"sort_algorithm":"alpha"},"phpdoc_indent":true,"general_phpdoc_tag_rename":{"fix_inline":true},"phpdoc_no_access":true,"phpdoc_no_package":true,"phpdoc_no_useless_inheritdoc":true,"phpdoc_scalar":true,"phpdoc_single_line_var_spacing":true,"phpdoc_summary":true,"phpdoc_to_comment":true,"phpdoc_trim":true,"phpdoc_types":true,"phpdoc_var_without_name":true,"psr_autoloading":true,"self_accessor":true,"short_scalar_cast":true,"single_blank_line_at_eof":true,"single_blank_line_before_namespace":true,"single_class_element_per_statement":true,"single_import_per_statement":true,"single_line_after_imports":true,"single_line_comment_style":{"comment_types":["hash"]},"single_quote":true,"space_after_semicolon":true,"standardize_not_equals":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"ternary_operator_spaces":true,"trailing_comma_in_multiline":true,"trim_array_spaces":true,"unary_operator_spaces":true,"visibility_required":{"elements":["method","property"]},"whitespace_after_comma_in_array":true},"hashes":{"src\/Exceptions\/AttributeCast.php":434103662,"src\/JSON.php":694837827,"tests\/ViewRestrictionTest.php":2932397528,"tests\/TestCase.php":3876162363,"tests\/JSONTest.php":611995313}} \ No newline at end of file +{"php":"8.2.6","version":"3.17.0","indent":" ","lineEnding":"\n","rules":{"binary_operator_spaces":{"default":"single_space","operators":{"=>":null}},"blank_line_after_namespace":true,"blank_line_after_opening_tag":true,"blank_line_before_statement":{"statements":["return"]},"braces":true,"cast_spaces":true,"class_attributes_separation":{"elements":{"method":"one"}},"class_definition":true,"concat_space":{"spacing":"none"},"declare_equal_normalize":true,"elseif":true,"encoding":true,"full_opening_tag":true,"fully_qualified_strict_types":true,"function_declaration":true,"function_typehint_space":true,"heredoc_to_nowdoc":true,"include":true,"increment_style":{"style":"post"},"indentation_type":true,"linebreak_after_opening_tag":true,"line_ending":true,"lowercase_cast":true,"constant_case":true,"lowercase_keywords":true,"lowercase_static_reference":true,"magic_method_casing":true,"magic_constant_casing":true,"method_argument_space":true,"native_function_casing":true,"no_alias_functions":true,"no_extra_blank_lines":{"tokens":["extra","throw","use","use_trait"]},"no_blank_lines_after_class_opening":true,"no_blank_lines_after_phpdoc":true,"no_closing_tag":true,"no_empty_phpdoc":true,"no_empty_statement":true,"no_leading_import_slash":true,"no_leading_namespace_whitespace":true,"no_mixed_echo_print":{"use":"echo"},"no_multiline_whitespace_around_double_arrow":true,"multiline_whitespace_before_semicolons":{"strategy":"no_multi_line"},"no_short_bool_cast":true,"no_singleline_whitespace_before_semicolons":true,"no_spaces_after_function_name":true,"no_spaces_around_offset":true,"no_spaces_inside_parenthesis":true,"no_trailing_comma_in_list_call":true,"no_trailing_comma_in_singleline_array":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"no_unneeded_control_parentheses":true,"no_unreachable_default_argument_value":true,"no_useless_return":true,"no_whitespace_before_comma_in_array":true,"no_whitespace_in_blank_line":true,"normalize_index_brace":true,"not_operator_with_successor_space":true,"object_operator_without_whitespace":true,"ordered_imports":{"sort_algorithm":"alpha"},"phpdoc_indent":true,"general_phpdoc_tag_rename":{"fix_inline":true},"phpdoc_no_access":true,"phpdoc_no_package":true,"phpdoc_no_useless_inheritdoc":true,"phpdoc_scalar":true,"phpdoc_single_line_var_spacing":true,"phpdoc_summary":true,"phpdoc_to_comment":true,"phpdoc_trim":true,"phpdoc_types":true,"phpdoc_var_without_name":true,"psr_autoloading":true,"self_accessor":true,"short_scalar_cast":true,"single_blank_line_at_eof":true,"single_blank_line_before_namespace":true,"single_class_element_per_statement":true,"single_import_per_statement":true,"single_line_after_imports":true,"single_line_comment_style":{"comment_types":["hash"]},"single_quote":true,"space_after_semicolon":true,"standardize_not_equals":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"ternary_operator_spaces":true,"trailing_comma_in_multiline":true,"trim_array_spaces":true,"unary_operator_spaces":true,"visibility_required":{"elements":["method","property"]},"whitespace_after_comma_in_array":true},"hashes":{"src\/Exceptions\/AttributeCast.php":"68100ab4410c9d9acf2a5b2028e3e012","src\/JSON.php":"d3d95feee5574ff5cb957ff56e9bdaef","tests\/JSONTest.php":"2aa9e4fd93aec9b1307542cb1a324c05","tests\/TestCase.php":"f8ee8b282f455932565a70b1c072d254","tests\/ViewRestrictionTest.php":"20fc5b6273f279627a3c62e3c9da14f4"}} \ No newline at end of file From 9483c8683be526e6cfc0dfc309918981f33ddf20 Mon Sep 17 00:00:00 2001 From: Krishan Koenig Date: Mon, 29 May 2023 09:06:23 +0200 Subject: [PATCH 4/8] wip --- .github/workflows/run-tests-old.yml | 41 ----------------------------- .github/workflows/run-tests.yml | 8 ++++-- 2 files changed, 6 insertions(+), 43 deletions(-) delete mode 100644 .github/workflows/run-tests-old.yml diff --git a/.github/workflows/run-tests-old.yml b/.github/workflows/run-tests-old.yml deleted file mode 100644 index 137c0f2..0000000 --- a/.github/workflows/run-tests-old.yml +++ /dev/null @@ -1,41 +0,0 @@ -name: run-tests-old - -on: [push, pull_request] - -jobs: - test: - runs-on: ${{ matrix.os }} - strategy: - fail-fast: true - matrix: - os: [ubuntu-latest] - php: [7.4, 8.0] - laravel: [8.*] - dependency-version: [prefer-stable] - include: - - laravel: 8.* - testbench: 6.* - - name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }} - - steps: - - name: Checkout code - uses: actions/checkout@v2 - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php }} - extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo - coverage: none - - - name: Install dependencies - run: | - composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update - composer config "http-basic.nova.laravel.com" "${{ secrets.NOVA_USERNAME }}" "${{ secrets.NOVA_PASSWORD }}" - composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction - env: - COMPOSER_AUTH: ${{ secrets.COMPOSER_AUTH }} - - - name: Execute tests - run: vendor/bin/phpunit diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index bd6e145..e7a53af 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -9,12 +9,16 @@ jobs: fail-fast: true matrix: os: [ubuntu-latest] - php: [8.0, 8.1] - laravel: [9.*] + php: [8.1, 8.2] + laravel: [9.*, 10.*] dependency-version: [prefer-stable] include: - laravel: 9.* testbench: 7.* + php: 8.1 + - laravel: 10.* + testbench: 8.* + php: 8.2 name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }} From 62de51a0c77a77998365bf5a01c2ea2d5caee6ab Mon Sep 17 00:00:00 2001 From: Krishan Koenig Date: Mon, 29 May 2023 09:11:06 +0200 Subject: [PATCH 5/8] wip --- .github/workflows/run-tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index e7a53af..e4a7597 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -12,6 +12,7 @@ jobs: php: [8.1, 8.2] laravel: [9.*, 10.*] dependency-version: [prefer-stable] + testbench: [7.*, 8.*] include: - laravel: 9.* testbench: 7.* @@ -20,7 +21,7 @@ jobs: testbench: 8.* php: 8.2 - name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }} + name: P${{ matrix.php }} - L${{ matrix.laravel }} - T{{ matrix.testbench }} - ${{ matrix.dependency-version }} - ${{ matrix.os }} steps: - name: Checkout code From 590a74f647f7f47fbb042b41b0728cd2f3fb2e15 Mon Sep 17 00:00:00 2001 From: Krishan Koenig Date: Mon, 29 May 2023 09:12:37 +0200 Subject: [PATCH 6/8] wip --- .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 e4a7597..1f3db9c 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -21,7 +21,7 @@ jobs: testbench: 8.* php: 8.2 - name: P${{ matrix.php }} - L${{ matrix.laravel }} - T{{ matrix.testbench }} - ${{ matrix.dependency-version }} - ${{ matrix.os }} + name: P${{ matrix.php }} - L${{ matrix.laravel }} - T${{ matrix.testbench }} - ${{ matrix.dependency-version }} - ${{ matrix.os }} steps: - name: Checkout code From 6133cb416f90d699c52828e7950984062c2b9e14 Mon Sep 17 00:00:00 2001 From: Krishan Koenig Date: Mon, 29 May 2023 09:15:03 +0200 Subject: [PATCH 7/8] wip --- .github/workflows/run-tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 1f3db9c..ffbf6da 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -20,6 +20,9 @@ jobs: - laravel: 10.* testbench: 8.* php: 8.2 + exclude: + - laravel: 10.* + php: 8.0 name: P${{ matrix.php }} - L${{ matrix.laravel }} - T${{ matrix.testbench }} - ${{ matrix.dependency-version }} - ${{ matrix.os }} From cbdab3f68dc5c14682333b13bd6f639d61f708ba Mon Sep 17 00:00:00 2001 From: Krishan Koenig Date: Mon, 29 May 2023 09:15:58 +0200 Subject: [PATCH 8/8] wip --- .github/workflows/run-tests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index ffbf6da..91902c0 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -21,8 +21,10 @@ jobs: testbench: 8.* php: 8.2 exclude: + - laravel: 9.* + testbench: 8.* - laravel: 10.* - php: 8.0 + testbench: 7.* name: P${{ matrix.php }} - L${{ matrix.laravel }} - T${{ matrix.testbench }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}