corrections

Author: jcheron

micro/cache/CacheManager.php

@@ -107,7 +107,7 @@ public static function initCache(&$config, $type="all",$silent=false) {
 			self::initRestCache($config,$silent);
 	}
 
-	private static function _getFiles(&$config,$type,$silent=false){
+	protected static function _getFiles(&$config,$type,$silent=false){
 		$typeNS=$config["mvcNS"][$type];
 		$typeDir=ROOT . DS . str_replace("\\", DS, $typeNS);
 		if(!$silent)

micro/cache/parser/ControllerParser.php

@@ -135,7 +135,7 @@ public static function parseRouteArray(&$result, $controllerClass, $routeArray,
 
 	public static function addParamsPath($path, \ReflectionMethod $method) {
 		$parameters=[ ];
-		$hasOptionnal=false;
+		$hasOptional=false;
 		preg_match_all('@\{(\.\.\.|\~)?(.+?)\}@s', $path, $matches);
 		if (isset($matches[2]) && \sizeof($matches[2]) > 0) {
 			$path=\preg_quote($path);
@@ -144,33 +144,37 @@ public static function addParamsPath($path, \ReflectionMethod $method) {
 			foreach ( $matches[2] as $paramMatch ) {
 				$find=\array_search($paramMatch, $params);
 				if ($find !== false) {
-					if(isset($matches[1][$index])){
-						if($matches[1][$index]==="..."){
-							$parameters[]="*";
-							$path=\str_replace("\{\.\.\." . $paramMatch . "\}", "(.*?)", $path);
-						}elseif($matches[1][$index]==="~"){
-							$parameters[]="~".$find;
-							$path=\str_replace("\{~" . $paramMatch . "\}", "", $path);
-							$hasOptionnal=true;
-						}else{
-							$parameters[]=$find;
-							$path=\str_replace("\{" . $paramMatch . "\}", "(.+?)", $path);
-						}
-					}else{
-						$parameters[]=$find;
-						$path=\str_replace("\{" . $paramMatch . "\}", "(.+?)", $path);
-					}
+					self::scanParam($parameters, $hasOptional, $matches, $index, $paramMatch, $find, $path);
 				} else {
 					throw new \Exception("{$paramMatch} is not a parameter of the method " . $method->name);
 				}
 				$index++;
 			}
 		}
-		if($hasOptionnal)
+		if($hasOptional)
 			$path.="/(.*?)";
 		return [ "path" => $path,"parameters" => $parameters ];
 	}
 
+	private static function scanParam(&$parameters,&$hasOptional,$matches,$index,$paramMatch,$find,&$path){
+		if(isset($matches[1][$index])){
+			if($matches[1][$index]==="..."){
+				$parameters[]="*";
+				$path=\str_replace("\{\.\.\." . $paramMatch . "\}", "(.*?)", $path);
+			}elseif($matches[1][$index]==="~"){
+				$parameters[]="~".$find;
+				$path=\str_replace("\{~" . $paramMatch . "\}", "", $path);
+				$hasOptional=true;
+			}else{
+				$parameters[]=$find;
+				$path=\str_replace("\{" . $paramMatch . "\}", "(.+?)", $path);
+			}
+		}else{
+			$parameters[]=$find;
+			$path=\str_replace("\{" . $paramMatch . "\}", "(.+?)", $path);
+		}
+	}
+
 	private static function createRouteMethod(&$result, $controllerClass, $path, $httpMethods, $method, $parameters, $name, $cache, $duration) {
 		foreach ( $httpMethods as $httpMethod ) {
 			$result[$path][$httpMethod]=[ "controller" => $controllerClass,"action" => $method,"parameters" => $parameters,"name" => $name,"cache" => $cache,"duration" => $duration ];

micro/cache/traits/ModelsCacheTrait.php

@@ -9,6 +9,7 @@
  * @static array $cache
  */
 trait ModelsCacheTrait{
+	abstract protected static function _getFiles(&$config,$type,$silent=false);
 
 	public static function createOrmModelCache($classname) {
 		$key=self::getModelCacheKey($classname);

micro/cache/traits/RestCacheTrait.php

@@ -63,4 +63,4 @@ public static function getRestCacheController($controllerClass){
 		}
 		return null;
 	}
-}
+}

micro/cache/traits/RouterCacheTrait.php

@@ -13,7 +13,7 @@
  *
  */
 trait RouterCacheTrait{
-
+	abstract protected static function _getFiles(&$config,$type,$silent=false);
 	private static $expiredRoutes=[ ];
 
 	private static function addControllerCache($classname) {

micro/controllers/admin/UbiquityMyAdminViewer.php

@@ -297,7 +297,7 @@ public function getModelsStructureDataTable($datas){
 		$de->setFields($fields);
 		$de->setCaptions($fields);
 		foreach ($fields as $key){
-			$de->setValueFunction($key, function($value) use ($key){
+			$de->setValueFunction($key, function($value){
 				if($value instanceof  \stdClass){
 					$value=(array) $value;
 				}

micro/controllers/admin/popo/Route.php

@@ -153,5 +153,12 @@ public function getMessages() {
 		return $this->messages;
 	}
 
+	public function getMethods() {
+		return $this->methods;
+	}
 
+	public function setMethods($methods) {
+		$this->methods=$methods;
+		return $this;
+	}
 }

micro/utils/yuml/ClassesToYuml.php

@@ -21,12 +21,8 @@ public function __construct($displayProperties=true,$displayAssociations=true,$d
 		$this->displayMethodsParams=$displayMethodsParams;
 		$this->displayPropertiesTypes=$displayPropertiesTypes;
 	}
+
 	/**
-	 * @param boolean $displayProperties
-	 * @param boolean $displayAssociations
-	 * @param boolean $displayMethods
-	 * @param boolean $displayMethodsParams
-	 * @param boolean $displayPropertiesTypes
 	 * @return ClassParser[]|string[]
 	 */
 	public function parse(){