supernova-ws / SuperNova

includes/classes/PropertyHiderInObject.php

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 
 class PropertyHiderInObject extends PropertyHider {
   private function getPhysicalPropertyName($name) {
-    return '_' . $name;
+    return '_'.$name;
   }
 
   /**

buddy.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
 
 $template = gettemplate('viewreport', true);
 $template->assign_var('PAGE_HINT', classLocale::$lang['cr_view_hint']);

includes/classes/PropertyHider.php

Spacing +15 added lines, -15 removed lines

@@ -76,13 +76,13 @@ 
 
   protected function checkPropertyExists($name) {
     if (!array_key_exists($name, $this->_properties)) {
-      throw new ExceptionPropertyNotExists('Property [' . get_called_class() . '::' . $name . '] not exists', ERR_ERROR);
+      throw new ExceptionPropertyNotExists('Property ['.get_called_class().'::'.$name.'] not exists', ERR_ERROR);
     }
   }
 
   protected function checkOverwriteAdjusted($name) {
     if (array_key_exists($name, $this->propertiesAdjusted)) {
-      throw new PropertyAccessException('Property [' . get_called_class() . '::' . $name . '] already was adjusted so no SET is possible until dbSave', ERR_ERROR);
+      throw new PropertyAccessException('Property ['.get_called_class().'::'.$name.'] already was adjusted so no SET is possible until dbSave', ERR_ERROR);
     }
   }
 
@@ -131,7 +131,7 @@ 
    * @return boolean
    */
   public function isContainerEmpty() {
-    throw new Exception('PropertyHider::isContainerEmpty() is not implemented. You should implement it in class ' . get_called_class());
+    throw new Exception('PropertyHider::isContainerEmpty() is not implemented. You should implement it in class '.get_called_class());
   }
 
 
@@ -175,15 +175,15 @@ 
     $result = null;
     // Now deciding - will we call a protected setter or will we work with protected property
     // Todo - on init recalc all method_exists
-    if (method_exists($this, $methodName = $action . ucfirst($name))) {
+    if (method_exists($this, $methodName = $action.ucfirst($name))) {
       // If method exists - just calling it
       // TODO - should return TRUE if value changed or FALSE otherwise
       $result = call_user_func_array(array($this, $methodName), array($value));
     } elseif ($this->isPropertyActionAvailable($name, $action)) {
       // No setter exists - works directly with protected property
-      $result = $this->{$action . 'Property'}($name, $value);
+      $result = $this->{$action.'Property'}($name, $value);
     } else {
-      throw new ExceptionPropertyNotExists('Property [' . get_called_class() . '::' . $name . '] does not have ' . $action . 'ter/property to ' . $action, ERR_ERROR);
+      throw new ExceptionPropertyNotExists('Property ['.get_called_class().'::'.$name.'] does not have '.$action.'ter/property to '.$action, ERR_ERROR);
     }
 
     return $result;
@@ -274,7 +274,7 @@ 
    * @return string
    */
   protected function adjustPropertyString($name, $diff) {
-    return (string)$this->$name . (string)$diff;
+    return (string) $this->$name.(string) $diff;
   }
 
   /**
@@ -284,8 +284,8 @@ 
    * @return array
    */
   protected function adjustPropertyArray($name, $diff) {
-    $copy = (array)$this->$name;
-    HelperArray::merge($copy, (array)$diff, HelperArray::MERGE_PHP);
+    $copy = (array) $this->$name;
+    HelperArray::merge($copy, (array) $diff, HelperArray::MERGE_PHP);
 
     return $copy;
   }
@@ -297,7 +297,7 @@ 
    * @return int
    */
   protected function deltaInteger($name, $diff) {
-    return (int)HelperArray::keyExistsOr($this->propertiesAdjusted, $name, 0) + (int)$diff;
+    return (int) HelperArray::keyExistsOr($this->propertiesAdjusted, $name, 0) + (int) $diff;
   }
 
   /**
@@ -307,7 +307,7 @@ 
    * @return float
    */
   protected function deltaDouble($name, $diff) {
-    return (float)HelperArray::keyExistsOr($this->propertiesAdjusted, $name, 0.0) + (float)$diff;
+    return (float) HelperArray::keyExistsOr($this->propertiesAdjusted, $name, 0.0) + (float) $diff;
   }
 
   /**
@@ -317,7 +317,7 @@ 
    * @return string
    */
   protected function deltaString($name, $diff) {
-    return (string)HelperArray::keyExistsOr($this->propertiesAdjusted, $name, '') . (string)$diff;
+    return (string) HelperArray::keyExistsOr($this->propertiesAdjusted, $name, '').(string) $diff;
   }
 
   /**
@@ -327,7 +327,7 @@ 
    * @return array
    */
   protected function deltaArray($name, $diff) {
-    $copy = (array)HelperArray::keyExistsOr($this->propertiesAdjusted, $name, array());
+    $copy = (array) HelperArray::keyExistsOr($this->propertiesAdjusted, $name, array());
     HelperArray::merge($copy, $diff, HelperArray::MERGE_PHP);
 
     return $copy;
@@ -350,10 +350,10 @@ 
     // Capitalizing type name
     $methodName = explode(' ', $type);
     array_walk($methodName, 'DbSqlHelper::UCFirstByRef');
-    $methodName = $prefix . implode('', $methodName);
+    $methodName = $prefix.implode('', $methodName);
 
     if (!method_exists($this, $methodName)) {
-      throw new ExceptionTypeUnsupported('Type "' . $type . '" is unsupported in PropertyHider::propertyMethodResult');
+      throw new ExceptionTypeUnsupported('Type "'.$type.'" is unsupported in PropertyHider::propertyMethodResult');
     }
 
     return call_user_func(array($this, $methodName), $name, $diff);

includes/classes/Common/Types.php

Spacing +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
       break;
 
       case TYPE_ARRAY:
-        $value = (array)$value;
+        $value = (array) $value;
       break;
 
       case TYPE_STRING:
@@ -38,7 +38,7 @@ 
       case TYPE_EMPTY:
         // No-type defaults to string
       default:
-        $value = (string)$value;
+        $value = (string) $value;
       break;
     }
 

includes/classes/V2PropertyContainer.php

Spacing +2 added lines, -2 removed lines

@@ -52,7 +52,7 @@ 
     if (is_callable($callable)) {
       $this->accessors[$type][$varName] = $callable;
     } else {
-      throw new Exception('Error assigning callable in ' . get_called_class() . '! Callable typed [' . $type . '] is not a callable or not accessible in the scope');
+      throw new Exception('Error assigning callable in '.get_called_class().'! Callable typed ['.$type.'] is not a callable or not accessible in the scope');
     }
   }
 
@@ -73,7 +73,7 @@ 
   }
 
   public function importRow($row) {
-    if(empty($row)) {
+    if (empty($row)) {
       return;
     }
 

includes/classes/V2Unit/V2UnitModel.php

Spacing +6 added lines, -6 removed lines

@@ -78,12 +78,12 @@ 
     $that = $this;
 
     $this->_container->assignAccessor('type', P_CONTAINER_GETTER,
-      function () use ($that) {
+      function() use ($that) {
         return $that->type;
       }
     );
     $this->_container->assignAccessor('type', P_CONTAINER_SETTER,
-      function ($value) use ($that) {
+      function($value) use ($that) {
         $that->type = $value;
         $array = get_unit_param($value);
         $that->unitInfo = $array;
@@ -99,7 +99,7 @@ 
     $propertyName = 'timeStart';
     $fieldName = self::$_properties[$propertyName][P_DB_FIELD];
     $this->_container->assignAccessor($propertyName, P_CONTAINER_IMPORTER,
-      function (&$row) use ($that, $fieldName) {
+      function(&$row) use ($that, $fieldName) {
         if (isset($row[$fieldName])) {
           $dateTime = new \DateTime($row[$fieldName]);
         } else {
@@ -109,7 +109,7 @@ 
       }
     );
     $this->_container->assignAccessor($propertyName, P_CONTAINER_EXPORTER,
-      function (&$row) use ($that, $fieldName) {
+      function(&$row) use ($that, $fieldName) {
         $dateTime = $that->timeStart;
         if ($dateTime instanceof \DateTime) {
           $row[$fieldName] = $dateTime->format(FMT_DATE_TIME_SQL);
@@ -122,7 +122,7 @@ 
     $propertyName = 'timeFinish';
     $fieldName = self::$_properties[$propertyName][P_DB_FIELD];
     $this->_container->assignAccessor($propertyName, P_CONTAINER_IMPORTER,
-      function (&$row) use ($that, $fieldName) {
+      function(&$row) use ($that, $fieldName) {
         if (isset($row[$fieldName])) {
           $dateTime = new \DateTime($row[$fieldName]);
         } else {
@@ -132,7 +132,7 @@ 
       }
     );
     $this->_container->assignAccessor($propertyName, P_CONTAINER_EXPORTER,
-      function (&$row) use ($that, $fieldName) {
+      function(&$row) use ($that, $fieldName) {
         $dateTime = $that->timeFinish;
         if ($dateTime instanceof \DateTime) {
           $row[$fieldName] = $dateTime->format(FMT_DATE_TIME_SQL);

includes/classes/Buddy/BuddyView.php

Spacing +4 added lines, -4 removed lines

@@ -27,14 +27,14 @@
     $cBuddy->new_request_text_unsafe = sys_get_param_str_unsafe('request_text');
     $cBuddy->playerArray = $user;
 
-    $cBuddy->playerId = function (BuddyRoutingParams $cBuddy) {
+    $cBuddy->playerId = function(BuddyRoutingParams $cBuddy) {
       return $cBuddy->playerArray['id'];
     };
-    $cBuddy->playerName = function (BuddyRoutingParams $cBuddy) {
+    $cBuddy->playerName = function(BuddyRoutingParams $cBuddy) {
       return $cBuddy->playerArray['username'];
     };
-    $cBuddy->playerNameAndCoordinates = function (BuddyRoutingParams $cBuddy) {
-      return "{$cBuddy->playerArray['username']} " . uni_render_coordinates($cBuddy->playerArray);
+    $cBuddy->playerNameAndCoordinates = function(BuddyRoutingParams $cBuddy) {
+      return "{$cBuddy->playerArray['username']} ".uni_render_coordinates($cBuddy->playerArray);
     };
 
     $result = array();

includes/classes/classSupernova.php

Unused Use Statements -1 removed lines

@@ -1,7 +1,6 @@
 <?php
 
 use Vector\Vector;
-
 use Common\GlobalContainer;
 
 class classSupernova {

Spacing +11 added lines, -11 removed lines

@@ -203,7 +203,7 @@ 
     ini_get('magic_quotes_sybase') ? die('SN is incompatible with \'magic_quotes_sybase\' turned on. Disable it in php.ini or .htaccess...') : false;
     if (@get_magic_quotes_gpc()) {
       $gpcr = array(&$_GET, &$_POST, &$_COOKIE, &$_REQUEST);
-      array_walk_recursive($gpcr, function (&$value, $key) {
+      array_walk_recursive($gpcr, function(&$value, $key) {
         $value = stripslashes($value);
       });
     }
@@ -219,43 +219,43 @@ 
     $gc = static::$gc;
 
     // Default db
-    $gc->db = function ($c) {
+    $gc->db = function($c) {
       $db = new db_mysql($c);
       $db->sn_db_connect();
 
       return $db;
     };
 
-    $gc->debug = function ($c) {
+    $gc->debug = function($c) {
       return new debug();
     };
 
-    $gc->cache = function ($c) {
+    $gc->cache = function($c) {
       return new classCache(classSupernova::$cache_prefix);
     };
 
-    $gc->config = function ($c) {
+    $gc->config = function($c) {
       return new classConfig(classSupernova::$cache_prefix);
     };
 
-    $gc->localePlayer = function (GlobalContainer $c) {
+    $gc->localePlayer = function(GlobalContainer $c) {
       return new classLocale($c->config->server_locale_log_usage);
     };
 
-    $gc->dbRowOperator = function ($c) {
+    $gc->dbRowOperator = function($c) {
       return new DbRowDirectOperator($c);
     };
 
     $gc->buddyClass = 'Buddy\BuddyModel';
-    $gc->buddy = $gc->factory(function (GlobalContainer $c) {
+    $gc->buddy = $gc->factory(function(GlobalContainer $c) {
       return new $c->buddyClass($c);
     });
 
-    $gc->query = $gc->factory(function (GlobalContainer $c) {
+    $gc->query = $gc->factory(function(GlobalContainer $c) {
       return new DbQueryConstructor($c->db);
     });
 
-    $gc->unit = $gc->factory(function (GlobalContainer $c) {
+    $gc->unit = $gc->factory(function(GlobalContainer $c) {
       return new \V2Unit\V2UnitModel($c);
     });
 
@@ -268,7 +268,7 @@ 
   public static function init_3_load_config_file() {
     $dbsettings = array();
 
-    require(SN_ROOT_PHYSICAL . "config" . DOT_PHP_EX);
+    require(SN_ROOT_PHYSICAL."config".DOT_PHP_EX);
     self::$cache_prefix = !empty($dbsettings['cache_prefix']) ? $dbsettings['cache_prefix'] : $dbsettings['prefix'];
     self::$db_name = $dbsettings['name'];
     self::$sn_secret_word = $dbsettings['secretword'];

includes/classes/DBAL/DbTransaction.php

Doc Comments +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
    *   <p>true - транзакция должна быть запущена - для совместимости с $for_update</p>
    *   <p>false - всё равно - для совместимости с $for_update</p>
    *
-   * @return bool Текущий статус транзакции
+   * @return null|boolean Текущий статус транзакции
    */
   public function check($status = null) {
     $error_msg = false;

Spacing +2 added lines, -2 removed lines

@@ -51,7 +51,7 @@ 
 
     if (!empty($error_msg)) {
       // TODO - Убрать позже
-      print('<h1>СООБЩИТЕ ЭТО АДМИНУ: sn_db_transaction_check() - ' . $error_msg . '</h1>');
+      print('<h1>СООБЩИТЕ ЭТО АДМИНУ: sn_db_transaction_check() - '.$error_msg.'</h1>');
       $backtrace = debug_backtrace();
       array_shift($backtrace);
       pdump($backtrace);
@@ -64,7 +64,7 @@ 
   public function start($level = '') {
     $this->check(null);
 
-    $level ? $this->db->doExecute('SET TRANSACTION ISOLATION LEVEL ' . $level) : false;
+    $level ? $this->db->doExecute('SET TRANSACTION ISOLATION LEVEL '.$level) : false;
 
     $this->transaction_id++;
     $this->db->doExecute('START TRANSACTION');