supernova-ws / SuperNova

includes/classes/PropertyHider.php

Spacing +9 added lines, -9 removed lines

@@ -110,13 +110,13 @@ 
 
   protected function checkPropertyExists($name) {
     if (!array_key_exists($name, static::$_properties)) {
-      throw new ExceptionPropertyNotExists('Property [' . get_called_class() . '::' . $name . '] not exists when accessing via __get/__set', ERR_ERROR);
+      throw new ExceptionPropertyNotExists('Property ['.get_called_class().'::'.$name.'] not exists when accessing via __get/__set', 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);
     }
   }
 
@@ -134,14 +134,14 @@ 
 
     $result = null;
     // Now deciding - will we call a protected setter or will we work with protected property
-    if (method_exists($this, $methodName = 'get' . ucfirst($name))) {
+    if (method_exists($this, $methodName = 'get'.ucfirst($name))) {
       // If method exists - just calling it
       $result = call_user_func_array(array($this, $methodName), array());
-    } elseif (property_exists($this, $propertyName = '_' . $name)) {
+    } elseif (property_exists($this, $propertyName = '_'.$name)) {
       // No getter exists - works directly with protected property
       $result = $this->$propertyName;
     } else {
-      throw new ExceptionPropertyNotExists('Property [' . get_called_class() . '::' . $name . '] does not have getter/property to get', ERR_ERROR);
+      throw new ExceptionPropertyNotExists('Property ['.get_called_class().'::'.$name.'] does not have getter/property to get', ERR_ERROR);
     }
 
     return $result;
@@ -159,15 +159,15 @@ 
   protected function ___set($name, $value) {
     $result = null;
     // Now deciding - will we call a protected setter or will we work with protected property
-    if (method_exists($this, $methodName = 'set' . ucfirst($name))) {
+    if (method_exists($this, $methodName = 'set'.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 (property_exists($this, $propertyName = '_' . $name)) {
+    } elseif (property_exists($this, $propertyName = '_'.$name)) {
       // No setter exists - works directly with protected property
       $this->$propertyName = $value;
     } else {
-      throw new ExceptionPropertyNotExists('Property [' . get_called_class() . '::' . $name . '] does not have setter/property to set', ERR_ERROR);
+      throw new ExceptionPropertyNotExists('Property ['.get_called_class().'::'.$name.'] does not have setter/property to set', ERR_ERROR);
     }
 
     // TODO - should be primed only if value changed
@@ -210,7 +210,7 @@ 
     $this->checkPropertyExists($name);
 
     // Now deciding - will we call a protected setter or will we work with protected property
-    if (method_exists($this, $methodName = 'adj' . ucfirst($name))) {
+    if (method_exists($this, $methodName = 'adj'.ucfirst($name))) {
       // If method exists - just calling it
       // TODO - should return TRUE if value changed or FALSE otherwise
       $newValue = call_user_func_array(array($this, $methodName), array($diff));

includes/classes/DBRow.php

Spacing +12 added lines, -12 removed lines

@@ -86,7 +86,7 @@ 
    * @param db_mysql|null $db
    */
   public static function setDb($db = null) {
-    if(empty($db) || !($db instanceof db_mysql)) {
+    if (empty($db) || !($db instanceof db_mysql)) {
       $db = null;
     }
     static::$db = !empty($db) || !class_exists('classSupernova', false) ? $db : classSupernova::$db;
@@ -149,7 +149,7 @@ 
   public function dbLoad($dbId, $lockSkip = false) {
     $dbId = idval($dbId);
     if ($dbId <= 0) {
-      classSupernova::$debug->error(get_called_class() . '::' . __METHOD__ . ' $dbId not positive = ' . $dbId);
+      classSupernova::$debug->error(get_called_class().'::'.__METHOD__.' $dbId not positive = '.$dbId);
 
       return;
     }
@@ -161,7 +161,7 @@ 
       $this->dbGetLockById($this->_dbId);
     }
 
-    $db_row = doquery("SELECT * FROM `{{" . static::$_table . "}}` WHERE `" . static::$_dbIdFieldName . "` = " . $this->_dbId . " LIMIT 1 FOR UPDATE;", true);
+    $db_row = doquery("SELECT * FROM `{{".static::$_table."}}` WHERE `".static::$_dbIdFieldName."` = ".$this->_dbId." LIMIT 1 FOR UPDATE;", true);
     if (empty($db_row)) {
       return;
     }
@@ -193,7 +193,7 @@ 
     if ($this->isNew()) {
       // No DB_ID - new unit
       if ($this->isEmpty()) {
-        classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - object is empty on ' . get_called_class() . '::dbSave');
+        classSupernova::$debug->error(__FILE__.':'.__LINE__.' - object is empty on '.get_called_class().'::dbSave');
       }
       $this->dbInsert();
     } else {
@@ -202,7 +202,7 @@ 
         $this->dbDelete();
       } else {
         if (!sn_db_transaction_check(false)) {
-          classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - transaction should always be started on ' . get_called_class() . '::dbUpdate');
+          classSupernova::$debug->error(__FILE__.':'.__LINE__.' - transaction should always be started on '.get_called_class().'::dbUpdate');
         }
         $this->dbUpdate();
       }
@@ -230,12 +230,12 @@ 
   // TODO - protected
   public function dbInsert() {
     if (!$this->isNew()) {
-      classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - record db_id is not empty on ' . get_called_class() . '::dbInsert');
+      classSupernova::$debug->error(__FILE__.':'.__LINE__.' - record db_id is not empty on '.get_called_class().'::dbInsert');
     }
     $this->_dbId = $this->db_field_set_create($this->dbMakeFieldSet());
 
     if (empty($this->_dbId)) {
-      classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - error saving record ' . get_called_class() . '::dbInsert');
+      classSupernova::$debug->error(__FILE__.':'.__LINE__.' - error saving record '.get_called_class().'::dbInsert');
     }
 
     return $this->_dbId;
@@ -248,7 +248,7 @@ 
   public function dbUpdate() {
     // TODO - Update
     if ($this->isNew()) {
-      classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - unit db_id is empty on dbUpdate');
+      classSupernova::$debug->error(__FILE__.':'.__LINE__.' - unit db_id is empty on dbUpdate');
     }
     $this->db_field_update($this->dbMakeFieldSet(true));
   }
@@ -259,9 +259,9 @@ 
   // TODO - protected
   public function dbDelete() {
     if ($this->isNew()) {
-      classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - unit db_id is empty on dbDelete');
+      classSupernova::$debug->error(__FILE__.':'.__LINE__.' - unit db_id is empty on dbDelete');
     }
-    doquery("DELETE FROM {{" . static::$_table . "}} WHERE `" . static::$_dbIdFieldName . "` = " . $this->_dbId);
+    doquery("DELETE FROM {{".static::$_table."}} WHERE `".static::$_dbIdFieldName."` = ".$this->_dbId);
     $this->_dbId = 0;
     // Обо всём остальном должен позаботиться контейнер
   }
@@ -414,7 +414,7 @@ 
     $fields = implode(',', array_keys($field_set));
 
     $result = 0;
-    if (classSupernova::db_query("INSERT INTO `{{" . static::$_table . "}}` ({$fields}) VALUES ({$values});")) {
+    if (classSupernova::db_query("INSERT INTO `{{".static::$_table."}}` ({$fields}) VALUES ({$values});")) {
       $result = db_insert_id();
     }
 
@@ -450,7 +450,7 @@ 
 
     return empty($set_string)
       ? true
-      : classSupernova::db_query("UPDATE `{{" . static::$_table . "}}` SET {$set_string} WHERE `" . static::$_dbIdFieldName . "` = " . $this->_dbId);
+      : classSupernova::db_query("UPDATE `{{".static::$_table."}}` SET {$set_string} WHERE `".static::$_dbIdFieldName."` = ".$this->_dbId);
   }
 
 }