Merge pull request #79 from phpMv/techempower-benchmarks

Update to 2.3.2

Author: jcheron

CHANGELOG.md

@@ -6,6 +6,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unrelease]
 - Nothing
+## [2.3.2] 2019-10-28
+### Added
+- bulk queries in `DAO` class
+  - `DAO::toAdd($instance)`
+  - `DAO::toUpdate($instance)`
+  - `DAO::toDelete($instance)`
+  - `DAO::flush()`
+- Composer create-project
+```
+composer create-project phpmv/ubiquity-project {projectName}
+```
+### Changed
+- `MicroTemplateEngine` optimization (cache) 
+### Added
 ## [2.3.1] 2019-09-25
 ### Added
 - `workerman` server

README.md

@@ -21,7 +21,7 @@
   - Scaffolding
   - Console Admin interface (Devtools)
   - Assets & themes management (since 2.1.0, on a [proposal](https://github.com/phpMv/ubiquity/issues/11) from [@Gildonei](https://github.com/gildonei))
-  - Managed servers: fpm/fastcgi with Apache or nginX, Swoole, PHP-PM with ReactPHP (Dev only)
+  - Managed servers: fpm/fastcgi with Apache or nginX, [Workerman](https://github.com/walkor/Workerman), [Swoole](https://github.com/swoole/swoole-src), [PHP-PM](https://github.com/php-pm/php-pm) with ReactPHP (Dev only)
 
 # Upgrade
 If Ubiquity devtools are already globally installed, and you want to upgrade to the lastest stable version:

src/Ubiquity/core/Framework.php

@@ -21,7 +21,7 @@
 use Ubiquity\utils\http\USession;
 
 class Framework {
-	public const version = '2.3.1';
+	public const version = '2.3.2';
 
 	public static function getVersion() {
 		return self::version;

src/Ubiquity/orm/DAO.php

@@ -134,7 +134,7 @@ public static function getOne($className, $condition, $included = true, $paramet
 	 * @return object the instance loaded or null if not found
 	 */
 	public static function getById($className, $keyValues, $included = true, $useCache = NULL) {
-		return self::_getOne ( self::getDb ( $className ), $className, self::getConditionParser ( $className, $keyValues ), $included, $useCache );
+		return self::_getOne ( self::getDatabase ( self::$modelsDatabase [$className] ?? 'default'), $className, self::getConditionParser ( $className, $keyValues ), $included, $useCache );
 	}
 
 	protected static function getConditionParser($className, $keyValues): ConditionParser {

src/Ubiquity/orm/parser/ConditionParser.php

@@ -58,7 +58,7 @@ public function setKeyValues($values) {
 		} else {
 			$this->params = [ ];
 			foreach ( $values as $val ) {
-				$this->addParams ( $val );
+				$this->params [$val] = true;
 			}
 		}
 	}

src/Ubiquity/utils/base/UIntrospection.php

@@ -7,7 +7,7 @@
  * This class is part of Ubiquity
  *
  * @author jcheron <[email protected]>
- * @version 1.0.5
+ * @version 1.0.6
  *
  */
 class UIntrospection {
@@ -34,7 +34,7 @@ public static function getLoadedViews(\ReflectionMethod $r, $lines) {
 		if (isset ( $matches [1] )) {
 			$result = array_merge ( $result, $matches [1] );
 		}
-		if (strpos ( $code, '$this->loadDefaultView' ) !== false || strpos ( $code, '$this->jquery->renderDefaultView' ) !== false) {
+		if (\strpos ( $code, '$this->loadDefaultView' ) !== false || strpos ( $code, '$this->jquery->renderDefaultView' ) !== false) {
 			$result [] = $r->getDeclaringClass ()->getShortName () . '/' . $r->getName () . '.html';
 		}
 		return $result;
@@ -80,7 +80,8 @@ public static function closure_dump(\Closure $c) {
 		$sLine = $r->getStartLine ();
 		$eLine = $r->getEndLine ();
 		if ($eLine === $sLine) {
-			$str .= \strstr ( \strstr ( $lines [$sLine - 1], "{" ), "}", true ) . "}";
+			$match = \strstr ( $lines [$sLine - 1], "function" );
+			$str .= \strstr ( \strstr ( $match, "{" ), "}", true ) . "}";
 		} else {
 			$str .= \strrchr ( $lines [$sLine - 1], "{" );
 			for($l = $sLine; $l < $eLine - 1; $l ++) {

src/Ubiquity/views/View.php

@@ -2,85 +2,88 @@
 
 namespace Ubiquity\views;
 
-use Ubiquity\utils\base\UString;
 use Ubiquity\views\engine\TemplateEngine;
 use Ubiquity\controllers\Startup;
 
 /**
- * Represents a view
+ * Represents a view.
+ * Ubiquity\views$View
+ * This class is part of Ubiquity
+ *
  * @author jcheron <[email protected]>
- * @version 1.0.2
+ * @version 1.0.3
  *
  */
 class View {
 	private $vars;
 
 	public function __construct() {
-		$this->vars=array ();
+		$this->vars = array ();
 	}
 
 	protected function includeFileAsString($filename) {
-		\ob_start();
+		\ob_start ();
 		include ($filename);
-		return \ob_get_clean();
+		return \ob_get_clean ();
 	}
 
 	public function setVar($name, $value) {
-		$this->vars[$name]=$value;
+		$this->vars [$name] = $value;
 		return $this;
 	}
 
 	public function setVars($vars) {
-		if (\is_array($vars))
-			$this->vars=\array_merge($this->vars, $vars);
+		if (\is_array ( $vars ))
+			$this->vars = \array_merge ( $this->vars, $vars );
 		else
-			$this->vars=$vars;
+			$this->vars = $vars;
 		return $this;
 	}
 
 	public function getVar($name) {
-		if (\array_key_exists($name, $this->vars)) {
-			return $this->vars[$name];
+		if (\array_key_exists ( $name, $this->vars )) {
+			return $this->vars [$name];
 		}
 	}
 
 	/**
 	 * affiche la vue $viewName
+	 *
 	 * @param string $viewName nom de la vue à charger
 	 * @param boolean $asString Si vrai, la vue n'est pas affichée mais retournée sous forme de chaîne (utilisable dans une variable)
 	 * @throws \Exception
 	 * @return string
 	 */
-	public function render($viewName, $asString=false) {
-		$templateEngine=Startup::$templateEngine;
-		$ext=\pathinfo($viewName, PATHINFO_EXTENSION);
+	public function render($viewName, $asString = false) {
+		$templateEngine = Startup::$templateEngine;
+		$ext = \pathinfo ( $viewName, PATHINFO_EXTENSION );
 		if ($ext === null)
-			$viewName=$viewName . ".php";
-		$data=$this->vars;
-		if (!UString::endswith($viewName, ".php") && $templateEngine instanceof TemplateEngine) {
-			return $templateEngine->render($viewName, $data, $asString);
+			$viewName = $viewName . '.php';
+		$data = $this->vars;
+		if (\substr ( $viewName, - strlen ( '.php' ) ) !== '.php' && $templateEngine instanceof TemplateEngine) {
+			return $templateEngine->render ( $viewName, $data, $asString );
 		}
 
-		if (is_array($data)) {
-			extract($data);
+		if (\is_array ( $data )) {
+			\extract ( $data );
 		}
-		$fileName=\ROOT . \DS . "views".\DS . $viewName;
-		if(file_exists($fileName)){
+		$fileName = \ROOT . \DS . 'views' . \DS . $viewName;
+		if (\file_exists ( $fileName )) {
 			if ($asString) {
-				return $this->includeFileAsString($fileName);
+				return $this->includeFileAsString ( $fileName );
 			} else {
 				include ($fileName);
 			}
-		}else{
-			throw new \Exception("View {$viewName} not found!");
+		} else {
+			throw new \Exception ( "View {$viewName} not found!" );
 		}
 	}
-	
-	public function getBlockNames($templateName){
-		return Startup::$templateEngine->getBlockNames($templateName);
+
+	public function getBlockNames($templateName) {
+		return Startup::$templateEngine->getBlockNames ( $templateName );
 	}
-	
-	public function getCode($templateName){
-		return Startup::$templateEngine->getCode($templateName);
+
+	public function getCode($templateName) {
+		return Startup::$templateEngine->getCode ( $templateName );
 	}
 }

src/Ubiquity/views/engine/micro/MicroTemplateEngine.php

@@ -3,28 +3,32 @@
 namespace Ubiquity\views\engine\micro;
 
 use Ubiquity\views\engine\TemplateEngine;
-use Ubiquity\controllers\Startup;
 use Ubiquity\utils\base\UFileSystem;
 
 class MicroTemplateEngine extends TemplateEngine {
 	private $viewsFolder;
+	private $parsers = [ ];
+
+	private function getTemplateParser(string $viewName): TemplateParser {
+		if (! isset ( $this->parsers [$viewName] )) {
+			$this->parsers [$viewName] = new TemplateParser ( $this->viewsFolder . $viewName );
+		}
+		return $this->parsers [$viewName];
+	}
 
 	public function __construct() {
-		$this->viewsFolder = \ROOT . \DS . "views" . \DS;
+		$this->viewsFolder = \ROOT . \DS . 'views' . \DS;
 	}
 
 	/*
 	 * (non-PHPdoc)
 	 * @see TemplateEngine::render()
 	 */
 	public function render($viewName, $pData, $asString) {
-		$config = Startup::getConfig (); // eventually used in template code
-		$fileName = $this->viewsFolder . $viewName;
 		if (\is_array ( $pData )) {
 			\extract ( $pData );
 		}
-		$tpl = new TemplateParser ( $fileName );
-		$content = eval ( '?>' . $tpl->__toString () );
+		$content = eval ( '?>' . $this->getTemplateParser ( $viewName )->__toString () );
 		if ($asString)
 			return $content;
 		else

src/Ubiquity/views/engine/micro/TemplateParser.php

@@ -3,25 +3,29 @@
 namespace Ubiquity\views\engine\micro;
 
 /**
- * Moteur de template pour les fichiers d'extension phtml
- * @author jc
+ * Micro template engine parser
+ * Ubiquity\views\engine\micro$TemplateParser
+ * This class is part of Ubiquity
+ *
+ * @author jcheron <[email protected]>
+ * @version 1.0.1
  *
  */
 class TemplateParser {
 	private $fileContent;
 
 	public function __construct($fileName) {
-		$this->fileContent=file_get_contents($fileName);
+		$this->fileContent = $this->parse ( \file_get_contents ( $fileName ) );
 	}
 
 	private function parse($html) {
-		$startPoint='{{';
-		$endPoint='}}';
-		$result=preg_replace('/(' . preg_quote($startPoint) . ')(.*?)(' . preg_quote($endPoint) . ')/sim', '<?php echo $2 ?>', $html);
+		$startPoint = '{{';
+		$endPoint = '}}';
+		$result = \preg_replace ( '/(' . \preg_quote ( $startPoint ) . ')(.*?)(' . \preg_quote ( $endPoint ) . ')/sim', '<?php echo $2 ?>', $html );
 		return $result;
 	}
 
 	public function __toString() {
-		return $this->parse($this->fileContent);
+		return $this->fileContent;
 	}
 }