Divergence / framework

src/App.php

Spacing +3 added lines, -3 removed lines

@@ -35,7 +35,7 @@ 
     {
         $this->ApplicationPath = $Path;
 
-        if (php_sapi_name()!=='cli') {
+        if (php_sapi_name() !== 'cli') {
             $this->Path = new Path($_SERVER['REQUEST_URI']);
         }
         
@@ -46,9 +46,9 @@ 
 
     public function config($Label)
     {
-        $Config = $this->ApplicationPath . '/config/' . $Label . '.php';
+        $Config = $this->ApplicationPath.'/config/'.$Label.'.php';
         if (!file_exists($Config)) {
-            throw new \Exception($Config . ' not found in '.static::class.'::config()');
+            throw new \Exception($Config.' not found in '.static::class.'::config()');
         }
         return require $Config;
     }

src/Models/ActiveRecord.php

Indentation +3 added lines, -3 removed lines

@@ -93,8 +93,8 @@ 
 
 
     /**
-    * @var array $validators Validation checks
-    */
+     * @var array $validators Validation checks
+     */
     public static $validators = [];
 
     /**
@@ -1134,7 +1134,7 @@ 
                         }
                     }
                 }
-             }
+                }
         }
         return [
             'fields' => $fields,

Spacing +16 added lines, -16 removed lines

@@ -727,11 +727,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;
@@ -741,7 +741,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;
             }
@@ -773,7 +773,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']);
             }
         }
 
@@ -788,7 +788,7 @@ 
      */
     public static function delete($id): bool
     {
-        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;
     }
@@ -841,7 +841,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'];
@@ -1008,7 +1008,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);
         }
@@ -1082,7 +1082,7 @@ 
             }
             $attributeFields = $class::_definedAttributeFields();
             if (!empty($attributeFields['fields'])) {
-                static::$_classFields[$className] = array_merge(static::$_classFields[$className],$attributeFields['fields']);
+                static::$_classFields[$className] = array_merge(static::$_classFields[$className], $attributeFields['fields']);
             }
             if (!empty($attributeFields['relations'])) {
                 $class::$relationships = $attributeFields['relations'];
@@ -1101,14 +1101,14 @@ 
         $fields = [];
         $relations = [];
         $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;
                     }
@@ -1116,10 +1116,10 @@ 
                     $isRelationship = false;
 
                     if ($attributes = $property->getAttributes()) {
-                        foreach($attributes as $attribute) {
+                        foreach ($attributes as $attribute) {
                             $attributeName = $attribute->getName();
                             if ($attributeName === Column::class) {
-                                $fields[$property->getName()] = array_merge($attribute->getArguments(),['attributeField'=>true]);
+                                $fields[$property->getName()] = array_merge($attribute->getArguments(), ['attributeField'=>true]);
                             }
 
                             if ($attributeName === Relation::class) {
@@ -1302,7 +1302,7 @@ 
                 case 'boolean':
                     {
                         if (!isset($this->_convertedValues[$field])) {
-                            $this->_convertedValues[$field] = (bool)$value;
+                            $this->_convertedValues[$field] = (bool) $value;
                         }
 
                         return $this->_convertedValues[$field];
@@ -1538,7 +1538,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';