Merge branch 'namespace--all' of https://github.com/C-Lodder/joomla-cms…

… into namespace--all
joomla · Mar 13, 2019 · 98d3a1f · 98d3a1f
2 parents 685a28e + 1c3e325
commit 98d3a1f
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/administrator/components/com_languages/Model/LanguageModel.php b/administrator/components/com_languages/Model/LanguageModel.php
@@ -125,7 +125,7 @@ public function getItem($langId = null)
 		}
 
 		$properties = $table->getProperties(1);
-		$value      = ArrayHelper::toObject($properties, 'CMSObject');
+		$value      = ArrayHelper::toObject($properties, CMSObject::class);
 
 		return $value;
 	}

diff --git a/administrator/components/com_menus/Model/MenuModel.php b/administrator/components/com_menus/Model/MenuModel.php
@@ -139,7 +139,7 @@ public function &getItem($itemId = null)
 		}
 
 		$properties = $table->getProperties(1);
-		$value      = ArrayHelper::toObject($properties, 'CMSObject');
+		$value      = ArrayHelper::toObject($properties, CMSObject::class);
 
 		return $value;
 	}

diff --git a/administrator/components/com_modules/Model/ModuleModel.php b/administrator/components/com_modules/Model/ModuleModel.php
@@ -721,7 +721,7 @@ public function getItem($pk = null)
 
 			// Convert to the CMSObject before adding other data.
 			$properties        = $table->getProperties(1);
-			$this->_cache[$pk] = ArrayHelper::toObject($properties, 'CMSObject');
+			$this->_cache[$pk] = ArrayHelper::toObject($properties, CMSObject::class);
 
 			// Convert the params field to an array.
 			$registry = new Registry($table->params);

diff --git a/administrator/components/com_plugins/Model/PluginModel.php b/administrator/components/com_plugins/Model/PluginModel.php
@@ -178,7 +178,7 @@ public function getItem($pk = null)
 
 			// Convert to the CMSObject before adding other data.
 			$properties = $table->getProperties(1);
-			$this->_cache[$pk] = ArrayHelper::toObject($properties, 'CMSObject');
+			$this->_cache[$pk] = ArrayHelper::toObject($properties, CMSObject::class);
 
 			// Convert the params field to an array.
 			$registry = new Registry($table->params);

diff --git a/administrator/components/com_templates/Model/StyleModel.php b/administrator/components/com_templates/Model/StyleModel.php
@@ -366,7 +366,7 @@ public function getItem($pk = null)
 
 			// Convert to the CMSObject before adding other data.
 			$properties        = $table->getProperties(1);
-			$this->_cache[$pk] = ArrayHelper::toObject($properties, 'CMSObject');
+			$this->_cache[$pk] = ArrayHelper::toObject($properties, CMSObject::class);
 
 			// Convert the params field to an array.
 			$registry = new Registry($table->params);

diff --git a/administrator/components/com_users/Model/GroupModel.php b/administrator/components/com_users/Model/GroupModel.php
@@ -131,7 +131,7 @@ protected function loadFormData()
 	 */
 	protected function preprocessForm(\JForm $form, $data, $group = '')
 	{
-		$obj = is_array($data) ? ArrayHelper::toObject($data, 'CMSObject') : $data;
+		$obj = is_array($data) ? ArrayHelper::toObject($data, CMSObject::class) : $data;
 
 		if (isset($obj->parent_id) && $obj->parent_id == 0 && $obj->id > 0)
 		{

diff --git a/libraries/cms/html/behavior.php b/libraries/cms/html/behavior.php
@@ -646,7 +646,7 @@ protected static function calendartranslation()
 		$jsscript = 1;
 
 		// To keep the code simple here, run strings through Text::_() using array_map()
-		$callback = array('Text', '_');
+		$callback = array(Text::class, '_');
 		$weekdays_full = array_map(
 			$callback, array(
 				'SUNDAY', 'MONDAY', 'TUESDAY', 'WEDNESDAY', 'THURSDAY', 'FRIDAY', 'SATURDAY', 'SUNDAY',