From d630fa115445d4ea597a2471bcd604d571cc17d9 Mon Sep 17 00:00:00 2001
From: Khadreal <opeyemi.khadri@gmail.com>
Date: Wed, 18 Dec 2024 12:08:20 +0100
Subject: [PATCH] Merge develop and fix container method error

---
 classes/ThirdParty/Plugins/GravityForms.php | 2 +-
 classes/ThirdParty/ServiceProvider.php      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/ThirdParty/Plugins/GravityForms.php b/classes/ThirdParty/Plugins/GravityForms.php
index acf52e53..6e5d9e26 100644
--- a/classes/ThirdParty/Plugins/GravityForms.php
+++ b/classes/ThirdParty/Plugins/GravityForms.php
@@ -68,6 +68,6 @@ private function is_gravity_forms_no_conflict_mode_enabled(): bool {
 		return is_plugin_active( 'gravityforms/gravityforms.php' )
 			&& class_exists( 'GFCommon' )
 			&& get_option( 'gform_enable_noconflict', false )
-			&& GFForms::is_gravity_page();
+			&& GFForms::is_gravity_page(); // @phpstan-ignore-line
 	}
 }
diff --git a/classes/ThirdParty/ServiceProvider.php b/classes/ThirdParty/ServiceProvider.php
index 105d709e..bbd22496 100644
--- a/classes/ThirdParty/ServiceProvider.php
+++ b/classes/ThirdParty/ServiceProvider.php
@@ -54,6 +54,6 @@ public function get_subscribers() {
 	 * @return void
 	 */
 	public function register(): void {
-		$this->getContainer()->share( 'gravity_from_subscriber', GravityForms::class );
+		$this->getContainer()->addShared( 'gravity_from_subscriber', GravityForms::class );
 	}
 }