mettle · JonoB · Jul 5, 2021 · May 10, 2021 · May 10, 2021 · May 10, 2021
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Run php-cs-fixer
         uses: docker://oskarstark/php-cs-fixer-ga
         with:
-          args: --config=.php_cs
+          args: --config=.php-cs-fixer.php
       - uses: stefanzweifel/git-auto-commit-action@v4
         with:
-          commit_message: Apply php-cs-fixer changes
+          commit_message: Apply php-cs-fixer changes
diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache
@@ -0,0 +1 @@
+{"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"},"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":"alpha"},"no_unused_imports":true},"hashes":{"database\/migrations\/2019_07_30_153117_create_message_urls_table.php":705558235,"database\/migrations\/2019_07_10_194325_create_messages_table.php":363206356,"database\/migrations\/2017_04_11_133343_create_email_service_tables.php":3427154831,"database\/migrations\/2020_08_04_085127_add_mailjet_email_service.php":3944202562,"database\/migrations\/2020_01_23_153845_create_message_failures_table.php":422864738,"database\/migrations\/2020_10_02_152306_drop_segment_name_unique.php":4012226671,"database\/migrations\/2020_06_16_072137_adjust_template_content.php":2080692104,"database\/migrations\/2017_04_28_223029_create_campaign_statuses_table.php":2276996524,"database\/migrations\/2017_04_28_223915_create_campaigns_table.php":2960271218,"database\/migrations\/2017_04_28_223854_create_segment_subscriber_table.php":1063336079,"database\/migrations\/2017_04_28_223844_create_segments_table.php":2282300550,"database\/migrations\/2021_01_29_121118_rename_segments_to_tags.php":1165017040,"database\/migrations\/2017_04_12_6000_create_unsubscribed_table.php":2962850529,"database\/migrations\/2017_04_28_223906_create_templates_table.php":1412364793,"database\/migrations\/2021_02_26_110520_add_smtp_email_service_type.php":1641396792,"database\/migrations\/2020_10_16_092234_prefix_tables.php":556248659,"database\/migrations\/2020_07_17_072137_add_cancelled_campaign_status.php":3715055616,"database\/migrations\/2017_04_28_223840_create_subscribers_table.php":1979215806,"database\/migrations\/2020_06_16_072116_adjust_campaign_content.php":2571342875,"database\/migrations\/2017_05_02_104440_create_campaign_segment_table.php":1072962515,"database\/factories\/EmailServiceFactory.php":43073394,"database\/factories\/MessageFactory.php":695066239,"database\/factories\/TagFactory.php":1169600564,"database\/factories\/TemplateFactory.php":3108929340,"database\/factories\/CampaignFactory.php":2495530143,"database\/factories\/SubscriberFactory.php":2748110434,"config\/config.php":2062531828,"tests\/Unit\/Http\/Requests\/EmailServiceRequestTest.php":2700458550,"tests\/Unit\/Repositories\/MessageTenantRepositoryTest.php":2487578016,"tests\/Unit\/Repositories\/SubscriberTenantRepositoryTest.php":584282148,"tests\/Unit\/Repositories\/CampaignTenantRepositoryTest.php":1447350338,"tests\/Unit\/Factories\/MailAdapterFactoryTest.php":3144386253,"tests\/Unit\/Services\/QuotaServiceTest.php":3513682087,"tests\/Unit\/Services\/Messages\/MessageTrackingOptionsTest.php":3029481194,"tests\/Unit\/Models\/MessageTest.php":3982119879,"tests\/Unit\/Models\/TemplateTest.php":4268353941,"tests\/Unit\/Models\/CampaignStatusTest.php":2938161465,"tests\/Unit\/Models\/CampaignTest.php":640844939,"tests\/Unit\/Models\/SubscriberTest.php":180446296,"tests\/TestCase.php":3966647562,"tests\/SendportalTestSupportTrait.php":997394200,"tests\/SendportalTestServiceProvider.php":906056513,"tests\/Feature\/EmailServices\/TestEmailServiceControllerTest.php":3296002313,"tests\/Feature\/EmailServices\/EmailServicesControllerTest.php":642328649,"tests\/Feature\/Templates\/TemplatesControllerTest.php":1772875015,"tests\/Feature\/Subscribers\/SubscribersImportControllerTest.php":2709242023,"tests\/Feature\/Subscribers\/SubscribersControllerTest.php":4137548719,"tests\/Feature\/API\/CampaignsControllerTest.php":3153298462,"tests\/Feature\/API\/TagSubscribersControllerTest.php":4250813164,"tests\/Feature\/API\/TemplatesControllerTest.php":4211586093,"tests\/Feature\/API\/CampaignDispatchControllerTest.php":3396148260,"tests\/Feature\/API\/SubscriberTagsControllerTest.php":4092876763,"tests\/Feature\/API\/SubscribersControllerTest.php":1577417930,"tests\/Feature\/API\/TagsControllerTest.php":198952062,"tests\/Feature\/Campaigns\/CampaignReportsControllerTest.php":1958370496,"tests\/Feature\/Campaigns\/CampaignDispatchControllerTest.php":3011874918,"tests\/Feature\/Campaigns\/CampaignControllerTest.php":826272366,"tests\/Feature\/Campaigns\/CampaignCancellationControllerTest.php":3109153620,"tests\/Feature\/Webhooks\/SendgridWebhooksTest.php":1402973208,"tests\/Feature\/Webhooks\/MailgunWebhooksTest.php":1408717700,"tests\/Feature\/Webhooks\/MailjetWebhooksTest.php":1439103583,"tests\/Feature\/Webhooks\/PostmarkWebhooksTest.php":1835765995,"tests\/Feature\/Webhooks\/AwsWebhooksTest.php":1754161542,"tests\/Feature\/Messages\/MessagesControllerTest.php":1464206648,"tests\/Feature\/Tags\/TagsControllerTest.php":3080662402,"tests\/Feature\/Content\/MergeSubjectTest.php":1929997388,"tests\/Feature\/Content\/MergeContentTest.php":2891855239,"tests\/Feature\/Webview\/WebviewControllerTest.php":2995672246,"src\/Rules\/NotEmpty.php":881473860,"src\/Rules\/CanAccessTag.php":981316191,"src\/Rules\/CanAccessSubscriber.php":155089760,"src\/Facades\/Helper.php":4106765437,"src\/Facades\/Sendportal.php":4114588634,"src\/Http\/Controllers\/EmailServices\/EmailServicesController.php":930489050,"src\/Http\/Controllers\/EmailServices\/TestEmailServiceController.php":4189490502,"src\/Http\/Controllers\/Auth\/ProfileController.php":2127456338,"src\/Http\/Controllers\/Auth\/RegisterController.php":2992468056,"src\/Http\/Controllers\/Controller.php":153774118,"src\/Http\/Controllers\/Subscribers\/SubscribersImportController.php":3321930474,"src\/Http\/Controllers\/Subscribers\/SubscribersController.php":1980508251,"src\/Http\/Controllers\/Workspaces\/PendingInvitationController.php":3832725633,"src\/Http\/Controllers\/Workspaces\/SwitchWorkspaceController.php":1038632863,"src\/Http\/Controllers\/Campaigns\/CampaignTestController.php":625408867,"src\/Http\/Controllers\/Campaigns\/CampaignDeleteController.php":2048917372,"src\/Http\/Controllers\/Campaigns\/CampaignsController.php":1440473787,"src\/Http\/Controllers\/Campaigns\/CampaignDispatchController.php":606841697,"src\/Http\/Controllers\/Campaigns\/CampaignDuplicateController.php":1425742220,"src\/Http\/Controllers\/Campaigns\/CampaignReportsController.php":2272626045,"src\/Http\/Controllers\/Campaigns\/CampaignCancellationController.php":3527120325,"src\/Http\/Controllers\/MessagesController.php":298702372,"src\/Http\/Controllers\/Subscriptions\/SubscriptionsController.php":974643272,"src\/Http\/Controllers\/TemplatesController.php":1890102235,"src\/Http\/Controllers\/Tags\/TagsController.php":3900834107,"src\/Http\/Controllers\/DashboardController.php":4089589445,"src\/Http\/Controllers\/Webview\/WebviewController.php":3081362885,"src\/Http\/Controllers\/Api\/TagSubscribersController.php":2065171095,"src\/Http\/Controllers\/Api\/TagsController.php":3484423157,"src\/Http\/Controllers\/Api\/WorkspacesController.php":4223646033,"src\/Http\/Controllers\/Api\/Webhooks\/SesWebhooksController.php":3278766678,"src\/Http\/Controllers\/Api\/Webhooks\/SendgridWebhooksController.php":308336950,"src\/Http\/Controllers\/Api\/Webhooks\/PostmarkWebhooksController.php":2649888651,"src\/Http\/Controllers\/Api\/Webhooks\/MailjetWebhooksController.php":2105386302,"src\/Http\/Controllers\/Api\/Webhooks\/MailgunWebhooksController.php":1388261497,"src\/Http\/Controllers\/Api\/TemplatesController.php":282593284,"src\/Http\/Controllers\/Api\/CampaignsController.php":2436071588,"src\/Http\/Controllers\/Api\/SubscriberTagsController.php":1762324752,"src\/Http\/Controllers\/Api\/CampaignDispatchController.php":507181692,"src\/Http\/Controllers\/Api\/SubscribersController.php":786430554,"src\/Http\/Controllers\/Api\/PingController.php":1901035083,"src\/Http\/Requests\/CampaignDispatchRequest.php":809493100,"src\/Http\/Requests\/EmailServiceStoreRequest.php":1247658478,"src\/Http\/Requests\/TagUpdateRequest.php":4077131334,"src\/Http\/Requests\/CampaignStoreRequest.php":460877489,"src\/Http\/Requests\/SubscriptionToggleRequest.php":3726657740,"src\/Http\/Requests\/CampaignContentRequest.php":1232189474,"src\/Http\/Requests\/EmailServiceUpdateRequest.php":2689607115,"src\/Http\/Requests\/TagStoreRequest.php":3425690872,"src\/Http\/Requests\/EmailServiceTestRequest.php":1797151555,"src\/Http\/Requests\/CampaignTemplateUpdateRequest.php":234900153,"src\/Http\/Requests\/SubscribersImportRequest.php":2395242170,"src\/Http\/Requests\/CampaignTestRequest.php":4235293899,"src\/Http\/Requests\/CampaignDeleteRequest.php":852510701,"src\/Http\/Requests\/TemplateUpdateRequest.php":2399537847,"src\/Http\/Requests\/SubscriberRequest.php":1352239694,"src\/Http\/Requests\/TemplateStoreRequest.php":1276922578,"src\/Http\/Requests\/EmailServiceRequest.php":1533425059,"src\/Http\/Requests\/Api\/CampaignDispatchRequest.php":3488474283,"src\/Http\/Requests\/Api\/TagUpdateRequest.php":1885993792,"src\/Http\/Requests\/Api\/CampaignStoreRequest.php":1949834292,"src\/Http\/Requests\/Api\/TagSubscriberStoreRequest.php":2941469131,"src\/Http\/Requests\/Api\/TagStoreRequest.php":2835696453,"src\/Http\/Requests\/Api\/SubscriberTagUpdateRequest.php":3425662496,"src\/Http\/Requests\/Api\/SubscriberStoreRequest.php":3260972543,"src\/Http\/Requests\/Api\/SubscriberTagStoreRequest.php":2241658482,"src\/Http\/Requests\/Api\/TagSubscriberUpdateRequest.php":93824302,"src\/Http\/Requests\/Api\/SubscriberUpdateRequest.php":546298387,"src\/Http\/Requests\/Api\/TemplateUpdateRequest.php":953682051,"src\/Http\/Requests\/Api\/TemplateStoreRequest.php":1068837218,"src\/Http\/Requests\/Api\/SubscriberTagDestroyRequest.php":2995551175,"src\/Http\/Requests\/Api\/TagSubscriberDestroyRequest.php":51329561,"src\/Http\/Resources\/Tag.php":802221137,"src\/Http\/Resources\/Campaign.php":3647121720,"src\/Http\/Resources\/Template.php":3600632339,"src\/Http\/Resources\/Workspace.php":4013160935,"src\/Http\/Resources\/Subscriber.php":586539631,"src\/Events\/MessageDispatchEvent.php":301345637,"src\/Events\/SubscriberAddedEvent.php":2226178055,"src\/Events\/Webhooks\/MailgunWebhookReceived.php":3881941755,"src\/Events\/Webhooks\/SesWebhookReceived.php":743580678,"src\/Events\/Webhooks\/SendgridWebhookReceived.php":641948760,"src\/Events\/Webhooks\/MailjetWebhookReceived.php":4190624551,"src\/Events\/Webhooks\/PostmarkWebhookReceived.php":3896170533,"src\/Routes\/WebRoutes.php":1128128011,"src\/Routes\/ApiRoutes.php":2890983368,"src\/Console\/Commands\/CampaignDispatchCommand.php":1955564877,"src\/Console\/Kernel.php":3023176262,"src\/Repositories\/EmailServiceTenantRepository.php":1345639575,"src\/Repositories\/Subscribers\/MySqlSubscriberTenantRepository.php":280251076,"src\/Repositories\/Subscribers\/PostgresSubscriberTenantRepository.php":382531628,"src\/Repositories\/Subscribers\/SubscriberTenantRepositoryInterface.php":4000722737,"src\/Repositories\/Subscribers\/BaseSubscriberTenantRepository.php":3442608196,"src\/Repositories\/BaseEloquentRepository.php":2158650621,"src\/Repositories\/Campaigns\/PostgresCampaignTenantRepository.php":687676756,"src\/Repositories\/Campaigns\/CampaignTenantRepositoryInterface.php":598929512,"src\/Repositories\/Campaigns\/BaseCampaignTenantRepository.php":2157749153,"src\/Repositories\/Campaigns\/MySqlCampaignTenantRepository.php":3211702238,"src\/Repositories\/BaseTenantRepository.php":3464483901,"src\/Repositories\/TemplateTenantRepository.php":1819072745,"src\/Repositories\/Messages\/PostgresMessageTenantRepository.php":261563092,"src\/Repositories\/Messages\/MessageTenantRepositoryInterface.php":1440401593,"src\/Repositories\/Messages\/MySqlMessageTenantRepository.php":3468269621,"src\/Repositories\/Messages\/BaseMessageTenantRepository.php":1392238193,"src\/Repositories\/MessageUrlRepository.php":520332968,"src\/Repositories\/TagTenantRepository.php":986856375,"src\/Interfaces\/QuotaServiceInterface.php":4143125697,"src\/Interfaces\/BaseEloquentInterface.php":2679968441,"src\/Interfaces\/BaseTenantInterface.php":1039061782,"src\/Interfaces\/MailAdapterInterface.php":2744397698,"src\/Factories\/MailAdapterFactory.php":1879110807,"src\/UpgradeMigration.php":3288163232,"src\/Pipelines\/Campaigns\/CreateMessages.php":3523817261,"src\/Pipelines\/Campaigns\/StartCampaign.php":4264567283,"src\/Pipelines\/Campaigns\/CompleteCampaign.php":3051555738,"src\/Traits\/ResolvesDatabaseDriver.php":1376479529,"src\/Traits\/ScheduledAt.php":4210545466,"src\/Traits\/ThrottlesSending.php":1616950802,"src\/Traits\/SecondsToHms.php":1549572817,"src\/Traits\/Uuid.php":1070796280,"src\/Traits\/NormalizeTags.php":3993386615,"src\/View\/Components\/FileField.php":3597466276,"src\/View\/Components\/CheckboxField.php":1431187004,"src\/View\/Components\/SelectField.php":2855451345,"src\/View\/Components\/TextField.php":3165036925,"src\/View\/Components\/SubmitButton.php":2196663048,"src\/View\/Components\/TextareaField.php":3699610421,"src\/View\/Components\/FieldWrapper.php":3647969572,"src\/View\/Components\/Label.php":3394159880,"src\/Providers\/EventServiceProvider.php":3692315593,"src\/Providers\/SendportalAppServiceProvider.php":2705741767,"src\/Providers\/FormServiceProvider.php":3542056556,"src\/Providers\/ResolverProvider.php":2991755500,"src\/Providers\/RouteServiceProvider.php":3272398877,"src\/Services\/ResolverService.php":2329176598,"src\/Services\/Templates\/TemplateService.php":2140165200,"src\/Services\/Helper.php":3273682296,"src\/Services\/QuotaService.php":2707092128,"src\/Services\/Subscribers\/Tags\/ApiSubscriberTagService.php":906631069,"src\/Services\/Subscribers\/ImportSubscriberService.php":568441773,"src\/Services\/Subscribers\/ApiSubscriberService.php":421725646,"src\/Services\/Campaigns\/CampaignDispatchService.php":729552414,"src\/Services\/Campaigns\/CampaignStatisticsService.php":2595127881,"src\/Services\/Webhooks\/Mailgun\/WebhookVerifier.php":1769120066,"src\/Services\/Webhooks\/EmailWebhookService.php":3504613757,"src\/Services\/Sendportal.php":2188499411,"src\/Services\/Messages\/MessageTrackingOptions.php":2022358752,"src\/Services\/Messages\/ResolveEmailService.php":3697855227,"src\/Services\/Messages\/MarkAsSent.php":3611214529,"src\/Services\/Messages\/RelayMessage.php":943777897,"src\/Services\/Messages\/DispatchMessage.php":3878365891,"src\/Services\/Messages\/DispatchTestMessage.php":3984013142,"src\/Services\/Messages\/MessageOptions.php":441844720,"src\/Services\/Tags\/ApiTagSubscriberService.php":1712087394,"src\/Services\/Tags\/ApiTagService.php":1645448568,"src\/Services\/Content\/MergeSubjectService.php":162684874,"src\/Services\/Content\/MergeContentService.php":1263842447,"src\/Adapters\/SendgridMailAdapter.php":4277132130,"src\/Adapters\/SesMailAdapter.php":3730945172,"src\/Adapters\/BaseMailAdapter.php":2529230802,"src\/Adapters\/PostmarkMailAdapter.php":538078784,"src\/Adapters\/MailjetAdapter.php":955812295,"src\/Adapters\/MailgunMailAdapter.php":1483562893,"src\/Adapters\/SmtpAdapter.php":3897179522,"src\/Listeners\/MessageDispatchHandler.php":3514540013,"src\/Listeners\/Webhooks\/HandlePostmarkWebhook.php":1633073198,"src\/Listeners\/Webhooks\/HandleMailgunWebhook.php":508480186,"src\/Listeners\/Webhooks\/HandleMailjetWebhook.php":1085085614,"src\/Listeners\/Webhooks\/HandleSendgridWebhook.php":2195241036,"src\/Listeners\/Webhooks\/HandleSesWebhook.php":1514930979,"src\/Exceptions\/Handler.php":2905627596,"src\/SendportalBaseServiceProvider.php":4015437128,"src\/Models\/UnsubscribeEventType.php":4183590160,"src\/Models\/Tag.php":1376026161,"src\/Models\/Campaign.php":3423032994,"src\/Models\/Template.php":4153521454,"src\/Models\/CampaignStatus.php":3384662187,"src\/Models\/BaseModel.php":4169817253,"src\/Models\/MessageUrl.php":3513256280,"src\/Models\/Message.php":489500285,"src\/Models\/EmailServiceType.php":3394878690,"src\/Models\/Subscription.php":2794321122,"src\/Models\/MessageFailure.php":2611898046,"src\/Models\/Subscriber.php":3823815764,"src\/Models\/EmailService.php":220840468,"src\/Presenters\/CampaignReportPresenter.php":273384896}}
diff --git a/.php_cs → .php-cs-fixer.php b/.php_cs → .php-cs-fixer.php
@@ -9,11 +9,12 @@
   ->name('*.php')
   ->notName('*.blade.php');
 
-return PhpCsFixer\Config::create()
-  ->setRules([
+$config = new PhpCsFixer\Config();
+
+return $config->setRules([
     '@PSR2' => true,
     'array_syntax' => ['syntax' => 'short'],
-    'ordered_imports' => ['sortAlgorithm' => 'alpha'],
+    'ordered_imports' => ['sort_algorithm' => 'alpha'],
     'no_unused_imports' => true,
   ])
   ->setFinder($finder);