@@ -121,7 +121,7 @@ discard block |
||
| 121 | 121 | $this->setStatusCode(Template::STATUS_OK); |
| 122 | 122 | break; |
| 123 | 123 | default: |
| 124 | - $this->setStatusCode('HTTP/1.0 ' .($status ?: 200)); |
|
| 124 | + $this->setStatusCode('HTTP/1.0 '.($status ?: 200)); |
|
| 125 | 125 | break; |
| 126 | 126 | } |
| 127 | 127 | return $this; |
@@ -135,11 +135,11 @@ discard block |
||
| 135 | 135 | private function setReponseHeaders($contentType = 'text/html', array $cookies = array()) |
| 136 | 136 | { |
| 137 | 137 | $powered = Config::getParam('poweredBy', 'PSFS'); |
| 138 | - header('X-Powered-By: ' . $powered); |
|
| 138 | + header('X-Powered-By: '.$powered); |
|
| 139 | 139 | ResponseHelper::setStatusHeader($this->getStatusCode()); |
| 140 | 140 | ResponseHelper::setAuthHeaders($this->isPublicZone()); |
| 141 | 141 | ResponseHelper::setCookieHeaders($cookies); |
| 142 | - header('Content-type: ' . $contentType); |
|
| 142 | + header('Content-type: '.$contentType); |
|
| 143 | 143 | |
| 144 | 144 | } |
| 145 | 145 | |
@@ -152,20 +152,20 @@ discard block |
||
| 152 | 152 | */ |
| 153 | 153 | public function output($output = '', $contentType = 'text/html', array $cookies = array()) |
| 154 | 154 | { |
| 155 | - if(!self::isTest()) { |
|
| 155 | + if (!self::isTest()) { |
|
| 156 | 156 | Logger::log('Start output response'); |
| 157 | 157 | ob_start(); |
| 158 | 158 | $this->setReponseHeaders($contentType, $cookies); |
| 159 | - header('Content-length: ' . strlen($output)); |
|
| 160 | - header('CRC: ' . crc32($output)); |
|
| 159 | + header('Content-length: '.strlen($output)); |
|
| 160 | + header('CRC: '.crc32($output)); |
|
| 161 | 161 | |
| 162 | 162 | $needCache = Cache::needCache(); |
| 163 | 163 | $cache = Cache::getInstance(); |
| 164 | 164 | list($path, $cacheDataName) = $cache->getRequestCacheHash(); |
| 165 | 165 | if (null !== $cacheDataName && false !== $needCache && $this->getStatusCode() === Template::STATUS_OK) { |
| 166 | 166 | Logger::log('Saving output response into cache'); |
| 167 | - $cache->storeData('json' . DIRECTORY_SEPARATOR . $path . $cacheDataName, $output); |
|
| 168 | - $cache->storeData('json' . DIRECTORY_SEPARATOR . $path . $cacheDataName . '.headers', headers_list(), Cache::JSON); |
|
| 167 | + $cache->storeData('json'.DIRECTORY_SEPARATOR.$path.$cacheDataName, $output); |
|
| 168 | + $cache->storeData('json'.DIRECTORY_SEPARATOR.$path.$cacheDataName.'.headers', headers_list(), Cache::JSON); |
|
| 169 | 169 | } elseif (Request::getInstance()->getMethod() !== 'GET') { |
| 170 | 170 | $cache->flushCache(); |
| 171 | 171 | } |
@@ -175,7 +175,7 @@ discard block |
||
| 175 | 175 | ob_end_clean(); |
| 176 | 176 | Logger::log('End output response'); |
| 177 | 177 | $this->closeRender(); |
| 178 | - } else { |
|
| 178 | + }else { |
|
| 179 | 179 | return $output; |
| 180 | 180 | } |
| 181 | 181 | } |
@@ -188,11 +188,11 @@ discard block |
||
| 188 | 188 | Logger::log('Close template render'); |
| 189 | 189 | $uri = Request::requestUri(); |
| 190 | 190 | Security::getInstance()->setSessionKey('lastRequest', array( |
| 191 | - 'url' => Request::getInstance()->getRootUrl() . $uri, |
|
| 191 | + 'url' => Request::getInstance()->getRootUrl().$uri, |
|
| 192 | 192 | 'ts' => microtime(true), |
| 193 | 193 | )); |
| 194 | 194 | Security::getInstance()->updateSession(); |
| 195 | - Logger::log('End request: ' . $uri, LOG_INFO); |
|
| 195 | + Logger::log('End request: '.$uri, LOG_INFO); |
|
| 196 | 196 | exit; |
| 197 | 197 | } |
| 198 | 198 | |
@@ -230,17 +230,17 @@ discard block |
||
| 230 | 230 | ///////////////////////////////////////////////////////////// |
| 231 | 231 | // Date in the past sets the value to already have been expired. |
| 232 | 232 | header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); |
| 233 | - header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); |
|
| 233 | + header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); |
|
| 234 | 234 | header('Cache-Control: no-store, no-cache, must-revalidate'); // HTTP/1.1 |
| 235 | 235 | header('Cache-Control: pre-check=0, post-check=0, max-age=0'); // HTTP/1.1 |
| 236 | 236 | header('Pragma: no-cache'); |
| 237 | 237 | header('Expires: 0'); |
| 238 | 238 | header('Content-Transfer-Encoding: binary'); |
| 239 | - header('Content-type: ' . $content); |
|
| 240 | - header('Content-length: ' . strlen($data)); |
|
| 241 | - header('Content-Disposition: attachment; filename="' . $filename . '"'); |
|
| 239 | + header('Content-type: '.$content); |
|
| 240 | + header('Content-length: '.strlen($data)); |
|
| 241 | + header('Content-Disposition: attachment; filename="'.$filename.'"'); |
|
| 242 | 242 | header('Access-Control-Expose-Headers: Filename'); |
| 243 | - header('Filename: ' . $filename); |
|
| 243 | + header('Filename: '.$filename); |
|
| 244 | 244 | echo $data; |
| 245 | 245 | ob_flush(); |
| 246 | 246 | ob_end_clean(); |
@@ -29,7 +29,7 @@ |
||
| 29 | 29 | 'attachments' => [ |
| 30 | 30 | [ |
| 31 | 31 | "author_name" => $request->getRootUrl(true), |
| 32 | - "text" => $file . (strlen($line) ? ' [' . $line . ']' : ''), |
|
| 32 | + "text" => $file.(strlen($line) ? ' ['.$line.']' : ''), |
|
| 33 | 33 | "color" => Config::getParam('debug', true) ? 'warning' : "danger", |
| 34 | 34 | "title" => $message, |
| 35 | 35 | 'fallback' => 'PSFS Error notifier', |
@@ -81,20 +81,20 @@ discard block |
||
| 81 | 81 | public function init() |
| 82 | 82 | { |
| 83 | 83 | parent::init(); |
| 84 | - Logger::log(static::class . ' init', LOG_DEBUG); |
|
| 84 | + Logger::log(static::class.' init', LOG_DEBUG); |
|
| 85 | 85 | $this->domain = $this->getDomain(); |
| 86 | 86 | $this->hydrateRequestData(); |
| 87 | 87 | $this->hydrateOrders(); |
| 88 | - if($this instanceof CustomApi === false) { |
|
| 88 | + if ($this instanceof CustomApi === false) { |
|
| 89 | 89 | $this->createConnection($this->getTableMap()); |
| 90 | 90 | } |
| 91 | 91 | $this->checkFieldType(); |
| 92 | 92 | $this->setLoaded(true); |
| 93 | - Logger::log(static::class . ' loaded', LOG_DEBUG); |
|
| 93 | + Logger::log(static::class.' loaded', LOG_DEBUG); |
|
| 94 | 94 | } |
| 95 | 95 | |
| 96 | 96 | private function checkActions($method) { |
| 97 | - switch($method) { |
|
| 97 | + switch ($method) { |
|
| 98 | 98 | default: |
| 99 | 99 | case 'modelList': $this->action = self::API_ACTION_LIST; break; |
| 100 | 100 | case 'get': $this->action = self::API_ACTION_GET; break; |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | protected function hydrateOrders() |
| 112 | 112 | { |
| 113 | 113 | if (count($this->query)) { |
| 114 | - Logger::log(static::class . ' gathering query string', LOG_DEBUG); |
|
| 114 | + Logger::log(static::class.' gathering query string', LOG_DEBUG); |
|
| 115 | 115 | foreach ($this->query as $key => $value) { |
| 116 | 116 | if ($key === self::API_ORDER_FIELD && is_array($value)) { |
| 117 | 117 | foreach ($value as $field => $direction) { |
@@ -128,10 +128,10 @@ discard block |
||
| 128 | 128 | */ |
| 129 | 129 | protected function extractPagination() |
| 130 | 130 | { |
| 131 | - Logger::log(static::class . ' extract pagination start', LOG_DEBUG); |
|
| 131 | + Logger::log(static::class.' extract pagination start', LOG_DEBUG); |
|
| 132 | 132 | $page = array_key_exists(self::API_PAGE_FIELD, $this->query) ? $this->query[self::API_PAGE_FIELD] : 1; |
| 133 | 133 | $limit = array_key_exists(self::API_LIMIT_FIELD, $this->query) ? $this->query[self::API_LIMIT_FIELD] : 100; |
| 134 | - Logger::log(static::class . ' extract pagination end', LOG_DEBUG); |
|
| 134 | + Logger::log(static::class.' extract pagination end', LOG_DEBUG); |
|
| 135 | 135 | return array($page, (int)$limit); |
| 136 | 136 | } |
| 137 | 137 | |
@@ -142,7 +142,7 @@ discard block |
||
| 142 | 142 | */ |
| 143 | 143 | private function addOrders(ModelCriteria &$query) |
| 144 | 144 | { |
| 145 | - Logger::log(static::class . ' extract orders start ', LOG_DEBUG); |
|
| 145 | + Logger::log(static::class.' extract orders start ', LOG_DEBUG); |
|
| 146 | 146 | $orderAdded = FALSE; |
| 147 | 147 | $tableMap = $this->getTableMap(); |
| 148 | 148 | foreach ($this->order->getOrders() as $field => $direction) { |
@@ -150,18 +150,18 @@ discard block |
||
| 150 | 150 | $orderAdded = TRUE; |
| 151 | 151 | if ($direction === Order::ASC) { |
| 152 | 152 | $query->addAscendingOrderByColumn($column->getPhpName()); |
| 153 | - } else { |
|
| 153 | + }else { |
|
| 154 | 154 | $query->addDescendingOrderByColumn($column->getPhpName()); |
| 155 | 155 | } |
| 156 | 156 | } |
| 157 | 157 | } |
| 158 | 158 | if (!$orderAdded) { |
| 159 | 159 | $pks = $this->getPkDbName(); |
| 160 | - foreach(array_keys($pks) as $key) { |
|
| 160 | + foreach (array_keys($pks) as $key) { |
|
| 161 | 161 | $query->addAscendingOrderByColumn($key); |
| 162 | 162 | } |
| 163 | 163 | } |
| 164 | - Logger::log(static::class . ' extract orders end', LOG_DEBUG); |
|
| 164 | + Logger::log(static::class.' extract orders end', LOG_DEBUG); |
|
| 165 | 165 | } |
| 166 | 166 | |
| 167 | 167 | /** |
@@ -176,7 +176,7 @@ discard block |
||
| 176 | 176 | foreach ($this->query as $field => $value) { |
| 177 | 177 | if (self::API_COMBO_FIELD === $field) { |
| 178 | 178 | ApiHelper::composerComboField($tableMap, $query, $this->extraColumns, $value); |
| 179 | - } elseif(!preg_match('/^__/', $field)) { |
|
| 179 | + } elseif (!preg_match('/^__/', $field)) { |
|
| 180 | 180 | ApiHelper::addModelField($tableMap, $query, $field, $value); |
| 181 | 181 | } |
| 182 | 182 | } |
@@ -197,10 +197,10 @@ discard block |
||
| 197 | 197 | list($page, $limit) = $this->extractPagination(); |
| 198 | 198 | if ($limit === -1) { |
| 199 | 199 | $this->list = $query->find($this->con); |
| 200 | - } else { |
|
| 200 | + }else { |
|
| 201 | 201 | $this->list = $query->paginate($page, $limit, $this->con); |
| 202 | 202 | } |
| 203 | - } catch (\Exception $e) { |
|
| 203 | + }catch (\Exception $e) { |
|
| 204 | 204 | Logger::log($e->getMessage(), LOG_ERR); |
| 205 | 205 | } |
| 206 | 206 | } |
@@ -219,7 +219,7 @@ discard block |
||
| 219 | 219 | $code = 200; |
| 220 | 220 | list($return, $total, $pages) = $this->getList(); |
| 221 | 221 | $message = null; |
| 222 | - if(!$total) { |
|
| 222 | + if (!$total) { |
|
| 223 | 223 | $message = t('No se han encontrado elementos para la búsqueda'); |
| 224 | 224 | } |
| 225 | 225 | |
@@ -245,7 +245,7 @@ discard block |
||
| 245 | 245 | $pages = 1; |
| 246 | 246 | $message = null; |
| 247 | 247 | list($code, $return) = $this->getSingleResult($pk); |
| 248 | - if($code !== 200) { |
|
| 248 | + if ($code !== 200) { |
|
| 249 | 249 | $message = t('No se ha encontrado el elemento solicitado'); |
| 250 | 250 | } |
| 251 | 251 | |
@@ -274,13 +274,13 @@ discard block |
||
| 274 | 274 | $status = 200; |
| 275 | 275 | $saved = TRUE; |
| 276 | 276 | $model = $this->model->toArray($this->fieldType ?: TableMap::TYPE_PHPNAME, true, [], true); |
| 277 | - } else { |
|
| 277 | + }else { |
|
| 278 | 278 | $message = t('No se ha podido guardar el modelo seleccionado'); |
| 279 | 279 | } |
| 280 | - } catch (\Exception $e) { |
|
| 281 | - $message = t('Ha ocurrido un error intentando guardar el elemento: ') .'<br>'. $e->getMessage(); |
|
| 280 | + }catch (\Exception $e) { |
|
| 281 | + $message = t('Ha ocurrido un error intentando guardar el elemento: ').'<br>'.$e->getMessage(); |
|
| 282 | 282 | $context = []; |
| 283 | - if(null !== $e->getPrevious()) { |
|
| 283 | + if (null !== $e->getPrevious()) { |
|
| 284 | 284 | $context[] = $e->getPrevious()->getMessage(); |
| 285 | 285 | } |
| 286 | 286 | Logger::log($e->getMessage(), LOG_CRIT, $context); |
@@ -316,18 +316,18 @@ discard block |
||
| 316 | 316 | $updated = TRUE; |
| 317 | 317 | $status = 200; |
| 318 | 318 | $model = $this->model->toArray($this->fieldType ?: TableMap::TYPE_PHPNAME, true, [], true); |
| 319 | - } else { |
|
| 319 | + }else { |
|
| 320 | 320 | $message = t('Ha ocurrido un error intentando actualizar el elemento, por favor revisa los logs'); |
| 321 | 321 | } |
| 322 | - } catch (\Exception $e) { |
|
| 322 | + }catch (\Exception $e) { |
|
| 323 | 323 | $message = t('Ha ocurrido un error intentando actualizar el elemento, por favor revisa los logs'); |
| 324 | 324 | $context = []; |
| 325 | - if(null !== $e->getPrevious()) { |
|
| 325 | + if (null !== $e->getPrevious()) { |
|
| 326 | 326 | $context[] = $e->getPrevious()->getMessage(); |
| 327 | 327 | } |
| 328 | 328 | Logger::log($e->getMessage(), LOG_CRIT, $context); |
| 329 | 329 | } |
| 330 | - } else { |
|
| 330 | + }else { |
|
| 331 | 331 | $message = t('No se ha encontrado el modelo al que se hace referencia para actualizar'); |
| 332 | 332 | } |
| 333 | 333 | |
@@ -355,15 +355,15 @@ discard block |
||
| 355 | 355 | $this->con->beginTransaction(); |
| 356 | 356 | $this->hydrateModel($pk); |
| 357 | 357 | if (NULL !== $this->model) { |
| 358 | - if(method_exists('clearAllReferences', $this->model)) { |
|
| 358 | + if (method_exists('clearAllReferences', $this->model)) { |
|
| 359 | 359 | $this->model->clearAllReferences(true); |
| 360 | 360 | } |
| 361 | 361 | $this->model->delete($this->con); |
| 362 | 362 | $deleted = TRUE; |
| 363 | 363 | } |
| 364 | - } catch (\Exception $e) { |
|
| 364 | + }catch (\Exception $e) { |
|
| 365 | 365 | $context = []; |
| 366 | - if(null !== $e->getPrevious()) { |
|
| 366 | + if (null !== $e->getPrevious()) { |
|
| 367 | 367 | $context[] = $e->getPrevious()->getMessage(); |
| 368 | 368 | } |
| 369 | 369 | Logger::log($e->getMessage(), LOG_CRIT, $context); |
@@ -392,7 +392,7 @@ discard block |
||
| 392 | 392 | $this->saveBulk(); |
| 393 | 393 | $saved = true; |
| 394 | 394 | $status = 200; |
| 395 | - } catch(\Exception $e) { |
|
| 395 | + }catch (\Exception $e) { |
|
| 396 | 396 | Logger::log($e->getMessage(), LOG_CRIT, $this->getRequest()->getData()); |
| 397 | 397 | $message = t('Bulk insert rolled back'); |
| 398 | 398 | } |
@@ -414,7 +414,7 @@ discard block |
||
| 414 | 414 | |
| 415 | 415 | /** @var CustomerTableMap $tableMap */ |
| 416 | 416 | $modelPk = ApiHelper::extractPrimaryKeyColumnName($this->getTableMap()); |
| 417 | - foreach($this->list->getData() as $data) { |
|
| 417 | + foreach ($this->list->getData() as $data) { |
|
| 418 | 418 | $return[] = ApiHelper::mapArrayObject($this->getModelNamespace(), $modelPk, $this->query, $data); |
| 419 | 419 | } |
| 420 | 420 | return $return; |
@@ -431,23 +431,23 @@ discard block |
||
| 431 | 431 | try { |
| 432 | 432 | $this->paginate(); |
| 433 | 433 | if (null !== $this->list) { |
| 434 | - if(array_key_exists(self::API_FIELDS_RESULT_FIELD, $this->query) && Config::getParam('api.field.types')) { |
|
| 434 | + if (array_key_exists(self::API_FIELDS_RESULT_FIELD, $this->query) && Config::getParam('api.field.types')) { |
|
| 435 | 435 | $return = $this->extractDataWithFormat(); |
| 436 | - } else { |
|
| 436 | + }else { |
|
| 437 | 437 | $return = $this->list->toArray(null, false, $this->fieldType ?: TableMap::TYPE_PHPNAME, false); |
| 438 | 438 | } |
| 439 | 439 | $total = 0; |
| 440 | 440 | $pages = 0; |
| 441 | - if($this->list instanceof PropelModelPager) { |
|
| 441 | + if ($this->list instanceof PropelModelPager) { |
|
| 442 | 442 | $total = $this->list->getNbResults(); |
| 443 | 443 | $pages = $this->list->getLastPage(); |
| 444 | - } elseif($this->list instanceof ArrayCollection) { |
|
| 444 | + } elseif ($this->list instanceof ArrayCollection) { |
|
| 445 | 445 | $total = count($return); |
| 446 | 446 | $pages = 1; |
| 447 | 447 | } |
| 448 | 448 | } |
| 449 | - } catch (\Exception $e) { |
|
| 450 | - Logger::log(get_class($this) . ': ' . $e->getMessage(), LOG_ERR); |
|
| 449 | + }catch (\Exception $e) { |
|
| 450 | + Logger::log(get_class($this).': '.$e->getMessage(), LOG_ERR); |
|
| 451 | 451 | } |
| 452 | 452 | |
| 453 | 453 | return array($return, $total, $pages); |
@@ -465,7 +465,7 @@ discard block |
||
| 465 | 465 | $return = array(); |
| 466 | 466 | if (NULL === $model || !method_exists($model, 'toArray')) { |
| 467 | 467 | $code = 404; |
| 468 | - } else { |
|
| 468 | + }else { |
|
| 469 | 469 | $return = $model->toArray($this->fieldType ?: TableMap::TYPE_PHPNAME, true, [], true); |
| 470 | 470 | } |
| 471 | 471 | |
@@ -37,7 +37,7 @@ |
||
| 37 | 37 | )) |
| 38 | 38 | ->addButton('submit', t("Acceder como {{username}}")) |
| 39 | 39 | ->addButton("cancel", t("Cancelar"), "button", array( |
| 40 | - "onclick" => "javacript:location.href = \"" . Router::getInstance()->getRoute('') . "\";", |
|
| 40 | + "onclick" => "javacript:location.href = \"".Router::getInstance()->getRoute('')."\";", |
|
| 41 | 41 | "class" => "btn-link", |
| 42 | 42 | )); |
| 43 | 43 | } |
@@ -83,9 +83,9 @@ |
||
| 83 | 83 | 'class' => 'btn-warning md-default', |
| 84 | 84 | 'icon' => 'fa-plus', |
| 85 | 85 | ]; |
| 86 | - if(Config::getParam('admin.version', 'v1') === 'v1') { |
|
| 87 | - $add['onclick'] = 'javascript:addNewField(document.getElementById("' . $this->getName() . '"));'; |
|
| 88 | - } else { |
|
| 86 | + if (Config::getParam('admin.version', 'v1') === 'v1') { |
|
| 87 | + $add['onclick'] = 'javascript:addNewField(document.getElementById("'.$this->getName().'"));'; |
|
| 88 | + }else { |
|
| 89 | 89 | $add['ng-click'] = 'addNewField()'; |
| 90 | 90 | } |
| 91 | 91 | $this->addButton('submit', t('Guardar configuración'), 'submit', array( |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | */ |
| 146 | 146 | public static function header($name, $default = null) |
| 147 | 147 | { |
| 148 | - return self::getInstance()->getHeader($name, $default); |
|
| 148 | + return self::getInstance()->getHeader($name, $default); |
|
| 149 | 149 | } |
| 150 | 150 | |
| 151 | 151 | /** |
@@ -158,10 +158,10 @@ discard block |
||
| 158 | 158 | $header = null; |
| 159 | 159 | if ($this->hasHeader($name)) { |
| 160 | 160 | $header = $this->header[$name]; |
| 161 | - } else if(array_key_exists('h_' . strtolower($name), $this->query)) { |
|
| 162 | - $header = $this->query['h_' . strtolower($name)]; |
|
| 163 | - } else if(array_key_exists('HTTP_' . strtoupper(str_replace('-', '_', $name)), $this->server)) { |
|
| 164 | - $header = $this->server['HTTP_' . strtoupper(str_replace('-', '_', $name))]; |
|
| 161 | + }else if (array_key_exists('h_'.strtolower($name), $this->query)) { |
|
| 162 | + $header = $this->query['h_'.strtolower($name)]; |
|
| 163 | + }else if (array_key_exists('HTTP_'.strtoupper(str_replace('-', '_', $name)), $this->server)) { |
|
| 164 | + $header = $this->server['HTTP_'.strtoupper(str_replace('-', '_', $name))]; |
|
| 165 | 165 | } |
| 166 | 166 | return $header ?: $default; |
| 167 | 167 | } |
@@ -260,7 +260,7 @@ discard block |
||
| 260 | 260 | $url = $this->getServer('HTTP_ORIGIN'); |
| 261 | 261 | } |
| 262 | 262 | ob_start(); |
| 263 | - header('Location: ' . $url); |
|
| 263 | + header('Location: '.$url); |
|
| 264 | 264 | ob_end_clean(); |
| 265 | 265 | Security::getInstance()->updateSession(); |
| 266 | 266 | exit(t('Redireccionando...')); |
@@ -306,10 +306,10 @@ discard block |
||
| 306 | 306 | $url = $this->getServerName(); |
| 307 | 307 | $protocol = $hasProtocol ? $this->getProtocol() : ''; |
| 308 | 308 | if (!empty($protocol)) { |
| 309 | - $url = $protocol . $url; |
|
| 309 | + $url = $protocol.$url; |
|
| 310 | 310 | } |
| 311 | 311 | if (!in_array((integer)$this->getServer('SERVER_PORT'), [80, 443], true)) { |
| 312 | - $url .= ':' . $this->getServer('SERVER_PORT'); |
|
| 312 | + $url .= ':'.$this->getServer('SERVER_PORT'); |
|
| 313 | 313 | } |
| 314 | 314 | return $url; |
| 315 | 315 | } |
@@ -55,7 +55,7 @@ |
||
| 55 | 55 | $router->simpatize(); |
| 56 | 56 | Security::getInstance()->setFlash("callback_message", t("Rutas generadas correctamente")); |
| 57 | 57 | Security::getInstance()->setFlash("callback_route", $this->getRoute("admin-routes", true)); |
| 58 | - } catch (\Exception $e) { |
|
| 58 | + }catch (\Exception $e) { |
|
| 59 | 59 | Logger::log($e->getMessage(), LOG_ERR); |
| 60 | 60 | Security::getInstance()->setFlash("callback_message", t("Algo no ha salido bien, revisa los logs")); |
| 61 | 61 | Security::getInstance()->setFlash("callback_route", $this->getRoute("admin-routes", true)); |
@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | Logger::log('Configuration saved successful'); |
| 64 | 64 | Security::getInstance()->setFlash("callback_message", t("Usuario agregado correctamente")); |
| 65 | 65 | Security::getInstance()->setFlash("callback_route", Router::getInstance()->getRoute("admin", true)); |
| 66 | - } else { |
|
| 66 | + }else { |
|
| 67 | 67 | throw new ConfigException(t('Error al guardar los administradores, prueba a cambiar los permisos')); |
| 68 | 68 | } |
| 69 | 69 | } |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | { |
| 100 | 100 | if ($this->isAdmin()) { |
| 101 | 101 | return $this->redirect('admin'); |
| 102 | - } else { |
|
| 102 | + }else { |
|
| 103 | 103 | return Admin::staticAdminLogon($route); |
| 104 | 104 | } |
| 105 | 105 | } |
@@ -131,7 +131,7 @@ discard block |
||
| 131 | 131 | $cookies = array( |
| 132 | 132 | array( |
| 133 | 133 | "name" => Security::getInstance()->getHash(), |
| 134 | - "value" => base64_encode($form->getFieldValue("user") . ":" . $form->getFieldValue("pass")), |
|
| 134 | + "value" => base64_encode($form->getFieldValue("user").":".$form->getFieldValue("pass")), |
|
| 135 | 135 | "expire" => time() + 3600, |
| 136 | 136 | "http" => true, |
| 137 | 137 | ) |
@@ -142,7 +142,7 @@ discard block |
||
| 142 | 142 | 'status_message' => t("Acceso permitido... redirigiendo!!"), |
| 143 | 143 | 'delay' => 1, |
| 144 | 144 | ); |
| 145 | - } else { |
|
| 145 | + }else { |
|
| 146 | 146 | $form->setError("user", t("El usuario no tiene acceso a la web")); |
| 147 | 147 | } |
| 148 | 148 | } |
@@ -39,24 +39,24 @@ discard block |
||
| 39 | 39 | */ |
| 40 | 40 | public static function findTranslations($path, $locale) |
| 41 | 41 | { |
| 42 | - $localePath = realpath(BASE_DIR . DIRECTORY_SEPARATOR . 'locale'); |
|
| 43 | - $localePath .= DIRECTORY_SEPARATOR . $locale . DIRECTORY_SEPARATOR . 'LC_MESSAGES' . DIRECTORY_SEPARATOR; |
|
| 42 | + $localePath = realpath(BASE_DIR.DIRECTORY_SEPARATOR.'locale'); |
|
| 43 | + $localePath .= DIRECTORY_SEPARATOR.$locale.DIRECTORY_SEPARATOR.'LC_MESSAGES'.DIRECTORY_SEPARATOR; |
|
| 44 | 44 | |
| 45 | 45 | $translations = array(); |
| 46 | 46 | if (file_exists($path)) { |
| 47 | 47 | $d = dir($path); |
| 48 | 48 | while (false !== ($dir = $d->read())) { |
| 49 | 49 | GeneratorHelper::createDir($localePath); |
| 50 | - if (!file_exists($localePath . 'translations.po')) { |
|
| 51 | - file_put_contents($localePath . 'translations.po', ''); |
|
| 50 | + if (!file_exists($localePath.'translations.po')) { |
|
| 51 | + file_put_contents($localePath.'translations.po', ''); |
|
| 52 | 52 | } |
| 53 | - $inspect_path = realpath($path . DIRECTORY_SEPARATOR . $dir); |
|
| 54 | - $cmd_php = "export PATH=\$PATH:/opt/local/bin; xgettext " . |
|
| 55 | - $inspect_path . DIRECTORY_SEPARATOR . |
|
| 53 | + $inspect_path = realpath($path.DIRECTORY_SEPARATOR.$dir); |
|
| 54 | + $cmd_php = "export PATH=\$PATH:/opt/local/bin; xgettext ". |
|
| 55 | + $inspect_path.DIRECTORY_SEPARATOR. |
|
| 56 | 56 | "*.php --from-code=UTF-8 -j -L PHP --debug --force-po -o {$localePath}translations.po"; |
| 57 | - if (is_dir($path . DIRECTORY_SEPARATOR . $dir) && preg_match('/^\./', $dir) == 0) { |
|
| 58 | - $res = t('Revisando directorio: ') . $inspect_path; |
|
| 59 | - $res .= t('Comando ejecutado: ') . $cmd_php; |
|
| 57 | + if (is_dir($path.DIRECTORY_SEPARATOR.$dir) && preg_match('/^\./', $dir) == 0) { |
|
| 58 | + $res = t('Revisando directorio: ').$inspect_path; |
|
| 59 | + $res .= t('Comando ejecutado: ').$cmd_php; |
|
| 60 | 60 | $res .= shell_exec($cmd_php); |
| 61 | 61 | usleep(10); |
| 62 | 62 | $translations[] = $res; |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | */ |
| 78 | 78 | public function createStructureModule($module, $force = false, $type = "", $apiClass = "") |
| 79 | 79 | { |
| 80 | - $mod_path = CORE_DIR . DIRECTORY_SEPARATOR; |
|
| 80 | + $mod_path = CORE_DIR.DIRECTORY_SEPARATOR; |
|
| 81 | 81 | $module = ucfirst($module); |
| 82 | 82 | $this->createModulePath($module, $mod_path); |
| 83 | 83 | $this->createModulePathTree($module, $mod_path); |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | // Creates the src folder |
| 99 | 99 | GeneratorHelper::createDir($mod_path); |
| 100 | 100 | // Create module path |
| 101 | - GeneratorHelper::createDir($mod_path . $module); |
|
| 101 | + GeneratorHelper::createDir($mod_path.$module); |
|
| 102 | 102 | } |
| 103 | 103 | |
| 104 | 104 | /** |
@@ -113,16 +113,16 @@ discard block |
||
| 113 | 113 | $this->log->addLog("Generamos la estructura"); |
| 114 | 114 | $paths = [ |
| 115 | 115 | "Api", "Api/base", "Config", "Controller", "Models", "Public", "Templates", "Services", "Test", "Doc", |
| 116 | - "Locale", "Locale/" . Config::getParam('default.locale', 'es_ES'), "Locale/" . Config::getParam('default.locale', 'es_ES') . "/LC_MESSAGES" |
|
| 116 | + "Locale", "Locale/".Config::getParam('default.locale', 'es_ES'), "Locale/".Config::getParam('default.locale', 'es_ES')."/LC_MESSAGES" |
|
| 117 | 117 | ]; |
| 118 | - $module_path = $mod_path . $module; |
|
| 118 | + $module_path = $mod_path.$module; |
|
| 119 | 119 | foreach ($paths as $path) { |
| 120 | - GeneratorHelper::createDir($module_path . DIRECTORY_SEPARATOR . $path); |
|
| 120 | + GeneratorHelper::createDir($module_path.DIRECTORY_SEPARATOR.$path); |
|
| 121 | 121 | } |
| 122 | 122 | //Creamos las carpetas de los assets |
| 123 | 123 | $htmlPaths = array("css", "js", "img", "media", "font"); |
| 124 | 124 | foreach ($htmlPaths as $path) { |
| 125 | - GeneratorHelper::createDir($module_path . DIRECTORY_SEPARATOR . "Public" . DIRECTORY_SEPARATOR . $path); |
|
| 125 | + GeneratorHelper::createDir($module_path.DIRECTORY_SEPARATOR."Public".DIRECTORY_SEPARATOR.$path); |
|
| 126 | 126 | } |
| 127 | 127 | } |
| 128 | 128 | |
@@ -135,7 +135,7 @@ discard block |
||
| 135 | 135 | */ |
| 136 | 136 | private function createModuleBaseFiles($module, $mod_path, $force = false, $controllerType = '') |
| 137 | 137 | { |
| 138 | - $module_path = $mod_path . $module; |
|
| 138 | + $module_path = $mod_path.$module; |
|
| 139 | 139 | $this->generateControllerTemplate($module, $module_path, $force, $controllerType); |
| 140 | 140 | $this->generateServiceTemplate($module, $module_path, $force); |
| 141 | 141 | $this->genereateAutoloaderTemplate($module, $module_path, $force); |
@@ -153,8 +153,8 @@ discard block |
||
| 153 | 153 | */ |
| 154 | 154 | private function createModuleModels($module, $path) |
| 155 | 155 | { |
| 156 | - $module_path = $path . $module; |
|
| 157 | - $module_path = str_replace(CORE_DIR . DIRECTORY_SEPARATOR, '', $module_path); |
|
| 156 | + $module_path = $path.$module; |
|
| 157 | + $module_path = str_replace(CORE_DIR.DIRECTORY_SEPARATOR, '', $module_path); |
|
| 158 | 158 | |
| 159 | 159 | $configGenerator = $this->getConfigGenerator($module_path); |
| 160 | 160 | |
@@ -164,8 +164,8 @@ discard block |
||
| 164 | 164 | $configTemplate = $this->tpl->dump("generator/config.propel.template.twig", array( |
| 165 | 165 | "module" => $module, |
| 166 | 166 | )); |
| 167 | - $this->writeTemplateToFile($configTemplate, CORE_DIR . DIRECTORY_SEPARATOR . $module_path . DIRECTORY_SEPARATOR . "Config" . |
|
| 168 | - DIRECTORY_SEPARATOR . "config.php", true); |
|
| 167 | + $this->writeTemplateToFile($configTemplate, CORE_DIR.DIRECTORY_SEPARATOR.$module_path.DIRECTORY_SEPARATOR."Config". |
|
| 168 | + DIRECTORY_SEPARATOR."config.php", true); |
|
| 169 | 169 | $this->log->addLog("Generado config genérico para propel"); |
| 170 | 170 | } |
| 171 | 171 | |
@@ -187,28 +187,28 @@ discard block |
||
| 187 | 187 | "namespace" => preg_replace('/(\\\|\/)/', '\\', $module), |
| 188 | 188 | "url" => preg_replace('/(\\\|\/)/', '/', $module), |
| 189 | 189 | "class" => $class, |
| 190 | - "controllerType" => $class . "Base", |
|
| 190 | + "controllerType" => $class."Base", |
|
| 191 | 191 | "is_base" => false |
| 192 | 192 | )); |
| 193 | - $controller = $this->writeTemplateToFile($controllerBody, $mod_path . DIRECTORY_SEPARATOR . "Controller" . |
|
| 194 | - DIRECTORY_SEPARATOR . "{$class}Controller.php", $force); |
|
| 193 | + $controller = $this->writeTemplateToFile($controllerBody, $mod_path.DIRECTORY_SEPARATOR."Controller". |
|
| 194 | + DIRECTORY_SEPARATOR."{$class}Controller.php", $force); |
|
| 195 | 195 | |
| 196 | 196 | $controllerBody = $this->tpl->dump("generator/controller.template.twig", array( |
| 197 | 197 | "module" => $module, |
| 198 | 198 | "namespace" => preg_replace('/(\\\|\/)/', '\\', $module), |
| 199 | 199 | "url" => preg_replace('/(\\\|\/)/', '/', $module), |
| 200 | - "class" => $class . "Base", |
|
| 200 | + "class" => $class."Base", |
|
| 201 | 201 | "service" => $class, |
| 202 | 202 | "controllerType" => $controllerType, |
| 203 | 203 | "is_base" => true, |
| 204 | 204 | "domain" => $class, |
| 205 | 205 | )); |
| 206 | - $controllerBase = $this->writeTemplateToFile($controllerBody, $mod_path . DIRECTORY_SEPARATOR . "Controller" . |
|
| 207 | - DIRECTORY_SEPARATOR . "base" . DIRECTORY_SEPARATOR . "{$class}BaseController.php", true); |
|
| 206 | + $controllerBase = $this->writeTemplateToFile($controllerBody, $mod_path.DIRECTORY_SEPARATOR."Controller". |
|
| 207 | + DIRECTORY_SEPARATOR."base".DIRECTORY_SEPARATOR."{$class}BaseController.php", true); |
|
| 208 | 208 | |
| 209 | - $filename = $mod_path . DIRECTORY_SEPARATOR . "Test" . DIRECTORY_SEPARATOR . "{$class}Test.php"; |
|
| 209 | + $filename = $mod_path.DIRECTORY_SEPARATOR."Test".DIRECTORY_SEPARATOR."{$class}Test.php"; |
|
| 210 | 210 | $test = true; |
| 211 | - if(!file_exists($filename)) { |
|
| 211 | + if (!file_exists($filename)) { |
|
| 212 | 212 | $testTemplate = $this->tpl->dump("generator/testCase.template.twig", array( |
| 213 | 213 | "module" => $module, |
| 214 | 214 | "namespace" => preg_replace('/(\\\|\/)/', '\\', $module), |
@@ -229,8 +229,8 @@ discard block |
||
| 229 | 229 | private function generateBaseApiTemplate($module, $mod_path, $force = false, $apiClass = "") |
| 230 | 230 | { |
| 231 | 231 | $created = true; |
| 232 | - $modelPath = $mod_path . $module . DIRECTORY_SEPARATOR . 'Models'; |
|
| 233 | - $api_path = $mod_path . $module . DIRECTORY_SEPARATOR . 'Api'; |
|
| 232 | + $modelPath = $mod_path.$module.DIRECTORY_SEPARATOR.'Models'; |
|
| 233 | + $api_path = $mod_path.$module.DIRECTORY_SEPARATOR.'Api'; |
|
| 234 | 234 | if (file_exists($modelPath)) { |
| 235 | 235 | $dir = dir($modelPath); |
| 236 | 236 | while ($file = $dir->read()) { |
@@ -258,7 +258,7 @@ discard block |
||
| 258 | 258 | //Generamos el fichero de configuración |
| 259 | 259 | $this->log->addLog("Generamos fichero vacío de configuración"); |
| 260 | 260 | return $this->writeTemplateToFile("<?php\n\t", |
| 261 | - $mod_path . DIRECTORY_SEPARATOR . "Config" . DIRECTORY_SEPARATOR . "config.php", |
|
| 261 | + $mod_path.DIRECTORY_SEPARATOR."Config".DIRECTORY_SEPARATOR."config.php", |
|
| 262 | 262 | $force); |
| 263 | 263 | } |
| 264 | 264 | |
@@ -273,10 +273,10 @@ discard block |
||
| 273 | 273 | //Generamos el fichero de configuración |
| 274 | 274 | $this->log->addLog("Generamos ficheros para assets base"); |
| 275 | 275 | $css = $this->writeTemplateToFile("/* CSS3 STYLES */\n\n", |
| 276 | - $mod_path . DIRECTORY_SEPARATOR . "Public" . DIRECTORY_SEPARATOR . "css" . DIRECTORY_SEPARATOR . "styles.css", |
|
| 276 | + $mod_path.DIRECTORY_SEPARATOR."Public".DIRECTORY_SEPARATOR."css".DIRECTORY_SEPARATOR."styles.css", |
|
| 277 | 277 | $force); |
| 278 | 278 | $js = $this->writeTemplateToFile("/* APP MODULE JS */\n\n(function() {\n\t'use strict';\n})();", |
| 279 | - $mod_path . DIRECTORY_SEPARATOR . "Public" . DIRECTORY_SEPARATOR . "js" . DIRECTORY_SEPARATOR . "app.js", |
|
| 279 | + $mod_path.DIRECTORY_SEPARATOR."Public".DIRECTORY_SEPARATOR."js".DIRECTORY_SEPARATOR."app.js", |
|
| 280 | 280 | $force); |
| 281 | 281 | return ($css && $js); |
| 282 | 282 | } |
@@ -298,7 +298,7 @@ discard block |
||
| 298 | 298 | "class" => $class, |
| 299 | 299 | )); |
| 300 | 300 | return $this->writeTemplateToFile($controller, |
| 301 | - $mod_path . DIRECTORY_SEPARATOR . "Services" . DIRECTORY_SEPARATOR . "{$class}Service.php", |
|
| 301 | + $mod_path.DIRECTORY_SEPARATOR."Services".DIRECTORY_SEPARATOR."{$class}Service.php", |
|
| 302 | 302 | $force); |
| 303 | 303 | } |
| 304 | 304 | |
@@ -317,13 +317,13 @@ discard block |
||
| 317 | 317 | "autoloader" => preg_replace('/(\\\|\/)/', '_', $module), |
| 318 | 318 | "regex" => preg_replace('/(\\\|\/)/m', '\\\\\\\\\\\\', $module), |
| 319 | 319 | )); |
| 320 | - $autoload = $this->writeTemplateToFile($autoloader, $mod_path . DIRECTORY_SEPARATOR . "autoload.php", $force); |
|
| 320 | + $autoload = $this->writeTemplateToFile($autoloader, $mod_path.DIRECTORY_SEPARATOR."autoload.php", $force); |
|
| 321 | 321 | |
| 322 | 322 | $this->log->addLog("Generamos el phpunit"); |
| 323 | 323 | $phpUnitTemplate = $this->tpl->dump("generator/phpunit.template.twig", array( |
| 324 | 324 | "module" => $module, |
| 325 | 325 | )); |
| 326 | - $phpunit = $this->writeTemplateToFile($phpUnitTemplate, $mod_path . DIRECTORY_SEPARATOR . "phpunit.xml.dist", $force); |
|
| 326 | + $phpunit = $this->writeTemplateToFile($phpUnitTemplate, $mod_path.DIRECTORY_SEPARATOR."phpunit.xml.dist", $force); |
|
| 327 | 327 | return $autoload && $phpunit; |
| 328 | 328 | } |
| 329 | 329 | |
@@ -344,7 +344,7 @@ discard block |
||
| 344 | 344 | "db" => $this->config->get("db_name"), |
| 345 | 345 | )); |
| 346 | 346 | return $this->writeTemplateToFile($schema, |
| 347 | - $mod_path . DIRECTORY_SEPARATOR . "Config" . DIRECTORY_SEPARATOR . "schema.xml", |
|
| 347 | + $mod_path.DIRECTORY_SEPARATOR."Config".DIRECTORY_SEPARATOR."schema.xml", |
|
| 348 | 348 | $force); |
| 349 | 349 | } |
| 350 | 350 | |
@@ -362,7 +362,7 @@ discard block |
||
| 362 | 362 | "namespace" => preg_replace('/(\\\|\/)/', '', $module), |
| 363 | 363 | )); |
| 364 | 364 | return $this->writeTemplateToFile($build_properties, |
| 365 | - $mod_path . DIRECTORY_SEPARATOR . "Config" . DIRECTORY_SEPARATOR . "propel.yml", |
|
| 365 | + $mod_path.DIRECTORY_SEPARATOR."Config".DIRECTORY_SEPARATOR."propel.yml", |
|
| 366 | 366 | $force); |
| 367 | 367 | } |
| 368 | 368 | |
@@ -380,7 +380,7 @@ discard block |
||
| 380 | 380 | "module" => $module, |
| 381 | 381 | )); |
| 382 | 382 | return $this->writeTemplateToFile($index, |
| 383 | - $mod_path . DIRECTORY_SEPARATOR . "Templates" . DIRECTORY_SEPARATOR . "index.html.twig", |
|
| 383 | + $mod_path.DIRECTORY_SEPARATOR."Templates".DIRECTORY_SEPARATOR."index.html.twig", |
|
| 384 | 384 | $force); |
| 385 | 385 | } |
| 386 | 386 | |
@@ -398,11 +398,11 @@ discard block |
||
| 398 | 398 | try { |
| 399 | 399 | $this->cache->storeData($filename, $fileContent, Cache::TEXT, true); |
| 400 | 400 | $created = true; |
| 401 | - } catch (\Exception $e) { |
|
| 401 | + }catch (\Exception $e) { |
|
| 402 | 402 | Logger::log($e->getMessage(), LOG_ERR); |
| 403 | 403 | } |
| 404 | - } else { |
|
| 405 | - Logger::log($filename . t(' not exists or cant write'), LOG_ERR); |
|
| 404 | + }else { |
|
| 405 | + Logger::log($filename.t(' not exists or cant write'), LOG_ERR); |
|
| 406 | 406 | } |
| 407 | 407 | return $created; |
| 408 | 408 | } |
@@ -431,7 +431,7 @@ discard block |
||
| 431 | 431 | )); |
| 432 | 432 | |
| 433 | 433 | return $this->writeTemplateToFile($controller, |
| 434 | - $mod_path . DIRECTORY_SEPARATOR . 'base' . DIRECTORY_SEPARATOR . "{$api}BaseApi.php", true); |
|
| 434 | + $mod_path.DIRECTORY_SEPARATOR.'base'.DIRECTORY_SEPARATOR."{$api}BaseApi.php", true); |
|
| 435 | 435 | } |
| 436 | 436 | |
| 437 | 437 | /** |
@@ -454,7 +454,7 @@ discard block |
||
| 454 | 454 | "class" => $class, |
| 455 | 455 | )); |
| 456 | 456 | |
| 457 | - return $this->writeTemplateToFile($controller, $mod_path . DIRECTORY_SEPARATOR . "{$api}.php", $force); |
|
| 457 | + return $this->writeTemplateToFile($controller, $mod_path.DIRECTORY_SEPARATOR."{$api}.php", $force); |
|
| 458 | 458 | } |
| 459 | 459 | |
| 460 | 460 | /** |
@@ -468,12 +468,12 @@ discard block |
||
| 468 | 468 | { |
| 469 | 469 | if (file_exists($filename_path)) { |
| 470 | 470 | $destfolder = basename($filename_path); |
| 471 | - if (!file_exists(WEB_DIR . $dest . DIRECTORY_SEPARATOR . $destfolder) || $debug || $force) { |
|
| 471 | + if (!file_exists(WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder) || $debug || $force) { |
|
| 472 | 472 | if (is_dir($filename_path)) { |
| 473 | - self::copyr($filename_path, WEB_DIR . $dest . DIRECTORY_SEPARATOR . $destfolder); |
|
| 474 | - } else { |
|
| 475 | - if (@copy($filename_path, WEB_DIR . $dest . DIRECTORY_SEPARATOR . $destfolder) === FALSE) { |
|
| 476 | - throw new ConfigException("Can't copy " . $filename_path . " to " . WEB_DIR . $dest . DIRECTORY_SEPARATOR . $destfolder); |
|
| 473 | + self::copyr($filename_path, WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder); |
|
| 474 | + }else { |
|
| 475 | + if (@copy($filename_path, WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder) === FALSE) { |
|
| 476 | + throw new ConfigException("Can't copy ".$filename_path." to ".WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder); |
|
| 477 | 477 | } |
| 478 | 478 | } |
| 479 | 479 | } |
@@ -492,10 +492,10 @@ discard block |
||
| 492 | 492 | GeneratorHelper::createDir($dst); |
| 493 | 493 | while (false !== ($file = readdir($dir))) { |
| 494 | 494 | if (($file != '.') && ($file != '..')) { |
| 495 | - if (is_dir($src . '/' . $file)) { |
|
| 496 | - self::copyr($src . '/' . $file, $dst . '/' . $file); |
|
| 497 | - } elseif (@copy($src . '/' . $file, $dst . '/' . $file) === false) { |
|
| 498 | - throw new ConfigException("Can't copy " . $src . " to " . $dst); |
|
| 495 | + if (is_dir($src.'/'.$file)) { |
|
| 496 | + self::copyr($src.'/'.$file, $dst.'/'.$file); |
|
| 497 | + } elseif (@copy($src.'/'.$file, $dst.'/'.$file) === false) { |
|
| 498 | + throw new ConfigException("Can't copy ".$src." to ".$dst); |
|
| 499 | 499 | } |
| 500 | 500 | } |
| 501 | 501 | } |
@@ -508,12 +508,12 @@ discard block |
||
| 508 | 508 | */ |
| 509 | 509 | private function getPropelPaths($module_path) |
| 510 | 510 | { |
| 511 | - $moduleDir = CORE_DIR . DIRECTORY_SEPARATOR . $module_path; |
|
| 511 | + $moduleDir = CORE_DIR.DIRECTORY_SEPARATOR.$module_path; |
|
| 512 | 512 | GeneratorHelper::createDir($moduleDir); |
| 513 | 513 | $moduleDir = realpath($moduleDir); |
| 514 | - $configDir = $moduleDir . DIRECTORY_SEPARATOR . 'Config'; |
|
| 515 | - $sqlDir = $moduleDir . DIRECTORY_SEPARATOR . 'Config' . DIRECTORY_SEPARATOR . 'Sql'; |
|
| 516 | - $migrationDir = $moduleDir . DIRECTORY_SEPARATOR . 'Config' . DIRECTORY_SEPARATOR . 'Migrations'; |
|
| 514 | + $configDir = $moduleDir.DIRECTORY_SEPARATOR.'Config'; |
|
| 515 | + $sqlDir = $moduleDir.DIRECTORY_SEPARATOR.'Config'.DIRECTORY_SEPARATOR.'Sql'; |
|
| 516 | + $migrationDir = $moduleDir.DIRECTORY_SEPARATOR.'Config'.DIRECTORY_SEPARATOR.'Migrations'; |
|
| 517 | 517 | $paths = [ |
| 518 | 518 | 'projectDir' => $moduleDir, |
| 519 | 519 | 'outputDir' => $moduleDir, |
@@ -578,9 +578,9 @@ discard block |
||
| 578 | 578 | private function setupManager(GeneratorConfig $configGenerator, AbstractManager &$manager, $workingDir = CORE_DIR) |
| 579 | 579 | { |
| 580 | 580 | $manager->setGeneratorConfig($configGenerator); |
| 581 | - $schemaFile = new \SplFileInfo($configGenerator->getSection('paths')['schemaDir'] . DIRECTORY_SEPARATOR . 'schema.xml'); |
|
| 581 | + $schemaFile = new \SplFileInfo($configGenerator->getSection('paths')['schemaDir'].DIRECTORY_SEPARATOR.'schema.xml'); |
|
| 582 | 582 | $manager->setSchemas([$schemaFile]); |
| 583 | - $manager->setLoggerClosure(function ($message) { |
|
| 583 | + $manager->setLoggerClosure(function($message) { |
|
| 584 | 584 | Logger::log($message, LOG_INFO); |
| 585 | 585 | }); |
| 586 | 586 | $manager->setWorkingDirectory($workingDir); |