psfs / core

src/base/types/helpers/ApiHelper.php

Spacing +37 added lines, -37 removed lines

@@ -37,20 +37,20 @@ 
         $behaviors = $tableMap->getBehaviors();
         foreach ($map::getFieldNames() as $field) {
             $fDto = self::parseFormField($domain, $tableMap, $field, $behaviors);
-            if(null !== $fDto) {
+            if (null !== $fDto) {
                 $form->addField($fDto);
             }
         }
 
-        if(array_key_exists('i18n', $behaviors)) {
-            $relateI18n = $tableMap->getRelation($tableMap->getPhpName() . 'I18n');
-            if(null !== $relateI18n) {
+        if (array_key_exists('i18n', $behaviors)) {
+            $relateI18n = $tableMap->getRelation($tableMap->getPhpName().'I18n');
+            if (null !== $relateI18n) {
                 $i18NTableMap = $relateI18n->getLocalTable();
-                foreach($i18NTableMap->getColumns() as $columnMap) {
+                foreach ($i18NTableMap->getColumns() as $columnMap) {
                     $columnName = self::getColumnMapName($columnMap);
-                    if(!$form->fieldExists($columnName)) {
+                    if (!$form->fieldExists($columnName)) {
                         $fDto = self::parseFormField($domain, $i18NTableMap, $columnMap->getPhpName(), $i18NTableMap->getBehaviors());
-                        if(null !== $fDto) {
+                        if (null !== $fDto) {
                             $fDto->pk = false;
                             $form->addField($fDto);
                         }
@@ -79,7 +79,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;
     }
 
@@ -186,14 +186,14 @@ 
     {
         $column = null;
         try {
-            foreach($tableMap->getColumns() as $tableMapColumn) {
+            foreach ($tableMap->getColumns() as $tableMapColumn) {
                 $columnName = $tableMapColumn->getPhpName();
-                if(preg_match('/^'.$field.'$/i', $columnName)) {
+                if (preg_match('/^'.$field.'$/i', $columnName)) {
                     $column = $tableMapColumn;
                     break;
                 }
             }
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_DEBUG);
         }
         return $column;
@@ -207,18 +207,18 @@ 
     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);
                 }
             }
@@ -238,31 +238,31 @@ 
         $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 ($extraColumns as $extra => $name) {
-            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.'%"');
     }
 
     /**
@@ -287,7 +287,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);
 
@@ -316,7 +316,7 @@ 
         } elseif ($mappedColumn->isText()) {
             if ($mappedColumn->getSize() > 100) {
                 $fDto = self::createField($field, Field::TEXTAREA_TYPE, $required);
-            } else {
+            }else {
                 $fDto = self::generateStringField($field, $required);
             }
         } elseif ($mappedColumn->getType() === PropelTypes::BOOLEAN) {
@@ -344,7 +344,7 @@ 
                 $fDto->pk = true;
             }
         }
-        switch(Config::getParam('api.field.case', TableMap::TYPE_PHPNAME)) {
+        switch (Config::getParam('api.field.case', TableMap::TYPE_PHPNAME)) {
             default:
             case TableMap::TYPE_PHPNAME:
                 $fDto->name = $mappedColumn->getPhpName();
@@ -368,7 +368,7 @@ 
      */
     public static function extractPrimaryKeyColumnName(TableMap $tableMap) {
         $modelPk = null;
-        foreach($tableMap->getPrimaryKeys() as $pk) {
+        foreach ($tableMap->getPrimaryKeys() as $pk) {
             $modelPk = $pk;
             break;
         }
@@ -377,15 +377,15 @@ 
 
     private static function mapResult(ActiveRecordInterface $model, array $data = []) {
         $result = [];
-        foreach($data as $key => $value) {
+        foreach ($data as $key => $value) {
             try {
                 $realValue = $model->getByName($key);
-            } catch(\Exception $e) {
+            }catch (\Exception $e) {
                 $realValue = $value;
             }
-            if(Api::API_MODEL_KEY_FIELD === $key) {
+            if (Api::API_MODEL_KEY_FIELD === $key) {
                 $result[$key] = (integer)$realValue;
-            } else {
+            }else {
                 $result[$key] = $realValue;
             }
         }
@@ -402,14 +402,14 @@ 
         $objTableMap = get_class($formatter->getTableMap());
         /** @var TableMapTrait $objTableMap */
         $objData = $data;
-        foreach($objTableMap::getFieldNames() as $field) {
-            if(!array_key_exists($field, $objData)) {
+        foreach ($objTableMap::getFieldNames() as $field) {
+            if (!array_key_exists($field, $objData)) {
                 $objData[$field] = null;
             }
         }
         $obj = @$formatter->getAllObjectsFromRow($objData);
         $result = self::mapResult($obj, $data);
-        if(!preg_match('/' . $modelPk->getPhpName() . '/i', $query[Api::API_FIELDS_RESULT_FIELD])) {
+        if (!preg_match('/'.$modelPk->getPhpName().'/i', $query[Api::API_FIELDS_RESULT_FIELD])) {
             unset($result[$modelPk->getPhpName()]);
         }
         return $result;
@@ -420,7 +420,7 @@ 
      */
     public static function getFieldTypes() {
         $configType = Config::getParam('api.field.case');
-        switch($configType) {
+        switch ($configType) {
             default:
             case 'UpperCamelCase':
             case TableMap::TYPE_PHPNAME:
@@ -446,11 +446,11 @@ 
     }
 
     public static function getColumnMapName(ColumnMap $field) {
-        switch(self::getFieldTypes()) {
+        switch (self::getFieldTypes()) {
             default:
             case 'UpperCamelCase':
             case TableMap::TYPE_PHPNAME:
-                $columnName =$field->getPhpName();
+                $columnName = $field->getPhpName();
                 break;
             case 'camelCase':
             case 'lowerCamelCase':

src/base/Service.php

Spacing +15 added lines, -15 removed lines

@@ -70,7 +70,7 @@ 
     protected $isMultipart = false;
 
     private function closeConnection() {
-        if(null !== $this->con) {
+        if (null !== $this->con) {
             curl_close($this->con);
         }
     }
@@ -233,7 +233,7 @@ 
      */
     public function setIsJson($isJson = true) {
         $this->isJson = $isJson;
-        if($isJson) {
+        if ($isJson) {
             $this->setIsMultipart(false);
         }
     }
@@ -251,7 +251,7 @@ 
      */
     public function setIsMultipart($isMultipart = true) {
         $this->isMultipart = $isMultipart;
-        if($isMultipart) {
+        if ($isMultipart) {
             $this->setIsJson(false);
         }
     }
@@ -271,7 +271,7 @@ 
         $this->url = NULL;
         $this->params = array();
         $this->headers = array();
-        Logger::log('Context service for ' . static::class . ' cleared!');
+        Logger::log('Context service for '.static::class.' cleared!');
         $this->closeConnection();
     }
 
@@ -314,18 +314,18 @@ 
     }
 
     protected function applyOptions() {
-        if(count($this->options)) {
+        if (count($this->options)) {
             curl_setopt_array($this->con, $this->options);
         }
     }
 
     protected function applyHeaders() {
         $headers = [];
-        foreach($this->headers as $key => $value) {
-            $headers[] = $key . ': ' . $value;
+        foreach ($this->headers as $key => $value) {
+            $headers[] = $key.': '.$value;
         }
         $headers[self::PSFS_TRACK_HEADER] = Logger::getUid();
-        if(count($headers)) {
+        if (count($headers)) {
             curl_setopt($this->con, CURLOPT_HTTPHEADER, $headers);
         }
     }
@@ -334,10 +334,10 @@ 
      * @return int
      */
     private function parseServiceType() {
-        if($this->getIsJson()) {
+        if ($this->getIsJson()) {
             return ServiceHelper::TYPE_JSON;
         }
-        if($this->getIsMultipart()) {
+        if ($this->getIsMultipart()) {
             return ServiceHelper::TYPE_MULTIPART;
         }
         return ServiceHelper::TYPE_HTTP;
@@ -350,9 +350,9 @@ 
             case Request::VERB_GET:
             default:
                 $this->addOption(CURLOPT_CUSTOMREQUEST, Request::VERB_GET);
-                if(!empty($this->params)) {
+                if (!empty($this->params)) {
                     $sep = false === strpos($this->getUrl(), '?') ? '?' : '';
-                    $this->url = $this->url . $sep . http_build_query($this->params);
+                    $this->url = $this->url.$sep.http_build_query($this->params);
                 }
                 break;
             case Request::VERB_POST:
@@ -384,14 +384,14 @@ 
         $this->applyOptions();
         $this->applyHeaders();
         $verbose = null;
-        if('debug' === Config::getParam('log.level')) {
+        if ('debug' === Config::getParam('log.level')) {
             curl_setopt($this->con, CURLOPT_VERBOSE, true);
             $verbose = fopen('php://temp', 'wb+');
             curl_setopt($this->con, CURLOPT_STDERR, $verbose);
         }
         $result = curl_exec($this->con);
         $this->result = $this->isJson ? json_decode($result, true) : $result;
-        if('debug' === Config::getParam('log.level')) {
+        if ('debug' === Config::getParam('log.level')) {
             rewind($verbose);
             $verboseLog = stream_get_contents($verbose);
             Logger::log($verboseLog, LOG_DEBUG, [
@@ -401,7 +401,7 @@ 
             ]);
             $this->info['verbose'] = $verboseLog;
         }
-        Logger::log($this->url . ' response: ', LOG_DEBUG, is_array($this->result) ? $this->result : [$this->result]);
+        Logger::log($this->url.' response: ', LOG_DEBUG, is_array($this->result) ? $this->result : [$this->result]);
         $this->info = array_merge($this->info, curl_getinfo($this->con));
     }
 

src/base/types/helpers/SlackHelper.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
             'attachments' => [
                 [
                     "author_name" => $request->getRootUrl(true),
-                    "text" => $file . (strlen($line) ? ' [' . $line . ']' : ''),
+                    "text" => $file.(strlen($line) ? ' ['.$line.']' : ''),
                     "color" => Config::getParam('debug', true) ? 'warning' : "danger",
                     "title" => $message,
                     'fallback' => 'PSFS Error notifier',