updating components to helper class

infinum · Apr 29, 2024 · 6d8ee42 · 6d8ee42
1 parent 172aabe
commit 6d8ee42
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/src/Editor/Editor.php b/src/Editor/Editor.php
@@ -14,7 +14,7 @@
 use EightshiftForms\CustomPostType\Forms;
 use EightshiftFormsVendor\EightshiftFormsUtils\Config\UtilsConfig;
 use EightshiftFormsVendor\EightshiftFormsUtils\Helpers\UtilsGeneralHelper;
-use EightshiftFormsVendor\EightshiftLibs\Helpers\Components;
+use EightshiftFormsVendor\EightshiftLibs\Helpers\Helpers;
 use EightshiftFormsVendor\EightshiftLibs\Services\ServiceInterface;
 
 /**
@@ -39,7 +39,7 @@ public function register(): void
 	 */
 	public function getEditorBackLink(): void
 	{
-		$actualUrl = Components::getCurrentUrl();
+		$actualUrl = Helpers::getCurrentUrl();
 
 		$types = [
 			Forms::POST_TYPE_SLUG,

diff --git a/src/Integrations/Hubspot/HubspotClient.php b/src/Integrations/Hubspot/HubspotClient.php
@@ -23,7 +23,7 @@
 use EightshiftFormsVendor\EightshiftFormsUtils\Helpers\UtilsDeveloperHelper;
 use EightshiftFormsVendor\EightshiftFormsUtils\Helpers\UtilsHelper;
 use EightshiftFormsVendor\EightshiftFormsUtils\Helpers\UtilsHooksHelper;
-use EightshiftFormsVendor\EightshiftLibs\Helpers\Components;
+use EightshiftFormsVendor\EightshiftLibs\Helpers\Helpers;
 
 /**
  * HubspotClient integration class.
@@ -221,7 +221,7 @@ public function postApplication(string $itemId, array $params, array $files, str
 			'context' => [
 				'ipAddress' => $this->security->getIpAddress(),
 				'hutk' => $params[UtilsHelper::getStateParam('hubspotCookie')]['value'],
-				'pageUri' => Components::cleanUrlParams($params[UtilsHelper::getStateParam('hubspotPageUrl')]['value']),
+				'pageUri' => Helpers::cleanUrlParams($params[UtilsHelper::getStateParam('hubspotPageUrl')]['value']),
 				'pageName' => $params[UtilsHelper::getStateParam('hubspotPageName')]['value'],
 			],
 		];
@@ -297,7 +297,7 @@ public function postContactProperty(string $email, array $params): array
 	{
 		$properties = [];
 
-		$customFields = \array_flip(Components::flattenArray(UtilsHelper::getStateParams()));
+		$customFields = \array_flip(Helpers::flattenArray(UtilsHelper::getStateParams()));
 
 		if ($params) {
 			foreach ($params as $key => $value) {
@@ -649,7 +649,7 @@ static function ($item) {
 		$consentData = $consentData[0] ?? '';
 
 		// Validate if json.
-		if (!Components::isJson($consentData)) {
+		if (!Helpers::isJson($consentData)) {
 			return [];
 		}
 

diff --git a/src/Integrations/Mailer/Mailer.php b/src/Integrations/Mailer/Mailer.php
@@ -18,7 +18,6 @@
 use EightshiftFormsVendor\EightshiftFormsUtils\Config\UtilsConfig;
 use EightshiftFormsVendor\EightshiftFormsUtils\Helpers\UtilsHooksHelper;
 use EightshiftForms_Parsedown as Parsedown;
-use EightshiftFormsVendor\EightshiftLibs\Helpers\Components;
 use EightshiftFormsVendor\EightshiftLibs\Helpers\Helpers;
 
 /**
@@ -141,7 +140,7 @@ public function fallbackIntegrationEmail(
 					}
 					break;
 				default:
-					$filesOutput = Components::recursiveArrayFind($files, 'path');
+					$filesOutput = Helpers::recursiveArrayFind($files, 'path');
 					break;
 			}
 		}
@@ -222,7 +221,7 @@ public function fallbackProcessingEmail(
 					}
 					break;
 				default:
-					$filesOutput = Components::recursiveArrayFind($files, 'path');
+					$filesOutput = Helpers::recursiveArrayFind($files, 'path');
 					break;
 			}
 		}

diff --git a/src/Settings/Settings/Settings.php b/src/Settings/Settings/Settings.php
@@ -16,7 +16,7 @@
 use EightshiftFormsVendor\EightshiftFormsUtils\Config\UtilsConfig;
 use EightshiftFormsVendor\EightshiftFormsUtils\Helpers\UtilsSettingsHelper;
 use EightshiftFormsVendor\EightshiftFormsUtils\Helpers\UtilsHelper;
-use EightshiftFormsVendor\EightshiftLibs\Helpers\Components;
+use EightshiftFormsVendor\EightshiftLibs\Helpers\Helpers;
 
 /**
  * Settings class.
@@ -112,7 +112,7 @@ public function getSettingsForm(string $type, string $formId): string
 			UtilsHelper::getStateAttribute('formId') => $formId,
 			UtilsHelper::getStateAttribute('formType') => $internalType,
 			UtilsHelper::getStateAttribute('settingsType') => $type,
-			UtilsHelper::getStateAttribute('successRedirect') => Components::getCurrentUrl(),
+			UtilsHelper::getStateAttribute('successRedirect') => Helpers::getCurrentUrl(),
 		];
 
 		// Populate and build form.