psfs / core

src/base/types/helpers/SecurityHelper.php

Spacing +13 added lines, -13 removed lines

@@ -34,7 +34,7 @@ 
             && (preg_match('/^\/(admin|setup\-admin)/i', $route) || Config::getParam('restricted', false))
         ) {
             if (!self::isTest() &&
-                null === Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json', Cache::JSONGZ, true)) {
+                null === Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json', Cache::JSONGZ, true)) {
                 throw new AdminCredentialsException();
             }
             if (!Security::getInstance()->checkAdmin()) {
@@ -54,8 +54,8 @@ 
         $token = '';
         $length = strlen($timestamp);
         for ($i = 0; $i < $length; $i++) {
-            $token = substr($hash, $i, 1) .
-                substr($timestamp, $i, 1) .
+            $token = substr($hash, $i, 1).
+                substr($timestamp, $i, 1).
                 $token;
         }
         return $token;
@@ -74,16 +74,16 @@ 
         $charsLength = strlen(self::RAND_SEP) - 1;
         $tsLength = strlen($timestamp);
         $i = 0;
-        $partCount = ceil($hashRest / 4);
-        $part = substr($hash, $tsLength + $partCount * $i, $partCount);
+        $partCount = ceil($hashRest/4);
+        $part = substr($hash, $tsLength + $partCount*$i, $partCount);
         while (false !== $part && strlen($part) > 0) {
-            $mixedToken .= $part .
-                substr(self::RAND_SEP, round(rand(0, $charsLength), 0, PHP_ROUND_HALF_DOWN), 1) .
+            $mixedToken .= $part.
+                substr(self::RAND_SEP, round(rand(0, $charsLength), 0, PHP_ROUND_HALF_DOWN), 1).
                 substr(self::RAND_SEP, round(rand(0, $charsLength), 0, PHP_ROUND_HALF_DOWN), 1);
-            $part = substr($hash, $tsLength + $partCount * $i, $partCount);
+            $part = substr($hash, $tsLength + $partCount*$i, $partCount);
             $i++;
         }
-        return $mixedToken . $token;
+        return $mixedToken.$token;
     }
 
     /**
@@ -93,7 +93,7 @@ 
     private static function getTs($isOdd = null)
     {
         $timestamp = time();
-        $tsIsOdd = (bool)((int)substr($timestamp, -1) % 2);
+        $tsIsOdd = (bool)((int)substr($timestamp, -1)%2);
         if (false === $isOdd && !$tsIsOdd) {
             $timestamp--;
         } elseif (true === $isOdd && !$tsIsOdd) {
@@ -129,9 +129,9 @@ 
         $timestamp = '';
         $part = strrev($part);
         for ($i = 0, $ct = strlen($part); $i < $ct; $i++) {
-            if ($i % 2 == 0) {
+            if ($i%2 == 0) {
                 $timestamp .= substr($part, $i, 1);
-            } else {
+            }else {
                 $partToken .= substr($part, $i, 1);
             }
         }
@@ -148,7 +148,7 @@ 
         list($partToken, $timestamp) = self::extractTs(array_pop($parts));
         $token = null;
         if ($timestamp > 0) {
-            $token = $partToken . implode('', $parts);
+            $token = $partToken.implode('', $parts);
         }
         return [$token, $timestamp];
     }

src/base/types/helpers/RouterHelper.php

Spacing +14 added lines, -14 removed lines

@@ -24,11 +24,11 @@ 
     {
         Inspector::stats('[RouterHelper] Getting class to call for executing the request action', Inspector::SCOPE_DEBUG);
         Logger::log('Getting class to call for executing the request action', LOG_DEBUG, $action);
-        $actionClass = class_exists($action['class']) ? $action['class'] : "\\" . $action['class'];
+        $actionClass = class_exists($action['class']) ? $action['class'] : "\\".$action['class'];
         $reflectionClass = new ReflectionClass($actionClass);
         if ($reflectionClass->hasMethod('getInstance')) {
             $class = $reflectionClass->getMethod('getInstance')->invoke(null, $action['method']);
-        } else {
+        }else {
             $class = new $actionClass;
         }
         return $class;
@@ -62,7 +62,7 @@ 
     public static function extractComponents($route, $pattern)
     {
         Inspector::stats('[RouterHelper] Extracting parts for the request to execute', Inspector::SCOPE_DEBUG);
-        if(Config::getParam('allow.double.slashes', true)) {
+        if (Config::getParam('allow.double.slashes', true)) {
             $route = preg_replace("/\/\//", '/', $route);
         }
         $url = parse_url($route);
@@ -100,7 +100,7 @@ 
             $cleanPatternSep--;
         }
 
-        if(Config::getParam('allow.double.slashes', true)) {
+        if (Config::getParam('allow.double.slashes', true)) {
             $path = preg_replace("/\/\//", '/', $path);
         }
         $pathSep = count(explode('/', $path));
@@ -120,14 +120,14 @@ 
      */
     public static function matchRoutePattern($routePattern, $path)
     {
-        if(Config::getParam('allow.double.slashes', true)) {
+        if (Config::getParam('allow.double.slashes', true)) {
             $path = preg_replace("/\/\//", '/', $path);
         }
         $expr = preg_replace('/\{([^}]+)\}/', '%%%', $routePattern);
         $expr = preg_quote($expr, '/');
         $expr = str_replace('%%%', '(.*)', $expr);
         $expr2 = preg_replace('/\(\.\*\)$/', '', $expr);
-        $matched = preg_match('/^' . $expr . '\/?$/i', $path) || preg_match('/^' . $expr2 . '?$/i', $path);
+        $matched = preg_match('/^'.$expr.'\/?$/i', $path) || preg_match('/^'.$expr2.'?$/i', $path);
         return $matched;
     }
 
@@ -138,7 +138,7 @@ 
      */
     public static function extractDomainInfo(ReflectionClass $class, $domain)
     {
-        $path = dirname($class->getFileName()) . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR;
+        $path = dirname($class->getFileName()).DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR;
         $templatesPath = 'templates';
         $publicPath = 'public';
         $modelsPath = 'models';
@@ -148,13 +148,13 @@ 
             $modelsPath = ucfirst($modelsPath);
         }
         if ($class->hasConstant('TPL')) {
-            $templatesPath .= DIRECTORY_SEPARATOR . $class->getConstant('TPL');
+            $templatesPath .= DIRECTORY_SEPARATOR.$class->getConstant('TPL');
         }
         return [
             'base' => $path,
-            'template' => $path . $templatesPath,
-            'model' => $path . $modelsPath,
-            'public' => $path . $publicPath,
+            'template' => $path.$templatesPath,
+            'model' => $path.$modelsPath,
+            'public' => $path.$publicPath,
         ];
     }
 
@@ -175,12 +175,12 @@ 
             foreach ($parameters as $param) {
                 if ($param->isOptional() && !is_array($param->getDefaultValue())) {
                     $params[$param->getName()] = $param->getDefaultValue();
-                    $default = str_replace('{' . $param->getName() . '}', $param->getDefaultValue() ?: '', $regex ?: '');
+                    $default = str_replace('{'.$param->getName().'}', $param->getDefaultValue() ?: '', $regex ?: '');
                 } elseif (!$param->isOptional()) {
                     $requirements[] = $param->getName();
                 }
             }
-        } else {
+        }else {
             $default = $regex;
         }
 
@@ -210,7 +210,7 @@ 
             $httpMethod = AnnotationHelper::extractReflectionHttpMethod($docComments);
             $icon = AnnotationHelper::extractDocIcon($docComments);
             $label = AnnotationHelper::extractReflectionLabel(str_replace('{__API__}', $api, $docComments));
-            $route = $httpMethod . "#|#" . $regex;
+            $route = $httpMethod."#|#".$regex;
             $route = preg_replace('/(\\r|\\f|\\t|\\n)/', '', $route);
             $info = [
                 'method' => $method->getName(),

src/base/types/traits/Generator/PropelHelperTrait.php

Spacing +7 added lines, -7 removed lines

@@ -22,12 +22,12 @@ 
      */
     private function getPropelPaths($modulePath)
     {
-        $moduleDir = CORE_DIR . DIRECTORY_SEPARATOR . $modulePath;
+        $moduleDir = CORE_DIR.DIRECTORY_SEPARATOR.$modulePath;
         GeneratorHelper::createDir($moduleDir);
         $moduleDir = realpath($moduleDir);
-        $configDir = $moduleDir . DIRECTORY_SEPARATOR . 'Config';
-        $sqlDir = $moduleDir . DIRECTORY_SEPARATOR . 'Config' . DIRECTORY_SEPARATOR . 'Sql';
-        $migrationDir = $moduleDir . DIRECTORY_SEPARATOR . 'Config' . DIRECTORY_SEPARATOR . 'Migrations';
+        $configDir = $moduleDir.DIRECTORY_SEPARATOR.'Config';
+        $sqlDir = $moduleDir.DIRECTORY_SEPARATOR.'Config'.DIRECTORY_SEPARATOR.'Sql';
+        $migrationDir = $moduleDir.DIRECTORY_SEPARATOR.'Config'.DIRECTORY_SEPARATOR.'Migrations';
         $paths = [
             'projectDir' => $moduleDir,
             'outputDir' => $moduleDir,
@@ -90,12 +90,12 @@ 
      * @param AbstractManager $manager
      * @param string $workingDir
      */
-    private function setupManager(GeneratorConfig $configGenerator, AbstractManager &$manager, $workingDir = CORE_DIR)
+    private function setupManager(GeneratorConfig $configGenerator, AbstractManager & $manager, $workingDir = CORE_DIR)
     {
         $manager->setGeneratorConfig($configGenerator);
-        $schemaFile = new \SplFileInfo($configGenerator->getSection('paths')['schemaDir'] . DIRECTORY_SEPARATOR . 'schema.xml');
+        $schemaFile = new \SplFileInfo($configGenerator->getSection('paths')['schemaDir'].DIRECTORY_SEPARATOR.'schema.xml');
         $manager->setSchemas([$schemaFile]);
-        $manager->setLoggerClosure(function ($message) {
+        $manager->setLoggerClosure(function($message) {
             Logger::log($message, LOG_INFO);
         });
         $manager->setWorkingDirectory($workingDir);

src/base/types/traits/Helper/FieldModelHelperTrait.php

Spacing +18 added lines, -18 removed lines

@@ -31,7 +31,7 @@ 
         $fDto->entity = $relatedModel;
         $relatedField = $foreignTable->getColumn($mappedColumn->getRelatedColumnName());
         $fDto->relatedField = $relatedField->getPhpName();
-        $fDto->url = Router::getInstance()->getRoute(strtolower($domain) . '-api-' . $relatedModel);
+        $fDto->url = Router::getInstance()->getRoute(strtolower($domain).'-api-'.$relatedModel);
         return $fDto;
     }
 
@@ -40,21 +40,21 @@ 
      * @param ModelCriteria $query
      * @param mixed $value
      */
-    private static function addQueryFilter(ColumnMap $column, ModelCriteria &$query, $value = null)
+    private static function addQueryFilter(ColumnMap $column, ModelCriteria & $query, $value = null)
     {
         $tableField = $column->getFullyQualifiedName();
-        if(is_array($value)) {
+        if (is_array($value)) {
             $query->add($tableField, $value, Criteria::IN);
         } elseif (preg_match('/^\[/', $value) && preg_match('/\]$/', $value)) {
             $query->add($tableField, explode(',', preg_replace('/(\[|\])/', '', $value)), Criteria::IN);
         } elseif (preg_match('/^(\'|\")(.*)(\'|\")$/', $value)) {
             $text = preg_replace('/(\'|\")/', '', $value);
             $text = preg_replace('/\ /', '%', $text);
-            $query->add($tableField, '%' . $text . '%', Criteria::LIKE);
-        } else {
-            if(null !== $column->getValueSet()) {
+            $query->add($tableField, '%'.$text.'%', Criteria::LIKE);
+        }else {
+            if (null !== $column->getValueSet()) {
                 $valueSet = $column->getValueSet();
-                if(in_array($value, $valueSet)) {
+                if (in_array($value, $valueSet)) {
                     $value = array_search($value, $valueSet);
                 }
             }
@@ -69,7 +69,7 @@ 
      * @param string $field
      * @param mixed $value
      */
-    public static function addModelField(TableMap $tableMap, ModelCriteria &$query, $field, $value = null)
+    public static function addModelField(TableMap $tableMap, ModelCriteria & $query, $field, $value = null)
     {
         if ($column = self::checkFieldExists($tableMap, $field)) {
             self::addQueryFilter($column, $query, $value);
@@ -84,7 +84,7 @@ 
      */
     public static function extractQuery($modelNameNamespace, ConnectionInterface $con = null)
     {
-        $queryReflector = new \ReflectionClass($modelNameNamespace . "Query");
+        $queryReflector = new \ReflectionClass($modelNameNamespace."Query");
         /** @var \Propel\Runtime\ActiveQuery\ModelCriteria $query */
         $query = $queryReflector->getMethod('create')->invoke($con);
 
@@ -97,37 +97,37 @@ 
      * @param array $extraColumns
      * @param mixed $value
      */
-    public static function composerComboField(TableMap $tableMap, ModelCriteria &$query, array $extraColumns = [], $value = null)
+    public static function composerComboField(TableMap $tableMap, ModelCriteria & $query, array $extraColumns = [], $value = null)
     {
         $exp = 'CONCAT(';
         $sep = '';
         foreach ($tableMap->getColumns() as $column) {
             if ($column->isText()) {
-                $exp .= $sep . 'IFNULL(' . $column->getFullyQualifiedName() . ',"")';
+                $exp .= $sep.'IFNULL('.$column->getFullyQualifiedName().',"")';
                 $sep = ', " ", ';
             }
         }
-        foreach($tableMap->getRelations() as $relation) {
-            if(preg_match('/I18n$/i', $relation->getName())) {
+        foreach ($tableMap->getRelations() as $relation) {
+            if (preg_match('/I18n$/i', $relation->getName())) {
                 $localeTableMap = $relation->getLocalTable();
                 foreach ($localeTableMap->getColumns() as $column) {
                     if ($column->isText()) {
-                        $exp .= $sep . 'IFNULL(' . $column->getFullyQualifiedName() . ',"")';
+                        $exp .= $sep.'IFNULL('.$column->getFullyQualifiedName().',"")';
                         $sep = ', " ", ';
                     }
                 }
             }
         }
         foreach (array_keys($extraColumns) as $extra) {
-            if(!preg_match("/(COUNT|DISTINCT|SUM|MAX|MIN|GROUP)/i", $extra)) {
-                $exp .= $sep . $extra;
+            if (!preg_match("/(COUNT|DISTINCT|SUM|MAX|MIN|GROUP)/i", $extra)) {
+                $exp .= $sep.$extra;
                 $sep = ', " ", ';
             }
         }
         $exp .= ")";
         $text = preg_replace('/(\'|\")/', '', $value);
         $text = preg_replace('/\ /', '%', $text);
-        $query->where($exp . Criteria::LIKE . '"%' . $text . '%"');
+        $query->where($exp.Criteria::LIKE.'"%'.$text.'%"');
     }
 
     /**
@@ -136,7 +136,7 @@ 
      */
     public static function extractPrimaryKeyColumnName(TableMap $tableMap) {
         $modelPk = null;
-        foreach($tableMap->getPrimaryKeys() as $pk) {
+        foreach ($tableMap->getPrimaryKeys() as $pk) {
             $modelPk = $pk;
             break;
         }

src/base/types/traits/Helper/ParameterTrait.php

Spacing +3 added lines, -3 removed lines

@@ -17,7 +17,7 @@ 
      */
     public function getParams()
     {
-        return $this->params?: [];
+        return $this->params ?: [];
     }
 
     /**
@@ -49,7 +49,7 @@ 
      * @return ParameterTrait
      */
     public function dropParam($key) {
-        if(array_key_exists($key, $this->params)) {
+        if (array_key_exists($key, $this->params)) {
             unset($this->params[$key]);
         }
         return $this;
@@ -60,7 +60,7 @@ 
      * @return mixed|null
      */
     public function getParam($key) {
-        if(array_key_exists($key, $this->params)) {
+        if (array_key_exists($key, $this->params)) {
             return $this->params[$key];
         }
         return null;

src/base/types/traits/Api/ApiTrait.php

Spacing +17 added lines, -17 removed lines

@@ -96,15 +96,15 @@ 
     protected function hydrateBulkRequest() {
         $class = new \ReflectionClass($this->getModelNamespace());
         $this->list = [];
-        foreach($this->data as $item) {
-            if(is_array($item)) {
-                if(count($this->list) < Config::getParam('api.block.limit', 1000)) {
+        foreach ($this->data as $item) {
+            if (is_array($item)) {
+                if (count($this->list) < Config::getParam('api.block.limit', 1000)) {
                     /** @var ActiveRecordInterface $model */
                     $model = $class->newInstance();
                     $this->hydrateModelFromRequest($model, $item);
                     $this->list[] = $model;
-                } else {
-                    Logger::log(t('Max items per bulk insert raised'), LOG_WARNING, count($this->data) . t('items'));
+                }else {
+                    Logger::log(t('Max items per bulk insert raised'), LOG_WARNING, count($this->data).t('items'));
                 }
             }
         }
@@ -115,12 +115,12 @@ 
      */
     protected function saveBulk() {
         $tablemap = $this->getTableMap();
-        foreach($this->list as &$model) {
+        foreach ($this->list as &$model) {
             $con = Propel::getWriteConnection($tablemap::DATABASE_NAME);
             try {
                 $model->save($con);
                 $con->commit();
-            } catch(\Exception $e) {
+            }catch (\Exception $e) {
                 Logger::log($e->getMessage(), LOG_ERR, $model->toArray());
                 $con->rollBack();
             }
@@ -133,7 +133,7 @@ 
     protected function exportList() {
         $list = [];
         /** @var ActiveRecordInterface $item */
-        foreach($this->list as $item) {
+        foreach ($this->list as $item) {
             $list[] = $item->toArray();
         }
         return $list;
@@ -144,7 +144,7 @@ 
      *
      * @param ModelCriteria $query
      */
-    protected function joinTables(ModelCriteria &$query)
+    protected function joinTables(ModelCriteria & $query)
     {
         //TODO for specific implementations
     }
@@ -157,18 +157,18 @@ 
      */
     protected function findPk(ModelCriteria $query, $primaryKey) {
         $pks = explode(Api::API_PK_SEPARATOR, urldecode($primaryKey));
-        if(count($pks) === 1 && !empty($pks[0])) {
+        if (count($pks) === 1 && !empty($pks[0])) {
             $query->filterByPrimaryKey($pks[0]);
-        } else {
+        }else {
             $item = 0;
-            foreach($this->getPkDbName() as $phpName) {
+            foreach ($this->getPkDbName() as $phpName) {
                 try {
                     $query->filterBy($phpName, $pks[$item]);
                     $item++;
-                    if($item >= count($pks)) {
+                    if ($item >= count($pks)) {
                         break;
                     }
-                } catch(\Exception $e) {
+                }catch (\Exception $e) {
                     Logger::log($e->getMessage(), LOG_DEBUG);
                 }
             }
@@ -198,8 +198,8 @@ 
         try {
             $query = $this->prepareQuery();
             $this->model = $this->findPk($query, $primaryKey);
-        } catch (\Exception $e) {
-            Logger::log(get_class($this) . ': ' . $e->getMessage(), LOG_ERR);
+        }catch (\Exception $e) {
+            Logger::log(get_class($this).': '.$e->getMessage(), LOG_ERR);
         }
     }
 
@@ -220,7 +220,7 @@ 
     /**
      * @param ModelCriteria $query
      */
-    protected function checkReturnFields(ModelCriteria &$query)
+    protected function checkReturnFields(ModelCriteria & $query)
     {
         $returnFields = Request::getInstance()->getQuery(Api::API_FIELDS_RESULT_FIELD);
         if (null !== $returnFields) {

src/base/types/traits/Api/MutationTrait.php

Spacing +24 added lines, -24 removed lines

@@ -81,7 +81,7 @@ 
         if (count($pks) === 1) {
             $pks = array_keys($pks);
             return [
-                $tableMap::TABLE_NAME . '.' . $pks[0] => Api::API_MODEL_KEY_FIELD
+                $tableMap::TABLE_NAME.'.'.$pks[0] => Api::API_MODEL_KEY_FIELD
             ];
         }
         if (count($pks) > 1) {
@@ -89,9 +89,9 @@ 
             $principal = '';
             $sep = 'CONCAT(';
             foreach ($pks as $pk) {
-                $apiPks[$tableMap::TABLE_NAME . '.' . $pk->getName()] = $pk->getPhpName();
-                $principal .= $sep . $tableMap::TABLE_NAME . '.' . $pk->getName();
-                $sep = ', "' . Api::API_PK_SEPARATOR . '", ';
+                $apiPks[$tableMap::TABLE_NAME.'.'.$pk->getName()] = $pk->getPhpName();
+                $principal .= $sep.$tableMap::TABLE_NAME.'.'.$pk->getName();
+                $sep = ', "'.Api::API_PK_SEPARATOR.'", ';
             }
             $principal .= ')';
             $apiPks[$principal] = Api::API_MODEL_KEY_FIELD;
@@ -118,10 +118,10 @@ 
         $pks = '';
         $sep = '';
         foreach ($tableMap->getPrimaryKeys() as $pk) {
-            $pks .= $sep . $pk->getFullyQualifiedName();
+            $pks .= $sep.$pk->getFullyQualifiedName();
             $sep = ', "|", ';
         }
-        $this->extraColumns['CONCAT("' . $tableMap->getPhpName() . ' #", ' . $pks . ')'] = Api::API_LIST_NAME_FIELD;
+        $this->extraColumns['CONCAT("'.$tableMap->getPhpName().' #", '.$pks.')'] = Api::API_LIST_NAME_FIELD;
     }
 
     /**
@@ -143,7 +143,7 @@ 
             }
             if (null !== $column) {
                 $this->extraColumns[$column->getFullyQualifiedName()] = Api::API_LIST_NAME_FIELD;
-            } else {
+            }else {
                 $this->addClassListName($tableMap);
             }
         }
@@ -154,22 +154,22 @@ 
      * @param $action
      * @throws ApiException
      */
-    private function addExtraColumns(ModelCriteria &$query, $action)
+    private function addExtraColumns(ModelCriteria & $query, $action)
     {
         if (Api::API_ACTION_LIST === $action) {
             $this->addDefaultListField();
             $this->addPkToList();
         }
         if (!empty($this->extraColumns)) {
-            if(Config::getParam('api.extrafields.compat', true)) {
+            if (Config::getParam('api.extrafields.compat', true)) {
                 $fields = array_values($this->extraColumns);
-            } else {
+            }else {
                 $returnFields = Request::getInstance()->getQuery(Api::API_FIELDS_RESULT_FIELD);
                 $fields = explode(',', $returnFields ?: '');
                 $fields[] = self::API_MODEL_KEY_FIELD;
             }
             foreach ($this->extraColumns as $expression => $columnName) {
-                if(empty($fields) || in_array($columnName, $fields)) {
+                if (empty($fields) || in_array($columnName, $fields)) {
                     $query->withColumn($expression, $columnName);
                 }
             }
@@ -196,22 +196,22 @@ 
     /**
      * @param ModelCriteria $query
      */
-    protected function checkI18n(ModelCriteria &$query)
+    protected function checkI18n(ModelCriteria & $query)
     {
         $this->extractApiLang();
         $model = $this->getModelNamespace();
-        $modelI18n = $model . 'I18n';
+        $modelI18n = $model.'I18n';
         if (method_exists($query, 'useI18nQuery')) {
             $query->useI18nQuery($this->lang);
             $modelParts = explode('\\', $modelI18n);
-            $i18nMapClass = str_replace(end($modelParts), 'Map\\' . end($modelParts), $modelI18n) . 'TableMap';
+            $i18nMapClass = str_replace(end($modelParts), 'Map\\'.end($modelParts), $modelI18n).'TableMap';
             /** @var TableMap $modelI18nTableMap */
             $modelI18nTableMap = $i18nMapClass::getTableMap();
-            foreach($modelI18nTableMap->getColumns() as $columnMap) {
-                if(!$columnMap->isPrimaryKey()) {
+            foreach ($modelI18nTableMap->getColumns() as $columnMap) {
+                if (!$columnMap->isPrimaryKey()) {
                     $query->withColumn($columnMap->getFullyQualifiedName(), ApiHelper::getColumnMapName($columnMap));
-                } elseif(!$columnMap->isForeignKey()) {
-                    $query->withColumn('IFNULL(' . $columnMap->getFullyQualifiedName() . ', "'.$this->lang.'")', ApiHelper::getColumnMapName($columnMap));
+                } elseif (!$columnMap->isForeignKey()) {
+                    $query->withColumn('IFNULL('.$columnMap->getFullyQualifiedName().', "'.$this->lang.'")', ApiHelper::getColumnMapName($columnMap));
                 }
             }
         }
@@ -225,22 +225,22 @@ 
         $model->fromArray($data, ApiHelper::getFieldTypes());
         $tableMap = $this->getTableMap();
         try {
-            if($tableMap->hasRelation($tableMap->getPhpName() . 'I18n'))
+            if ($tableMap->hasRelation($tableMap->getPhpName().'I18n'))
             {
-                $relateI18n = $tableMap->getRelation($tableMap->getPhpName() . 'I18n');
+                $relateI18n = $tableMap->getRelation($tableMap->getPhpName().'I18n');
                 $i18NTableMap = $relateI18n->getLocalTable();
                 $model->setLocale(array_key_exists('Locale', $data) ? $data['Locale'] : (array_key_exists('locale', $data) ? $data['locale'] : Request::header(Api::HEADER_API_LANG, 'es_ES')));
-                foreach($i18NTableMap->getColumns() as $columnMap) {
-                    $method = 'set' . $columnMap->getPhpName();
+                foreach ($i18NTableMap->getColumns() as $columnMap) {
+                    $method = 'set'.$columnMap->getPhpName();
                     $dtoColumnName = ApiHelper::getColumnMapName($columnMap);
-                    if(array_key_exists($dtoColumnName, $data)
+                    if (array_key_exists($dtoColumnName, $data)
                         && method_exists($model, $method)
                         && !($columnMap->isPrimaryKey() && $columnMap->isForeignKey())) {
                         $model->$method($data[$dtoColumnName]);
                     }
                 }
             }
-        } catch(Exception $e) {
+        }catch (Exception $e) {
             Logger::log($e->getMessage(), LOG_DEBUG);
         }
     }

src/controller/GeneratorController.php

Indentation +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
                 GeneratorHelper::checkCustomNamespaceApi($apiClass);
                 $this->gen->createStructureModule($module, false, $type, $apiClass);
                 Security::getInstance()->setFlash("callback_message", str_replace("%s", $module, t("Módulo %s generado correctamente")));
-                 Security::getInstance()->setFlash("callback_route", $this->getRoute("admin-module", true));
+                    Security::getInstance()->setFlash("callback_route", $this->getRoute("admin-module", true));
             } catch (Exception $e) {
                 Logger::log($e->getMessage() . " [" . $e->getFile() . ":" . $e->getLine() . "]");
                 Security::getInstance()->setFlash("callback_message", htmlentities($e->getMessage()));

Spacing +3 added lines, -3 removed lines

@@ -33,7 +33,7 @@ 
      */
     public function generateModule()
     {
-        Logger::log("Arranque generador de módulos al solicitar " . $this->getRequest()->getRequestUri());
+        Logger::log("Arranque generador de módulos al solicitar ".$this->getRequest()->getRequestUri());
         /* @var $form ConfigForm */
         $form = new ModuleForm();
         $form->build();
@@ -64,8 +64,8 @@ 
                 $this->gen->createStructureModule($module, false, $type, $apiClass);
                 Security::getInstance()->setFlash("callback_message", str_replace("%s", $module, t("Módulo %s generado correctamente")));
                  Security::getInstance()->setFlash("callback_route", $this->getRoute("admin-module", true));
-            } catch (Exception $e) {
-                Logger::log($e->getMessage() . " [" . $e->getFile() . ":" . $e->getLine() . "]");
+            }catch (Exception $e) {
+                Logger::log($e->getMessage()." [".$e->getFile().":".$e->getLine()."]");
                 Security::getInstance()->setFlash("callback_message", htmlentities($e->getMessage()));
             }
         }

src/base/extension/traits/JsTrait.php

Spacing +15 added lines, -15 removed lines

@@ -23,8 +23,8 @@ 
             foreach ($compiledFiles as $file) {
                 echo "\t\t<script type='text/javascript' src='{$file}'></script>\n";
             }
-        } else {
-            echo "\t\t<script type='text/javascript' src='" . $baseUrl . "/js/" . $hash . ".js'" .
+        }else {
+            echo "\t\t<script type='text/javascript' src='".$baseUrl."/js/".$hash.".js'".
                 "></script>\n";
         }
     }
@@ -40,12 +40,12 @@ 
      */
     protected function putDebugJs($pathParts, $base, $file, $hash, array &$compiledFiles)
     {
-        $filePath = $hash . "_" . $pathParts[count($pathParts) - 1];
-        $compiledFiles[] = "/js/" . $filePath;
+        $filePath = $hash."_".$pathParts[count($pathParts) - 1];
+        $compiledFiles[] = "/js/".$filePath;
         $data = "";
-        if (!file_exists($base . $filePath) || filemtime($base . $filePath) < filemtime($file)) {
+        if (!file_exists($base.$filePath) || filemtime($base.$filePath) < filemtime($file)) {
             $data = file_get_contents($file);
-            AssetsHelper::storeContents($base . $filePath, $data);
+            AssetsHelper::storeContents($base.$filePath, $data);
         }
         return $data;
     }
@@ -61,9 +61,9 @@ 
      */
     protected function compileJs(array $files, $basePath, $hash, array &$compiledFiles)
     {
-        $base = $basePath . "js" . DIRECTORY_SEPARATOR;
+        $base = $basePath."js".DIRECTORY_SEPARATOR;
         $debug = Config::getParam('debug');
-        if ($debug || !file_exists($base . $hash . ".js")) {
+        if ($debug || !file_exists($base.$hash.".js")) {
             $data = '';
             if (0 < count($files)) {
                 $minifier = new JS();
@@ -72,15 +72,15 @@ 
                     if (file_exists($file)) {
                         if ($debug) {
                             $data = $this->putDebugJs($pathParts, $base, $file, $hash, $compiledFiles);
-                        } elseif (!file_exists($base . $hash . ".js")) {
+                        } elseif (!file_exists($base.$hash.".js")) {
                             $minifier->add($file);
                             //$data = $this->putProductionJs($base, $file, $data);
                         }
                     }
                 }
-                if($debug) {
-                    AssetsHelper::storeContents($base . $hash . ".js", $data);
-                } else {
+                if ($debug) {
+                    AssetsHelper::storeContents($base.$hash.".js", $data);
+                }else {
                     $this->dumpJs($hash, $base, $minifier);
                 }
                 unset($minifier);
@@ -101,9 +101,9 @@ 
         ini_set('memory_limit', -1);
         GeneratorHelper::createDir($base);
         if (Config::getParam('assets.obfuscate', false)) {
-            $minifier->gzip($base . $hash . ".js");
-        } else {
-            $minifier->minify($base . $hash . ".js");
+            $minifier->gzip($base.$hash.".js");
+        }else {
+            $minifier->minify($base.$hash.".js");
         }
     }
 }