injitools / cms-Inji

system/modules/Migrations/appAdminControllers/MapController.php

Braces +6 added lines, -3 removed lines

@@ -19,7 +19,8 @@ 
                 if (is_numeric($objectType)) {
                     $mapPath->object_id = $objectType;
                     $mapPath->type = 'object';
-                } else {
+                }
+                else {
                     if ($objectType == 'object') {
                         $object = new Migrations\Migration\Object();
                         $object->model = !empty($_POST['typeOptions'][$pathId]) ? $_POST['typeOptions'][$pathId] : '';
@@ -28,7 +29,8 @@ 
                         $object->save();
                         $mapPath->type = 'object';
                         $mapPath->object_id = $object->id;
-                    } else {
+                    }
+                    else {
                         $mapPath->type = $objectType;
                     }
                 }
@@ -48,7 +50,8 @@ 
                     $object->save();
                     $param->type = 'object';
                     $param->value = $object->id;
-                } else {
+                }
+                else {
                     $param->type = $type;
                     $param->value = !empty($_POST['paramOptions'][$paramId]) ? $_POST['paramOptions'][$paramId] : '';
                 }

system/modules/Migrations/objects/Parser/Object.php

Braces +14 added lines, -7 removed lines

@@ -28,7 +28,8 @@ 
                     $ids[] = $id;
                 }
             }
-        } else {
+        }
+        else {
             $id = $this->parseData($this->data, $preset);
             if ($id) {
                 $ids[] = $id;
@@ -56,10 +57,12 @@ 
                         $parser->parentModel = $model;
                         $parser->walker = $this->walker;
                         $parser->parse();
-                    } else {
+                    }
+                    else {
                         if ($param->type == 'custom') {
                             $parserName = $param->value;
-                        } else {
+                        }
+                        else {
                             $parserName = '\Migrations\Parser\Object\\' . ucfirst($param->type);
                         }
                         $parser = new $parserName;
@@ -105,7 +108,8 @@ 
             if ($param->type == 'item_key') {
                 $keyCol = $param->code;
                 break;
-            } elseif (!empty($options['unique'])) {
+            }
+            elseif (!empty($options['unique'])) {
                 $uniques[$param->code] = $param;
             }
         }
@@ -114,7 +118,8 @@ 
             if ($objectId) {
                 $modelName = $this->object->model;
                 $model = $modelName::get($objectId->object_id);
-            } else {
+            }
+            else {
                 $model = new $this->object->model;
                 $model->save(['empty' => true]);
                 $objectId = new \Migrations\Id();
@@ -125,7 +130,8 @@ 
                 \App::$cur->migrations->ids['objectIds'][$this->object->model][$model->id] = $objectId;
                 \App::$cur->migrations->ids['parseIds'][$this->object->model][(string) $data[$keyCol]] = $objectId;
             }
-        } elseif ($uniques) {
+        }
+        elseif ($uniques) {
             $where = [];
             foreach ($uniques as $code => $param) {
                 if (!isset($data[$code])) {
@@ -168,7 +174,8 @@ 
                     if (!empty($relation['type']) && $relation['type'] == 'many') {
                         $where[] = [$relation['col'], $this->parentModel->pk()];
                     }
-                } elseif ($this->parentObject) {
+                }
+                elseif ($this->parentObject) {
                     $modelName = $this->parentObject->object->model;
                     $where[] = [$modelName::index(), $this->parentModel->pk()];
                 }

system/modules/Migrations/objects/Parser/Object/ParamsList.php

Braces +4 added lines, -2 removed lines

@@ -23,7 +23,8 @@ 
             if ($this->model) {
                 if ($param->type == 'custom') {
                     $parserName = $param->value;
-                } else {
+                }
+                else {
                     $parserName = '\Migrations\Parser\Object\\' . ucfirst($param->type);
                 }
                 if (!\Tools::isAssoc($this->data)) {
@@ -35,7 +36,8 @@ 
                         $parser->object = $this->object;
                         $parser->parse();
                     }
-                } else {
+                }
+                else {
                     $parser = new $parserName;
                     $parser->data = &$this->data[$param->code];
                     $parser->param = $param;

system/modules/Migrations/objects/Parser/Object/Relation.php

Braces +6 added lines, -3 removed lines

@@ -52,7 +52,8 @@ 
                             }
                             $ids = array_merge($ids, $objectParser->parse([$relation['col'] => $this->model->pk()]));
                         }
-                    } else {
+                    }
+                    else {
                         $objectParser = new \Migrations\Parser\Object();
                         $objectParser->object = $object;
                         $objectParser->parentObject = $this->object;
@@ -85,7 +86,8 @@ 
                     $delObject->delete();
                 }
             }
-        } else {
+        }
+        else {
             $objectParser = new \Migrations\Parser\Object();
             $objectParser->object = $object;
             $objectParser->parentObject = $this->object;
@@ -100,7 +102,8 @@ 
                         $ids[] = $model->id;
                     }
                 }
-            } else {
+            }
+            else {
                 $model = $objectParser->setModel($this->data);
                 if ($model && $model->id) {
                     $ids[] = $model->id;

system/modules/Migrations/objects/Parser/Object/Value.php

Braces +8 added lines, -4 removed lines

@@ -38,7 +38,8 @@ 
                                 $itemModel = get_class($item);
                                 $relation = $itemModel::getRelation($relationName);
                                 $sourceModel = $relation['model'];
-                            } else {
+                            }
+                            else {
                                 $relation = $modelName::getRelation($type['relation']);
                                 $sourceModel = $relation['model'];
                             }
@@ -49,10 +50,12 @@ 
                         }
                         break;
                 }
-            } else {
+            }
+            else {
                 $type = $col['type'];
             }
-        } else {
+        }
+        else {
             $type = 'text';
         }
 
@@ -63,7 +66,8 @@ 
                 $valueObject->param_id = $this->param->id;
                 $valueObject->original = $value;
                 $valueObject->save();
-            } else {
+            }
+            else {
                 $valueObject = $values[$value];
             }
             $value = $valueObject->replace;

system/modules/Migrations/objects/Parser/Object/Param.php

Braces +4 added lines, -2 removed lines

@@ -22,7 +22,8 @@ 
             foreach ($this->data as &$data) {
                 $this->parseData($data, $params);
             }
-        } else {
+        }
+        else {
             $this->parseData($this->data, $params);
         }
     }
@@ -44,7 +45,8 @@ 
                             $valueObject->param_id = $param->id;
                             $valueObject->original = (string) $objectParam;
                             $valueObject->save();
-                        } else {
+                        }
+                        else {
                             $objectParamValue['col'] = $col->replace;
                         }
                         break;

system/modules/Migrations/objects/Walker.php

Braces +12 added lines, -5 removed lines

@@ -27,7 +27,8 @@ 
         //walk know pathes
         foreach ($this->map->paths(['where' => ['path', $this->curPath]]) as $path) {
             if (isset($this->data[$path->item])) {
-                if ($path->type == 'container') { //create walker for container
+                if ($path->type == 'container') {
+//create walker for container
                     $walker = new Walker();
                     $walker->migration = $this->migration;
                     $walker->map = $this->map;
@@ -37,7 +38,9 @@ 
                     $walker->mapPathParent = $this->mapPath;
                     $walker->migtarionLog = $this->migtarionLog;
                     $walker->walk();
-                } elseif ($path->type == 'object') { //start parse path data
+                }
+                elseif ($path->type == 'object') {
+//start parse path data
                     $this->startObjectParse($path->object_id, $this->data[$path->item]);
                 }
             }
@@ -54,9 +57,12 @@ 
                         ['code', $key],
                         ['migration_id', $this->migration->id]
             ]);
-            if ($object) { //parse as object
+            if ($object) {
+//parse as object
                 $this->startObjectParse($object, $data);
-            } else { //create new map path for configure unknown path
+            }
+            else {
+//create new map path for configure unknown path
                 $this->mapPath = new Migration\Map\Path();
                 $this->mapPath->parent_id = $this->mapPathParent ? $this->mapPathParent->id : 0;
                 $this->mapPath->path = $this->curPath;
@@ -79,7 +85,8 @@ 
             $where = json_decode($objectParser->object->clear, true);
             if (!$where) {
                 $where = [];
-            } else {
+            }
+            else {
                 $where = [[$where]];
             }
             if ($ids) {

system/modules/Exchange1c/objects/Parser/Orders.php

Braces +8 added lines, -4 removed lines

@@ -47,7 +47,8 @@ 
                 $payed = true;
                 $date = new \DateTime((string) $reqs['Дата оплаты по 1С']);
                 $cart->payed_date = $date->format('Y-m-d H:i:s');
-            } elseif (
+            }
+            elseif (
                     (!empty($reqs['Отменен']) && $reqs['Отменен'] == 'true') ||
                     (!empty($reqs['Дата оплаты по 1С']) && $reqs['Дата оплаты по 1С'] == 'T')) {
                 $cancel = true;
@@ -57,10 +58,12 @@ 
             $cart->payed = $payed;
             if ($payed && $cart->cart_status_id == 5) {
                 
-            } elseif ($payed && $cart->cart_status_id == 3) {
+            }
+            elseif ($payed && $cart->cart_status_id == 3) {
                 $cart->cart_status_id = 5;
                 $cart->save();
-            } elseif ($cancel && $cart->cart_status_id == 3) {
+            }
+            elseif ($cancel && $cart->cart_status_id == 3) {
                 $cart->cart_status_id = 4;
             }
             if ($cart->warehouse_block && !$payed && !$cancel && !empty($reqs['Проведен']) && $reqs['Проведен'] == 'true') {
@@ -104,7 +107,8 @@ 
             $itemPrice = number_format((string) $item->ЦенаЗаЕдиницу, 2, '.', '');
             if (!empty($pricesByPrice[$itemPrice])) {
                 $price = $pricesByPrice[$itemPrice];
-            } else {
+            }
+            else {
                 $rolePrice = 0;
                 foreach ($siteItem->prices as $priceId => $itemPrice) {
                     if (!$itemPrice->type->cipt_roles) {

system/modules/Exchange1c/objects/Parser/Item/Images.php

Braces +4 added lines, -2 removed lines

@@ -39,7 +39,8 @@ 
                 $md5File = '';
                 if ($file->md5) {
                     $md5File = $file->md5;
-                } elseif (file_exists($file->getRealPath())) {
+                }
+                elseif (file_exists($file->getRealPath())) {
                     $md5File = $file->md5 = md5_file($file->getRealPath());
                     $file->save();
                 }
@@ -60,7 +61,8 @@ 
                     $image->save();
                     $ids[] = $image->id;
                 }
-            } else {
+            }
+            else {
                 $image->weight = $key;
             }
             if ($image && !$this->model->image_file_id) {