more jtext

joomla · Mar 12, 2019 · d721332 · d721332
1 parent b2a8996
commit d721332
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 14 deletions.
diff --git a/build/build-modules-js/namespace.es6.js b/build/build-modules-js/namespace.es6.js
@@ -4,12 +4,13 @@ const RootPath = require('./utils/rootpath.es6.js')._();
 
 
 const jregex = /defined\('(JPATH_BASE|_JEXEC|JPATH_PLATFORM)'\) or die;/gm;
-const oldClassName = 'JText';
-const newClassName = 'Text';
-const classUse  = 'use Joomla\\CMS\\Language\\Text;';
+const oldClassName = 'JRegistry';
+const newClassName = 'Registry';
+const classUse  = 'use Joomla\\Registry\\Registry;';
 const root = `${RootPath}/`;
 const filesToIgnore = [
 	'classmap.php',
+	'com_finder',
 ]
 
 module.exports.run = () => {
@@ -56,7 +57,7 @@ const readFile = (path) => {
 
 const getInstances = (content, path) => {
 	//const regex = /[^\s*](?=\S)(?!\/\*\*)(?!\/\/)(?!\*)(\\?JText)/gm;
-	const regex = /(?=\S)(?!\/\*\*)(?!\/\/)(?!\*)(\\?JText)/gm;
+	const regex = /(?=\S)(?!\/\*\*)(?!\/\/)(?!\*)(\\?JRegistry)/gm;
 	const matches = content.match(regex);
 
 	if (matches !== null) {

diff --git a/libraries/cms/html/behavior.php b/libraries/cms/html/behavior.php
@@ -16,9 +16,6 @@
 use Joomla\CMS\Log\Log;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Uri\Uri;
-use of formvalidation is deprecated use formvalidator instead.'
- Log::WARNING
- 'deprecated');
 
 /**
  * Utility class for JavaScript behaviors
@@ -102,7 +99,7 @@ public static function core()
 	 */
 	public static function formvalidation()
 	{
-		Log::add('The 
+		Log::add('The use of formvalidation is deprecated use formvalidator instead.', Log::WARNING, 'deprecated');
 
 		// Only load once
 		if (isset(static::$loaded[__METHOD__]))

diff --git a/libraries/src/MVC/Controller/FormController.php b/libraries/src/MVC/Controller/FormController.php
@@ -10,7 +10,6 @@
 
 defined('JPATH_PLATFORM') or die;
 
-use FormFactoryAwareTrait;
 use Joomla\CMS\Application\CMSApplication;
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
@@ -32,7 +31,7 @@
  */
 class FormController extends BaseController implements FormFactoryAwareInterface
 {
-
+	use FormFactoryAwareTrait;
 
 	/**
 	 * The context for storing internal data, e.g. record.

diff --git a/libraries/src/MVC/Model/BaseModel.php b/libraries/src/MVC/Model/BaseModel.php
@@ -12,8 +12,6 @@
 
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Object\CMSObject;
-use LeagcyModelLoaderTrait;
-use StateBehaviorTrait;
 
 /**
  * Base class for a Joomla Model
@@ -22,8 +20,8 @@
  */
 abstract class BaseModel extends CMSObject implements ModelInterface, StatefulModelInterface
 {
-
-
+	use LeagcyModelLoaderTrait;
+	use StateBehaviorTrait;
 
 	/**
 	 * The model (base) name