AgelxNash / DocLister

assets/lib/MODxAPI/MODx.php

Braces +212 added lines, -206 removed lines

@@ -7,15 +7,15 @@ 
 /**
  * Class MODxAPIhelpers
  */
-class MODxAPIhelpers
-{
+class MODxAPIhelpers

+{

     /**
      * @param $email
      * @param bool $dns
      * @return false|string
      */
-    public function emailValidate($email, $dns = true)
-    {
+    public function emailValidate($email, $dns = true)

+    {

         return \APIhelpers::emailValidate($email, $dns);
     }
 
@@ -24,8 +24,8 @@ 
      * @param string $data
      * @return string
      */
-    public function genPass($len, $data = '')
-    {
+    public function genPass($len, $data = '')

+    {

         return \APIhelpers::genPass($len, $data);
     }
 
@@ -33,8 +33,8 @@ 
      * @param string $out
      * @return string
      */
-    public function getUserIP($out = '127.0.0.1')
-    {
+    public function getUserIP($out = '127.0.0.1')

+    {

         return \APIhelpers::getUserIP($out);
     }
 
@@ -42,8 +42,8 @@ 
      * @param $data
      * @return array|mixed|string
      */
-    public function sanitarTag($data)
-    {
+    public function sanitarTag($data)

+    {

         return \APIhelpers::sanitarTag($data);
     }
 
@@ -54,8 +54,8 @@ 
      * @param array $mixArray
      * @return bool
      */
-    public function checkString($value, $minLen = 1, $alph = array(), $mixArray = array())
-    {
+    public function checkString($value, $minLen = 1, $alph = array(), $mixArray = array())

+    {

         return \APIhelpers::checkString($value, $minLen, $alph, $mixArray);
     }
 }
@@ -63,8 +63,8 @@ 
 /**
  * Class MODxAPI
  */
-abstract class MODxAPI extends MODxAPIhelpers
-{
+abstract class MODxAPI extends MODxAPIhelpers

+{

     /**
      * Объект DocumentParser - основной класс MODX
      * @var \DocumentParser
@@ -148,10 +148,10 @@ 
      * @param bool $debug
      * @throws Exception
      */
-    public function __construct(DocumentParser $modx, $debug = false)
-    {
+    public function __construct(DocumentParser $modx, $debug = false)

+    {

         $this->modx = $modx;
-        if (function_exists("get_magic_quotes_gpc") && get_magic_quotes_gpc()) {
+        if (function_exists("get_magic_quotes_gpc") && get_magic_quotes_gpc()) {

             throw new Exception('Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config.');
         }
 
@@ -163,8 +163,8 @@ 
      * @param boolean $flag
      * @return $this
      */
-    public function setDebug($flag)
-    {
+    public function setDebug($flag)

+    {

         $this->_debug = (bool)$flag;
 
         return $this;
@@ -173,16 +173,16 @@ 
     /**
      * @return bool
      */
-    public function getDebug()
-    {
+    public function getDebug()

+    {

         return $this->_debug;
     }
 
     /**
      * @return array
      */
-    public function getDefaultFields()
-    {
+    public function getDefaultFields()

+    {

         return $this->default_field;
     }
 
@@ -191,8 +191,8 @@ 
      * @param null $default
      * @return mixed
      */
-    final public function modxConfig($name, $default = null)
-    {
+    final public function modxConfig($name, $default = null)

+    {

         return APIHelpers::getkey($this->modx->config, $name, $default);
     }
 
@@ -200,9 +200,9 @@ 
      * @param $q
      * @return $this
      */
-    public function addQuery($q)
-    {
-        if (is_scalar($q) && !empty($q)) {
+    public function addQuery($q)

+    {

+        if (is_scalar($q) && !empty($q)) {

             $this->_query[] = $q;
         }
 
@@ -212,8 +212,8 @@ 
     /**
      * @return array
      */
-    public function getQueryList()
-    {
+    public function getQueryList()

+    {

         return $this->_query;
     }
 
@@ -221,9 +221,9 @@ 
      * @param $SQL
      * @return mixed
      */
-    final public function query($SQL)
-    {
-        if ($this->getDebug()) {
+    final public function query($SQL)

+    {

+        if ($this->getDebug()) {

             $this->addQuery($SQL);
         }
 
@@ -234,11 +234,11 @@ 
      * @param $value
      * @return string|void
      */
-    final public function escape($value)
-    {
-        if (!is_scalar($value)) {
+    final public function escape($value)

+    {

+        if (!is_scalar($value)) {

             $value = '';
-        } else {
+        } else {

             $value = $this->modx->db->escape($value);
         }
 
@@ -251,10 +251,10 @@ 
      * @param bool $flag
      * @return $this
      */
-    final public function invokeEvent($name, $data = array(), $flag = false)
-    {
+    final public function invokeEvent($name, $data = array(), $flag = false)

+    {

         $flag = (isset($flag) && $flag != '') ? (bool)$flag : false;
-        if ($flag) {
+        if ($flag) {

             $this->modx->invokeEvent($name, $data);
         }
 
@@ -267,8 +267,8 @@ 
      * @param boolean $flag
      * @return array|bool
      */
-    final public function getInvokeEventResult($name, $data = array(), $flag = null)
-    {
+    final public function getInvokeEventResult($name, $data = array(), $flag = null)

+    {

         $flag = (isset($flag) && $flag != '') ? (bool)$flag : false;
 
         return $flag ? $this->modx->invokeEvent($name, $data) : false;
@@ -277,8 +277,8 @@ 
     /**
      * @return $this
      */
-    final public function clearLog()
-    {
+    final public function clearLog()

+    {

         $this->log = array();
 
         return $this;
@@ -287,8 +287,8 @@ 
     /**
      * @return array
      */
-    final public function getLog()
-    {
+    final public function getLog()

+    {

         return $this->log;
     }
 
@@ -296,10 +296,10 @@ 
      * @param bool $flush
      * @return $this
      */
-    final public function list_log($flush = false)
-    {
+    final public function list_log($flush = false)

+    {

         echo '<pre>' . print_r(APIHelpers::sanitarTag($this->log), true) . '</pre>';
-        if ($flush) {
+        if ($flush) {

             $this->clearLog();
         }
 
@@ -310,10 +310,10 @@ 
      * @param bool $full
      * @return string
      */
-    final public function getCachePath($full = true)
-    {
+    final public function getCachePath($full = true)

+    {

         $path = $this->modx->getCachePath();
-        if ($full) {
+        if ($full) {

             $path = MODX_BASE_PATH . substr($path, strlen(MODX_BASE_URL));
         }
 
@@ -324,10 +324,10 @@ 
      * @param boolean $fire_events
      * @param bool $custom
      */
-    final public function clearCache($fire_events = false, $custom = false)
-    {
+    final public function clearCache($fire_events = false, $custom = false)

+    {

         $IDs = array();
-        if ($custom === false) {
+        if ($custom === false) {

             $this->modx->clearCache();
             include_once(MODX_MANAGER_PATH . 'processors/cache_sync.class.processor.php');
             $sync = new synccache();
@@ -335,22 +335,22 @@ 
             $sync->setCachepath($path);
             $sync->setReport(false);
             $sync->emptyCache();
-        } else {
-            if (is_scalar($custom)) {
+        } else {

+            if (is_scalar($custom)) {

                 $custom = array($custom);
             }
-            switch ($this->modx->config['cache_type']) {
+            switch ($this->modx->config['cache_type']) {

                 case 2:
                     $cacheFile = "_*.pageCache.php";
                     break;
                 default:
                     $cacheFile = ".pageCache.php";
             }
-            if (is_array($custom)) {
-                foreach ($custom as $id) {
+            if (is_array($custom)) {

+                foreach ($custom as $id) {

                     $tmp = glob(MODX_BASE_PATH . "assets/cache/docid_" . $id . $cacheFile);
-                    foreach ($tmp as $file) {
-                        if (is_readable($file)) {
+                    foreach ($tmp as $file) {

+                        if (is_readable($file)) {

                             unlink($file);
                         }
                         $IDs[] = $id;
@@ -366,9 +366,9 @@ 
      * @param integer $id
      * @return MODxAPI
      */
-    public function switchObject($id)
-    {
-        switch (true) {
+    public function switchObject($id)

+    {

+        switch (true) {

             //Если загружен другой объект - не тот, с которым мы хотим временно поработать
             case ($this->getID() != $id && $id):
                 $obj = clone $this;
@@ -390,8 +390,8 @@ 
      * @param bool $flag
      * @return $this
      */
-    public function useIgnore($flag = true)
-    {
+    public function useIgnore($flag = true)

+    {

         $this->ignoreError = $flag ? 'IGNORE' : '';
 
         return $this;
@@ -400,8 +400,8 @@ 
     /**
      * @return bool
      */
-    public function hasIgnore()
-    {
+    public function hasIgnore()

+    {

         return (bool)$this->ignoreError;
     }
 
@@ -410,9 +410,9 @@ 
      * @param $value
      * @return $this
      */
-    public function set($key, $value)
-    {
-        if ((is_scalar($value) || $this->isJsonField($key)) && is_scalar($key) && !empty($key)) {
+    public function set($key, $value)

+    {

+        if ((is_scalar($value) || $this->isJsonField($key)) && is_scalar($key) && !empty($key)) {

             $this->field[$key] = $value;
         }
 
@@ -422,8 +422,8 @@ 
     /**
      * @return null|int
      */
-    final public function getID()
-    {
+    final public function getID()

+    {

         return $this->id;
     }
 
@@ -431,8 +431,8 @@ 
      * @param $key
      * @return mixed
      */
-    public function get($key)
-    {
+    public function get($key)

+    {

         return APIHelpers::getkey($this->field, $key, null);
     }
 
@@ -440,10 +440,10 @@ 
      * @param $data
      * @return $this
      */
-    public function fromArray($data)
-    {
-        if (is_array($data)) {
-            foreach ($data as $key => $value) {
+    public function fromArray($data)

+    {

+        if (is_array($data)) {

+            foreach ($data as $key => $value) {

                 $this->set($key, $value);
             }
         }
@@ -459,22 +459,22 @@ 
      * @return $this
      * @throws Exception
      */
-    final protected function Uset($key, $id = '')
-    {
-        if (!isset($this->field[$key])) {
+    final protected function Uset($key, $id = '')

+    {

+        if (!isset($this->field[$key])) {

             $tmp = "`{$key}`=''";
             $this->log[] = "{$key} is empty";
-        } else {
-            if ($this->issetField($key) && is_scalar($this->field[$key])) {
+        } else {

+            if ($this->issetField($key) && is_scalar($this->field[$key])) {

                 $tmp = "`{$key}`='{$this->escape($this->field[$key])}'";
-            } else {
+            } else {

                 throw new Exception("{$key} is invalid <pre>" . print_r($this->field[$key], true) . "</pre>");
             }
         }
-        if (!empty($tmp) && $this->isChanged($key)) {
-            if ($id == '') {
+        if (!empty($tmp) && $this->isChanged($key)) {

+            if ($id == '') {

                 $this->set[] = $tmp;
-            } else {
+            } else {

                 $this->set[$id][] = $tmp;
             }
         }
@@ -488,8 +488,11 @@ 
      * @param array $data
      * @return $this
      */
-    public function store($data = array()) {
-        if (is_array($data)) $this->store = $data;
+    public function store($data = array())

+    {

+        if (is_array($data)) {

+            $this->store = $data;

+        }

 
         return $this;
     }
@@ -500,10 +503,11 @@ 
      * @param string $key
      * @return MODxAPI
      */
-    public function rollback($key = '') {
-        if (!empty($key) && isset($this->store[$key])) {
+    public function rollback($key = '')

+    {

+        if (!empty($key) && isset($this->store[$key])) {

             $this->set($key,$this->store[$key]);
-        } else {
+        } else {

             $this->fromArray($this->store);
         }
 
@@ -516,7 +520,8 @@ 
      * @param $key
      * @return bool
      */
-    public function isChanged($key) {
+    public function isChanged($key)

+    {

         $flag = !isset($this->store[$key]) || (isset($this->store[$key]) && $this->store[$key] != $this->field[$key]);
 
         return $flag;
@@ -529,23 +534,24 @@ 
      * @return array
      * @throws Exception
      */
-    final public function cleanIDs($IDs, $sep = ',', $ignore = array())
-    {
+    final public function cleanIDs($IDs, $sep = ',', $ignore = array())

+    {

         $out = array();
-        if (!is_array($IDs)) {
-            if (is_scalar($IDs)) {
+        if (!is_array($IDs)) {

+            if (is_scalar($IDs)) {

                 $IDs = explode($sep, $IDs);
-            } else {
+            } else {

                 $IDs = array();
                 throw new Exception('Invalid IDs list <pre>' . print_r($IDs, 1) . '</pre>');
             }
         }
-        foreach ($IDs as $item) {
+        foreach ($IDs as $item) {

             $item = trim($item);
-            if (is_scalar($item) && (int)$item >= 0) { //Fix 0xfffffffff
-                if (!empty($ignore) && in_array((int)$item, $ignore, true)) {
+            if (is_scalar($item) && (int)$item >= 0) {

+//Fix 0xfffffffff
+                if (!empty($ignore) && in_array((int)$item, $ignore, true)) {

                     $this->log[] = 'Ignore id ' . (int)$item;
-                } else {
+                } else {

                     $out[] = (int)$item;
                 }
             }
@@ -561,26 +567,26 @@ 
      * @return $this
      * @throws Exception
      */
-    final public function fromJson($data, $callback = null)
-    {
-        if (is_scalar($data) && !empty($data)) {
+    final public function fromJson($data, $callback = null)

+    {

+        if (is_scalar($data) && !empty($data)) {

             $json = json_decode($data);
-        } else {
+        } else {

             throw new Exception("json is not string with json data");
         }
 
-        if ($this->jsonError($json)) {
-            if (isset($callback) && is_callable($callback)) {
+        if ($this->jsonError($json)) {

+            if (isset($callback) && is_callable($callback)) {

                 call_user_func_array($callback, array($json));
-            } else {
-                if (isset($callback)) {
+            } else {

+                if (isset($callback)) {

                     throw new Exception("Can't call callback JSON unpack <pre>" . print_r($callback, 1) . "</pre>");
                 }
-                foreach ($json as $key => $val) {
+                foreach ($json as $key => $val) {

                     $this->set($key, $val);
                 }
             }
-        } else {
+        } else {

             throw new Exception('Error from JSON decode: <pre>' . print_r($data, 1) . '</pre>');
         }
 
@@ -592,19 +598,19 @@ 
      * @return string
      * @throws Exception
      */
-    final public function toJson($callback = null)
-    {
+    final public function toJson($callback = null)

+    {

         $data = $this->toArray();
-        if (isset($callback) && is_callable($callback)) {
+        if (isset($callback) && is_callable($callback)) {

             $data = call_user_func_array($callback, array($data));
-        } else {
-            if (isset($callback)) {
+        } else {

+            if (isset($callback)) {

                 throw new Exception("Can't call callback JSON pre pack <pre>" . print_r($callback, 1) . "</pre>");
             }
         }
         $json = json_encode($data);
 
-        if ($this->jsonError($data)) {
+        if ($this->jsonError($data)) {

             throw new Exception('Error from JSON decode: <pre>' . print_r($data, 1) . '</pre>');
         }
 
@@ -615,10 +621,10 @@ 
      * @param $data
      * @return bool
      */
-    final protected function jsonError($data)
-    {
+    final protected function jsonError($data)

+    {

         $flag = false;
-        if (json_last_error() === JSON_ERROR_NONE && is_object($data) && $data instanceof stdClass) {
+        if (json_last_error() === JSON_ERROR_NONE && is_object($data) && $data instanceof stdClass) {

             $flag = true;
         }
 
@@ -631,25 +637,25 @@ 
      * @param string $sep
      * @return array
      */
-    public function toArray($prefix = '', $suffix = '', $sep = '_')
-    {
+    public function toArray($prefix = '', $suffix = '', $sep = '_')

+    {

         $tpl = '';
         $plh = '[+key+]';
-        if ($prefix !== '') {
+        if ($prefix !== '') {

             $tpl = $prefix . $sep;
         }
         $tpl .= $plh;
-        if ($suffix !== '') {
+        if ($suffix !== '') {

             $tpl .= $sep . $suffix;
         }
         $out = array();
         $fields = $this->field;
         $fields[$this->fieldPKName()] = $this->getID();
-        if ($tpl != $plh) {
-            foreach ($fields as $key => $value) {
+        if ($tpl != $plh) {

+            foreach ($fields as $key => $value) {

                 $out[str_replace($plh, $key, $tpl)] = $value;
             }
-        } else {
+        } else {

             $out = $fields;
         }
 
@@ -659,8 +665,8 @@ 
     /**
      * @return string
      */
-    final public function fieldPKName()
-    {
+    final public function fieldPKName()

+    {

         return $this->pkName;
     }
 
@@ -668,8 +674,8 @@ 
      * @param $table
      * @return mixed|string
      */
-    final public function makeTable($table)
-    {
+    final public function makeTable($table)

+    {

         //Без использования APIHelpers::getkey(). Иначе getFullTableName будет всегда выполняться
         return (isset($this->_table[$table])) ? $this->_table[$table] : $this->modx->getFullTableName($table);
     }
@@ -679,14 +685,14 @@ 
      * @param string $sep
      * @return array|string
      */
-    final public function sanitarIn($data, $sep = ',')
-    {
-        if (!is_array($data)) {
+    final public function sanitarIn($data, $sep = ',')

+    {

+        if (!is_array($data)) {

             $data = explode($sep, $data);
         }
         $out = array();
-        foreach ($data as $item) {
-            if ($item !== '') {
+        foreach ($data as $item) {

+            if ($item !== '') {

                 $out[] = $this->escape($item);
             }
         }
@@ -701,34 +707,34 @@ 
      * @param string $PK
      * @return bool
      */
-    public function checkUnique($table, $field, $PK = 'id')
-    {
-        if (is_array($field)) {
+    public function checkUnique($table, $field, $PK = 'id')

+    {

+        if (is_array($field)) {

             $where = array();
-            foreach ($field as $_field) {
+            foreach ($field as $_field) {

                 $val = $this->get($_field);
-                if ($val != '') {
+                if ($val != '') {

                     $where[] = "`" . $this->escape($_field) . "` = '" . $this->escape($val) . "'";
                 }
             }
             $where = implode(' AND ', $where);
-        } else {
+        } else {

             $where = '';
             $val = $this->get($field);
-            if ($val != '') {
+            if ($val != '') {

                 $where = "`" . $this->escape($field) . "` = '" . $this->escape($val) . "'";
             }
         }
 
-        if ($where != '') {
+        if ($where != '') {

             $sql = $this->query("SELECT `" . $this->escape($PK) . "` FROM " . $this->makeTable($table) . " WHERE " . $where);
             $id = $this->modx->db->getValue($sql);
-            if (is_null($id) || (!$this->newDoc && $id == $this->getID())) {
+            if (is_null($id) || (!$this->newDoc && $id == $this->getID())) {

                 $flag = true;
-            } else {
+            } else {

                 $flag = false;
             }
-        } else {
+        } else {

             $flag = false;
         }
 
@@ -739,8 +745,8 @@ 
      * @param array $data
      * @return $this
      */
-    public function create($data = array())
-    {
+    public function create($data = array())

+    {

         $this->close();
         $this->fromArray($data);
 
@@ -751,8 +757,8 @@ 
      * @param $id
      * @return $this
      */
-    public function copy($id)
-    {
+    public function copy($id)

+    {

         $this->edit($id)->id = 0;
         $this->newDoc = true;
         $this->store = array();
@@ -763,8 +769,8 @@ 
     /**
      *
      */
-    public function close()
-    {
+    public function close()

+    {

         $this->newDoc = true;
         $this->id = null;
         $this->field = array();
@@ -777,8 +783,8 @@ 
      * @param $key
      * @return bool
      */
-    public function issetField($key)
-    {
+    public function issetField($key)

+    {

         return (is_scalar($key) && array_key_exists($key, $this->default_field));
     }
 
@@ -806,8 +812,8 @@ 
      * @param $data
      * @return array|mixed|string
      */
-    final public function sanitarTag($data)
-    {
+    final public function sanitarTag($data)

+    {

         return parent::sanitarTag($this->modx->stripTags($data));
     }
 
@@ -816,17 +822,17 @@ 
      * @param bool $dmi3yy
      * @return bool
      */
-    final protected function checkVersion($version, $dmi3yy = true)
-    {
+    final protected function checkVersion($version, $dmi3yy = true)

+    {

         $flag = false;
         $currentVer = $this->modx->getVersionData('version');
-        if (is_array($currentVer)) {
+        if (is_array($currentVer)) {

             $currentVer = APIHelpers::getkey($currentVer, 'version', '');
         }
         $tmp = substr($currentVer, 0, strlen($version));
-        if (version_compare($tmp, $version, '>=')) {
+        if (version_compare($tmp, $version, '>=')) {

             $flag = true;
-            if ($dmi3yy) {
+            if ($dmi3yy) {

                 $flag = (boolean)preg_match('/^' . $tmp . '(.*)\-d/', $currentVer);
             }
         }
@@ -838,10 +844,10 @@ 
      * @param string $name
      * @return bool|mixed
      */
-    protected function eraseField($name)
-    {
+    protected function eraseField($name)

+    {

         $flag = false;
-        if (array_key_exists($name, $this->field)) {
+        if (array_key_exists($name, $this->field)) {

             $flag = $this->field[$name];
             unset($this->field[$name]);
         }
@@ -854,8 +860,8 @@ 
      * @param  string $field имя поля
      * @return boolean
      */
-    public function isJsonField($field)
-    {
+    public function isJsonField($field)

+    {

         return (is_scalar($field) && in_array($field, $this->jsonFields));
     }
 
@@ -864,9 +870,9 @@ 
      * @param  string $field имя поля
      * @return $this
      */
-    public function markAsDecode($field)
-    {
-        if (is_scalar($field)) {
+    public function markAsDecode($field)

+    {

+        if (is_scalar($field)) {

             $this->_decodedFields->set($field, false);
         }
 
@@ -878,9 +884,9 @@ 
      * @param  string $field имя поля
      * @return $this
      */
-    public function markAsEncode($field)
-    {
-        if (is_scalar($field)) {
+    public function markAsEncode($field)

+    {

+        if (is_scalar($field)) {

             $this->_decodedFields->set($field, true);
         }
 
@@ -891,10 +897,10 @@ 
      * Пометить все поля как запакованные
      * @return $this
      */
-    public function markAllEncode()
-    {
+    public function markAllEncode()

+    {

         $this->_decodedFields->clear();
-        foreach ($this->jsonFields as $field) {
+        foreach ($this->jsonFields as $field) {

             $this->markAsEncode($field);
         }
 
@@ -905,10 +911,10 @@ 
      * Пометить все поля как распакованные
      * @return $this
      */
-    public function markAllDecode()
-    {
+    public function markAllDecode()

+    {

         $this->_decodedFields->clear();
-        foreach ($this->jsonFields as $field) {
+        foreach ($this->jsonFields as $field) {

             $this->markAsDecode($field);
         }
 
@@ -919,9 +925,9 @@ 
      * Получить список не запакованных полей
      * @return DLCollection
      */
-    public function getNoEncodeFields()
-    {
-        return $this->_decodedFields->filter(function ($value) {
+    public function getNoEncodeFields()

+    {

+        return $this->_decodedFields->filter(function ($value) {

             return ($value === false);
         });
     }
@@ -930,9 +936,9 @@ 
      * Получить список не распакованных полей
      * @return DLCollection
      */
-    public function getNoDecodeFields()
-    {
-        return $this->_decodedFields->filter(function ($value) {
+    public function getNoDecodeFields()

+    {

+        return $this->_decodedFields->filter(function ($value) {

             return ($value === true);
         });
     }
@@ -942,8 +948,8 @@ 
      * @param  string $field имя поля
      * @return boolean
      */
-    public function isDecodableField($field)
-    {
+    public function isDecodableField($field)

+    {

         $data = $this->get($field);
 
         /**
@@ -958,8 +964,8 @@ 
      * @param  string $field имя поля
      * @return boolean
      */
-    public function isEncodableField($field)
-    {
+    public function isEncodableField($field)

+    {

         /**
          * Если поле было распаковано ранее и еще не упаковано
          */
@@ -972,14 +978,14 @@ 
      * @param  bool $store обновить распакованное поле
      * @return array ассоциативный массив с данными из json строки
      */
-    public function decodeField($field, $store = false)
-    {
+    public function decodeField($field, $store = false)

+    {

         $out = array();
-        if ($this->isDecodableField($field)) {
+        if ($this->isDecodableField($field)) {

             $data = $this->get($field);
             $out = jsonHelper::jsonDecode($data, array('assoc' => true), true);
         }
-        if ($store) {
+        if ($store) {

             $this->field[$field] = $out;
             $this->markAsDecode($field);
         }
@@ -991,9 +997,9 @@ 
      * Декодирование всех json полей
      * @return $this
      */
-    protected function decodeFields()
-    {
-        foreach ($this->getNoDecodeFields() as $field => $flag) {
+    protected function decodeFields()

+    {

+        foreach ($this->getNoDecodeFields() as $field => $flag) {

             $this->decodeField($field, true);
         }
 
@@ -1006,14 +1012,14 @@ 
      * @param  bool $store обновить запакованное поле
      * @return string|null json строка
      */
-    public function encodeField($field, $store = false)
-    {
+    public function encodeField($field, $store = false)

+    {

         $out = null;
-        if ($this->isEncodableField($field)) {
+        if ($this->isEncodableField($field)) {

             $data = $this->get($field);
             $out = json_encode($data);
         }
-        if ($store) {
+        if ($store) {

             $this->field[$field] = $out;
             $this->markAsEncode($field);
         }
@@ -1025,9 +1031,9 @@ 
      * Запаковка всех json полей
      * @return $this
      */
-    protected function encodeFields()
-    {
-        foreach ($this->getNoEncodeFields() as $field => $flag) {
+    protected function encodeFields()

+    {

+        foreach ($this->getNoEncodeFields() as $field => $flag) {

             $this->encodeField($field, true);
         }