@@ -27,10 +27,10 @@ discard block |
||
| 27 | 27 | $label = self::getLabel($property->getDocComment()); |
| 28 | 28 | $values = self::getValues($property->getDocComment()); |
| 29 | 29 | $isArray = (bool)preg_match('/\[\]$/', $instanceType); |
| 30 | - if($isArray) { |
|
| 30 | + if ($isArray) { |
|
| 31 | 31 | $instanceType = str_replace('[]', '', $instanceType); |
| 32 | 32 | } |
| 33 | - if($instanceType === '\\DateTime' || !Router::exists($instanceType)) { |
|
| 33 | + if ($instanceType === '\\DateTime' || !Router::exists($instanceType)) { |
|
| 34 | 34 | list($type, $format) = DocumentorHelper::translateSwaggerFormats($instanceType); |
| 35 | 35 | $variables[$property->getName()] = [ |
| 36 | 36 | 'type' => $type, |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | 'required' => $isRequired, |
| 39 | 39 | 'description' => $label, |
| 40 | 40 | ]; |
| 41 | - } else { |
|
| 41 | + }else { |
|
| 42 | 42 | $instance = new \ReflectionClass($instanceType); |
| 43 | 43 | $variables[$property->getName()] = [ |
| 44 | 44 | 'is_array' => $isArray, |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | 'properties' => self::extractVariables($instance), |
| 48 | 48 | ]; |
| 49 | 49 | } |
| 50 | - if(!empty($values)){ |
|
| 50 | + if (!empty($values)) { |
|
| 51 | 51 | $variables[$property->getName()]['enum'] = $values; |
| 52 | 52 | } |
| 53 | 53 | } |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | { |
| 115 | 115 | $visible = false; |
| 116 | 116 | if (false !== preg_match('/@visible\s+([^\s]+)/', $doc, $matches)) { |
| 117 | - $visible = count($matches) < 2 || 'false' !== strtolower($matches[1]); |
|
| 117 | + $visible = count($matches) < 2 || 'false' !== strtolower($matches[1]); |
|
| 118 | 118 | } |
| 119 | 119 | return $visible; |
| 120 | 120 | } |
@@ -127,7 +127,7 @@ discard block |
||
| 127 | 127 | // Extract description |
| 128 | 128 | $label = null; |
| 129 | 129 | preg_match('/@label\ (.*)\n/i', $doc, $matches); |
| 130 | - if(count($matches) > 1) { |
|
| 130 | + if (count($matches) > 1) { |
|
| 131 | 131 | $label = t($matches[1]); |
| 132 | 132 | } |
| 133 | 133 | return $label; |
@@ -141,7 +141,7 @@ discard block |
||
| 141 | 141 | // Extract description |
| 142 | 142 | $label = null; |
| 143 | 143 | preg_match('/@values\ (.*)\n/i', $doc, $matches); |
| 144 | - if(count($matches) > 1) { |
|
| 144 | + if (count($matches) > 1) { |
|
| 145 | 145 | $label = t($matches[1]); |
| 146 | 146 | } |
| 147 | 147 | return false !== strpos($label, '|') ? explode('|', $label) : $label; |
@@ -154,7 +154,7 @@ discard block |
||
| 154 | 154 | public static function getDefaultValue($doc) { |
| 155 | 155 | $default = null; |
| 156 | 156 | preg_match('/@default\ (.*)\n/i', $doc, $matches); |
| 157 | - if(count($matches) > 1) { |
|
| 157 | + if (count($matches) > 1) { |
|
| 158 | 158 | $default = $matches[1]; |
| 159 | 159 | } |
| 160 | 160 | return $default; |
@@ -169,13 +169,13 @@ discard block |
||
| 169 | 169 | */ |
| 170 | 170 | public static function constructInyectableInstance($variable, $singleton, $classNameSpace, $calledClass) |
| 171 | 171 | { |
| 172 | - Logger::log('Create inyectable instance for ' . $classNameSpace); |
|
| 172 | + Logger::log('Create inyectable instance for '.$classNameSpace); |
|
| 173 | 173 | $reflector = new \ReflectionClass($calledClass); |
| 174 | 174 | $property = $reflector->getProperty($variable); |
| 175 | 175 | $varInstanceType = (null === $classNameSpace) ? InjectorHelper::extractVarType($property->getDocComment()) : $classNameSpace; |
| 176 | 176 | if (true === $singleton && method_exists($varInstanceType, 'getInstance')) { |
| 177 | 177 | $instance = $varInstanceType::getInstance(); |
| 178 | - } else { |
|
| 178 | + }else { |
|
| 179 | 179 | $instance = new $varInstanceType(); |
| 180 | 180 | } |
| 181 | 181 | return $instance; |
@@ -189,7 +189,7 @@ discard block |
||
| 189 | 189 | public static function getClassProperties($class) |
| 190 | 190 | { |
| 191 | 191 | $properties = []; |
| 192 | - Logger::log('Extracting annotations properties from class ' . $class); |
|
| 192 | + Logger::log('Extracting annotations properties from class '.$class); |
|
| 193 | 193 | $selfReflector = new \ReflectionClass($class); |
| 194 | 194 | if (false !== $selfReflector->getParentClass()) { |
| 195 | 195 | $properties = self::getClassProperties($selfReflector->getParentClass()->getName()); |
@@ -14,9 +14,9 @@ discard block |
||
| 14 | 14 | */ |
| 15 | 15 | private static function searchPayloadParam($params, $variable) { |
| 16 | 16 | $exists = false; |
| 17 | - if(null !== $params && count($params)) { |
|
| 18 | - foreach($params as $param) { |
|
| 19 | - if($param['name'] === $variable) { |
|
| 17 | + if (null !== $params && count($params)) { |
|
| 18 | + foreach ($params as $param) { |
|
| 19 | + if ($param['name'] === $variable) { |
|
| 20 | 20 | $exists = true; |
| 21 | 21 | break; |
| 22 | 22 | } |
@@ -40,12 +40,12 @@ discard block |
||
| 40 | 40 | ]; |
| 41 | 41 | if ($endpoint['payload']['is_array']) { |
| 42 | 42 | $schema['items'] = [ |
| 43 | - '$ref' => '#/definitions/' . $endpoint['payload']['type'], |
|
| 43 | + '$ref' => '#/definitions/'.$endpoint['payload']['type'], |
|
| 44 | 44 | ]; |
| 45 | - } else { |
|
| 46 | - $schema['$ref'] = '#/definitions/' . $endpoint['payload']['type']; |
|
| 45 | + }else { |
|
| 46 | + $schema['$ref'] = '#/definitions/'.$endpoint['payload']['type']; |
|
| 47 | 47 | } |
| 48 | - if(!self::searchPayloadParam($paths[$url][$method]['parameters'], $endpoint['payload']['type'])) { |
|
| 48 | + if (!self::searchPayloadParam($paths[$url][$method]['parameters'], $endpoint['payload']['type'])) { |
|
| 49 | 49 | $paths[$url][$method]['parameters'][] = [ |
| 50 | 50 | 'in' => 'body', |
| 51 | 51 | 'name' => $endpoint['payload']['type'], |
@@ -74,18 +74,18 @@ discard block |
||
| 74 | 74 | if (array_key_exists('data', $endpoint['return']) && count(array_keys($object)) === count(array_keys($endpoint['return']['data']))) { |
| 75 | 75 | $classDefinition = [ |
| 76 | 76 | 'type' => 'object', |
| 77 | - '$ref' => '#/definitions/' . $class, |
|
| 77 | + '$ref' => '#/definitions/'.$class, |
|
| 78 | 78 | ]; |
| 79 | - } else { |
|
| 79 | + }else { |
|
| 80 | 80 | $classDefinition = [ |
| 81 | 81 | 'type' => 'array', |
| 82 | 82 | 'items' => [ |
| 83 | - '$ref' => '#/definitions/' . $class, |
|
| 83 | + '$ref' => '#/definitions/'.$class, |
|
| 84 | 84 | ], |
| 85 | 85 | ]; |
| 86 | 86 | } |
| 87 | 87 | |
| 88 | - if($paths[$url][$method]['responses'][200]['schema']['properties']['data']['type'] === 'boolean') { |
|
| 88 | + if ($paths[$url][$method]['responses'][200]['schema']['properties']['data']['type'] === 'boolean') { |
|
| 89 | 89 | $paths[$url][$method]['responses'][200]['schema']['properties']['data'] = $classDefinition; |
| 90 | 90 | } |
| 91 | 91 | $dtos += self::extractSwaggerDefinition($class, $object); |
@@ -163,18 +163,18 @@ discard block |
||
| 163 | 163 | ], |
| 164 | 164 | ]; |
| 165 | 165 | foreach ($fields as $field => $info) { |
| 166 | - if(array_key_exists('type', $info) && in_array($info['type'], ['array', 'object'])) { |
|
| 166 | + if (array_key_exists('type', $info) && in_array($info['type'], ['array', 'object'])) { |
|
| 167 | 167 | $definition[$name]['properties'][$field] = $info; |
| 168 | - } elseif(array_key_exists('type', $info)) { |
|
| 168 | + } elseif (array_key_exists('type', $info)) { |
|
| 169 | 169 | list($type, $format) = self::translateSwaggerFormats($info['type']); |
| 170 | 170 | $fieldData = [ |
| 171 | 171 | "type" => $type, |
| 172 | 172 | "required" => $info['required'], |
| 173 | 173 | ]; |
| 174 | - if(array_key_exists('description', $info)) { |
|
| 174 | + if (array_key_exists('description', $info)) { |
|
| 175 | 175 | $fieldData['description'] = $info['description']; |
| 176 | 176 | } |
| 177 | - if(array_key_exists('format', $info)) { |
|
| 177 | + if (array_key_exists('format', $info)) { |
|
| 178 | 178 | $fieldData['format'] = $info['format']; |
| 179 | 179 | } |
| 180 | 180 | $dto['properties'][$field] = $fieldData; |
@@ -25,10 +25,10 @@ discard block |
||
| 25 | 25 | */ |
| 26 | 26 | public function json($response, $statusCode = 200) |
| 27 | 27 | { |
| 28 | - if(Config::getParam('profiling.enable')) { |
|
| 29 | - if(is_array($response)) { |
|
| 28 | + if (Config::getParam('profiling.enable')) { |
|
| 29 | + if (is_array($response)) { |
|
| 30 | 30 | $response['profiling'] = Inspector::getStats(); |
| 31 | - } elseif($response instanceof JsonResponse) { |
|
| 31 | + } elseif ($response instanceof JsonResponse) { |
|
| 32 | 32 | $response = ProfilingJsonResponse::createFromPrevious($response, Inspector::getStats()); |
| 33 | 33 | } |
| 34 | 34 | } |
@@ -36,17 +36,17 @@ discard block |
||
| 36 | 36 | $this->decodeJsonResponse($response); |
| 37 | 37 | |
| 38 | 38 | $mask = JSON_UNESCAPED_LINE_TERMINATORS | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE | JSON_BIGINT_AS_STRING; |
| 39 | - if(Config::getParam('output.json.strict_numbers')) { |
|
| 39 | + if (Config::getParam('output.json.strict_numbers')) { |
|
| 40 | 40 | $mask = JSON_UNESCAPED_LINE_TERMINATORS | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE | JSON_BIGINT_AS_STRING | JSON_NUMERIC_CHECK; |
| 41 | 41 | } |
| 42 | 42 | |
| 43 | 43 | $data = json_encode($response, $mask); |
| 44 | - if(json_last_error() !== JSON_ERROR_NONE) { |
|
| 44 | + if (json_last_error() !== JSON_ERROR_NONE) { |
|
| 45 | 45 | Logger::log(json_last_error_msg(), LOG_CRIT); |
| 46 | 46 | } |
| 47 | 47 | |
| 48 | - if(Config::getParam('angular.protection', false)) { |
|
| 49 | - $data = ")]}',\n" . $data; |
|
| 48 | + if (Config::getParam('angular.protection', false)) { |
|
| 49 | + $data = ")]}',\n".$data; |
|
| 50 | 50 | } |
| 51 | 51 | $this->setStatus($statusCode); |
| 52 | 52 | ResponseHelper::setDebugHeaders([]); |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | $dump = ''; |
| 118 | 118 | try { |
| 119 | 119 | $dump = $this->tpl->render($tpl, $vars); |
| 120 | - } catch (\Exception $e) { |
|
| 120 | + }catch (\Exception $e) { |
|
| 121 | 121 | Logger::log($e->getMessage(), LOG_ERR); |
| 122 | 122 | } |
| 123 | 123 | return $dump; |
@@ -144,7 +144,7 @@ discard block |
||
| 144 | 144 | public function regenerateTemplates() |
| 145 | 145 | { |
| 146 | 146 | $this->generateTemplatesCache(); |
| 147 | - $domains = Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'domains.json', Cache::JSON, true); |
|
| 147 | + $domains = Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'domains.json', Cache::JSON, true); |
|
| 148 | 148 | $translations = []; |
| 149 | 149 | if (is_array($domains)) { |
| 150 | 150 | $translations = $this->parsePathTranslations($domains); |
@@ -166,8 +166,8 @@ discard block |
||
| 166 | 166 | // force compilation |
| 167 | 167 | if ($file->isFile()) { |
| 168 | 168 | try { |
| 169 | - $this->tpl->load(str_replace($tplDir . '/', '', $file)); |
|
| 170 | - } catch (\Exception $e) { |
|
| 169 | + $this->tpl->load(str_replace($tplDir.'/', '', $file)); |
|
| 170 | + }catch (\Exception $e) { |
|
| 171 | 171 | Logger::log($e->getMessage(), LOG_ERR, ['file' => $e->getFile(), 'line' => $e->getLine()]); |
| 172 | 172 | } |
| 173 | 173 | } |
@@ -228,7 +228,7 @@ discard block |
||
| 228 | 228 | 'getFlash' => TemplateFunctions::GET_FLASH_FUNCTION, |
| 229 | 229 | 'getQuery' => TemplateFunctions::GET_QUERY_FUNCTION, |
| 230 | 230 | ]; |
| 231 | - foreach($functions as $name => $function) { |
|
| 231 | + foreach ($functions as $name => $function) { |
|
| 232 | 232 | $this->addTemplateFunction($name, $function); |
| 233 | 233 | } |
| 234 | 234 | } |
@@ -247,7 +247,7 @@ discard block |
||
| 247 | 247 | */ |
| 248 | 248 | private function loadDomains() |
| 249 | 249 | { |
| 250 | - $domains = Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'domains.json', Cache::JSON, true); |
|
| 250 | + $domains = Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'domains.json', Cache::JSON, true); |
|
| 251 | 251 | if (null !== $domains) { |
| 252 | 252 | foreach ($domains as $domain => $paths) { |
| 253 | 253 | $this->addPath($paths['template'], preg_replace('/(@|\/)/', '', $domain)); |
@@ -262,7 +262,7 @@ discard block |
||
| 262 | 262 | { |
| 263 | 263 | $loader = new FilesystemLoader(GeneratorHelper::getTemplatePath()); |
| 264 | 264 | $this->tpl = new Environment($loader, array( |
| 265 | - 'cache' => CACHE_DIR . DIRECTORY_SEPARATOR . 'twig', |
|
| 265 | + 'cache' => CACHE_DIR.DIRECTORY_SEPARATOR.'twig', |
|
| 266 | 266 | 'debug' => (bool)$this->debug, |
| 267 | 267 | 'auto_reload' => Config::getParam('twig.autoreload', TRUE), |
| 268 | 268 | )); |
@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | public function __construct($type = 'js') |
| 36 | 36 | { |
| 37 | 37 | $this->type = $type; |
| 38 | - $this->path = WEB_DIR . DIRECTORY_SEPARATOR; |
|
| 38 | + $this->path = WEB_DIR.DIRECTORY_SEPARATOR; |
|
| 39 | 39 | $this->domains = Template::getDomains(true); |
| 40 | 40 | $this->debug = Config::getParam('debug', true); |
| 41 | 41 | $this->cdnPath = Config::getParam('resources.cdn.url', Request::getInstance()->getRootUrl()); |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | $sourceFile = explode("?", $sourceFile); |
| 59 | 59 | $sourceFile = $sourceFile[0]; |
| 60 | 60 | } |
| 61 | - $orig = realpath(dirname($filenamePath) . DIRECTORY_SEPARATOR . $sourceFile); |
|
| 61 | + $orig = realpath(dirname($filenamePath).DIRECTORY_SEPARATOR.$sourceFile); |
|
| 62 | 62 | return $orig; |
| 63 | 63 | } |
| 64 | 64 | |
@@ -71,12 +71,12 @@ discard block |
||
| 71 | 71 | */ |
| 72 | 72 | public function addFile($filename) |
| 73 | 73 | { |
| 74 | - if (file_exists($this->path . $filename) && preg_match('/\.' . $this->type . '$/i', $filename)) { |
|
| 74 | + if (file_exists($this->path.$filename) && preg_match('/\.'.$this->type.'$/i', $filename)) { |
|
| 75 | 75 | $this->files[] = $filename; |
| 76 | 76 | } elseif (!empty($this->domains)) { |
| 77 | 77 | foreach ($this->domains as $domain => $paths) { |
| 78 | 78 | $domainFilename = str_replace($domain, $paths["public"], $filename); |
| 79 | - if (file_exists($domainFilename) && preg_match('/\.' . $this->type . '$/i', $domainFilename)) { |
|
| 79 | + if (file_exists($domainFilename) && preg_match('/\.'.$this->type.'$/i', $domainFilename)) { |
|
| 80 | 80 | $this->files[] = $domainFilename; |
| 81 | 81 | } |
| 82 | 82 | } |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | public function setHash($hash) |
| 94 | 94 | { |
| 95 | 95 | $cache = Config::getParam('cache.var', ''); |
| 96 | - $this->hash = $hash . (strlen($cache) ? '.' : '') . $cache; |
|
| 96 | + $this->hash = $hash.(strlen($cache) ? '.' : '').$cache; |
|
| 97 | 97 | return $this; |
| 98 | 98 | } |
| 99 | 99 | |
@@ -127,8 +127,8 @@ discard block |
||
| 127 | 127 | */ |
| 128 | 128 | protected function compileCss() |
| 129 | 129 | { |
| 130 | - $base = $this->path . "css" . DIRECTORY_SEPARATOR; |
|
| 131 | - if ($this->debug || !file_exists($base . $this->hash . ".css")) { |
|
| 130 | + $base = $this->path."css".DIRECTORY_SEPARATOR; |
|
| 131 | + if ($this->debug || !file_exists($base.$this->hash.".css")) { |
|
| 132 | 132 | $data = ''; |
| 133 | 133 | if (0 < count($this->files)) { |
| 134 | 134 | $minifier = new CSS(); |
@@ -136,15 +136,15 @@ discard block |
||
| 136 | 136 | $data = $this->processCssLine($file, $base, $data); |
| 137 | 137 | } |
| 138 | 138 | } |
| 139 | - if($this->debug) { |
|
| 140 | - $this->storeContents($base . $this->hash . ".css", $data); |
|
| 141 | - } else { |
|
| 139 | + if ($this->debug) { |
|
| 140 | + $this->storeContents($base.$this->hash.".css", $data); |
|
| 141 | + }else { |
|
| 142 | 142 | $minifier = new CSS(); |
| 143 | 143 | $minifier->add($data); |
| 144 | 144 | ini_set('max_execution_time', -1); |
| 145 | 145 | ini_set('memory_limit', -1); |
| 146 | 146 | GeneratorHelper::createDir($base); |
| 147 | - $minifier->minify($base . $this->hash . ".css"); |
|
| 147 | + $minifier->minify($base.$this->hash.".css"); |
|
| 148 | 148 | ini_restore('memory_limit'); |
| 149 | 149 | ini_restore('max_execution_time'); |
| 150 | 150 | } |
@@ -160,8 +160,8 @@ discard block |
||
| 160 | 160 | */ |
| 161 | 161 | protected function compileJs() |
| 162 | 162 | { |
| 163 | - $base = $this->path . "js" . DIRECTORY_SEPARATOR; |
|
| 164 | - if ($this->debug || !file_exists($base . $this->hash . ".js")) { |
|
| 163 | + $base = $this->path."js".DIRECTORY_SEPARATOR; |
|
| 164 | + if ($this->debug || !file_exists($base.$this->hash.".js")) { |
|
| 165 | 165 | $data = ''; |
| 166 | 166 | if (0 < count($this->files)) { |
| 167 | 167 | $minifier = new JS(); |
@@ -170,19 +170,19 @@ discard block |
||
| 170 | 170 | if (file_exists($file)) { |
| 171 | 171 | if ($this->debug) { |
| 172 | 172 | $data = $this->putDebugJs($pathParts, $base, $file); |
| 173 | - } elseif (!file_exists($base . $this->hash . ".js")) { |
|
| 173 | + } elseif (!file_exists($base.$this->hash.".js")) { |
|
| 174 | 174 | $minifier->add($file); |
| 175 | 175 | //$data = $this->putProductionJs($base, $file, $data); |
| 176 | 176 | } |
| 177 | 177 | } |
| 178 | 178 | } |
| 179 | - if($this->debug) { |
|
| 180 | - $this->storeContents($base . $this->hash . ".js", $data); |
|
| 181 | - } else { |
|
| 179 | + if ($this->debug) { |
|
| 180 | + $this->storeContents($base.$this->hash.".js", $data); |
|
| 181 | + }else { |
|
| 182 | 182 | ini_set('max_execution_time', -1); |
| 183 | 183 | ini_set('memory_limit', -1); |
| 184 | 184 | GeneratorHelper::createDir($base); |
| 185 | - $minifier->minify($base . $this->hash . ".js"); |
|
| 185 | + $minifier->minify($base.$this->hash.".js"); |
|
| 186 | 186 | ini_restore('memory_limit'); |
| 187 | 187 | ini_restore('max_execution_time'); |
| 188 | 188 | } |
@@ -202,7 +202,7 @@ discard block |
||
| 202 | 202 | { |
| 203 | 203 | GeneratorHelper::createDir(dirname($path)); |
| 204 | 204 | if ("" !== $content && false === file_put_contents($path, $content)) { |
| 205 | - throw new ConfigException(t('No se tienen permisos para escribir en ' . $path)); |
|
| 205 | + throw new ConfigException(t('No se tienen permisos para escribir en '.$path)); |
|
| 206 | 206 | } |
| 207 | 207 | } |
| 208 | 208 | |
@@ -231,9 +231,9 @@ discard block |
||
| 231 | 231 | foreach ($this->compiled_files as $file) { |
| 232 | 232 | echo "\t\t<script type='text/javascript' src='{$file}'></script>\n"; |
| 233 | 233 | } |
| 234 | - } else { |
|
| 234 | + }else { |
|
| 235 | 235 | $basePath = $this->cdnPath ?: ''; |
| 236 | - echo "\t\t<script type='text/javascript' src='" . $basePath . "/js/" . $this->hash . ".js'></script>\n"; |
|
| 236 | + echo "\t\t<script type='text/javascript' src='".$basePath."/js/".$this->hash.".js'></script>\n"; |
|
| 237 | 237 | } |
| 238 | 238 | } |
| 239 | 239 | |
@@ -246,9 +246,9 @@ discard block |
||
| 246 | 246 | foreach ($this->compiled_files as $file) { |
| 247 | 247 | echo "\t\t<link href='{$file}' rel='stylesheet' media='screen, print'>"; |
| 248 | 248 | } |
| 249 | - } else { |
|
| 249 | + }else { |
|
| 250 | 250 | $basePath = $this->cdnPath ?: ''; |
| 251 | - echo "\t\t<link href='" . $basePath . "/css/" . $this->hash . ".css' rel='stylesheet'>"; |
|
| 251 | + echo "\t\t<link href='".$basePath."/css/".$this->hash.".css' rel='stylesheet'>"; |
|
| 252 | 252 | } |
| 253 | 253 | } |
| 254 | 254 | |
@@ -259,20 +259,20 @@ discard block |
||
| 259 | 259 | protected function extractCssResources($source, $file) |
| 260 | 260 | { |
| 261 | 261 | $sourceFile = $this->extractSourceFilename($source); |
| 262 | - $orig = realpath(dirname($file) . DIRECTORY_SEPARATOR . $sourceFile); |
|
| 262 | + $orig = realpath(dirname($file).DIRECTORY_SEPARATOR.$sourceFile); |
|
| 263 | 263 | $origPart = preg_split('/(\/|\\\)public(\/|\\\)/i', $orig); |
| 264 | 264 | try { |
| 265 | 265 | if (count($source) > 1 && array_key_exists(1, $origPart)) { |
| 266 | - $dest = $this->path . $origPart[1]; |
|
| 266 | + $dest = $this->path.$origPart[1]; |
|
| 267 | 267 | GeneratorHelper::createDir(dirname($dest)); |
| 268 | 268 | if (!file_exists($dest) || filemtime($orig) > filemtime($dest)) { |
| 269 | 269 | if (@copy($orig, $dest) === FALSE) { |
| 270 | - throw new \RuntimeException('Can\' copy ' . $dest . ''); |
|
| 270 | + throw new \RuntimeException('Can\' copy '.$dest.''); |
|
| 271 | 271 | } |
| 272 | 272 | Logger::log("$orig copiado a $dest", LOG_INFO); |
| 273 | 273 | } |
| 274 | 274 | } |
| 275 | - } catch (\Exception $e) { |
|
| 275 | + }catch (\Exception $e) { |
|
| 276 | 276 | Logger::log($e->getMessage(), LOG_ERR); |
| 277 | 277 | } |
| 278 | 278 | } |
@@ -289,21 +289,21 @@ discard block |
||
| 289 | 289 | { |
| 290 | 290 | if (file_exists($file)) { |
| 291 | 291 | $pathParts = explode("/", $file); |
| 292 | - $filePath = $this->hash . "_" . $pathParts[count($pathParts) - 1]; |
|
| 293 | - if (!file_exists($base . $filePath) || filemtime($base . $filePath) < filemtime($file) || $this->debug) { |
|
| 292 | + $filePath = $this->hash."_".$pathParts[count($pathParts) - 1]; |
|
| 293 | + if (!file_exists($base.$filePath) || filemtime($base.$filePath) < filemtime($file) || $this->debug) { |
|
| 294 | 294 | //Si tenemos modificaciones tenemos que compilar de nuevo todos los ficheros modificados |
| 295 | - if (file_exists($base . $this->hash . ".css") && @unlink($base . $this->hash . ".css") === false) { |
|
| 296 | - throw new ConfigException("Can't unlink file " . $base . $this->hash . ".css"); |
|
| 295 | + if (file_exists($base.$this->hash.".css") && @unlink($base.$this->hash.".css") === false) { |
|
| 296 | + throw new ConfigException("Can't unlink file ".$base.$this->hash.".css"); |
|
| 297 | 297 | } |
| 298 | 298 | $this->loopCssLines($file); |
| 299 | 299 | } |
| 300 | 300 | if ($this->debug) { |
| 301 | 301 | $data = file_get_contents($file); |
| 302 | - $this->storeContents($base . $filePath, $data); |
|
| 303 | - } else { |
|
| 302 | + $this->storeContents($base.$filePath, $data); |
|
| 303 | + }else { |
|
| 304 | 304 | $data .= file_get_contents($file); |
| 305 | 305 | } |
| 306 | - $this->compiled_files[] = "/css/" . $filePath; |
|
| 306 | + $this->compiled_files[] = "/css/".$filePath; |
|
| 307 | 307 | } |
| 308 | 308 | |
| 309 | 309 | return $data; |
@@ -318,12 +318,12 @@ discard block |
||
| 318 | 318 | */ |
| 319 | 319 | protected function putDebugJs($pathParts, $base, $file) |
| 320 | 320 | { |
| 321 | - $filePath = $this->hash . "_" . $pathParts[count($pathParts) - 1]; |
|
| 322 | - $this->compiled_files[] = "/js/" . $filePath; |
|
| 321 | + $filePath = $this->hash."_".$pathParts[count($pathParts) - 1]; |
|
| 322 | + $this->compiled_files[] = "/js/".$filePath; |
|
| 323 | 323 | $data = ""; |
| 324 | - if (!file_exists($base . $filePath) || filemtime($base . $filePath) < filemtime($file)) { |
|
| 324 | + if (!file_exists($base.$filePath) || filemtime($base.$filePath) < filemtime($file)) { |
|
| 325 | 325 | $data = file_get_contents($file); |
| 326 | - $this->storeContents($base . $filePath, $data); |
|
| 326 | + $this->storeContents($base.$filePath, $data); |
|
| 327 | 327 | } |
| 328 | 328 | return $data; |
| 329 | 329 | } |
@@ -365,60 +365,60 @@ discard block |
||
| 365 | 365 | { |
| 366 | 366 | $ppath = explode("/", $string); |
| 367 | 367 | $originalFilename = $ppath[count($ppath) - 1]; |
| 368 | - $base = WEB_DIR . DIRECTORY_SEPARATOR; |
|
| 368 | + $base = WEB_DIR.DIRECTORY_SEPARATOR; |
|
| 369 | 369 | $file = ""; |
| 370 | 370 | $htmlBase = ""; |
| 371 | 371 | $debug = Config::getInstance()->getDebugMode(); |
| 372 | 372 | $cache = Config::getInstance()->get('cache.var'); |
| 373 | - $cache = $cache ? '.' . $cache : ''; |
|
| 373 | + $cache = $cache ? '.'.$cache : ''; |
|
| 374 | 374 | $finfo = finfo_open(FILEINFO_MIME_TYPE); // devuelve el tipo mime de su extensión |
| 375 | 375 | $mime = finfo_file($finfo, $filenamePath); |
| 376 | 376 | finfo_close($finfo); |
| 377 | 377 | if (preg_match('/\.css$/i', $string)) { |
| 378 | - $file = "/" . substr(md5($string), 0, 8) . "$cache.css"; |
|
| 378 | + $file = "/".substr(md5($string), 0, 8)."$cache.css"; |
|
| 379 | 379 | $htmlBase = "css"; |
| 380 | 380 | if ($debug) { |
| 381 | - $file = str_replace(".css", "_" . $originalFilename, $file); |
|
| 381 | + $file = str_replace(".css", "_".$originalFilename, $file); |
|
| 382 | 382 | } |
| 383 | 383 | } elseif (preg_match('/\.js$/i', $string)) { |
| 384 | - $file = "/" . substr(md5($string), 0, 8) . "$cache.js"; |
|
| 384 | + $file = "/".substr(md5($string), 0, 8)."$cache.js"; |
|
| 385 | 385 | $htmlBase = "js"; |
| 386 | 386 | if ($debug) { |
| 387 | - $file = str_replace(".js", "_" . $originalFilename, $file); |
|
| 387 | + $file = str_replace(".js", "_".$originalFilename, $file); |
|
| 388 | 388 | } |
| 389 | 389 | } elseif (preg_match("/image/i", $mime)) { |
| 390 | 390 | $ext = explode(".", $string); |
| 391 | - $file = "/" . substr(md5($string), 0, 8) . "." . $ext[count($ext) - 1]; |
|
| 391 | + $file = "/".substr(md5($string), 0, 8).".".$ext[count($ext) - 1]; |
|
| 392 | 392 | $htmlBase = "img"; |
| 393 | 393 | if ($debug) { |
| 394 | - $file = str_replace("." . $ext[count($ext) - 1], "_" . $originalFilename, $file); |
|
| 394 | + $file = str_replace(".".$ext[count($ext) - 1], "_".$originalFilename, $file); |
|
| 395 | 395 | } |
| 396 | 396 | } elseif (preg_match("/(doc|pdf)/i", $mime)) { |
| 397 | 397 | $ext = explode(".", $string); |
| 398 | - $file = "/" . substr(md5($string), 0, 8) . "." . $ext[count($ext) - 1]; |
|
| 398 | + $file = "/".substr(md5($string), 0, 8).".".$ext[count($ext) - 1]; |
|
| 399 | 399 | $htmlBase = "docs"; |
| 400 | 400 | if ($debug) { |
| 401 | - $file = str_replace("." . $ext[count($ext) - 1], "_" . $originalFilename, $file); |
|
| 401 | + $file = str_replace(".".$ext[count($ext) - 1], "_".$originalFilename, $file); |
|
| 402 | 402 | } |
| 403 | 403 | } elseif (preg_match("/(video|audio|ogg)/i", $mime)) { |
| 404 | 404 | $ext = explode(".", $string); |
| 405 | - $file = "/" . substr(md5($string), 0, 8) . "." . $ext[count($ext) - 1]; |
|
| 405 | + $file = "/".substr(md5($string), 0, 8).".".$ext[count($ext) - 1]; |
|
| 406 | 406 | $htmlBase = "media"; |
| 407 | 407 | if ($debug) { |
| 408 | - $file = str_replace("." . $ext[count($ext) - 1], "_" . $originalFilename, $file); |
|
| 408 | + $file = str_replace(".".$ext[count($ext) - 1], "_".$originalFilename, $file); |
|
| 409 | 409 | } |
| 410 | 410 | } elseif (preg_match("/(text|html)/i", $mime)) { |
| 411 | 411 | $ext = explode(".", $string); |
| 412 | - $file = "/" . substr(md5($string), 0, 8) . "." . $ext[count($ext) - 1]; |
|
| 412 | + $file = "/".substr(md5($string), 0, 8).".".$ext[count($ext) - 1]; |
|
| 413 | 413 | $htmlBase = "templates"; |
| 414 | 414 | if ($debug) { |
| 415 | - $file = str_replace("." . $ext[count($ext) - 1], "_" . $originalFilename, $file); |
|
| 415 | + $file = str_replace(".".$ext[count($ext) - 1], "_".$originalFilename, $file); |
|
| 416 | 416 | } |
| 417 | 417 | } elseif (!$return && !is_null($name)) { |
| 418 | 418 | $htmlBase = ''; |
| 419 | 419 | $file = $name; |
| 420 | 420 | } |
| 421 | - $filePath = $htmlBase . $file; |
|
| 421 | + $filePath = $htmlBase.$file; |
|
| 422 | 422 | |
| 423 | 423 | return array($base, $htmlBase, $filePath); |
| 424 | 424 | } |
@@ -436,15 +436,15 @@ discard block |
||
| 436 | 436 | if (preg_match_all('#url\((.*?)\)#', $line, $urls, PREG_SET_ORDER)) { |
| 437 | 437 | foreach ($urls as $source) { |
| 438 | 438 | $orig = self::calculateResourcePathname($filenamePath, $source); |
| 439 | - if(!empty($orig)) { |
|
| 439 | + if (!empty($orig)) { |
|
| 440 | 440 | $origPart = preg_split("/Public/i", $orig); |
| 441 | - $dest = WEB_DIR . $origPart[1]; |
|
| 441 | + $dest = WEB_DIR.$origPart[1]; |
|
| 442 | 442 | GeneratorHelper::createDir(dirname($dest)); |
| 443 | 443 | if (@copy($orig, $dest) === false) { |
| 444 | - throw new ConfigException("Can't copy " . $orig . " to " . $dest); |
|
| 444 | + throw new ConfigException("Can't copy ".$orig." to ".$dest); |
|
| 445 | 445 | } |
| 446 | - } else { |
|
| 447 | - Logger::log($filenamePath . ' has an empty origin with the url ' . $source, LOG_WARNING); |
|
| 446 | + }else { |
|
| 447 | + Logger::log($filenamePath.' has an empty origin with the url '.$source, LOG_WARNING); |
|
| 448 | 448 | } |
| 449 | 449 | } |
| 450 | 450 | } |
@@ -65,8 +65,8 @@ |
||
| 65 | 65 | $model = $this->getHydratedModel(); |
| 66 | 66 | $model->save(); |
| 67 | 67 | $save = true; |
| 68 | - Logger::log(get_class($this->model) . ' guardado con id ' . $this->model->getPrimaryKey(), LOG_INFO); |
|
| 69 | - } catch (\Exception $e) { |
|
| 68 | + Logger::log(get_class($this->model).' guardado con id '.$this->model->getPrimaryKey(), LOG_INFO); |
|
| 69 | + }catch (\Exception $e) { |
|
| 70 | 70 | Logger::log($e->getMessage(), LOG_ERR); |
| 71 | 71 | throw new FormException($e->getMessage(), $e->getCode(), $e); |
| 72 | 72 | } |
@@ -27,8 +27,8 @@ discard block |
||
| 27 | 27 | public function add($name, array $value = []) |
| 28 | 28 | { |
| 29 | 29 | $this->fields[$name] = $value; |
| 30 | - $this->fields[$name]['name'] = $this->getName() . '['.$name.']'; |
|
| 31 | - $this->fields[$name]['id'] = $this->getName() . '_' . $name; |
|
| 30 | + $this->fields[$name]['name'] = $this->getName().'['.$name.']'; |
|
| 31 | + $this->fields[$name]['id'] = $this->getName().'_'.$name; |
|
| 32 | 32 | $this->fields[$name]['placeholder'] = array_key_exists('placeholder', $value) ? $value['placeholder'] : $name; |
| 33 | 33 | $this->fields[$name]['hasLabel'] = array_key_exists('hasLabel', $value) ? $value['hasLabel'] : true; |
| 34 | 34 | return $this; |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | $data = array(); |
| 68 | 68 | if (count($this->fields) > 0) { |
| 69 | 69 | foreach ($this->fields as $key => $field) { |
| 70 | - if (self::SEPARATOR !== $key && $key !== ($this->getName() . '_token')) { |
|
| 70 | + if (self::SEPARATOR !== $key && $key !== ($this->getName().'_token')) { |
|
| 71 | 71 | $data[$key] = array_key_exists('value', $field) ? $field['value'] : null; |
| 72 | 72 | } |
| 73 | 73 | } |
@@ -115,10 +115,10 @@ discard block |
||
| 115 | 115 | if (array_key_exists($key, $data[$formName])) { |
| 116 | 116 | if (preg_match('/id/i', $key) && ($data[$formName][$key] === 0 || $data[$formName][$key] === '%' || $data[$formName][$key] === '')) { |
| 117 | 117 | $field['value'] = null; |
| 118 | - } else { |
|
| 118 | + }else { |
|
| 119 | 119 | $field['value'] = $data[$formName][$key]; |
| 120 | 120 | } |
| 121 | - } else { |
|
| 121 | + }else { |
|
| 122 | 122 | unset($field['value']); |
| 123 | 123 | } |
| 124 | 124 | return array($data, $field); |
@@ -47,10 +47,10 @@ discard block |
||
| 47 | 47 | if (null === $value) { |
| 48 | 48 | $isEmpty = true; |
| 49 | 49 | // Empty Array check |
| 50 | - } else if (is_array($value) && 0 === count($value)) { |
|
| 50 | + }else if (is_array($value) && 0 === count($value)) { |
|
| 51 | 51 | $isEmpty = true; |
| 52 | 52 | // Empty string check |
| 53 | - } else if ('' === preg_replace('/(\ |\r|\n)/m', '', $value)) { |
|
| 53 | + }else if ('' === preg_replace('/(\ |\r|\n)/m', '', $value)) { |
|
| 54 | 54 | $isEmpty = true; |
| 55 | 55 | } |
| 56 | 56 | |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | && array_key_exists($key, $field) |
| 77 | 77 | && !array_key_exists('error', $field[$key]) |
| 78 | 78 | && !empty($field['value']) |
| 79 | - && preg_match('/' . $field['pattern'] . '/', $field['value']) === 0 |
|
| 79 | + && preg_match('/'.$field['pattern'].'/', $field['value']) === 0 |
|
| 80 | 80 | ) { |
| 81 | 81 | $this->setError($key, str_replace('%s', "<strong>{$key}</strong>", t('El campo %s no tiene un formato válido'))); |
| 82 | 82 | $field['error'] = $this->getError($key); |
@@ -47,8 +47,8 @@ discard block |
||
| 47 | 47 | */ |
| 48 | 48 | private function hydrateModelField($key, $value) |
| 49 | 49 | { |
| 50 | - $setter = 'set' . ucfirst($key); |
|
| 51 | - $getter = 'get' . ucfirst($key); |
|
| 50 | + $setter = 'set'.ucfirst($key); |
|
| 51 | + $getter = 'get'.ucfirst($key); |
|
| 52 | 52 | if (method_exists($this->model, $setter)) { |
| 53 | 53 | if (method_exists($this->model, $getter)) { |
| 54 | 54 | $tmp = $this->model->$getter(); |
@@ -72,16 +72,16 @@ discard block |
||
| 72 | 72 | { |
| 73 | 73 | //Extraemos el dato del modelo relacionado si existe el getter |
| 74 | 74 | $method = null; |
| 75 | - if (array_key_exists('class_data', $field) && method_exists($val, 'get' . $field['class_data'])) { |
|
| 76 | - $classMethod = 'get' . $field['class_data']; |
|
| 75 | + if (array_key_exists('class_data', $field) && method_exists($val, 'get'.$field['class_data'])) { |
|
| 76 | + $classMethod = 'get'.$field['class_data']; |
|
| 77 | 77 | $class = $val->$classMethod(); |
| 78 | - if (array_key_exists('class_id', $field) && method_exists($class, 'get' . $field['class_id'])) { |
|
| 79 | - $method = 'get' . $field['class_id']; |
|
| 78 | + if (array_key_exists('class_id', $field) && method_exists($class, 'get'.$field['class_id'])) { |
|
| 79 | + $method = 'get'.$field['class_id']; |
|
| 80 | 80 | $data[] = $class->$method(); |
| 81 | - } else { |
|
| 81 | + }else { |
|
| 82 | 82 | $data[] = $class->getPrimaryKey(); |
| 83 | 83 | } |
| 84 | - } else { |
|
| 84 | + }else { |
|
| 85 | 85 | $data[] = $val; |
| 86 | 86 | } |
| 87 | 87 | |
@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | private function extractModelFieldValue($key, $field) |
| 134 | 134 | { |
| 135 | 135 | //Extraemos el valor del campo del modelo |
| 136 | - $method = 'get' . ucfirst($key); |
|
| 136 | + $method = 'get'.ucfirst($key); |
|
| 137 | 137 | $type = (array_key_exists('type', $field)) ? $field['type'] : 'text'; |
| 138 | 138 | //Extraemos los campos del modelo |
| 139 | 139 | if (method_exists($this->model, $method)) { |
@@ -143,16 +143,16 @@ discard block |
||
| 143 | 143 | //Si es una relación múltiple |
| 144 | 144 | if ($value instanceof ObjectCollection) { |
| 145 | 145 | $field = $this->computeModelFieldValue($field, $value, $type); |
| 146 | - } else { //O una relación unitaria |
|
| 146 | + }else { //O una relación unitaria |
|
| 147 | 147 | if (method_exists($value, '__toString')) { |
| 148 | 148 | $field['value'] = $value; |
| 149 | 149 | } elseif ($value instanceof \DateTime) { |
| 150 | 150 | $field['value'] = $value->format('Y-m-d H:i:s'); |
| 151 | - } else { |
|
| 151 | + }else { |
|
| 152 | 152 | $field['value'] = $value->getPrimaryKey(); |
| 153 | 153 | } |
| 154 | 154 | } |
| 155 | - } else { |
|
| 155 | + }else { |
|
| 156 | 156 | $field['value'] = $value; |
| 157 | 157 | } |
| 158 | 158 | } |