updating forms to libs 8.0.0 and adding code corrections

infinum · Apr 29, 2024 · 172aabe · 172aabe
1 parent 8a62081
commit 172aabe
Show file tree

Hide file tree

Showing 70 changed files with 507 additions and 417 deletions.
diff --git a/composer.json b/composer.json
@@ -26,6 +26,7 @@
 		"issues": "https://github.com/infinum/eightshift-forms/issues",
 		"source": "https://github.com/infinum/eightshift-forms"
 	},
+
 	"require-dev": {
 		"brain/faker": "dev-master",
 		"brain/monkey": "^2.6.1",
@@ -37,10 +38,16 @@
 		"szepeviktor/phpstan-wordpress": "^1.3",
 		"wp-cli/wp-cli": "^2.9"
 	},
+	"repositories": [
+		{
+			"type": "vcs",
+			"url": "https://github.com/infinum/eightshift-forms-utils.git"
+		}
+	],
 	"require": {
 		"php": "^7.4 || >=8.0",
 		"erusev/parsedown": "^1.7.4",
-		"infinum/eightshift-forms-utils": "^1.3.5"
+		"infinum/eightshift-forms-utils": "dev-feature/test-libs"
 	},
 	"autoload": {
 		"psr-4": {

diff --git a/composer.lock b/composer.lock
diff --git a/eightshift-forms.php b/eightshift-forms.php
@@ -18,6 +18,7 @@
 
 use EightshiftForms\Main\Main;
 use EightshiftForms\Testfilters\Testfilters;
+use EightshiftForms\Cache\ManifestCache;
 
 /**
  * If this file is called directly, abort.
@@ -62,6 +63,8 @@ function () {
 if (\class_exists(Main::class)) {
 	$sep = \DIRECTORY_SEPARATOR;
 
+	(new ManifestCache())->setProjectAllCache();
+
 	(new Main($loader->getPrefixesPsr4(), __NAMESPACE__))->register();
 
 	// Require public helper class.

diff --git a/setCache b/setCache
diff --git a/src/AdminMenus/FormAdminTopBarMenu.php b/src/AdminMenus/FormAdminTopBarMenu.php
@@ -19,6 +19,7 @@
 use EightshiftFormsVendor\EightshiftFormsUtils\Helpers\UtilsDeveloperHelper;
 use EightshiftFormsVendor\EightshiftFormsUtils\Helpers\UtilsHelper;
 use EightshiftFormsVendor\EightshiftFormsUtils\Helpers\UtilsHooksHelper;
+use EightshiftFormsVendor\EightshiftLibs\Helpers\Helpers;
 use EightshiftFormsVendor\EightshiftLibs\Services\ServiceInterface;
 use WP_Admin_Bar;
 
@@ -82,7 +83,7 @@ public function getTopBarMenu(WP_Admin_Bar $adminBar): void
 		$isDevelopMode = UtilsDeveloperHelper::isDeveloperModeActive();
 		$isDevelopModeQmLog = UtilsDeveloperHelper::isDeveloperQMLogActive();
 
-		$version = UtilsGeneralHelper::getProjectVersion();
+		$version = Helpers::getPluginVersion();
 
 		$mainLabel = \esc_html__('Eightshift Forms', 'eightshift-forms');
 

diff --git a/src/Blocks/SettingsBlocks.php b/src/Blocks/SettingsBlocks.php
@@ -10,15 +10,16 @@
 
 namespace EightshiftForms\Blocks;
 
+use EightshiftForms\Cache\ManifestCache;
 use EightshiftForms\Cache\SettingsCache;
 use EightshiftForms\Geolocation\GeolocationInterface;
 use EightshiftFormsVendor\EightshiftFormsUtils\Helpers\UtilsDeveloperHelper;
-use EightshiftFormsVendor\EightshiftFormsUtils\Helpers\UtilsGeneralHelper;
 use EightshiftFormsVendor\EightshiftFormsUtils\Helpers\UtilsHooksHelper;
 use EightshiftFormsVendor\EightshiftFormsUtils\Settings\UtilsSettingGlobalInterface;
 use EightshiftFormsVendor\EightshiftFormsUtils\Helpers\UtilsSettingsHelper;
 use EightshiftFormsVendor\EightshiftFormsUtils\Helpers\UtilsSettingsOutputHelper;
 use EightshiftFormsVendor\EightshiftFormsUtils\Settings\UtilsSettingInterface;
+use EightshiftFormsVendor\EightshiftLibs\Cache\ManifestCacheInterface;
 use EightshiftFormsVendor\EightshiftLibs\Services\ServiceInterface;
 
 /**
@@ -77,14 +78,25 @@ class SettingsBlocks implements UtilsSettingGlobalInterface, UtilsSettingInterfa
 	 */
 	protected GeolocationInterface $geolocation;
 
+	/**
+	 * Instance variable for manifest cache.
+	 *
+	 * @var ManifestCacheInterface
+	 */
+	protected $manifestCache;
+
 	/**
 	 * Create a new admin instance.
 	 *
 	 * @param GeolocationInterface $geolocation Inject geolocation which holds data about for storing to geolocation.
+	 * @param ManifestCacheInterface $manifestCache Inject manifest cache.
 	 */
-	public function __construct(GeolocationInterface $geolocation)
-	{
+	public function __construct(
+		GeolocationInterface $geolocation,
+		ManifestCacheInterface $manifestCache
+	) {
 		$this->geolocation = $geolocation;
+		$this->manifestCache = $manifestCache;
 	}
 
 	/**
@@ -354,7 +366,7 @@ private function getCountriesDataSet(bool $useFullOutput = true): array
 		}
 
 		if (!$output) {
-			$countries = UtilsGeneralHelper::getCountrySelectList();
+			$countries = $this->manifestCache->getManifestCacheTopItem(ManifestCache::COUNTRIES_KEY, ManifestCache::TYPE_FORMS);
 
 			$output = [
 				'default' => [

diff --git a/src/Blocks/components/admin-listing/admin-listing.php b/src/Blocks/components/admin-listing/admin-listing.php
@@ -9,7 +9,7 @@
 use EightshiftFormsVendor\EightshiftFormsUtils\Helpers\UtilsHelper;
 use EightshiftFormsVendor\EightshiftLibs\Helpers\Components;
 
-$manifest = Components::getManifest(__DIR__);
+$manifest = Components::getManifestByDir(__DIR__);
 $manifestSection = Components::getComponent('admin-settings-section');
 
 echo Components::outputCssVariablesGlobal(); // phpcs:ignore Eightshift.Security.ComponentsEscape.OutputNotEscaped

diff --git a/src/Blocks/components/admin-settings/admin-settings.php b/src/Blocks/components/admin-settings/admin-settings.php
@@ -9,7 +9,7 @@
 use EightshiftFormsVendor\EightshiftFormsUtils\Helpers\UtilsHelper;
 use EightshiftFormsVendor\EightshiftLibs\Helpers\Components;
 
-$manifest = Components::getManifest(__DIR__);
+$manifest = Components::getManifestByDir(__DIR__);
 $manifestSection = Components::getComponent('admin-settings-section');
 
 echo Components::outputCssVariablesGlobal(); // phpcs:ignore Eightshift.Security.ComponentsEscape.OutputNotEscaped
@@ -45,9 +45,14 @@
 	<?php if ($adminSettingsNotice) { ?>
 		<div class="<?php echo esc_attr("{$sectionClass}__notice"); ?>">
 			<?php
-			echo Components::render('notice', [
-				'noticeContent' => $adminSettingsNotice,
-			], '', true);
+				echo Components::render(
+					'notice',
+					[
+					'noticeContent' => $adminSettingsNotice,
+					],
+					'components',
+					true
+				);
 			?>
 		</div>
 	<?php } ?>
@@ -65,11 +70,18 @@
 
 		<?php
 		// phpcs:ignore Eightshift.Security.ComponentsEscape.OutputNotEscaped
-		echo Components::renderPartial('component', $componentName, 'sidebar-section', [
-			'items' => $adminSettingsSidebar,
-			'sectionClass' => $sectionClass,
-			'adminSettingsType' => $adminSettingsType,
-		]);
+		echo $componentName;
+		echo Components::render(
+			'sidebar-section',
+			[
+				'items' => $adminSettingsSidebar,
+				'sectionClass' => $sectionClass,
+				'adminSettingsType' => $adminSettingsType,
+			],
+			'components',
+			false,
+			"{$componentName}/partials"
+		);
 		?>
 	</div>
 	<div class="<?php echo esc_attr("{$sectionClass}__main"); ?>">

diff --git a/src/Blocks/components/card-inline/card-inline.php b/src/Blocks/components/card-inline/card-inline.php
@@ -8,7 +8,7 @@
 
 use EightshiftFormsVendor\EightshiftLibs\Helpers\Components;
 
-$manifest = Components::getManifest(__DIR__);
+$manifest = Components::getManifestByDir(__DIR__);
 
 $componentClass = $manifest['componentClass'] ?? '';
 $additionalClass = $attributes['additionalClass'] ?? '';

diff --git a/src/Blocks/components/checkbox/checkbox.php b/src/Blocks/components/checkbox/checkbox.php
@@ -9,7 +9,7 @@
 use EightshiftFormsVendor\EightshiftFormsUtils\Helpers\UtilsHelper;
 use EightshiftFormsVendor\EightshiftLibs\Helpers\Components;
 
-$manifest = Components::getManifest(__DIR__);
+$manifest = Components::getManifestByDir(__DIR__);
 
 $componentName = $manifest['componentName'] ?? '';
 $componentClass = $manifest['componentClass'] ?? '';

diff --git a/src/Blocks/components/checkboxes/checkboxes.php b/src/Blocks/components/checkboxes/checkboxes.php
@@ -10,7 +10,7 @@
 use EightshiftFormsVendor\EightshiftFormsUtils\Helpers\UtilsGeneralHelper;
 use EightshiftFormsVendor\EightshiftLibs\Helpers\Components;
 
-$manifest = Components::getManifest(__DIR__);
+$manifest = Components::getManifestByDir(__DIR__);
 
 $checkboxesName = Components::checkAttr('checkboxesName', $attributes, $manifest);
 if (!$checkboxesName) {

diff --git a/src/Blocks/components/conditional-tags/conditional-tags.php b/src/Blocks/components/conditional-tags/conditional-tags.php
@@ -8,7 +8,7 @@
 
 use EightshiftFormsVendor\EightshiftLibs\Helpers\Components;
 
-$manifest = Components::getManifest(__DIR__);
+$manifest = Components::getManifestByDir(__DIR__);
 
 $conditionalTagsUse = Components::checkAttr('conditionalTagsUse', $attributes, $manifest);
 $conditionalTagsRules = Components::checkAttr('conditionalTagsRules', $attributes, $manifest);

diff --git a/src/Blocks/components/container/container.php b/src/Blocks/components/container/container.php
@@ -8,7 +8,7 @@
 
 use EightshiftFormsVendor\EightshiftLibs\Helpers\Components;
 
-$manifest = Components::getManifest(__DIR__);
+$manifest = Components::getManifestByDir(__DIR__);
 
 $containerUse = Components::checkAttr('containerUse', $attributes, $manifest);
 

diff --git a/src/Blocks/components/country/country.php b/src/Blocks/components/country/country.php
@@ -13,7 +13,7 @@
 use EightshiftFormsVendor\EightshiftFormsUtils\Config\UtilsConfig;
 use EightshiftFormsVendor\EightshiftFormsUtils\Helpers\UtilsHelper;
 
-$manifest = Components::getManifest(__DIR__);
+$manifest = Components::getManifestByDir(__DIR__);
 $manifestSelect = Components::getComponent('select');
 
 $componentName = $manifest['componentName'] ?? '';

diff --git a/src/Blocks/components/date/date.php b/src/Blocks/components/date/date.php
@@ -11,7 +11,7 @@
 use EightshiftFormsVendor\EightshiftFormsUtils\Helpers\UtilsHelper;
 use EightshiftFormsVendor\EightshiftLibs\Helpers\Components;
 
-$manifest = Components::getManifest(__DIR__);
+$manifest = Components::getManifestByDir(__DIR__);
 
 $componentClass = $manifest['componentClass'] ?? '';
 $additionalClass = $attributes['additionalClass'] ?? '';

diff --git a/src/Blocks/components/divider/divider.php b/src/Blocks/components/divider/divider.php
@@ -8,7 +8,7 @@
 
 use EightshiftFormsVendor\EightshiftLibs\Helpers\Components;
 
-$manifest = Components::getManifest(__DIR__);
+$manifest = Components::getManifestByDir(__DIR__);
 
 $componentClass = $manifest['componentClass'] ?? '';
 $additionalClass = $attributes['additionalClass'] ?? '';

diff --git a/src/Blocks/components/dynamic/dynamic.php b/src/Blocks/components/dynamic/dynamic.php
@@ -9,7 +9,7 @@
 use EightshiftFormsVendor\EightshiftFormsUtils\Helpers\UtilsHooksHelper;
 use EightshiftFormsVendor\EightshiftLibs\Helpers\Components;
 
-$manifest = Components::getManifest(__DIR__);
+$manifest = Components::getManifestByDir(__DIR__);
 
 $dynamicName = Components::checkAttr('dynamicName', $attributes, $manifest);
 if (!$dynamicName) {

diff --git a/src/Blocks/components/error/error.php b/src/Blocks/components/error/error.php
@@ -9,7 +9,7 @@
 use EightshiftFormsVendor\EightshiftFormsUtils\Helpers\UtilsHelper;
 use EightshiftFormsVendor\EightshiftLibs\Helpers\Components;
 
-$manifest = Components::getManifest(__DIR__);
+$manifest = Components::getManifestByDir(__DIR__);
 
 $componentClass = $manifest['componentClass'] ?? '';
 $additionalErrorClass = $attributes['additionalErrorClass'] ?? '';

diff --git a/src/Blocks/components/field/field.php b/src/Blocks/components/field/field.php
@@ -11,7 +11,7 @@
 use EightshiftFormsVendor\EightshiftFormsUtils\Helpers\UtilsHooksHelper;
 use EightshiftFormsVendor\EightshiftLibs\Helpers\Components;
 
-$manifest = Components::getManifest(__DIR__);
+$manifest = Components::getManifestByDir(__DIR__);
 
 $fieldUse = Components::checkAttr('fieldUse', $attributes, $manifest);
 if (!$fieldUse) {
@@ -160,14 +160,20 @@ class="<?php echo esc_attr($fieldClass); ?>"
 
 	<?php
 	if ($fieldUniqueId) {
-		echo Components::outputCssVariables($attributes, $manifest, $fieldUniqueId, [], 'wp-block');
+		echo Components::outputCssVariables($attributes, $manifest, $fieldUniqueId, 'wp-block');
 	} else {
 		echo Components::outputCssVariables($attributes, $manifest, $unique);
 	}
 
-	echo Components::renderPartial('component', 'utils', 'debug-field-details', [  // phpcs:ignore Eightshift.Security.ComponentsEscape.OutputNotEscaped
-		'name' => Components::checkAttr('fieldName', $attributes, $manifest),
-	]);
+	echo Components::render(
+		'debug-field-details',
+		[
+			'name' => Components::checkAttr('fieldName', $attributes, $manifest),
+		],
+		'components',
+		false,
+		'utils/partials'
+	);
 
 	?>
 	<div class="<?php echo esc_attr("{$componentClass}__inner"); ?>">
@@ -219,7 +225,7 @@ class="<?php echo esc_attr($labelClass); ?>"
 				Components::props('error', $attributes, [
 					'errorId' => $fieldId,
 					'selectorClass' => $componentClass
-				])
+				]),
 			);
 		}
 		?>

diff --git a/src/Blocks/components/file/file.php b/src/Blocks/components/file/file.php
@@ -10,7 +10,7 @@
 use EightshiftFormsVendor\EightshiftFormsUtils\Helpers\UtilsGeneralHelper;
 use EightshiftFormsVendor\EightshiftLibs\Helpers\Components;
 
-$manifest = Components::getManifest(__DIR__);
+$manifest = Components::getManifestByDir(__DIR__);
 
 $componentClass = $manifest['componentClass'] ?? '';
 $additionalClass = $attributes['additionalClass'] ?? '';

diff --git a/src/Blocks/components/form/form.php b/src/Blocks/components/form/form.php
@@ -17,7 +17,7 @@
 use EightshiftFormsVendor\EightshiftFormsUtils\Helpers\UtilsHooksHelper;
 use EightshiftFormsVendor\EightshiftLibs\Helpers\Components;
 
-$manifest = Components::getManifest(__DIR__);
+$manifest = Components::getManifestByDir(__DIR__);
 
 $componentClass = $manifest['componentClass'] ?? '';
 $additionalClass = $attributes['additionalClass'] ?? '';

diff --git a/src/Blocks/components/global-msg/global-msg.php b/src/Blocks/components/global-msg/global-msg.php
@@ -10,7 +10,7 @@
 use EightshiftFormsVendor\EightshiftFormsUtils\Helpers\UtilsHooksHelper;
 use EightshiftFormsVendor\EightshiftLibs\Helpers\Components;
 
-$manifest = Components::getManifest(__DIR__);
+$manifest = Components::getManifestByDir(__DIR__);
 
 $componentClass = $manifest['componentClass'] ?? '';
 $additionalClass = $attributes['additionalClass'] ?? '';

diff --git a/src/Blocks/components/group/group.php b/src/Blocks/components/group/group.php
@@ -9,7 +9,7 @@
 use EightshiftFormsVendor\EightshiftFormsUtils\Helpers\UtilsHelper;
 use EightshiftFormsVendor\EightshiftLibs\Helpers\Components;
 
-$manifest = Components::getManifest(__DIR__);
+$manifest = Components::getManifestByDir(__DIR__);
 
 $componentClass = $manifest['componentClass'] ?? '';
 $additionalGroupClass = $attributes['additionalGroupClass'] ?? '';

diff --git a/src/Blocks/components/highlighted-content/highlighted-content.php b/src/Blocks/components/highlighted-content/highlighted-content.php
@@ -9,7 +9,7 @@
 use EightshiftFormsVendor\EightshiftFormsUtils\Helpers\UtilsHelper;
 use EightshiftFormsVendor\EightshiftLibs\Helpers\Components;
 
-$manifest = Components::getManifest(__DIR__);
+$manifest = Components::getManifestByDir(__DIR__);
 
 $componentClass = $manifest['componentClass'] ?? '';
 $additionalClass = $attributes['additionalClass'] ?? '';

diff --git a/src/Blocks/components/input/input.php b/src/Blocks/components/input/input.php
@@ -11,7 +11,7 @@
 use EightshiftFormsVendor\EightshiftFormsUtils\Helpers\UtilsHelper;
 use EightshiftFormsVendor\EightshiftLibs\Helpers\Components;
 
-$manifest = Components::getManifest(__DIR__);
+$manifest = Components::getManifestByDir(__DIR__);
 
 $componentClass = $manifest['componentClass'] ?? '';
 $additionalClass = $attributes['additionalClass'] ?? '';

diff --git a/src/Blocks/components/intro/intro.php b/src/Blocks/components/intro/intro.php
@@ -9,7 +9,7 @@
 use EightshiftFormsVendor\EightshiftFormsUtils\Helpers\UtilsHelper;
 use EightshiftFormsVendor\EightshiftLibs\Helpers\Components;
 
-$manifest = Components::getManifest(__DIR__);
+$manifest = Components::getManifestByDir(__DIR__);
 
 $componentClass = $manifest['componentClass'] ?? '';
 $additionalClass = $attributes['additionalClass'] ?? '';

diff --git a/src/Blocks/components/invalid/invalid.php b/src/Blocks/components/invalid/invalid.php
@@ -9,7 +9,7 @@
 use EightshiftFormsVendor\EightshiftFormsUtils\Helpers\UtilsHelper;
 use EightshiftFormsVendor\EightshiftLibs\Helpers\Components;
 
-$manifest = Components::getManifest(__DIR__);
+$manifest = Components::getManifestByDir(__DIR__);
 
 $componentClass = $manifest['componentClass'] ?? '';
 $heading = $attributes['heading'] ?? '';

diff --git a/src/Blocks/components/layout/layout.php b/src/Blocks/components/layout/layout.php
@@ -8,7 +8,7 @@
 
 use EightshiftFormsVendor\EightshiftLibs\Helpers\Components;
 
-$manifest = Components::getManifest(__DIR__);
+$manifest = Components::getManifestByDir(__DIR__);
 
 $layoutUse = Components::checkAttr('layoutUse', $attributes, $manifest);
 if (!$layoutUse) {

diff --git a/src/Blocks/components/loader/loader.php b/src/Blocks/components/loader/loader.php
@@ -9,7 +9,7 @@
 use EightshiftFormsVendor\EightshiftFormsUtils\Helpers\UtilsHelper;
 use EightshiftFormsVendor\EightshiftLibs\Helpers\Components;
 
-$manifest = Components::getManifest(__DIR__);
+$manifest = Components::getManifestByDir(__DIR__);
 
 $componentClass = $manifest['componentClass'] ?? '';
 $additionalClass = $attributes['additionalClass'] ?? '';