Divergence / framework

src/Models/SetMappers/DefaultSetMapper.php

Spacing +4 added lines, -4 removed lines

@@ -24,22 +24,22 @@
 {
     public function setStringValue($value): ?string
     {
-        return mb_convert_encoding($value??'', DB::$encoding, 'auto'); // normalize encoding to ASCII
+        return mb_convert_encoding($value ?? '', DB::$encoding, 'auto'); // normalize encoding to ASCII
     }
 
     public function setBooleanValue($value): bool
     {
-        return (bool)$value;
+        return (bool) $value;
     }
 
     public function setDecimalValue($value): ?float
     {
-        return is_null($value) ? null : (float)preg_replace('/[^-\d.]/', '', $value);
+        return is_null($value) ? null : (float) preg_replace('/[^-\d.]/', '', $value);
     }
 
     public function setIntegerValue($value): ?int
     {
-        return is_null($value) ? null : (int)preg_replace('/[^-\d]/', '', $value);
+        return is_null($value) ? null : (int) preg_replace('/[^-\d]/', '', $value);
     }
 
     public function setTimestampValue($value): ?string

src/Models/ActiveRecord.php

Indentation +3 added lines, -3 removed lines

@@ -91,8 +91,8 @@ 
 
 
     /**
-    * @var array $validators Validation checks
-    */
+     * @var array $validators Validation checks
+     */
     public static $validators = [];
 
     /**
@@ -1115,7 +1115,7 @@ 
                         $attributeMappedClassFields[$property->getName()] = [];
                     }
                 }
-             }
+                }
         }
         return $attributeMappedClassFields;
     }

Spacing +14 added lines, -14 removed lines

@@ -725,11 +725,11 @@ 
 
             // create new or update existing
             if ($this->_isPhantom) {
-                DB::nonQuery((new Insert())->setTable(static::$tableName)->set($set), null, [static::class,'handleException']);
+                DB::nonQuery((new Insert())->setTable(static::$tableName)->set($set), null, [static::class, 'handleException']);
                 $primaryKey = $this->getPrimaryKey();
                 $insertID = DB::insertID();
                 $fields = static::getClassFields();
-                if ( ($fields[$primaryKey]['type'] ?? false) === 'integer') {
+                if (($fields[$primaryKey]['type'] ?? false) === 'integer') {
                     $insertID = intval($insertID);
                 }
                 $this->_record[$primaryKey] = $insertID;
@@ -739,7 +739,7 @@ 
             } elseif (count($set)) {
                 DB::nonQuery((new Update())->setTable(static::$tableName)->set($set)->where(
                     sprintf('`%s` = %u', static::_cn($this->getPrimaryKey()), $this->getPrimaryKeyValue())
-                ), null, [static::class,'handleException']);
+                ), null, [static::class, 'handleException']);
 
                 $this->_isUpdated = true;
             }
@@ -771,7 +771,7 @@ 
                 $recordValues = $this->_prepareRecordValues();
                 $set = static::_mapValuesToSet($recordValues);
 
-                DB::nonQuery((new Insert())->setTable(static::getHistoryTable())->set($set), null, [static::class,'handleException']);
+                DB::nonQuery((new Insert())->setTable(static::getHistoryTable())->set($set), null, [static::class, 'handleException']);
             }
         }
 
@@ -786,7 +786,7 @@ 
      */
     public static function delete($id)
     {
-        DB::nonQuery((new Delete())->setTable(static::$tableName)->where(sprintf('`%s` = %u', static::_cn(static::$primaryKey ? static::$primaryKey : 'ID'), $id)), null, [static::class,'handleException']);
+        DB::nonQuery((new Delete())->setTable(static::$tableName)->where(sprintf('`%s` = %u', static::_cn(static::$primaryKey ? static::$primaryKey : 'ID'), $id)), null, [static::class, 'handleException']);
 
         return DB::affectedRows() > 0;
     }
@@ -839,7 +839,7 @@ 
     {
         static::init();
         if (!static::fieldExists($field)) {
-            throw new Exception('getColumnName called on nonexisting column: ' . get_called_class().'->'.$field);
+            throw new Exception('getColumnName called on nonexisting column: '.get_called_class().'->'.$field);
         }
 
         return static::$_classFields[get_called_class()][$field]['columnName'];
@@ -1006,7 +1006,7 @@ 
             // clear buffer (required for the next query to work without running fetchAll first
             $Statement->closeCursor();
 
-            return $Connection->query((string)$query); // now the query should finish with no error
+            return $Connection->query((string) $query); // now the query should finish with no error
         } else {
             return DB::handleException($e, $query, $queryLog);
         }
@@ -1094,20 +1094,20 @@ 
     {
         $attributeMappedClassFields = [];
         $properties = (new ReflectionClass(static::class))->getProperties();
-        if(!empty($properties)) {
+        if (!empty($properties)) {
             foreach ($properties as $property) {
                 if ($property->isProtected()) {
 
                     // skip these because they are built in
-                    if (in_array($property->getName(),[
-                        '_classFields','_classRelationships','_classBeforeSave','_classAfterSave','_fieldsDefined','_relationshipsDefined','_eventsDefined','_record','_validator'
-                        ,'_validationErrors','_isDirty','_isValid','fieldSetMapper','_convertedValues','_originalValues','_isPhantom','_wasPhantom','_isNew','_isUpdated','_relatedObjects'
+                    if (in_array($property->getName(), [
+                        '_classFields', '_classRelationships', '_classBeforeSave', '_classAfterSave', '_fieldsDefined', '_relationshipsDefined', '_eventsDefined', '_record', '_validator'
+                        ,'_validationErrors', '_isDirty', '_isValid', 'fieldSetMapper', '_convertedValues', '_originalValues', '_isPhantom', '_wasPhantom', '_isNew', '_isUpdated', '_relatedObjects'
                     ])) {
                         continue;
                     }
 
                     if ($attributes = $property->getAttributes()) {
-                        foreach($attributes as $attribute) {
+                        foreach ($attributes as $attribute) {
                             $attributeMappedClassFields[$property->getName()] = $attribute->getArguments();
                         }
                     } else {
@@ -1280,7 +1280,7 @@ 
                 case 'boolean':
                     {
                         if (!isset($this->_convertedValues[$field])) {
-                            $this->_convertedValues[$field] = (bool)$value;
+                            $this->_convertedValues[$field] = (bool) $value;
                         }
 
                         return $this->_convertedValues[$field];
@@ -1516,7 +1516,7 @@ 
             foreach ($order as $key => $value) {
                 if (is_string($key)) {
                     $columnName = static::_cn($key);
-                    $direction = strtoupper($value)=='DESC' ? 'DESC' : 'ASC';
+                    $direction = strtoupper($value) == 'DESC' ? 'DESC' : 'ASC';
                 } else {
                     $columnName = static::_cn($value);
                     $direction = 'ASC';