Merge pull request #12395 from mbabker/registry-instantiation

[3.7] Simplify instantiation of Registry

build/helpTOC.php

@@ -56,7 +56,7 @@ public function doExecute()
 		$namespace   = 'Help' . $helpVersion . ':';
 
 		// Set up options for JMediawiki
-		$options = new JRegistry;
+		$options = new Joomla\Registry\Registry;
 		$options->set('api.url', 'https://docs.joomla.org');
 
 		$mediawiki = new JMediawiki($options);

components/com_banners/models/banners.php

@@ -206,9 +206,7 @@ public function getItems()
 
 			foreach ($this->cache['items'] as &$item)
 			{
-				$parameters   = new Registry;
-				$parameters->loadString($item->params);
-				$item->params = $parameters;
+				$item->params = new Registry($item->params);
 			}
 		}
 

components/com_contact/models/category.php

@@ -96,9 +96,7 @@ public function getItems()
 			$item = & $items[$i];
 			if (!isset($this->_params))
 			{
-				$params = new Registry;
-				$params->loadString($item->params);
-				$item->params = $params;
+				$item->params = new Registry($item->params);
 			}
 			$this->tags = new JHelperTags;
 			$this->tags->getItemTags('com_contact.contact', $item->id);

components/com_contact/models/contact.php

@@ -205,13 +205,11 @@ public function &getItem($pk = null)
 				}
 
 				// Convert parameter fields to objects.
-				$registry = new Registry;
-				$registry->loadString($data->params);
+				$registry = new Registry($data->params);
 				$data->params = clone $this->getState('params');
 				$data->params->merge($registry);
 
-				$registry = new Registry;
-				$registry->loadString($data->metadata);
+				$registry = new Registry($data->metadata);
 				$data->metadata = $registry;
 
 				$data->tags = new JHelperTags;
@@ -273,8 +271,7 @@ protected function buildContactExtendedData($contact)
 		$groups    = implode(',', $user->getAuthorisedViewLevels());
 		$published = $this->getState('filter.published');
 
-		$contactParams = new Registry;
-		$contactParams->loadString($contact->params);
+		$contactParams = new Registry($contact->params);
 
 		// If we are showing a contact list, then the contact parameters take priority
 		// So merge the contact parameters with the merged parameters
@@ -459,8 +456,7 @@ protected function getContactQuery($pk = null)
 			if ($result)
 			{
 
-				$contactParams = new Registry;
-				$contactParams->loadString($result->params);
+				$contactParams = new Registry($result->params);
 
 				// If we are showing a contact list, then the contact parameters take priority
 				// So merge the contact parameters with the merged parameters

components/com_contact/models/featured.php

@@ -122,9 +122,7 @@ public function getItems()
 			$item = & $items[$i];
 			if (!isset($this->_params))
 			{
-				$params = new Registry;
-				$params->loadString($item->params);
-				$item->params = $params;
+				$item->params = new Registry($item->params);
 			}
 		}
 

components/com_contact/views/category/view.html.php

@@ -60,8 +60,7 @@ public function display($tpl = null)
 		foreach ($this->items as $item)
 		{
 			$item->slug = $item->alias ? ($item->id . ':' . $item->alias) : $item->id;
-			$temp       = new Registry;
-			$temp->loadString($item->params);
+			$temp       = new Registry($item->params);
 			$item->params = clone($this->params);
 			$item->params->merge($temp);
 

components/com_contact/views/featured/view.html.php

@@ -96,9 +96,7 @@ public function display($tpl = null)
 		{
 			$item       = &$items[$i];
 			$item->slug = $item->alias ? ($item->id . ':' . $item->alias) : $item->id;
-			$temp       = new Registry;
-
-			$temp->loadString($item->params);
+			$temp       = new Registry($item->params);
 			$item->params = clone $params;
 			$item->params->merge($temp);
 

components/com_content/models/article.php

@@ -170,15 +170,12 @@ public function getItem($pk = null)
 				}
 
 				// Convert parameter fields to objects.
-				$registry = new Registry;
-				$registry->loadString($data->attribs);
+				$registry = new Registry($data->attribs);
 
 				$data->params = clone $this->getState('params');
 				$data->params->merge($registry);
 
-				$registry = new Registry;
-				$registry->loadString($data->metadata);
-				$data->metadata = $registry;
+				$data->metadata = new Registry($data->metadata);
 
 				// Technically guest could edit an article, but lets not check that to improve performance a little.
 				if (!$user->get('guest'))

components/com_content/models/articles.php

@@ -580,8 +580,7 @@ public function getItems()
 		// Convert the parameter fields into objects.
 		foreach ($items as &$item)
 		{
-			$articleParams = new Registry;
-			$articleParams->loadString($item->attribs);
+			$articleParams = new Registry($item->attribs);
 
 			// Unpack readmore and layout params
 			$item->alternative_readmore = $articleParams->get('alternative_readmore');
@@ -620,8 +619,7 @@ public function getItems()
 				// Merge the selected article params
 				if (count($articleArray) > 0)
 				{
-					$articleParams = new Registry;
-					$articleParams->loadArray($articleArray);
+					$articleParams = new Registry($articleArray);
 					$item->params->merge($articleParams);
 				}
 			}

components/com_content/models/form.php

@@ -87,8 +87,7 @@ public function getItem($itemId = null)
 		$value = ArrayHelper::toObject($properties, 'JObject');
 
 		// Convert attrib field to Registry.
-		$value->params = new Registry;
-		$value->params->loadString($value->attribs);
+		$value->params = new Registry($value->attribs);
 
 		// Compute selected asset permissions.
 		$user   = JFactory::getUser();
@@ -141,8 +140,7 @@ public function getItem($itemId = null)
 		}
 
 		// Convert the metadata field to an array.
-		$registry = new Registry;
-		$registry->loadString($value->metadata);
+		$registry = new Registry($value->metadata);
 		$value->metadata = $registry->toArray();
 
 		if ($itemId)

components/com_finder/helpers/html/filter.php

@@ -66,9 +66,7 @@ public static function slider($options = array())
 			// Initialize the filter parameters.
 			if ($filter)
 			{
-				$registry = new Registry;
-				$registry->loadString($filter->params);
-				$filter->params = $registry;
+				$filter->params = new Registry($filter->params);
 			}
 		}
 
@@ -255,9 +253,7 @@ public static function select($idxQuery, $options)
 				// Initialize the filter parameters.
 				if ($filter)
 				{
-					$registry = new Registry;
-					$registry->loadString($filter->params);
-					$filter->params = $registry;
+					$filter->params = new Registry($filter->params);
 				}
 			}
 

components/com_newsfeeds/models/newsfeed.php

@@ -133,14 +133,11 @@ public function &getItem($pk = null)
 				}
 
 				// Convert parameter fields to objects.
-				$registry = new Registry;
-				$registry->loadString($data->params);
+				$registry = new Registry($data->params);
 				$data->params = clone $this->getState('params');
 				$data->params->merge($registry);
 
-				$registry = new Registry;
-				$registry->loadString($data->metadata);
-				$data->metadata = $registry;
+				$data->metadata = new Registry($data->metadata);
 
 				// Compute access permissions.
 

components/com_newsfeeds/views/category/view.html.php

@@ -52,8 +52,7 @@ public function display($tpl = null)
 		foreach ($this->items as $item)
 		{
 			$item->slug = $item->alias ? ($item->id . ':' . $item->alias) : $item->id;
-			$temp       = new Registry;
-			$temp->loadString($item->params);
+			$temp       = new Registry($item->params);
 			$item->params = clone $this->params;
 			$item->params->merge($temp);
 		}

components/com_newsfeeds/views/newsfeed/view.html.php

@@ -153,8 +153,7 @@ public function display($tpl = null)
 		// Get the newsfeed
 		$newsfeed = $item;
 
-		$temp = new Registry;
-		$temp->loadString($item->params);
+		$temp = new Registry($item->params);
 		$params->merge($temp);
 
 		try

components/com_search/views/search/view.html.php

@@ -49,8 +49,7 @@ public function display($tpl = null)
 		// Because the application sets a default page title, we need to get it right from the menu item itself
 		if (is_object($menu))
 		{
-			$menu_params = new Registry;
-			$menu_params->loadString($menu->params);
+			$menu_params = new Registry($menu->params);
 
 			if (!$menu_params->get('page_title'))
 			{

components/com_tags/views/tag/view.html.php

@@ -76,8 +76,7 @@ public function display($tpl = null)
 			// Prepare the data.
 			if (!empty($itemElement))
 			{
-				$temp = new Registry;
-				$temp->loadString($itemElement->params);
+				$temp = new Registry($itemElement->params);
 				$itemElement->params = clone $params;
 				$itemElement->params->merge($temp);
 				$itemElement->params = (array) json_decode($itemElement->params);

components/com_tags/views/tags/view.html.php

@@ -68,8 +68,7 @@ public function display($tpl = null)
 				}
 
 				// Prepare the data.
-				$temp = new Registry;
-				$temp->loadString($itemElement->params);
+				$temp = new Registry($itemElement->params);
 				$itemElement->params = clone $params;
 				$itemElement->params->merge($temp);
 				$itemElement->params = (array) json_decode($itemElement->params);

installation/application/web.php

@@ -534,7 +534,7 @@ public function loadSession(JSession $session = null)
 		if (!$session->get('registry') instanceof Registry)
 		{
 			// Registry has been corrupted somehow.
-			$session->set('registry', new Registry('session'));
+			$session->set('registry', new Registry);
 		}
 
 		// Set the session object.

libraries/cms/application/cms.php

@@ -145,7 +145,7 @@ public function afterSessionStart()
 
 		if ($session->isNew())
 		{
-			$session->set('registry', new Registry('session'));
+			$session->set('registry', new Registry);
 			$session->set('user', new JUser);
 		}
 	}

libraries/cms/application/site.php

@@ -351,8 +351,7 @@ public function getParams($option = null)
 				// Get show_page_heading from com_menu global settings
 				$params[$hash]->def('show_page_heading', $temp->get('show_page_heading'));
 
-				$temp = new Registry;
-				$temp->loadString($menu->params);
+				$temp = new Registry($menu->params);
 				$params[$hash]->merge($temp);
 				$title = $menu->title;
 			}
@@ -484,9 +483,7 @@ public function getTemplate($params = false)
 
 			foreach ($templates as &$template)
 			{
-				$registry = new Registry;
-				$registry->loadString($template->params);
-				$template->params = $registry;
+				$template->params = new Registry($template->params);
 
 				// Create home element
 				if ($template->home == 1 && !isset($templates[0]) || $this->_language_filter && $template->home == $tag)
@@ -521,9 +518,7 @@ public function getTemplate($params = false)
 					{
 						$template = $tmpl;
 
-						$registry = new Registry;
-						$registry->loadString($template->params);
-						$template->params = $registry;
+						$template->params = new Registry($template->params);
 
 						break;
 					}

libraries/cms/component/helper.php

@@ -58,9 +58,7 @@ public static function getComponent($option, $strict = false)
 
 		if (is_string($result->params))
 		{
-			$temp = new Registry;
-			$temp->loadString(static::$components[$option]->params);
-			static::$components[$option]->params = $temp;
+			static::$components[$option]->params = new Registry(static::$components[$option]->params);
 		}
 
 		return $result;

libraries/cms/editor/editor.php

@@ -536,8 +536,7 @@ protected function _loadEditor($config = array())
 			return false;
 		}
 
-		$params = new Registry;
-		$params->loadString($plugin->params);
+		$params = new Registry($plugin->params);
 		$params->loadArray($config);
 		$plugin->params = $params;
 

libraries/cms/installer/adapter/language.php

@@ -670,8 +670,7 @@ public function uninstall($eid)
 
 		foreach ($users as $user)
 		{
-			$registry = new Registry;
-			$registry->loadString($user->params);
+			$registry = new Registry($user->params);
 
 			if ($registry->get($param_name) == $element)
 			{

libraries/cms/library/helper.php

@@ -175,9 +175,7 @@ protected static function _load($element)
 		// Convert the params to an object.
 		if (is_string(static::$libraries[$element]->params))
 		{
-			$temp = new Registry;
-			$temp->loadString(static::$libraries[$element]->params);
-			static::$libraries[$element]->params = $temp;
+			static::$libraries[$element]->params = new Registry(static::$libraries[$element]->params);
 		}
 
 		return true;

libraries/cms/menu/menu.php

@@ -83,9 +83,7 @@ public function __construct($options = array())
 			// Decode the item params
 			try
 			{
-				$result = new Registry;
-				$result->loadString($item->params);
-				$item->params = $result;
+				$item->params = new Registry($item->params);
 			}
 			catch (RuntimeException $e)
 			{

libraries/cms/module/helper.php

@@ -166,8 +166,7 @@ public static function renderModule($module, $attribs = array())
 		$app->scope = $module->module;
 
 		// Get module parameters
-		$params = new Registry;
-		$params->loadString($module->params);
+		$params = new Registry($module->params);
 
 		// Get the template
 		$template = $app->getTemplate();

libraries/cms/plugin/plugin.php

@@ -71,8 +71,7 @@ public function __construct(&$subject, $config = array())
 			}
 			else
 			{
-				$this->params = new Registry;
-				$this->params->loadString($config['params']);
+				$this->params = new Registry($config['params']);
 			}
 		}