Merge pull request #121 from laravel-shift/l10-compatibility

Laravel 10.x Compatibility

.github/workflows/run-tests.yml

@@ -9,15 +9,17 @@ jobs:
             fail-fast: false
             matrix:
                 os: [ubuntu-latest, windows-latest]
-                php: [8.0]
-                laravel: [9.*]
+                php: [8.0, 8.1, 8.2]
+                laravel: [9.*, 10.*]
                 dependency-version: [prefer-lowest, prefer-stable]
                 include:
+                    -   laravel: 10.*
+                        testbench: 8.*
                     -   laravel: 9.*
                         testbench: 7.*
                 exclude:
-                    -   laravel: 9.*
-                        php: 7.4
+                    -   laravel: 10.*
+                        php: 8.0
 
         name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
 

.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,"class_attributes_separation":{"elements":{"method":"one"}},"single_trait_insert_per_statement":true},"hashes":{"src\/Notifications\/Notifiable.php":"f3dd7cee9c1e1ceddede95caf5d49ce5","src\/Notifications\/Notifications\/CheckSucceeded.php":"0489cf61a22cd99dd9c2de53b75b5c01","src\/Notifications\/Notifications\/CheckWarning.php":"f23139bc61a93de477272caedfb5846a","src\/Notifications\/Notifications\/CheckFailed.php":"5b35f4dab61db2b2090515f37fa83838","src\/Notifications\/Notifications\/CheckRestored.php":"f22917b928bcdf9113c14bf8e1127167","src\/Notifications\/EventHandler.php":"014f02aabf4f76d56a9b9af473a499ac","src\/Notifications\/BaseNotification.php":"fda317f5ca4e8e030d771353481e33ee","src\/Exceptions\/InvalidCheckDefinition.php":"b0ced433187e62c1b1dfcd0f1a546480","src\/Exceptions\/InvalidConfiguration.php":"94dabb6a8d44e2ec4da454321cb9d77e","src\/CheckCollection.php":"9e6714ff0861edfafe4b5c45841b5211","src\/Events\/Event.php":"397d2192c418ae5891f35c9f542ece43","src\/Events\/CheckSucceeded.php":"ee946d811ecc0bda92d2401dbaa2aaa7","src\/Events\/CheckWarning.php":"9c664f67117dea150f6d8e81450adceb","src\/Events\/CheckFailed.php":"208667e3c480cb1d726e1cbe8c09b6aa","src\/Events\/CheckRestored.php":"76a9917a5c8c25bf82ad736eb199797f","src\/HostRepository.php":"49dac4d0fc6e43777eeaaaae0c837252","src\/Helpers\/ConsoleOutput.php":"724c4ff53a789501f3b1fb700197ea62","src\/ServerMonitorServiceProvider.php":"3da4293806b0341a4e63e004dedff09b","src\/Manipulators\/Manipulator.php":"de9263463f5da859ccfa92039d10f05d","src\/Manipulators\/Passthrough.php":"e5d184a7a07e56c99dc1109b4898520a","src\/CheckDefinitions\/Elasticsearch.php":"8f8af0ead201a500ce2284a190f26b7b","src\/CheckDefinitions\/MySql.php":"ea5387e6a794144c9a10ccfadbe294ad","src\/CheckDefinitions\/Diskspace.php":"7d58417abe877c7e7a8640ea9eee304e","src\/CheckDefinitions\/CheckDefinition.php":"141ff9ca4de6e8e4bea1c1bce1104ef7","src\/CheckDefinitions\/Memcached.php":"2965f69bba22c3d90245976620b45427","src\/CheckRepository.php":"a4421119796778a89bd11de45c086c08","src\/Commands\/DumpChecks.php":"9a25c3b449fee0016b5378b6dc3b91a3","src\/Commands\/SyncFile.php":"75f1a799c98f2e8663ddefc1c83a0a46","src\/Commands\/RunChecks.php":"3adb60f055f397b2d7b57bebdef53923","src\/Commands\/DeleteHost.php":"331d05040e77909385a62eb7354e979b","src\/Commands\/ListChecks.php":"d96e59f5032777ad42f25e7597da93c4","src\/Commands\/BaseCommand.php":"bf905a636896c0233d9932a71900fc45","src\/Commands\/ListHosts.php":"f89ff9c44bde7f0ac6bb514dc1538180","src\/Commands\/AddHost.php":"e21ade6dc9d20581f99325cf42e3aa35","src\/Models\/Presenters\/HostPresenter.php":"6382500f56e4ee7da8ae862c265d106f","src\/Models\/Presenters\/CheckPresenter.php":"c390d0c787fa33ca99612217858f27e8","src\/Models\/Host.php":"7d14954ddd6135ed00aa88abeca1917e","src\/Models\/Enums\/CheckStatus.php":"be524b830b1857eccb2ce7de6052fd07","src\/Models\/Enums\/HostHealth.php":"d4873471b2b5aa3a91c6969cf11bc533","src\/Models\/Concerns\/HasProcess.php":"4aa4140e2d43910cbad59e3f519b845f","src\/Models\/Concerns\/HasCustomProperties.php":"d8044a15befa4f32d5c2acc42951b849","src\/Models\/Concerns\/ThrottlesFailingNotifications.php":"6bcfb6ac05c60b9fa48f0f274099f0fc","src\/Models\/Concerns\/HandlesCheckResult.php":"1690115e0fd9ada17a68035fec53c58b","src\/Models\/Check.php":"ae68275fbfc263137b174ebb6265f7e4","tests\/Pest.php":"d8988bf7fbe2084cab6ad6e8aadb224d","tests\/SshServer.php":"601e3e3dbf0af480bf4f4c579620c742","tests\/Notifications\/NotifiableTest.php":"0d8b92dd00bcffd55f9acd00bdc7913c","tests\/Notifications\/EventHandlerTest.php":"302f2f9f6873b1b77ae246c4dc6de44f","tests\/Events\/CheckRestoredTest.php":"37021721bd0bb62be36176391e2deb98","tests\/Events\/CheckWarningTest.php":"96e06ad48d24b448987f03407899b567","tests\/Events\/CheckSucceededTest.php":"35a19a2e267da8d855734c17d4a535dc","tests\/Events\/CheckFailedTest.php":"216bbc4db1103b996adfd0a23912f273","tests\/TestCase.php":"96fa269add0fcd0164e8ca1fa345885f","tests\/CheckDefinitions\/CheckDefinitionTest.php":"6ae486599bb3c95ee7a1fb1701cd03a4","tests\/CheckDefinitions\/ElasticsearchTest.php":"4f3cb04c8d87ea002aecb81b1b612be6","tests\/CheckDefinitions\/DiskspaceTest.php":"9b416fc021d5b2cc0a3c83db0f98076b","tests\/CheckDefinitions\/MySqlTest.php":"ff5f3f0c8103191674bd0267ea8f031b","tests\/CheckDefinitions\/MemcachedTest.php":"729d2fe3cefea770a97c33ec0ecad74b","tests\/IntegrationTest.php":"2396973cbc15218b5c3409d60eefaedc","tests\/Commands\/DumpChecksTest.php":"4e9a22a3ba192f1979f0e13f136e1478","tests\/Commands\/ListHostsTest.php":"bd02e0fe1950c47a7de884dc24aa537a","tests\/Commands\/SyncFileTest.php":"5fe8b0b25463ec30c881d5e89182d2d1","tests\/Commands\/ListChecksTest.php":"21fe802f2db6ded27ece9dab18bfce2b","tests\/Models\/CheckTest.php":"b1d5415fc5cbcb90748ca265cc732027","tests\/Models\/Concerns\/ThrottlesFailingNotificationsTest.php":"95a8841b48d5d39dfeda22cd34a0f661","tests\/Models\/Concerns\/HasCustomPropertiesTest.php":"ddda02361b5a4b8264519c0491fdbe2f","tests\/Models\/Concerns\/HasProcessTest.php":"9e1be573adb8dbc58fbd3e65a9b6cb10","tests\/Models\/HostTest.php":"40a1ad952317ae2e70b40e2b7973da85","tests\/Datasets\/events.php":"03407330b36140d49eb798b01286df43","tests\/Datasets\/percentage.php":"cd6229c9226b11f36bea78e2cd9b3011"}}
+{"php":"8.1.14","version":"3.13.2","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,"class_attributes_separation":{"elements":{"method":"one"}},"single_trait_insert_per_statement":true},"hashes":{"src\/ServerMonitorServiceProvider.php":"3da4293806b0341a4e63e004dedff09b","src\/CheckDefinitions\/Diskspace.php":"7d58417abe877c7e7a8640ea9eee304e","src\/CheckDefinitions\/CheckDefinition.php":"141ff9ca4de6e8e4bea1c1bce1104ef7","src\/CheckDefinitions\/Elasticsearch.php":"8f8af0ead201a500ce2284a190f26b7b","src\/CheckDefinitions\/MySql.php":"ea5387e6a794144c9a10ccfadbe294ad","src\/CheckDefinitions\/Memcached.php":"2965f69bba22c3d90245976620b45427","src\/HostRepository.php":"49dac4d0fc6e43777eeaaaae0c837252","src\/CheckCollection.php":"9e6714ff0861edfafe4b5c45841b5211","src\/Events\/CheckWarning.php":"9c664f67117dea150f6d8e81450adceb","src\/Events\/Event.php":"397d2192c418ae5891f35c9f542ece43","src\/Events\/CheckFailed.php":"208667e3c480cb1d726e1cbe8c09b6aa","src\/Events\/CheckRestored.php":"76a9917a5c8c25bf82ad736eb199797f","src\/Events\/CheckSucceeded.php":"ee946d811ecc0bda92d2401dbaa2aaa7","src\/Notifications\/BaseNotification.php":"fda317f5ca4e8e030d771353481e33ee","src\/Notifications\/Notifications\/CheckWarning.php":"f23139bc61a93de477272caedfb5846a","src\/Notifications\/Notifications\/CheckFailed.php":"5b35f4dab61db2b2090515f37fa83838","src\/Notifications\/Notifications\/CheckRestored.php":"f22917b928bcdf9113c14bf8e1127167","src\/Notifications\/Notifications\/CheckSucceeded.php":"0489cf61a22cd99dd9c2de53b75b5c01","src\/Notifications\/Notifiable.php":"f3dd7cee9c1e1ceddede95caf5d49ce5","src\/Notifications\/EventHandler.php":"014f02aabf4f76d56a9b9af473a499ac","src\/CheckRepository.php":"a4421119796778a89bd11de45c086c08","src\/Models\/Presenters\/HostPresenter.php":"6382500f56e4ee7da8ae862c265d106f","src\/Models\/Presenters\/CheckPresenter.php":"c390d0c787fa33ca99612217858f27e8","src\/Models\/Concerns\/HasCustomProperties.php":"d8044a15befa4f32d5c2acc42951b849","src\/Models\/Concerns\/HandlesCheckResult.php":"1690115e0fd9ada17a68035fec53c58b","src\/Models\/Concerns\/ThrottlesFailingNotifications.php":"6bcfb6ac05c60b9fa48f0f274099f0fc","src\/Models\/Concerns\/HasProcess.php":"4aa4140e2d43910cbad59e3f519b845f","src\/Models\/Enums\/CheckStatus.php":"be524b830b1857eccb2ce7de6052fd07","src\/Models\/Enums\/HostHealth.php":"d4873471b2b5aa3a91c6969cf11bc533","src\/Models\/Host.php":"7d14954ddd6135ed00aa88abeca1917e","src\/Models\/Check.php":"ae68275fbfc263137b174ebb6265f7e4","src\/Commands\/AddHost.php":"e21ade6dc9d20581f99325cf42e3aa35","src\/Commands\/SyncFile.php":"75f1a799c98f2e8663ddefc1c83a0a46","src\/Commands\/RunChecks.php":"3adb60f055f397b2d7b57bebdef53923","src\/Commands\/ListChecks.php":"d96e59f5032777ad42f25e7597da93c4","src\/Commands\/DumpChecks.php":"9a25c3b449fee0016b5378b6dc3b91a3","src\/Commands\/ListHosts.php":"f89ff9c44bde7f0ac6bb514dc1538180","src\/Commands\/BaseCommand.php":"bf905a636896c0233d9932a71900fc45","src\/Commands\/DeleteHost.php":"331d05040e77909385a62eb7354e979b","src\/Manipulators\/Manipulator.php":"de9263463f5da859ccfa92039d10f05d","src\/Manipulators\/Passthrough.php":"e5d184a7a07e56c99dc1109b4898520a","src\/Exceptions\/InvalidConfiguration.php":"94dabb6a8d44e2ec4da454321cb9d77e","src\/Exceptions\/InvalidCheckDefinition.php":"b0ced433187e62c1b1dfcd0f1a546480","src\/Helpers\/ConsoleOutput.php":"724c4ff53a789501f3b1fb700197ea62","tests\/TestCase.php":"96fa269add0fcd0164e8ca1fa345885f","tests\/CheckDefinitions\/CheckDefinitionTest.php":"6ae486599bb3c95ee7a1fb1701cd03a4","tests\/CheckDefinitions\/DiskspaceTest.php":"9b416fc021d5b2cc0a3c83db0f98076b","tests\/CheckDefinitions\/ElasticsearchTest.php":"4f3cb04c8d87ea002aecb81b1b612be6","tests\/CheckDefinitions\/MySqlTest.php":"ff5f3f0c8103191674bd0267ea8f031b","tests\/CheckDefinitions\/MemcachedTest.php":"729d2fe3cefea770a97c33ec0ecad74b","tests\/SshServer.php":"601e3e3dbf0af480bf4f4c579620c742","tests\/Events\/CheckFailedTest.php":"216bbc4db1103b996adfd0a23912f273","tests\/Events\/CheckRestoredTest.php":"37021721bd0bb62be36176391e2deb98","tests\/Events\/CheckSucceededTest.php":"35a19a2e267da8d855734c17d4a535dc","tests\/Events\/CheckWarningTest.php":"96e06ad48d24b448987f03407899b567","tests\/Notifications\/EventHandlerTest.php":"302f2f9f6873b1b77ae246c4dc6de44f","tests\/Notifications\/NotifiableTest.php":"0d8b92dd00bcffd55f9acd00bdc7913c","tests\/Datasets\/percentage.php":"cd6229c9226b11f36bea78e2cd9b3011","tests\/Datasets\/events.php":"03407330b36140d49eb798b01286df43","tests\/Models\/CheckTest.php":"b1d5415fc5cbcb90748ca265cc732027","tests\/Models\/Concerns\/HasProcessTest.php":"9e1be573adb8dbc58fbd3e65a9b6cb10","tests\/Models\/Concerns\/HasCustomPropertiesTest.php":"ddda02361b5a4b8264519c0491fdbe2f","tests\/Models\/Concerns\/ThrottlesFailingNotificationsTest.php":"95a8841b48d5d39dfeda22cd34a0f661","tests\/Models\/HostTest.php":"40a1ad952317ae2e70b40e2b7973da85","tests\/Commands\/SyncFileTest.php":"5fe8b0b25463ec30c881d5e89182d2d1","tests\/Commands\/ListChecksTest.php":"21fe802f2db6ded27ece9dab18bfce2b","tests\/Commands\/ListHostsTest.php":"bd02e0fe1950c47a7de884dc24aa537a","tests\/Commands\/DumpChecksTest.php":"4e9a22a3ba192f1979f0e13f136e1478","tests\/Pest.php":"d8988bf7fbe2084cab6ad6e8aadb224d","tests\/IntegrationTest.php":"2396973cbc15218b5c3409d60eefaedc"}}

composer.json

@@ -19,14 +19,14 @@
         "ext-json": "*",
         "php": "^8.0",
         "guzzlehttp/guzzle": "^7.0",
-        "laravel/framework": "^9.0",
+        "laravel/framework": "^9.0|^10.0",
         "spatie/laravel-blink": "^1.3",
-        "spatie/regex": "^1.1",
+        "spatie/regex": "^1.1|^3.1",
         "symfony/process": "^6.0"
     },
     "require-dev": {
         "mockery/mockery": "^1.4",
-        "orchestra/testbench": "^7.0",
+        "orchestra/testbench": "^7.0|^8.0",
         "pestphp/pest": "^1.22",
         "phpunit/phpunit": "^9.3"
     },