Форматирование кода под PSR-2

livestreet · Oct 8, 2014 · 9361b97 · psnet · Oct 8, 2014 · mzhelskiy
1 parent 0b5befd
commit 9361b97
Show file tree

Hide file tree

Showing 49 changed files with 705 additions and 359 deletions.
diff --git a/classes/engine/Action.class.php b/classes/engine/Action.class.php
@@ -253,12 +253,14 @@ public function ExecEvent()
                         throw new Exception("External processing for event not found: " . $aEvent['external']);
                     }
                 }
-                $this->Hook_Run("action_event_" . strtolower($this->sCurrentAction) . "_before", array('event' => $this->sCurrentEvent, 'params' => $this->GetParams()));
+                $this->Hook_Run("action_event_" . strtolower($this->sCurrentAction) . "_before",
+                    array('event' => $this->sCurrentEvent, 'params' => $this->GetParams()));
                 /**
                  * Проверяем на наличие внешнего обработчика евента
                  */
                 if ($aEvent['external']) {
-                    $sEventClass = $this->Plugin_GetDelegate('event', $this->aRegisterEventExternal[$aEvent['external']]);
+                    $sEventClass = $this->Plugin_GetDelegate('event',
+                        $this->aRegisterEventExternal[$aEvent['external']]);
                     $oEvent = new $sEventClass;
                     $oEvent->SetActionObject($this);
                     $oEvent->Init();
@@ -270,7 +272,8 @@ public function ExecEvent()
                 } else {
                     $result = call_user_func_array(array($this, $aEvent['method']), array());
                 }
-                $this->Hook_Run("action_event_" . strtolower($this->sCurrentAction) . "_after", array('event' => $this->sCurrentEvent, 'params' => $this->GetParams()));
+                $this->Hook_Run("action_event_" . strtolower($this->sCurrentAction) . "_after",
+                    array('event' => $this->sCurrentEvent, 'params' => $this->GetParams()));
                 return $result;
             }
         }
@@ -397,7 +400,8 @@ protected function SetTemplateAction($sTemplate)
         $sActionTemplatePath = $sTemplate . '.tpl';
         foreach ($aDelegates as $sAction) {
             if (preg_match('/^(Plugin([\w]+)_)?Action([\w]+)$/i', $sAction, $aMatches)) {
-                $sTemplatePath = $this->Plugin_GetDelegate('template', 'actions/Action' . ucfirst($aMatches[3]) . '/' . $sTemplate . '.tpl');
+                $sTemplatePath = $this->Plugin_GetDelegate('template',
+                    'actions/Action' . ucfirst($aMatches[3]) . '/' . $sTemplate . '.tpl');
                 if (empty($aMatches[1])) {
                     $sActionTemplatePath = $sTemplatePath;
                 } else {

diff --git a/classes/engine/ActionPlugin.class.php b/classes/engine/ActionPlugin.class.php
@@ -50,7 +50,8 @@ public function getTemplatePathPlugin()
              * Проверяем в списке шаблонов
              */
             $aMatches[1] = strtolower($aMatches[1]);
-            $aPaths = glob(Config::Get('path.application.plugins.server') . '/' . $aMatches[1] . '/templates/skin/*/actions/Action' . ucfirst($aMatches[2]), GLOB_ONLYDIR);
+            $aPaths = glob(Config::Get('path.application.plugins.server') . '/' . $aMatches[1] . '/templates/skin/*/actions/Action' . ucfirst($aMatches[2]),
+                GLOB_ONLYDIR);
             $sTemplateName = ($aPaths and in_array(
                     Config::Get('view.skin'),
                     array_map(
@@ -79,7 +80,9 @@ public function getTemplatePathPlugin()
      */
     public function setTemplatePathPlugin($sTemplatePath)
     {
-        if (!is_dir($sTemplatePath)) return false;
+        if (!is_dir($sTemplatePath)) {
+            return false;
+        }
         $this->sTemplatePathPlugin = $sTemplatePath;
     }
 

diff --git a/classes/engine/Engine.class.php b/classes/engine/Engine.class.php
@@ -421,7 +421,9 @@ protected function LoadModules()
         $this->LoadConfig();
         foreach ($this->aModuleAutoload as $sModuleName) {
             $sModuleClass = 'Module' . $sModuleName;
-            if (!in_array($sModuleName, array('Plugin', 'Hook'))) $sModuleClass = $this->Plugin_GetDelegate('module', $sModuleClass);
+            if (!in_array($sModuleName, array('Plugin', 'Hook'))) {
+                $sModuleClass = $this->Plugin_GetDelegate('module', $sModuleClass);
+            }
 
             if (!isset($this->aModules[$sModuleClass])) {
                 $this->LoadModule($sModuleClass);
@@ -573,7 +575,8 @@ public function _CallModule($sName, $aArgs)
         $sModuleName = strtolower($sModuleName);
         $aResultHook = array();
         if (!in_array($sModuleName, array('plugin', 'hook'))) {
-            $aResultHook = $this->_CallModule('Hook_Run', array('module_' . $sModuleName . '_' . strtolower($sMethod) . '_before', &$aArgs));
+            $aResultHook = $this->_CallModule('Hook_Run',
+                array('module_' . $sModuleName . '_' . strtolower($sMethod) . '_before', &$aArgs));
         }
         /**
          * Хук может делегировать результат выполнения метода модуля, сам метод при этом не выполняется, происходит только подмена результата
@@ -589,7 +592,8 @@ public function _CallModule($sName, $aArgs)
         }
 
         if (!in_array($sModuleName, array('plugin', 'hook'))) {
-            $this->Hook_Run('module_' . $sModuleName . '_' . strtolower($sMethod) . '_after', array('result' => &$result, 'params' => $aArgs));
+            $this->Hook_Run('module_' . $sModuleName . '_' . strtolower($sMethod) . '_after',
+                array('result' => &$result, 'params' => $aArgs));
         }
 
         return $result;
@@ -676,7 +680,10 @@ public function GetModuleObject($sName)
      */
     public function getStats()
     {
-        return array('sql' => $this->Database_GetStats(), 'cache' => $this->Cache_GetStats(), 'engine' => array('time_load_module' => round($this->iTimeLoadModule, 3)));
+        return array('sql'    => $this->Database_GetStats(),
+                     'cache'  => $this->Cache_GetStats(),
+                     'engine' => array('time_load_module' => round($this->iTimeLoadModule, 3))
+        );
     }
 
     /**
@@ -830,7 +837,8 @@ public static function GetEntityClass($sName)
          * If Plugin Entity doesn't exist, search among it's Module delegates
          */
         if (isset($sPlugin) && !self::GetClassPath($sClass)) {
-            $aModulesChain = Engine::GetInstance()->Plugin_GetDelegationChain('module', 'Plugin' . $sPlugin . '_Module' . $sModule);
+            $aModulesChain = Engine::GetInstance()->Plugin_GetDelegationChain('module',
+                'Plugin' . $sPlugin . '_Module' . $sModule);
             foreach ($aModulesChain as $sModuleName) {
                 $sClassTest = $sModuleName . '_Entity' . $sEntity;
                 if (self::GetClassPath($sClassTest)) {
@@ -938,7 +946,8 @@ public static function GetBehaviorClass($sName)
          * If Plugin Entity doesn't exist, search among it's Module delegates
          */
         if (isset($sPlugin) && !self::GetClassPath($sClass)) {
-            $aModulesChain = Engine::GetInstance()->Plugin_GetDelegationChain('module', 'Plugin' . $sPlugin . '_Module' . $sModule);
+            $aModulesChain = Engine::GetInstance()->Plugin_GetDelegationChain('module',
+                'Plugin' . $sPlugin . '_Module' . $sModule);
             foreach ($aModulesChain as $sModuleName) {
                 $sClassTest = $sModuleName . '_Behavior' . $sEntity;
                 if (self::GetClassPath($sClassTest)) {

diff --git a/classes/engine/Entity.class.php b/classes/engine/Entity.class.php
@@ -149,7 +149,9 @@ public function _setDataSafe($aData, $aSetEmpty = array())
      */
     public function _getData($aKeys = array())
     {
-        if (!is_array($aKeys) or !count($aKeys)) return $this->_aData;
+        if (!is_array($aKeys) or !count($aKeys)) {
+            return $this->_aData;
+        }
 
         $aReturn = array();
         foreach ($aKeys as $key) {
@@ -285,7 +287,8 @@ public function _Validate($aFields = null, $bClearErrors = true)
             $validator->validateEntity($this, $aFields);
         }
         $bResult = !$this->_hasValidateErrors();
-        $this->RunBehaviorHook('validate_after', array('bResult' => &$bResult, 'aFields' => $aFields, 'bClearErrors' => $bClearErrors));
+        $this->RunBehaviorHook('validate_after',
+            array('bResult' => &$bResult, 'aFields' => $aFields, 'bClearErrors' => $bClearErrors));
         return $bResult;
     }
 

diff --git a/classes/engine/EntityORM.class.php b/classes/engine/EntityORM.class.php
@@ -178,11 +178,12 @@ public function _SetIsNew($bIsNew)
      */
     public function Add()
     {
-        if ($this->beforeSave())
+        if ($this->beforeSave()) {
             if ($res = $this->_Method(__FUNCTION__)) {
                 $this->afterSave();
                 return $res;
             }
+        }
         return false;
     }
 
@@ -193,11 +194,12 @@ public function Add()
      */
     public function Update()
     {
-        if ($this->beforeSave())
+        if ($this->beforeSave()) {
             if ($res = $this->_Method(__FUNCTION__)) {
                 $this->afterSave();
                 return $res;
             }
+        }
         return false;
     }
 
@@ -208,11 +210,12 @@ public function Update()
      */
     public function Save()
     {
-        if ($this->beforeSave())
+        if ($this->beforeSave()) {
             if ($res = $this->_Method(__FUNCTION__)) {
                 $this->afterSave();
                 return $res;
             }
+        }
         return false;
     }
 
@@ -223,11 +226,12 @@ public function Save()
      */
     public function Delete()
     {
-        if ($this->beforeDelete())
+        if ($this->beforeDelete()) {
             if ($res = $this->_Method(__FUNCTION__)) {
                 $this->afterDelete();
                 return $res;
             }
+        }
         return false;
     }
 
@@ -428,7 +432,8 @@ protected function _Method($sName)
         $sModuleName = Engine::GetModuleName($sRootDelegater);
         $sPluginPrefix = Engine::GetPluginPrefix($sRootDelegater);
         $sEntityName = Engine::GetEntityName($sRootDelegater);
-        return Engine::GetInstance()->_CallModule("{$sPluginPrefix}{$sModuleName}_{$sName}{$sEntityName}", array($this));
+        return Engine::GetInstance()->_CallModule("{$sPluginPrefix}{$sModuleName}_{$sName}{$sEntityName}",
+            array($this));
     }
 
     /**

diff --git a/classes/engine/MapperORM.class.php b/classes/engine/MapperORM.class.php
@@ -58,7 +58,8 @@ public function UpdateEntity($oEntity)
             }
             $sWhere = ' 1 = 1 ';
             foreach ($aPrimaryKey as $sField) {
-                $sWhere .= ' and ' . $this->oDb->escape($sField, true) . " = " . $this->oDb->escape($oEntity->_getDataOne($sField));
+                $sWhere .= ' and ' . $this->oDb->escape($sField,
+                        true) . " = " . $this->oDb->escape($oEntity->_getDataOne($sField));
             }
             $sql = "UPDATE " . $sTableName . " SET ?a WHERE {$sWhere}";
             return $this->oDb->query($sql, $oEntity->_getDataFields());
@@ -67,7 +68,8 @@ public function UpdateEntity($oEntity)
             $sWhere = implode(' AND ', array_map(create_function(
                 '$k,$v,$oDb',
                 'return "{$oDb->escape($k,true)} = {$oDb->escape($v)}";'
-            ), array_keys($aOriginalData), array_values($aOriginalData), array_fill(0, count($aOriginalData), $this->oDb)));
+            ), array_keys($aOriginalData), array_values($aOriginalData),
+            array_fill(0, count($aOriginalData), $this->oDb)));
             $sql = "UPDATE " . $sTableName . " SET ?a WHERE 1=1 AND " . $sWhere;
             return $this->oDb->query($sql, $oEntity->_getDataFields());
         }
@@ -90,7 +92,8 @@ public function DeleteEntity($oEntity)
             }
             $sWhere = ' 1 = 1 ';
             foreach ($aPrimaryKey as $sField) {
-                $sWhere .= ' and ' . $this->oDb->escape($sField, true) . " = " . $this->oDb->escape($oEntity->_getDataOne($sField));
+                $sWhere .= ' and ' . $this->oDb->escape($sField,
+                        true) . " = " . $this->oDb->escape($oEntity->_getDataOne($sField));
             }
             $sql = "DELETE FROM " . $sTableName . " WHERE {$sWhere}";
             return $this->oDb->query($sql);
@@ -99,7 +102,8 @@ public function DeleteEntity($oEntity)
             $sWhere = implode(' AND ', array_map(create_function(
                 '$k,$v,$oDb',
                 'return "{$oDb->escape($k,true)} = {$oDb->escape($v)}";'
-            ), array_keys($aOriginalData), array_values($aOriginalData), array_fill(0, count($aOriginalData), $this->oDb)));
+            ), array_keys($aOriginalData), array_values($aOriginalData),
+            array_fill(0, count($aOriginalData), $this->oDb)));
             $sql = "DELETE FROM " . $sTableName . " WHERE 1=1 AND " . $sWhere;
             return $this->oDb->query($sql);
         }
@@ -238,8 +242,14 @@ public function GetCountItemsByFilter($aFilter, $sEntityFull)
         return 0;
     }
 
-    public function GetItemsByJoinEntity($sEntityJoin, $sKeyJoin, $sRelationKey, $aRelationValues, $aFilter, $sEntityFull)
-    {
+    public function GetItemsByJoinEntity(
+        $sEntityJoin,
+        $sKeyJoin,
+        $sRelationKey,
+        $aRelationValues,
+        $aFilter,
+        $sEntityFull
+    ) {
         $oEntitySample = Engine::GetEntity($sEntityFull);
         $oEntityJoinSample = Engine::GetEntity($sEntityJoin);
         $sTableName = self::GetTableName($sEntityFull);
@@ -271,7 +281,15 @@ public function GetItemsByJoinEntity($sEntityJoin, $sKeyJoin, $sRelationKey, $aR
          * SQL и параметры
          */
         $sql = "SELECT {$sFieldsJoinReturn}, b.* FROM ?# t LEFT JOIN ?# b ON b.?# = t.?# WHERE t.?# in ( ?a ) {$sFilterFields} {$sOrder} {$sLimit}";
-        $aQueryParams = array_merge(array($sql, $sTableJoinName, $sTableName, $oEntitySample->_getPrimaryKey(), $sRelationKey, $sKeyJoin, $aRelationValues), array_values($aFilterFields));
+        $aQueryParams = array_merge(array(
+                $sql,
+                $sTableJoinName,
+                $sTableName,
+                $oEntitySample->_getPrimaryKey(),
+                $sRelationKey,
+                $sKeyJoin,
+                $aRelationValues
+            ), array_values($aFilterFields));
         $aItems = array();
         /**
          * Выполняем запрос
@@ -296,8 +314,14 @@ public function GetItemsByJoinEntity($sEntityJoin, $sKeyJoin, $sRelationKey, $aR
         return $aItems;
     }
 
-    public function GetCountItemsByJoinEntity($sEntityJoin, $sKeyJoin, $sRelationKey, $aRelationValues, $aFilter, $sEntityFull)
-    {
+    public function GetCountItemsByJoinEntity(
+        $sEntityJoin,
+        $sKeyJoin,
+        $sRelationKey,
+        $aRelationValues,
+        $aFilter,
+        $sEntityFull
+    ) {
         $oEntitySample = Engine::GetEntity($sEntityFull);
         $oEntityJoinSample = Engine::GetEntity($sEntityJoin);
         $sTableName = self::GetTableName($sEntityFull);
@@ -315,7 +339,15 @@ public function GetCountItemsByJoinEntity($sEntityJoin, $sKeyJoin, $sRelationKey
          * SQL и параметры
          */
         $sql = "SELECT count(*) as c FROM ?# t LEFT JOIN ?# b ON b.?# = t.?# WHERE t.?# in ( ?a ) {$sFilterFields} ";
-        $aQueryParams = array_merge(array($sql, $sTableJoinName, $sTableName, $oEntitySample->_getPrimaryKey(), $sRelationKey, $sKeyJoin, $aRelationValues), array_values($aFilterFields));
+        $aQueryParams = array_merge(array(
+                $sql,
+                $sTableJoinName,
+                $sTableName,
+                $oEntitySample->_getPrimaryKey(),
+                $sRelationKey,
+                $sKeyJoin,
+                $aRelationValues
+            ), array_values($aFilterFields));
         if ($aRow = call_user_func_array(array($this->oDb, 'selectRow'), $aQueryParams)) {
             return $aRow['c'];
         }
@@ -429,7 +461,8 @@ public function BuildFilterMore($aFilter, $oEntitySample)
                     $aKeys = explode(':', $key);
                     if (count($aKeys) == 2) {
                         if (strtolower($aKeys[0]) == 'field' and is_array($aFilter['#order'][$key]) and count($aFilter['#order'][$key])) {
-                            $key = 'FIELD(t.' . $this->oDb->escape($oEntitySample->_getField(trim($aKeys[1])), true) . ',' . join(',', $aFilter['#order'][$key]) . ')';
+                            $key = 'FIELD(t.' . $this->oDb->escape($oEntitySample->_getField(trim($aKeys[1])),
+                                    true) . ',' . join(',', $aFilter['#order'][$key]) . ')';
                             $value = '';
                         } else {
                             /**
@@ -534,7 +567,9 @@ public function ShowColumnsFrom($oEntity)
      */
     public function ShowColumnsFromTable($sTableName)
     {
-        if (false === ($aItems = Engine::getInstance()->Cache_Get("columns_table_{$sTableName}", 'file_orm', true, true))) {
+        if (false === ($aItems = Engine::getInstance()->Cache_Get("columns_table_{$sTableName}", 'file_orm', true,
+                true))
+        ) {
             $sql = "SHOW COLUMNS FROM " . $sTableName;
             $aItems = array();
             if ($aRows = $this->oDb->select($sql)) {
@@ -545,7 +580,8 @@ public function ShowColumnsFromTable($sTableName)
                     }
                 }
             }
-            Engine::getInstance()->Cache_Set($aItems, "columns_table_{$sTableName}", array(), 60 * 60 * 4, 'file_orm', true);
+            Engine::getInstance()->Cache_Set($aItems, "columns_table_{$sTableName}", array(), 60 * 60 * 4, 'file_orm',
+                true);
         }
         return $aItems;
     }
@@ -570,7 +606,8 @@ public function ShowPrimaryIndexFrom($oEntity)
      */
     public function ShowPrimaryIndexFromTable($sTableName)
     {
-        if (false === ($aItems = Engine::getInstance()->Cache_Get("index_table_{$sTableName}", 'file_orm', true, true))) {
+        if (false === ($aItems = Engine::getInstance()->Cache_Get("index_table_{$sTableName}", 'file_orm', true, true))
+        ) {
             $sql = "SHOW INDEX FROM " . $sTableName;
             $aItems = array();
             if ($aRows = $this->oDb->select($sql)) {
@@ -580,7 +617,8 @@ public function ShowPrimaryIndexFromTable($sTableName)
                     }
                 }
             }
-            Engine::getInstance()->Cache_Set($aItems, "index_table_{$sTableName}", array(), 60 * 60 * 4, 'file_orm', true);
+            Engine::getInstance()->Cache_Set($aItems, "index_table_{$sTableName}", array(), 60 * 60 * 4, 'file_orm',
+                true);
         }
         return $aItems;
     }
@@ -601,7 +639,8 @@ public static function GetTableName($oEntity)
          *    prefix_pluginname_user
          *    prefix_pluginname_user_invite
          */
-        $sClass = Engine::getInstance()->Plugin_GetDelegater('entity', is_object($oEntity) ? get_class($oEntity) : $oEntity);
+        $sClass = Engine::getInstance()->Plugin_GetDelegater('entity',
+            is_object($oEntity) ? get_class($oEntity) : $oEntity);
         $sPluginName = func_underscore(Engine::GetPluginName($sClass));
         $sModuleName = func_underscore(Engine::GetModuleName($sClass));
         $sEntityName = func_underscore(Engine::GetEntityName($sClass));