More work on namespacing helpers

keianrad · Sep 20, 2017 · b9a386f · b9a386f
1 parent fe2edc1
commit b9a386f
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -55,10 +55,10 @@ plugins/*
 !plugins/system/
 plugins/system/*
 !plugins/system/fabrik
-!plugins/search/*
+!plugins/search/
+plugins/search/*
 !plugins/search/fabrik
 plugins/fabrik_list/download/libs
-!plugins/system/fabrik/
 !plugins/fabrik_element/
 !plugins/fabrik_form/
 plugins/fabrik_form/php/scripts/

diff --git a/components/com_fabrik/helpers/googlemap.php → ...aries/fabrik/fabrik/Helpers/Googlemap.php b/components/com_fabrik/helpers/googlemap.php → ...aries/fabrik/fabrik/Helpers/Googlemap.php
@@ -8,9 +8,13 @@
  * @license     GNU/GPL http://www.gnu.org/copyleft/gpl.html
  */
 
+namespace Fabrik\Helpers;
+
 // No direct access
 defined('_JEXEC') or die('Restricted access');
 
+use \stdClass;
+
 /**
  * Google Map class
  *
@@ -19,7 +23,7 @@
  * @since       3.0
  */
 
-class FabGoogleMapHelper
+class Googlemap
 {
 	/**
 	 * Set the google map style
@@ -53,18 +57,18 @@ public static function styleJs($params)
 
 		for ($i = 0; $i < count($features); $i ++)
 		{
-			$feature = FArrayHelper::getValue($features, $i);
-			$element = FArrayHelper::getValue($elements, $i);
+			$feature = ArrayHelper::getValue($features, $i);
+			$element = ArrayHelper::getValue($elements, $i);
 			$key = $feature . '|' . $element;
 
 			if (!array_key_exists($key, $stylers))
 			{
 				$stylers[$key] = array();
 			}
 
-			$aStyle = new stdClass;
-			$styleKey = FArrayHelper::getValue($styleKeys, $i);
-			$styleValue = FArrayHelper::getValue($styleValues, $i);
+			$aStyle = new \stdClass;
+			$styleKey = ArrayHelper::getValue($styleKeys, $i);
+			$styleValue = ArrayHelper::getValue($styleValues, $i);
 
 			if ($styleKey && $styleValue)
 			{
@@ -77,7 +81,7 @@ public static function styleJs($params)
 
 		foreach ($stylers as $styleKey => $styler)
 		{
-			$o = new stdClass;
+			$o = new \stdClass;
 			$bits = explode('|', $styleKey);
 
 			if ( $bits[0] !== 'all')

diff --git a/libraries/fabrik/fabrik/Helpers/arrayhelper.php b/libraries/fabrik/fabrik/Helpers/arrayhelper.php
@@ -13,6 +13,8 @@
 // No direct access
 defined('_JEXEC') or die('Restricted access');
 
+use \stdClass;
+
 /**
  * Array helper class
  *

diff --git a/libraries/fabrik/fabrik/Helpers/stringhelper.php b/libraries/fabrik/fabrik/Helpers/stringhelper.php
@@ -14,6 +14,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Utilities\ArrayHelper;
+use \stdClass;
 
 /**
  * String helpers

diff --git a/plugins/fabrik_element/googlemap/googlemap.php b/plugins/fabrik_element/googlemap/googlemap.php
@@ -12,9 +12,10 @@
 defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Utilities\ArrayHelper;
+use Fabrik\Helpers\Googlemap;
 
 require_once JPATH_SITE . '/components/com_fabrik/models/element.php';
-require_once JPATH_SITE . '/components/com_fabrik/helpers/googlemap.php';
+
 
 /**
  * Plugin element to render a Google map
@@ -332,7 +333,7 @@ public function elementJavascript($repeatCounter)
 					|| $geocode_on_load == 3
 				);
 		$opts->auto_center = (bool) $params->get('fb_gm_auto_center', false);
-		$opts->styles = FabGoogleMapHelper::styleJs($params);
+		$opts->styles = Googlemap::styleJs($params);
 
 		if ($opts->geocode == '2')
 		{