From 8951ebc69faeb93b872c9c1bf4ae3f0fcf0fb021 Mon Sep 17 00:00:00 2001 From: Peter Papp Date: Fri, 23 Jul 2021 10:50:29 +0200 Subject: [PATCH] php cs fixer tweak --- .gitignore | 1 + .php-cs-fixer.cache | 1 - .php-cs-fixer.dist.php | 91 ++++++++++--------- routes/channels.php | 4 +- src/App/Providers/AuthServiceProvider.php | 4 +- src/App/Providers/FortifyServiceProvider.php | 8 +- src/App/Users/Models/User.php | 4 +- .../Users/Resources/UserStorageResource.php | 20 +--- .../Controllers/PaymentMethodsController.php | 8 +- .../Controllers/ActivePlansController.php | 4 +- .../Plans/Controllers/PlansController.php | 12 +-- .../Controllers/StripeWebhookController.php | 4 +- .../Subscriptions/Traits/Subscription.php | 4 +- src/Support/helpers.php | 8 +- tests/Domain/Browsing/BrowseTest.php | 2 +- 15 files changed, 70 insertions(+), 105 deletions(-) delete mode 100644 .php-cs-fixer.cache diff --git a/.gitignore b/.gitignore index a11cda22..34af7727 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ .env .env.backup .env.testing +.php-cs-fixer.cache .phpunit.result.cache .phpstorm.meta.php .vscode/ diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache deleted file mode 100644 index ca871cd9..00000000 --- a/.php-cs-fixer.cache +++ /dev/null @@ -1 +0,0 @@ -{"php":"8.0.5","version":"3.0.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_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":"length"},"blank_line_before_statement":{"statements":["break","case","continue","declare","default","do","exit","for","foreach","goto","if","include","include_once","require","require_once","return","switch","throw","try","while","yield","yield_from"]},"no_extra_blank_lines":{"tokens":["break","case","continue","curly_brace_block","default","extra","parenthesis_brace_block","return","square_brace_block","switch","throw","use","use_trait"]},"cast_spaces":{"space":"single"},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"single_space_after_construct":true,"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":{"elements":["arrays"]},"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":{"operators":{"=>":"align"}},"method_chaining_indentation":true,"array_indentation":true,"single_quote":true,"no_singleline_whitespace_before_semicolons":true,"no_empty_statement":true,"standardize_increment":true,"object_operator_without_whitespace":true,"ternary_operator_spaces":true,"no_leading_namespace_whitespace":true,"no_blank_lines_before_namespace":true,"fully_qualified_strict_types":true,"single_line_throw":true,"function_typehint_space":true,"simplified_if_return":true,"no_useless_else":true,"no_unneeded_curly_braces":true,"no_empty_comment":true,"no_blank_lines_after_class_opening":true,"whitespace_after_comma_in_array":true,"trim_array_spaces":true,"no_whitespace_before_comma_in_array":true,"lowercase_static_reference":true},"hashes":{"src\/Domain\/Maintenance\/Controllers\/UpgradeTranslationsController.php":2644594253,"src\/Domain\/Maintenance\/Controllers\/MaintenanceModeController.php":1451041354,"src\/Domain\/Maintenance\/Controllers\/UpgradeDatabaseController.php":2652101690,"src\/Domain\/Items\/Controllers\/MoveFileOrFolderController.php":3990411940,"src\/Domain\/Items\/Controllers\/DeleteFileOrFolderController.php":4017001778,"src\/Domain\/Items\/Controllers\/VisitorMoveFileOrFolderController.php":4133927410,"src\/Domain\/Items\/Controllers\/RenameFileOrFolderController.php":982133499,"src\/Domain\/Items\/Controllers\/VisitorRenameFileOrFolderController.php":2095761532,"src\/Domain\/Items\/Controllers\/VisitorDeleteFileOrFolderController.php":1843242456,"src\/Domain\/Items\/Requests\/SearchRequest.php":3915754011,"src\/Domain\/Items\/Requests\/RenameItemRequest.php":869834870,"src\/Domain\/Items\/Requests\/DeleteItemRequest.php":3562895210,"src\/Domain\/Items\/Requests\/MoveItemRequest.php":3714785345,"src\/Domain\/Items\/Actions\/RenameFileOrFolderAction.php":3056187063,"src\/Domain\/Items\/Actions\/DeleteFileOrFolderAction.php":2999842483,"src\/Domain\/Items\/Actions\/MoveFileOrFolderAction.php":4082223549,"src\/Domain\/SetupWizard\/Controllers\/VerifyPurchaseCodeController.php":3718807387,"src\/Domain\/SetupWizard\/Controllers\/StoreDatabaseCredentialsController.php":2740332755,"src\/Domain\/SetupWizard\/Controllers\/CreateAdminAccountController.php":1096510376,"src\/Domain\/SetupWizard\/Controllers\/StorePlansController.php":3923598198,"src\/Domain\/SetupWizard\/Controllers\/StoreBillingsController.php":2228977234,"src\/Domain\/SetupWizard\/Controllers\/StoreEnvironmentSettingsController.php":1720755933,"src\/Domain\/SetupWizard\/Controllers\/StoreAppSettingsController.php":3457087309,"src\/Domain\/SetupWizard\/Controllers\/StoreSubscriptionServiceCredentialsController.php":3182538790,"src\/Domain\/SetupWizard\/Requests\/StoreDatabaseCredentialsRequest.php":3153599268,"src\/Domain\/SetupWizard\/Requests\/StoreStripeCredentialsRequest.php":1613239783,"src\/Domain\/SetupWizard\/Requests\/StoreStripePlansRequest.php":338687488,"src\/Domain\/SetupWizard\/Requests\/StoreAppSetupRequest.php":2169040704,"src\/Domain\/SetupWizard\/Requests\/StoreStripeBillingRequest.php":3858494405,"src\/Domain\/SetupWizard\/Requests\/StoreEnvironmentSetupRequest.php":4231339557,"src\/Domain\/SetupWizard\/Actions\/CreateDiskDirectoriesAction.php":484541254,"src\/Domain\/Pages\/Controllers\/PagesController.php":1845958287,"src\/Domain\/Pages\/Controllers\/AdminPagesController.php":3009775295,"src\/Domain\/Pages\/Models\/Page.php":4181722910,"src\/Domain\/Pages\/Actions\/SeedDefaultPagesAction.php":2606699268,"src\/Domain\/Pages\/Resources\/PageResource.php":804960304,"src\/Domain\/Pages\/Resources\/PageCollection.php":1109398745,"src\/Domain\/Homepage\/Mail\/SendContactMessage.php":1931784330,"src\/Domain\/Homepage\/Controllers\/SendContactMessageController.php":2653850928,"src\/Domain\/Homepage\/Controllers\/IndexController.php":2435118094,"src\/Domain\/Homepage\/Requests\/SendContactMessageRequest.php":618962938,"src\/Domain\/Trash\/Controllers\/RestoreTrashContentController.php":1685584424,"src\/Domain\/Trash\/Controllers\/DumpTrashController.php":3172525038,"src\/Domain\/Browsing\/Controllers\/BrowseTrashContentController.php":2097576480,"src\/Domain\/Browsing\/Controllers\/BrowseSharedItemsController.php":2394731885,"src\/Domain\/Browsing\/Controllers\/VisitorBrowseFolderContentController.php":1951408970,"src\/Domain\/Browsing\/Controllers\/BrowseLatestFilesController.php":781699058,"src\/Domain\/Browsing\/Controllers\/BrowseFolderContentController.php":984177966,"src\/Domain\/Browsing\/Controllers\/SearchFilesAndFoldersController.php":4240914230,"src\/Domain\/Browsing\/Controllers\/BrowseParticipantsUploadsController.php":91702802,"src\/Domain\/Browsing\/Controllers\/VisitorSearchFilesAndFoldersController.php":2562593543,"src\/Domain\/Traffic\/Models\/Traffic.php":1860703149,"src\/Domain\/Traffic\/Actions\/RecordUploadAction.php":2871055937,"src\/Domain\/Traffic\/Actions\/RecordDownloadAction.php":1415073920,"src\/Domain\/Payments\/Notifications\/ConfirmPayment.php":307807024,"src\/Domain\/Payments\/Controllers\/PaymentMethodsController.php":1712370661,"src\/Domain\/Payments\/Requests\/RegisterNewPaymentMethodRequest.php":3671668592,"src\/Domain\/Payments\/Resources\/PaymentDefaultCardResource.php":278448519,"src\/Domain\/Payments\/Resources\/PaymentCardCollection.php":1868249469,"src\/Domain\/Payments\/Resources\/PaymentCardResource.php":1513704153,"src\/Domain\/Zip\/Controllers\/GetZipController.php":1417347096,"src\/Domain\/Zip\/Controllers\/VisitorZipFolderController.php":248434201,"src\/Domain\/Zip\/Controllers\/VisitorZipFilesController.php":2491562604,"src\/Domain\/Zip\/Controllers\/VisitorGetZipController.php":1706836363,"src\/Domain\/Zip\/Controllers\/ZipFilesController.php":1786608550,"src\/Domain\/Zip\/Controllers\/ZipFolderController.php":731482057,"src\/Domain\/Zip\/Models\/Zip.php":3680116481,"src\/Domain\/Zip\/Actions\/ZipFilesAction.php":300324621,"src\/Domain\/Zip\/Actions\/ZipFolderAction.php":1823295967,"src\/Domain\/Admin\/Controllers\/Dashboard\/GetWidgetsValuesController.php":2618362791,"src\/Domain\/Admin\/Controllers\/Dashboard\/GetNewbiesController.php":2552056753,"src\/Domain\/Admin\/Controllers\/Users\/ResetUserPasswordController.php":2738299440,"src\/Domain\/Admin\/Controllers\/Users\/ShowUserSubscriptionController.php":540588124,"src\/Domain\/Admin\/Controllers\/Users\/DeleteUserController.php":754411336,"src\/Domain\/Admin\/Controllers\/Users\/ChangeUserStorageCapacityController.php":2553200038,"src\/Domain\/Admin\/Controllers\/Users\/UserController.php":662322122,"src\/Domain\/Admin\/Controllers\/Users\/ShowUserStorageCapacityController.php":2834560763,"src\/Domain\/Admin\/Controllers\/Users\/ShowUserInvoicesController.php":3504631351,"src\/Domain\/Admin\/Controllers\/Users\/ChangeUserRoleController.php":391560077,"src\/Domain\/Admin\/Rules\/DisabledMimetypes.php":2997200023,"src\/Domain\/Admin\/Requests\/DeleteUserRequest.php":3932690923,"src\/Domain\/Admin\/Requests\/ChangeStorageCapacityRequest.php":2882784774,"src\/Domain\/Admin\/Requests\/ChangeRoleRequest.php":895694346,"src\/Domain\/Admin\/Requests\/CreateUserByAdmin.php":2022986184,"src\/Domain\/Admin\/Actions\/DeleteUserDataAction.php":756339054,"src\/Domain\/Admin\/Resources\/InvoiceAdminCollection.php":3218014726,"src\/Domain\/Admin\/Resources\/InvoiceAdminResource.php":2457012714,"src\/Domain\/Sharing\/Notifications\/SharedSendViaEmail.php":3458225874,"src\/Domain\/Sharing\/Controllers\/ShareViaEmailController.php":232846290,"src\/Domain\/Sharing\/Controllers\/WebCrawlerOpenGraphController.php":3438856114,"src\/Domain\/Sharing\/Controllers\/SharePublicIndexController.php":600927185,"src\/Domain\/Sharing\/Controllers\/ShareController.php":2150073226,"src\/Domain\/Sharing\/Controllers\/VisitorUnlockLockedShareController.php":4079161323,"src\/Domain\/Sharing\/Models\/Share.php":1348397217,"src\/Domain\/Sharing\/Requests\/AuthenticateShareRequest.php":3888247093,"src\/Domain\/Sharing\/Requests\/UpdateShareRequest.php":3570908547,"src\/Domain\/Sharing\/Requests\/CreateShareRequest.php":885822971,"src\/Domain\/Sharing\/Actions\/VerifyAccessToItemAction.php":3241138123,"src\/Domain\/Sharing\/Actions\/SendViaEmailAction.php":800942278,"src\/Domain\/Sharing\/Actions\/ProtectShareRecordAction.php":1826981583,"src\/Domain\/Sharing\/Actions\/VerifyAccessToItemWithinAction.php":2694797220,"src\/Domain\/Sharing\/Resources\/ShareResource.php":428283428,"src\/Domain\/Settings\/Controllers\/FlushCacheController.php":4188781295,"src\/Domain\/Settings\/Controllers\/UpdateSettingValueController.php":4248151808,"src\/Domain\/Settings\/Controllers\/SetEmailController.php":3142025890,"src\/Domain\/Settings\/Controllers\/SetStripeController.php":2415386507,"src\/Domain\/Settings\/Controllers\/GetAppImageController.php":3303853349,"src\/Domain\/Settings\/Controllers\/AdminSettingsController.php":2864352661,"src\/Domain\/Settings\/Controllers\/GetSettingsValueController.php":1017358438,"src\/Domain\/Settings\/Models\/Setting.php":490216685,"src\/Domain\/Settings\/Actions\/SeedDefaultSettingsAction.php":3301584051,"src\/Domain\/Folders\/Controllers\/VisitorNavigationFolderTreeController.php":3304215200,"src\/Domain\/Folders\/Controllers\/FavouriteController.php":1152886529,"src\/Domain\/Folders\/Controllers\/CreateFolderController.php":3511544498,"src\/Domain\/Folders\/Controllers\/VisitorCreateFolderController.php":2940340601,"src\/Domain\/Folders\/Controllers\/NavigationFolderTreeController.php":2264726689,"src\/Domain\/Folders\/Models\/Folder.php":2360717484,"src\/Domain\/Folders\/Requests\/CreateFolderRequest.php":3250214773,"src\/Domain\/Folders\/Actions\/CreateFolderAction.php":2014292524,"src\/Domain\/Folders\/Actions\/UpdateFolderPropertyAction.php":3806932507,"src\/Domain\/Files\/Controllers\/UploadFileController.php":593771850,"src\/Domain\/Files\/Controllers\/VisitorUploadFileController.php":623090229,"src\/Domain\/Files\/Controllers\/VisitorShowFileController.php":3951615847,"src\/Domain\/Files\/Controllers\/FileAccess\/GetThumbnailController.php":933795025,"src\/Domain\/Files\/Controllers\/FileAccess\/VisitorGetFileController.php":545426638,"src\/Domain\/Files\/Controllers\/FileAccess\/VisitorGetThumbnailController.php":3787629156,"src\/Domain\/Files\/Controllers\/FileAccess\/GetFileController.php":447783808,"src\/Domain\/Files\/Models\/File.php":486952251,"src\/Domain\/Files\/Requests\/UploadRequest.php":2180127291,"src\/Domain\/Files\/Actions\/MoveFileToExternalStorageAction.php":2709601468,"src\/Domain\/Files\/Actions\/DownloadFileAction.php":1096078613,"src\/Domain\/Files\/Actions\/DownloadThumbnailAction.php":1581897280,"src\/Domain\/Files\/Actions\/CreateImageThumbnailAction.php":1930109651,"src\/Domain\/Files\/Actions\/UploadFileAction.php":2880976833,"src\/Domain\/Files\/Resources\/FileResource.php":3568752709,"src\/Domain\/Plans\/Controllers\/PlanSubscribersController.php":1830431871,"src\/Domain\/Plans\/Controllers\/PlansController.php":4201681968,"src\/Domain\/Plans\/Controllers\/ActivePlansController.php":2618580638,"src\/Domain\/Plans\/Resources\/PlanCollection.php":479544352,"src\/Domain\/Plans\/Resources\/PricingCollection.php":4269802870,"src\/Domain\/Plans\/Resources\/PricingResource.php":1381700062,"src\/Domain\/Plans\/Resources\/PlanResource.php":1224493377,"src\/Domain\/Localization\/Controllers\/CurrentLocalizationController.php":2296919756,"src\/Domain\/Localization\/Controllers\/UpdateLanguageStringController.php":1410094220,"src\/Domain\/Localization\/Controllers\/LanguageController.php":2882282951,"src\/Domain\/Localization\/Models\/Language.php":2393280184,"src\/Domain\/Localization\/Models\/LanguageTranslation.php":3766175713,"src\/Domain\/Localization\/Requests\/CreateLanguageRequest.php":3873123394,"src\/Domain\/Localization\/Requests\/UpdateStringRequest.php":3331682525,"src\/Domain\/Localization\/Requests\/UpdateLanguageRequest.php":3573126624,"src\/Domain\/Localization\/Actions\/SeedDefaultLanguageAction.php":4181005634,"src\/Domain\/Localization\/Actions\/UpgradeLanguageTranslationsAction.php":876019107,"src\/Domain\/Localization\/Actions\/SeedDefaultLanguageTranslationsAction.php":4211393189,"src\/Domain\/Localization\/Resources\/LanguageCollection.php":2828369194,"src\/Domain\/Localization\/Resources\/LanguageResource.php":2849112965,"src\/Domain\/Subscriptions\/Traits\/Subscription.php":4011637572,"src\/Domain\/Subscriptions\/Controllers\/SubscriptionDetailsController.php":3442274930,"src\/Domain\/Subscriptions\/Controllers\/SubscriptionCancelController.php":2972917877,"src\/Domain\/Subscriptions\/Controllers\/StripeWebhookController.php":471966630,"src\/Domain\/Subscriptions\/Controllers\/GetSetupIntentController.php":49615799,"src\/Domain\/Subscriptions\/Controllers\/SubscriptionUpgradeController.php":1318344502,"src\/Domain\/Subscriptions\/Controllers\/SubscriptionResumeController.php":2863396133,"src\/Domain\/Subscriptions\/Requests\/StoreUpgradeAccountRequest.php":194700795,"src\/Domain\/Subscriptions\/Services\/StripeService.php":3712921009,"src\/Domain\/Invoices\/Controllers\/AdminInvoiceController.php":2569534036,"src\/Domain\/Invoices\/Controllers\/UserProfileInvoiceController.php":2655904242,"src\/Domain\/Invoices\/Resources\/InvoiceResource.php":4219564147,"src\/Domain\/Invoices\/Resources\/InvoiceCollection.php":1652680057,"src\/Support\/Demo\/Actions\/FakeUploadFileAction.php":2630684405,"src\/Support\/Demo\/Actions\/FakeCreateFolderAction.php":2353065512,"src\/Support\/Demo\/Actions\/FakeRenameFileOrFolderAction.php":3421858252,"src\/Support\/Middleware\/RedirectIfAuthenticated.php":4142931892,"src\/Support\/Middleware\/ProtectSetupWizardRoutes.php":4246266854,"src\/Support\/Middleware\/EncryptCookies.php":3456828796,"src\/Support\/Middleware\/CheckForMaintenanceMode.php":1277502117,"src\/Support\/Middleware\/Authenticate.php":1562238595,"src\/Support\/Middleware\/VerifyCsrfToken.php":3431871678,"src\/Support\/Middleware\/TrustProxies.php":3211891715,"src\/Support\/Middleware\/PreventRequestsDuringMaintenance.php":1674382806,"src\/Support\/Middleware\/TrimStrings.php":1961049683,"src\/Support\/helpers.php":2247288752,"src\/Support\/Scheduler\/Actions\/DeleteFailedFilesAction.php":3908511387,"src\/Support\/Scheduler\/Actions\/DeleteOldZipsAction.php":1909436997,"src\/Support\/Scheduler\/Actions\/DeleteExpiredShareLinksAction.php":1224660785,"src\/Support\/Scheduler\/Actions\/DeleteUnverifiedUsersAction.php":276033621,"src\/App\/Providers\/RouteServiceProvider.php":95001940,"src\/App\/Providers\/AuthServiceProvider.php":3232559631,"src\/App\/Providers\/BroadcastServiceProvider.php":3541093703,"src\/App\/Providers\/FortifyServiceProvider.php":1738891868,"src\/App\/Providers\/EventServiceProvider.php":3395009334,"src\/App\/Providers\/AppServiceProvider.php":2531801172,"src\/App\/Exceptions\/Handler.php":1302274777,"src\/App\/Console\/Commands\/SetupDevEnvironment.php":532395599,"src\/App\/Console\/Commands\/SetupProdEnvironment.php":1026270495,"src\/App\/Console\/Kernel.php":3091225661,"src\/App\/BaseApplication.php":4281481777,"src\/App\/Users\/Notifications\/ResetPassword.php":2360343798,"src\/App\/Users\/Controllers\/ForgotPasswordController.php":2293622684,"src\/App\/Users\/Controllers\/VerificationController.php":4139166770,"src\/App\/Users\/Controllers\/Authentication\/CheckAccountController.php":3065674241,"src\/App\/Users\/Controllers\/Authentication\/AccountAccessTokenController.php":1281274553,"src\/App\/Users\/Controllers\/ConfirmPasswordController.php":4059171253,"src\/App\/Users\/Controllers\/LoginController.php":524523779,"src\/App\/Users\/Controllers\/Verification\/ResendVerificationEmail.php":1293927862,"src\/App\/Users\/Controllers\/Verification\/VerifyEmailController.php":529843283,"src\/App\/Users\/Controllers\/Account\/UpdateProfileSettingsController.php":2497437065,"src\/App\/Users\/Controllers\/Account\/AccountDetailsController.php":3589261576,"src\/App\/Users\/Controllers\/Account\/StorageCapacityController.php":1533098768,"src\/App\/Users\/Controllers\/Account\/UpdatePasswordController.php":3777432806,"src\/App\/Users\/Controllers\/ResetPasswordController.php":2211404968,"src\/App\/Users\/Controllers\/GetAvatarController.php":922169815,"src\/App\/Users\/Models\/UserSettings.php":3061261601,"src\/App\/Users\/Models\/User.php":4181134893,"src\/App\/Users\/Requests\/UpdateUserPasswordRequest.php":1564046463,"src\/App\/Users\/Requests\/CheckAccountRequest.php":1379924218,"src\/App\/Users\/Requests\/UserCreateAccessTokenRequest.php":384275951,"src\/App\/Users\/Actions\/UpdateUserProfileInformation.php":3421905791,"src\/App\/Users\/Actions\/UpdateUserPassword.php":790079175,"src\/App\/Users\/Actions\/ResetUserPassword.php":1305018343,"src\/App\/Users\/Actions\/CreateNewUserAction.php":4137230817,"src\/App\/Users\/Actions\/CheckStorageCapacityAction.php":2341094757,"src\/App\/Users\/Actions\/PasswordValidationRules.php":2096821603,"src\/App\/Users\/Resources\/UserSubscription.php":2073937565,"src\/App\/Users\/Resources\/UserStorageResource.php":2755643131,"src\/App\/Users\/Resources\/UserResource.php":2488671338,"src\/App\/Users\/Resources\/UsersCollection.php":1455484913,"src\/App\/Http\/Controllers\/Controller.php":2646027293,"src\/App\/Http\/Kernel.php":714906759,"routes\/api.php":1359573045,"routes\/file.php":2508008990,"routes\/user.php":3341009174,"routes\/console.php":2045403946,"routes\/admin.php":2817496380,"routes\/channels.php":2877044881,"routes\/web.php":1482164113,"routes\/setup.php":1975307615,"routes\/share.php":3988131227,"routes\/maintenance.php":4230693065,"config\/database.php":1500812285,"config\/vuefilemanager.php":1126120216,"config\/hashing.php":2194319214,"config\/queue.php":113961715,"config\/sanctum.php":3054545255,"config\/mail.php":1982918162,"config\/services.php":903116839,"config\/session.php":2232050276,"config\/view.php":3441258419,"config\/custom-language-translations.php":1251541856,"config\/backup.php":2804181921,"config\/content.php":2506681111,"config\/fortify.php":3059531343,"config\/language-translations.php":573201866,"config\/cashier.php":2463606152,"config\/app.php":3163075654,"config\/cache.php":3632019567,"config\/cors.php":814133164,"config\/broadcasting.php":639178001,"config\/laravel-query-monitor.php":332751186,"config\/logging.php":1549177037,"config\/scout.php":2655201160,"config\/auth.php":3813230962,"config\/filesystems.php":22502131,"tests\/TestCase.php":367832575,"tests\/Domain\/Maintenance\/AppUpgradeTest.php":1510420996,"tests\/Domain\/SetupWizard\/SetupServiceTest.php":1213127724,"tests\/Domain\/SetupWizard\/SetupWizardTest.php":3247456775,"tests\/Domain\/Pages\/AdminPagesTest.php":1514178512,"tests\/Domain\/Pages\/PagesTest.php":1465464952,"tests\/Domain\/Homepage\/HomepageTest.php":1106685009,"tests\/Domain\/Trash\/TrashTest.php":431684796,"tests\/Domain\/Browsing\/BrowseTest.php":3607202895,"tests\/Domain\/Traffic\/TrafficTest.php":2166367209,"tests\/Domain\/Admin\/AdminTest.php":530612496,"tests\/Domain\/Admin\/DashboardTest.php":4128072940,"tests\/Domain\/Sharing\/VisitorManipulatingTest.php":2953338478,"tests\/Domain\/Sharing\/UserShareTest.php":779550006,"tests\/Domain\/Sharing\/VisitorAccessToItemsTest.php":2339683262,"tests\/Domain\/Sharing\/VisitorBrowseTest.php":4261081297,"tests\/Domain\/Settings\/SettingsTest.php":1717576989,"tests\/Domain\/Folders\/FolderTest.php":1019325207,"tests\/Domain\/Folders\/FavouriteFolderTest.php":1283817781,"tests\/Domain\/Files\/FileTest.php":3895129440,"tests\/Domain\/Files\/ContentAccessTest.php":1794692998,"tests\/Domain\/Plans\/AdminPlansTest.php":808861349,"tests\/Domain\/Plans\/PlansTest.php":2312296401,"tests\/Domain\/Plans\/SetupWizardPlansTest.php":2059187886,"tests\/Domain\/Zipping\/UserZippingTest.php":2056162100,"tests\/Domain\/Zipping\/SharedZippingTest.php":1043138230,"tests\/Domain\/Languages\/AdminLanguageTranslatorTest.php":2424126650,"tests\/Domain\/Languages\/TranslationsAccessTest.php":2419786338,"tests\/Domain\/Subscriptions\/SubscriptionTest.php":3003651712,"tests\/Domain\/Subscriptions\/AdminSubscriptionTest.php":2968792799,"tests\/Domain\/Invoices\/UserInvoicesTest.php":1862816485,"tests\/Support\/Scheduler\/SchedulerTest.php":3221558220,"tests\/App\/Users\/UserAccountTest.php":226024348,"tests\/App\/Users\/SignFlowTest.php":573910526,"tests\/App\/Users\/PersonalAccessTokenTest.php":710899839,"tests\/CreatesApplication.php":1091900543}} \ No newline at end of file diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php index db233580..6082ba62 100644 --- a/.php-cs-fixer.dist.php +++ b/.php-cs-fixer.dist.php @@ -15,61 +15,66 @@ $finder = PhpCsFixer\Finder::create() $config = new PhpCsFixer\Config(); return $config->setRules([ - '@PSR2' => true, - 'array_syntax' => [ + '@PSR2' => true, + 'nullable_type_declaration_for_default_null_value' => [ + 'use_nullable_type_declaration' => true + ], + 'array_syntax' => [ 'syntax' => 'short' ], - 'ordered_imports' => [ + 'ordered_imports' => [ 'sort_algorithm' => 'length' ], - 'blank_line_before_statement' => [ + 'blank_line_before_statement' => [ 'statements' => ['break', 'case', 'continue', 'declare', 'default', 'do', 'exit', 'for', 'foreach', 'goto', 'if', 'include', 'include_once', 'require', 'require_once', 'return', 'switch', 'throw', 'try', 'while', 'yield', 'yield_from'], ], - 'method_argument_space' => [ + 'method_argument_space' => [ 'on_multiline' => 'ensure_fully_multiline', 'keep_multiple_spaces_after_comma' => true, ], - 'no_extra_blank_lines' => [ + 'no_extra_blank_lines' => [ 'tokens' => ['break', 'case', 'continue', 'curly_brace_block', 'default', 'extra', 'parenthesis_brace_block', 'return', 'square_brace_block', 'switch', 'throw', 'use', 'use_trait'], ], - 'cast_spaces' => [ + 'cast_spaces' => [ 'space' => 'single' ], - 'phpdoc_single_line_var_spacing' => true, - 'phpdoc_var_without_name' => true, - 'single_space_after_construct' => true, - 'single_line_after_imports' => true, - 'no_unused_imports' => true, - 'not_operator_with_successor_space' => true, - 'trailing_comma_in_multiline' => ['elements' => ['arrays']], - 'phpdoc_scalar' => true, - 'unary_operator_spaces' => true, - 'binary_operator_spaces' => ['operators' => ['=>' => 'align']], - 'single_trait_insert_per_statement' => false, - 'method_chaining_indentation' => true, - 'array_indentation' => true, - 'single_quote' => true, - 'no_singleline_whitespace_before_semicolons' => true, - 'no_empty_statement' => true, - 'standardize_increment' => true, - 'object_operator_without_whitespace' => true, - 'ternary_operator_spaces' => true, - 'no_leading_namespace_whitespace' => true, - 'no_blank_lines_before_namespace' => true, - 'blank_line_after_namespace' => true, - 'fully_qualified_strict_types' => true, - 'single_line_throw' => true, - 'function_typehint_space' => true, - 'simplified_if_return' => true, - 'no_useless_else' => true, - 'no_unneeded_curly_braces' => true, - 'no_empty_comment' => true, - 'no_blank_lines_after_class_opening' => true, - 'whitespace_after_comma_in_array' => true, - 'trim_array_spaces' => true, - 'no_whitespace_before_comma_in_array' => true, - 'constant_case' => true, - 'lowercase_keywords' => true, - 'lowercase_static_reference' => true, + 'use_arrow_functions' => true, + 'phpdoc_single_line_var_spacing' => true, + 'phpdoc_var_without_name' => true, + 'single_space_after_construct' => true, + 'single_line_after_imports' => true, + 'no_unused_imports' => true, + 'not_operator_with_successor_space' => true, + 'trailing_comma_in_multiline' => ['elements' => ['arrays']], + 'phpdoc_scalar' => true, + 'unary_operator_spaces' => true, + 'binary_operator_spaces' => ['operators' => ['=>' => 'align']], + 'single_trait_insert_per_statement' => false, + 'method_chaining_indentation' => true, + 'array_indentation' => true, + 'single_quote' => true, + 'no_singleline_whitespace_before_semicolons' => true, + 'no_empty_statement' => true, + 'standardize_increment' => true, + 'object_operator_without_whitespace' => true, + 'ternary_operator_spaces' => true, + 'no_leading_namespace_whitespace' => true, + 'no_blank_lines_before_namespace' => true, + 'blank_line_after_namespace' => true, + 'fully_qualified_strict_types' => true, + 'single_line_throw' => true, + 'function_typehint_space' => true, + 'simplified_if_return' => true, + 'no_useless_else' => true, + 'no_unneeded_curly_braces' => true, + 'no_empty_comment' => true, + 'no_blank_lines_after_class_opening' => true, + 'whitespace_after_comma_in_array' => true, + 'trim_array_spaces' => true, + 'no_whitespace_before_comma_in_array' => true, + 'constant_case' => true, + 'lowercase_keywords' => true, + 'lowercase_static_reference' => true, + 'lambda_not_used_import' => true, ]) ->setFinder($finder); diff --git a/routes/channels.php b/routes/channels.php index f16a20b9..076532c4 100644 --- a/routes/channels.php +++ b/routes/channels.php @@ -11,6 +11,4 @@ | */ -Broadcast::channel('App.User.{id}', function ($user, $id) { - return (int) $user->id === (int) $id; -}); +Broadcast::channel('App.User.{id}', fn ($user, $id) => (int) $user->id === (int) $id); diff --git a/src/App/Providers/AuthServiceProvider.php b/src/App/Providers/AuthServiceProvider.php index f6006443..e2d0c206 100644 --- a/src/App/Providers/AuthServiceProvider.php +++ b/src/App/Providers/AuthServiceProvider.php @@ -25,8 +25,6 @@ class AuthServiceProvider extends ServiceProvider $this->registerPolicies(); // Define admin maintenance gate - Gate::define('maintenance', function ($user) { - return $user->role === 'admin'; - }); + Gate::define('maintenance', fn ($user) => $user->role === 'admin'); } } diff --git a/src/App/Providers/FortifyServiceProvider.php b/src/App/Providers/FortifyServiceProvider.php index 0eef5c6c..c17665d2 100644 --- a/src/App/Providers/FortifyServiceProvider.php +++ b/src/App/Providers/FortifyServiceProvider.php @@ -32,12 +32,8 @@ class FortifyServiceProvider extends ServiceProvider Fortify::updateUserPasswordsUsing(UpdateUserPassword::class); Fortify::resetUserPasswordsUsing(ResetUserPassword::class); - RateLimiter::for('login', function (Request $request) { - return Limit::perMinute(20)->by($request->email.$request->ip()); - }); + RateLimiter::for('login', fn (Request $request) => Limit::perMinute(20)->by($request->email.$request->ip())); - RateLimiter::for('two-factor', function (Request $request) { - return Limit::perMinute(5)->by($request->session()->get('login.id')); - }); + RateLimiter::for('two-factor', fn (Request $request) => Limit::perMinute(5)->by($request->session()->get('login.id'))); } } diff --git a/src/App/Users/Models/User.php b/src/App/Users/Models/User.php index b0172dad..a352f3c8 100644 --- a/src/App/Users/Models/User.php +++ b/src/App/Users/Models/User.php @@ -114,9 +114,7 @@ class User extends Authenticatable implements MustVerifyEmail public function getUsedCapacityAttribute(): int { return $this->filesWithTrashed - ->map(function ($item) { - return $item->getRawOriginal(); - })->sum('filesize'); + ->map(fn ($item) => $item->getRawOriginal())->sum('filesize'); } /** diff --git a/src/App/Users/Resources/UserStorageResource.php b/src/App/Users/Resources/UserStorageResource.php index 9c6db964..8d892335 100644 --- a/src/App/Users/Resources/UserStorageResource.php +++ b/src/App/Users/Resources/UserStorageResource.php @@ -21,35 +21,25 @@ class UserStorageResource extends JsonResource // Get all images $images = File::where('user_id', $this->id) - ->where('type', 'image')->get()->map(function ($item) { - return (int) $item->getRawOriginal('filesize'); - })->sum(); + ->where('type', 'image')->get()->map(fn ($item) => (int) $item->getRawOriginal('filesize'))->sum(); // Get all audios $audios = File::where('user_id', $this->id) - ->where('type', 'audio')->get()->map(function ($item) { - return (int) $item->getRawOriginal('filesize'); - })->sum(); + ->where('type', 'audio')->get()->map(fn ($item) => (int) $item->getRawOriginal('filesize'))->sum(); // Get all videos $videos = File::where('user_id', $this->id) - ->where('type', 'video')->get()->map(function ($item) { - return (int) $item->getRawOriginal('filesize'); - })->sum(); + ->where('type', 'video')->get()->map(fn ($item) => (int) $item->getRawOriginal('filesize'))->sum(); // Get all documents $documents = File::where('user_id', $this->id) - ->whereIn('mimetype', $document_mimetypes)->get()->map(function ($item) { - return (int) $item->getRawOriginal('filesize'); - })->sum(); + ->whereIn('mimetype', $document_mimetypes)->get()->map(fn ($item) => (int) $item->getRawOriginal('filesize'))->sum(); // Get all other files $others = File::where('user_id', $this->id) ->whereNotIn('mimetype', $document_mimetypes) ->whereNotIn('type', ['audio', 'video', 'image']) - ->get()->map(function ($item) { - return (int) $item->getRawOriginal('filesize'); - })->sum(); + ->get()->map(fn ($item) => (int) $item->getRawOriginal('filesize'))->sum(); return [ 'data' => [ diff --git a/src/Domain/Payments/Controllers/PaymentMethodsController.php b/src/Domain/Payments/Controllers/PaymentMethodsController.php index 7b66bcf9..cdf9cc4e 100644 --- a/src/Domain/Payments/Controllers/PaymentMethodsController.php +++ b/src/Domain/Payments/Controllers/PaymentMethodsController.php @@ -48,14 +48,10 @@ class PaymentMethodsController extends Controller // filter payment methods without default payment $paymentMethodsMapped = Cache::rememberForever($slug_payment_methods, function () use ($defaultPaymentMethod, $user) { - $paymentMethods = $user->paymentMethods()->filter(function ($paymentMethod) use ($defaultPaymentMethod) { - return $paymentMethod->id !== $defaultPaymentMethod->id; - }); + $paymentMethods = $user->paymentMethods()->filter(fn ($paymentMethod) => $paymentMethod->id !== $defaultPaymentMethod->id); // Get payment methods - return $paymentMethods->map(function ($paymentMethod) { - return $paymentMethod->asStripePaymentMethod(); - })->values()->all(); + return $paymentMethods->map(fn ($paymentMethod) => $paymentMethod->asStripePaymentMethod())->values()->all(); }); } diff --git a/src/Domain/Plans/Controllers/ActivePlansController.php b/src/Domain/Plans/Controllers/ActivePlansController.php index 894b675f..9fca4ad1 100644 --- a/src/Domain/Plans/Controllers/ActivePlansController.php +++ b/src/Domain/Plans/Controllers/ActivePlansController.php @@ -13,9 +13,7 @@ class ActivePlansController public function __invoke(): PricingCollection { // Get pricing from cache - $pricing = Cache::rememberForever('pricing', function () { - return resolve(StripeService::class)->getActivePlans(); - }); + $pricing = Cache::rememberForever('pricing', fn () => resolve(StripeService::class)->getActivePlans()); // Format pricing to collection $collection = new PricingCollection($pricing); diff --git a/src/Domain/Plans/Controllers/PlansController.php b/src/Domain/Plans/Controllers/PlansController.php index 8e1d9571..9d2d4419 100644 --- a/src/Domain/Plans/Controllers/PlansController.php +++ b/src/Domain/Plans/Controllers/PlansController.php @@ -22,9 +22,7 @@ class PlansController extends Controller { // Store or Get plans to cache $plans = cache() - ->rememberForever('plans', function () { - return $this->stripe->getPlans(); - }); + ->rememberForever('plans', fn () => $this->stripe->getPlans()); return response(new PlanCollection($plans), 200); } @@ -36,9 +34,7 @@ class PlansController extends Controller { // Store or Get plan to cache $plan = cache() - ->rememberForever("plan-$id", function () use ($id) { - return $this->stripe->getPlan($id); - }); + ->rememberForever("plan-$id", fn () => $this->stripe->getPlan($id)); return response(new PlanResource($plan), 200); } @@ -51,9 +47,7 @@ class PlansController extends Controller { if (is_demo()) { $plan = cache() - ->rememberForever('plan-starter-pack', function () { - return $this->stripe->getPlan('starter-pack'); - }); + ->rememberForever('plan-starter-pack', fn () => $this->stripe->getPlan('starter-pack')); return new PlanResource($plan); } diff --git a/src/Domain/Subscriptions/Controllers/StripeWebhookController.php b/src/Domain/Subscriptions/Controllers/StripeWebhookController.php index 92ef47e8..b8d0d2eb 100644 --- a/src/Domain/Subscriptions/Controllers/StripeWebhookController.php +++ b/src/Domain/Subscriptions/Controllers/StripeWebhookController.php @@ -21,9 +21,7 @@ class StripeWebhookController extends CashierController public function handleCustomerSubscriptionDeleted($payload) { if ($user = $this->getUserByStripeId($payload['data']['object']['customer'])) { - $user->subscriptions->filter(function ($subscription) use ($payload) { - return $subscription->stripe_id === $payload['data']['object']['id']; - })->each(function ($subscription) { + $user->subscriptions->filter(fn ($subscription) => $subscription->stripe_id === $payload['data']['object']['id'])->each(function ($subscription) { $subscription->markAsCancelled(); }); } diff --git a/src/Domain/Subscriptions/Traits/Subscription.php b/src/Domain/Subscriptions/Traits/Subscription.php index fb37ec12..2f9453db 100644 --- a/src/Domain/Subscriptions/Traits/Subscription.php +++ b/src/Domain/Subscriptions/Traits/Subscription.php @@ -17,9 +17,7 @@ trait Subscription ); // Find tax rate - $user_tax_rate = $rates->first(function ($item) { - return $item['country'] === $this->settings->country && $item['active']; - }); + $user_tax_rate = $rates->first(fn ($item) => $item['country'] === $this->settings->country && $item['active']); return $user_tax_rate ? [$user_tax_rate['id']] : []; } diff --git a/src/Support/helpers.php b/src/Support/helpers.php index 522bbf2c..b094ed3a 100644 --- a/src/Support/helpers.php +++ b/src/Support/helpers.php @@ -596,9 +596,7 @@ if (! function_exists('map_language_translations')) { */ function map_language_translations($translations): Collection { - return $translations->map(function ($string) { - return [$string->key => $string->value]; - })->collapse(); + return $translations->map(fn ($string) => [$string->key => $string->value])->collapse(); } } @@ -904,9 +902,7 @@ if (! function_exists('get_files_for_zip')) { // Get all children folders and folders within if ($folders->folders->isNotEmpty()) { - $folders->folders->map(function ($folder) use ($files, $path) { - return get_files_for_zip($folder, $files, $path); - }); + $folders->folders->map(fn ($folder) => get_files_for_zip($folder, $files, $path)); } return get_files_for_zip($folders->folders->first(), $files, $path); diff --git a/tests/Domain/Browsing/BrowseTest.php b/tests/Domain/Browsing/BrowseTest.php index 46f2850a..e77a1122 100644 --- a/tests/Domain/Browsing/BrowseTest.php +++ b/tests/Domain/Browsing/BrowseTest.php @@ -430,7 +430,7 @@ class BrowseTest extends TestCase }); collect([$folder, $file]) - ->each(function ($item) use ($user) { + ->each(function ($item) { $this->getJson('/api/browse/share') ->assertStatus(200) ->assertJsonFragment([