Divergence / framework

src/Models/ActiveRecord.php

Spacing +12 added lines, -12 removed lines

@@ -737,7 +737,7 @@ 
 
             // 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();
@@ -750,8 +750,8 @@ 
                 $this->_isNew = true;
             } elseif (count($set)) {
                 DB::nonQuery((new Update())->setTable(static::$tableName)->set($set)->where(
-                    sprintf('`%s` = %u', static::_cn($this->getPrimaryKey()), (string)$this->getPrimaryKeyValue())
-                ), null, [static::class,'handleException']);
+                    sprintf('`%s` = %u', static::_cn($this->getPrimaryKey()), (string) $this->getPrimaryKeyValue())
+                ), null, [static::class, 'handleException']);
 
                 $this->_isUpdated = true;
             }
@@ -783,11 +783,11 @@ 
                 $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']);
             }
         }
 
-        return static::delete((string)$this->getPrimaryKeyValue());
+        return static::delete((string) $this->getPrimaryKeyValue());
     }
 
     /**
@@ -798,7 +798,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;
     }
@@ -851,7 +851,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'];
@@ -1018,7 +1018,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);
         }
@@ -1117,8 +1117,8 @@ 
 
                     // skip these because they are built in
                     if (in_array($property->getName(), [
-                        '_classFields','_classRelationships','_classBeforeSave','_classAfterSave','_fieldsDefined','_relationshipsDefined','_eventsDefined','_record','_validator'
-                        ,'_validationErrors','_isDirty','_isValid','_convertedValues','_originalValues','_isPhantom','_wasPhantom','_isNew','_isUpdated','_relatedObjects'
+                        '_classFields', '_classRelationships', '_classBeforeSave', '_classAfterSave', '_fieldsDefined', '_relationshipsDefined', '_eventsDefined', '_record', '_validator'
+                        ,'_validationErrors', '_isDirty', '_isValid', '_convertedValues', '_originalValues', '_isPhantom', '_wasPhantom', '_isNew', '_isUpdated', '_relatedObjects'
                     ])) {
                         continue;
                     }
@@ -1248,7 +1248,7 @@ 
     private function applyNewValue($type, $field, $value)
     {
         if (!isset($this->_convertedValues[$field])) {
-            if (is_null($value) && !in_array($type, ['set','list'])) {
+            if (is_null($value) && !in_array($type, ['set', 'list'])) {
                 unset($this->_convertedValues[$field]);
                 return null;
             }
@@ -1521,7 +1521,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';

src/Controllers/MediaRequestHandler.php

Spacing +6 added lines, -6 removed lines

@@ -45,7 +45,7 @@ 
 
     public $searchConditions = [
         'Caption' => [
-            'qualifiers' => ['any','caption']
+            'qualifiers' => ['any', 'caption']
             ,'points' => 2
             ,'sql' => 'Caption LIKE "%%%s%%"',
         ]
@@ -202,7 +202,7 @@ 
         } elseif ($_SERVER['REQUEST_METHOD'] == 'PUT') {
             $put = fopen(static::$inputStream, 'r'); // open input stream
 
-            $tmp = tempnam('/tmp', 'dvr');  // use PHP to make a temporary file
+            $tmp = tempnam('/tmp', 'dvr'); // use PHP to make a temporary file
             $fp = fopen($tmp, 'w'); // open write stream to temp file
 
             // write
@@ -238,7 +238,7 @@ 
         }
 
         return $this->respond('uploadComplete', [
-            'success' => (bool)$Media
+            'success' => (bool) $Media
             ,'data' => $Media,
         ]);
     }
@@ -260,9 +260,9 @@ 
      */
     public function setCache(Response $response): Response
     {
-        $expires = 60*60*24*365;
+        $expires = 60 * 60 * 24 * 365;
         return $response->withHeader('Cache-Control', "public, max-age= $expires")
-        ->withHeader('Expires', gmdate('D, d M Y H:i:s \G\M\T', time()+$expires))
+        ->withHeader('Expires', gmdate('D, d M Y H:i:s \G\M\T', time() + $expires))
         ->withHeader('Pragma', 'public');
     }
 
@@ -329,7 +329,7 @@ 
         // if partial content provide proper response header
         if (isset($chunkStart)) {
             // only send 206 if response is less than the whole file
-            if ($end-$start+1<$size) {
+            if ($end - $start + 1 < $size) {
                 $response = $response->withStatus(206);
             }
             $response = $response->withHeader('Content-Range', "bytes $start-$end/$size")

src/Responders/MediaBuilder.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
     public function getBody(): StreamInterface
     {
         $fp = new Stream(fopen($this->template, 'r'));
-        if (isset($this->start) && $this->start>0) {
+        if (isset($this->start) && $this->start > 0) {
             return new LimitStream($fp, $this->length, $this->start);
         }
         return $fp;