update Ubiquity renderView

Author: jcheron

Diff for: Ajax/php/ubiquity/JsUtils.php

@@ -15,7 +15,7 @@ class JsUtils extends \Ajax\JsUtils {
 	 */
 	protected function _open_script($src = '') {
 		$str = '<script ';
-		if (($this->params['csp']??false)==='nonce' && ContentSecurityManager::isStarted()) {
+		if (($this->params['csp'] ?? false) === 'nonce' && ContentSecurityManager::isStarted()) {
 			$nonce = ContentSecurityManager::getNonce('jsUtils');
 			$str .= ' nonce="' . $nonce . '" ';
 		}
@@ -24,14 +24,13 @@ protected function _open_script($src = '') {
 	}
 
 	public function inline($script, $cdata = true) {
-		if (($this->params['csp']??false)==='hash' && ContentSecurityManager::isStarted()) {
-			$script= ($cdata) ? "\n// <![CDATA[\n{$script}\n// ]]>\n" : "\n{$script}\n";
-			ContentSecurityManager::getHash('jsUtils',$script);
+		if (($this->params['csp'] ?? false) === 'hash' && ContentSecurityManager::isStarted()) {
+			$script = ($cdata) ? "\n// <![CDATA[\n{$script}\n// ]]>\n" : "\n{$script}\n";
+			ContentSecurityManager::getHash('jsUtils', $script);
 		}
-		return $this->_open_script().$script.$this->_close_script();
+		return $this->_open_script() . $script . $this->_close_script();
 	}
 
-
 	public function getUrl($url) {
 		return URequest::getUrl($url);
 	}
@@ -75,9 +74,7 @@ public function renderView($viewName, $parameters = [], $asString = false) {
 		if (isset($this->injected)) {
 			$view = $this->injected->getView();
 			$this->compile($view);
-			if (isset($parameters))
-				$view->setVars($parameters);
-			return $view->render($viewName, $asString);
+			return $this->injected->loadView($viewName, $parameters, $asString);
 		}
 		throw new \Exception(get_class() . " instance is not properly instancied : you omitted the second parameter \$controller!");
 	}

Diff for: Ajax/semantic/html/collections/form/HtmlFormField.php

@@ -2,6 +2,7 @@
 namespace Ajax\semantic\html\collections\form;
 
 use Ajax\JsUtils;
+use Ajax\semantic\components\validation\Rule;
 use Ajax\semantic\html\base\HtmlSemDoubleElement;
 use Ajax\semantic\html\base\constants\Wide;
 use Ajax\semantic\html\base\constants\State;
@@ -140,7 +141,11 @@ public function addRule($type, $prompt = NULL, $value = NULL) {
 			if (! isset($this->_validation)) {
 				$this->_validation = new FieldValidation($field->getIdentifier());
 			}
-			if ($type === 'empty' || ($type['type'] ?? '') === 'empty') {
+			if($type instanceof Rule){
+				if($type->getType()=='empty'){
+					$this->addToProperty('class', 'required');
+				}
+			}elseif ($type === 'empty' || ($type['type'] ?? '') === 'empty') {
 				$this->addToProperty('class', 'required');
 			}
 			$this->_validation->addRule($type, $prompt, $value);