From 2c4a0d770607712ad9afd5de25418640da7d0beb Mon Sep 17 00:00:00 2001 From: jesseeproductions Date: Thu, 4 Jan 2024 06:18:39 -0500 Subject: [PATCH 1/5] EVA-70 - Fix fatal when moving tickets in ET --- src/Uplink/Admin/Plugins_Page.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Uplink/Admin/Plugins_Page.php b/src/Uplink/Admin/Plugins_Page.php index ac4d8da6..f81081d0 100644 --- a/src/Uplink/Admin/Plugins_Page.php +++ b/src/Uplink/Admin/Plugins_Page.php @@ -32,7 +32,7 @@ class Plugins_Page { * * @return void */ - public function display_plugin_messages( string $page ): void { + public function display_plugin_messages( $page ): void { if ( 'plugins.php' !== $page ) { return; } @@ -137,7 +137,7 @@ public function get_plugin_notices(): array { * * @return void */ - public function store_admin_notices( string $page ): void { + public function store_admin_notices( $page ): void { if ( 'plugins.php' !== $page ) { return; } From d6a991026b1f75feb22738410117acdadc54a2f8 Mon Sep 17 00:00:00 2001 From: jesseeproductions Date: Thu, 4 Jan 2024 11:13:01 -0500 Subject: [PATCH 2/5] EVA-70 - Update docblock --- src/Uplink/Admin/Plugins_Page.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Uplink/Admin/Plugins_Page.php b/src/Uplink/Admin/Plugins_Page.php index f81081d0..f26c5b1b 100644 --- a/src/Uplink/Admin/Plugins_Page.php +++ b/src/Uplink/Admin/Plugins_Page.php @@ -28,7 +28,7 @@ class Plugins_Page { * * @since 1.0.0 * - * @param string $page + * @param string|null $page * * @return void */ @@ -133,7 +133,7 @@ public function get_plugin_notices(): array { /** * Add notices as JS variable * - * @param string $page + * @param string|null $page * * @return void */ From 420e4e7f3edf99b10f8c215be4337dac24864f7e Mon Sep 17 00:00:00 2001 From: Justin Frydman Date: Thu, 4 Jan 2024 09:21:45 -0700 Subject: [PATCH 3/5] Revert type removal and cast in provider --- src/Uplink/Admin/Plugins_Page.php | 8 ++++---- src/Uplink/Admin/Provider.php | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Uplink/Admin/Plugins_Page.php b/src/Uplink/Admin/Plugins_Page.php index f26c5b1b..ac4d8da6 100644 --- a/src/Uplink/Admin/Plugins_Page.php +++ b/src/Uplink/Admin/Plugins_Page.php @@ -28,11 +28,11 @@ class Plugins_Page { * * @since 1.0.0 * - * @param string|null $page + * @param string $page * * @return void */ - public function display_plugin_messages( $page ): void { + public function display_plugin_messages( string $page ): void { if ( 'plugins.php' !== $page ) { return; } @@ -133,11 +133,11 @@ public function get_plugin_notices(): array { /** * Add notices as JS variable * - * @param string|null $page + * @param string $page * * @return void */ - public function store_admin_notices( $page ): void { + public function store_admin_notices( string $page ): void { if ( 'plugins.php' !== $page ) { return; } diff --git a/src/Uplink/Admin/Provider.php b/src/Uplink/Admin/Provider.php index 74e132ce..81a390e6 100644 --- a/src/Uplink/Admin/Provider.php +++ b/src/Uplink/Admin/Provider.php @@ -130,7 +130,7 @@ public function admin_notices(): void { * @return void */ public function display_plugin_messages( $page ): void { - $this->container->get( Plugins_Page::class )->display_plugin_messages( $page ); + $this->container->get( Plugins_Page::class )->display_plugin_messages( (string) $page ); } /** @@ -143,7 +143,7 @@ public function display_plugin_messages( $page ): void { * @return void */ public function store_admin_notices( $page ): void { - $this->container->get( Plugins_Page::class )->store_admin_notices( $page ); + $this->container->get( Plugins_Page::class )->store_admin_notices( (string) $page ); } /** From 4309b3354ef6ff31550f0decca7495a8d2b5b017 Mon Sep 17 00:00:00 2001 From: Justin Frydman Date: Thu, 4 Jan 2024 09:22:52 -0700 Subject: [PATCH 4/5] Fix type --- src/Uplink/Pipeline/Pipeline.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Uplink/Pipeline/Pipeline.php b/src/Uplink/Pipeline/Pipeline.php index beed20ee..31608ea2 100644 --- a/src/Uplink/Pipeline/Pipeline.php +++ b/src/Uplink/Pipeline/Pipeline.php @@ -223,7 +223,7 @@ protected function pipes(): array { * * @return ContainerInterface */ - protected function getContainer(): ?ContainerInterface { + protected function getContainer(): ContainerInterface { if ( ! $this->container ) { throw new RuntimeException( 'A container instance has not been passed to the Pipeline.' ); } From 1cf121a0dc332f7870abc5d41b13118560ae64e6 Mon Sep 17 00:00:00 2001 From: Justin Frydman Date: Thu, 4 Jan 2024 09:23:39 -0700 Subject: [PATCH 5/5] Fix tests by using the new licensing URL --- tests/_support/Helper/Licensing/Service_Mock.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/_support/Helper/Licensing/Service_Mock.php b/tests/_support/Helper/Licensing/Service_Mock.php index 4a9a1280..ac1aa358 100644 --- a/tests/_support/Helper/Licensing/Service_Mock.php +++ b/tests/_support/Helper/Licensing/Service_Mock.php @@ -55,6 +55,6 @@ public function get_validate_key_success_body(): array { * {@inheritdoc } */ protected function get_url(): string { - return 'https://pue.theeventscalendar.com/api/'; + return 'https://licensing.stellarwp.com/api/'; } }