Fix pb in UIntrospection (closure_dump)

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 ++) {