Divergence / framework

config/app.php

Spacing +2 added lines, -2 removed lines

@@ -10,6 +10,6 @@
 use Divergence\App as App;
 
 return [
-    'debug'			=>	file_exists(App::$App->ApplicationPath . '/.debug'),
-    'environment'	=>	(file_exists(App::$App->ApplicationPath . '/.dev') ? 'dev' : 'production'),
+    'debug'			=>	file_exists(App::$App->ApplicationPath.'/.debug'),
+    'environment'	=>	(file_exists(App::$App->ApplicationPath.'/.dev') ? 'dev' : 'production'),
 ];

src/Controllers/RecordsRequestHandler.php

Spacing +7 added lines, -10 removed lines

@@ -69,7 +69,7 @@ 
             // check access for API response modes
             $this->responseBuilder = JsonBuilder::class;
 
-            if (in_array($this->responseBuilder, [JsonBuilder::class,JsonpBuilder::class])) {
+            if (in_array($this->responseBuilder, [JsonBuilder::class, JsonpBuilder::class])) {
                 if (!$this->checkAPIAccess()) {
                     return $this->throwAPIUnAuthorizedError();
                 }
@@ -82,8 +82,7 @@ 
     public function handleRecordsRequest($action = false): ResponseInterface
     {
         switch ($action ? $action : $action = $this->shiftPath()) {
-            case 'save':
-                {
+            case 'save' : {
                     return $this->handleMultiSaveRequest();
                 }
 
@@ -224,9 +223,7 @@ 
         }
 
         switch ($action ? $action : $action = $this->shiftPath()) {
-            case '':
-            case false:
-                {
+            case '' : case false : {
                     $className = static::$recordClass;
 
                     return $this->respond($this->getTemplateName($className::$singularNoun), [
@@ -314,7 +311,7 @@ 
     {
         $className = static::$recordClass;
 
-        $this->prepareResponseModeJSON(['POST','PUT']);
+        $this->prepareResponseModeJSON(['POST', 'PUT']);
 
         if (!empty($_REQUEST['data'])) {
             if ($className::fieldExists(key($_REQUEST['data']))) {
@@ -389,7 +386,7 @@ 
     {
         $className = static::$recordClass;
 
-        $this->prepareResponseModeJSON(['POST','PUT','DELETE']);
+        $this->prepareResponseModeJSON(['POST', 'PUT', 'DELETE']);
 
         if (!empty($_REQUEST['data'])) {
             if ($className::fieldExists(key($_REQUEST['data']))) {
@@ -453,7 +450,7 @@ 
             return $this->throwUnauthorizedError();
         }
 
-        if (in_array($_SERVER['REQUEST_METHOD'], ['POST','PUT'])) {
+        if (in_array($_SERVER['REQUEST_METHOD'], ['POST', 'PUT'])) {
             if ($this->responseBuilder === JsonBuilder::class) {
                 $_REQUEST = JSON::getRequestData();
                 if (is_array($_REQUEST['data'])) {
@@ -603,7 +600,7 @@ 
 
     public function getTemplateName($noun)
     {
-        return preg_replace_callback('/\s+([a-zA-Z])/', function ($matches) {
+        return preg_replace_callback('/\s+([a-zA-Z])/', function($matches) {
             return strtoupper($matches[1]);
         }, $noun);
     }

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/IO/Database/MySQL.php

Spacing +7 added lines, -7 removed lines

@@ -100,7 +100,7 @@ 
      * @param string $label
      * @return void
      */
-    public static function setConnection(string $label=null)
+    public static function setConnection(string $label = null)
     {
         if ($label === null && static::$currentConnection === null) {
             static::$currentConnection = static::getDefaultLabel();
@@ -133,7 +133,7 @@ 
      * @uses static::$Timezone
      * @uses PDO
      */
-    public static function getConnection($label=null)
+    public static function getConnection($label = null)
     {
         if ($label === null) {
             if (static::$currentConnection === null) {
@@ -152,10 +152,10 @@ 
 
             if (isset($config['socket'])) {
                 // socket connection
-                $DSN = 'mysql:unix_socket=' . $config['socket'] . ';dbname=' . $config['database'];
+                $DSN = 'mysql:unix_socket='.$config['socket'].';dbname='.$config['database'];
             } else {
                 // tcp connection
-                $DSN = 'mysql:host=' . $config['host'] . ';port=' . $config['port'] .';dbname=' . $config['database'];
+                $DSN = 'mysql:host='.$config['host'].';port='.$config['port'].';dbname='.$config['database'];
             }
 
             try {
@@ -186,7 +186,7 @@ 
     {
         if (is_string($data)) {
             $data = static::getConnection()->quote($data);
-            $data = substr($data, 1, strlen($data)-2);
+            $data = substr($data, 1, strlen($data) - 2);
             return $data;
         } elseif (is_array($data)) {
             foreach ($data as $key=>$string) {
@@ -511,7 +511,7 @@ 
         $error = static::getConnection()->errorInfo();
         $message = $error[2];
 
-        if (App::$App->Config['environment']=='dev') {
+        if (App::$App->Config['environment'] == 'dev') {
             /** @var \Whoops\Handler\PrettyPageHandler */
             $Handler = \Divergence\App::$App->whoops->popHandler();
 
@@ -555,7 +555,7 @@ 
      */
     protected static function startQueryLog($query)
     {
-        if (App::$App->Config['environment']!='dev') {
+        if (App::$App->Config['environment'] != 'dev') {
             return false;
         }
 

src/Models/Relations.php

Spacing +6 added lines, -6 removed lines

@@ -76,7 +76,7 @@ 
 
     protected static function _prepareOneOne(string $relationship, array $options): array
     {
-        $options['local'] = $options['local'] ?? $relationship . 'ID';
+        $options['local'] = $options['local'] ?? $relationship.'ID';
         $options['foreign'] = $options['foreign'] ?? 'ID';
         return $options;
     }
@@ -84,7 +84,7 @@ 
     protected static function _prepareOneMany(string $classShortName, array $options): array
     {
         $options['local'] = $options['local'] ?? 'ID';
-        $options['foreign'] = $options['foreign'] ?? $classShortName. 'ID';
+        $options['foreign'] = $options['foreign'] ?? $classShortName.'ID';
         $options['indexField'] = $options['indexField'] ?? false;
         $options['conditions'] = $options['conditions'] ?? [];
         $options['conditions'] = is_string($options['conditions']) ? [$options['conditions']] : $options['conditions'];
@@ -105,7 +105,7 @@ 
         $options['local'] = $options['local'] ?? 'ContextID';
         $options['foreign'] = $options['foreign'] ?? 'ID';
         $options['classField'] = $options['classField'] ?? 'ContextClass';
-        $options['allowedClasses'] = $options['allowedClasses'] ?? (!empty(static::$contextClasses)?static::$contextClasses:null);
+        $options['allowedClasses'] = $options['allowedClasses'] ?? (!empty(static::$contextClasses) ? static::$contextClasses : null);
         return $options;
     }
 
@@ -118,7 +118,7 @@ 
             throw new Exception('Relationship type many-many option requires a linkClass setting.');
         }
 
-        $options['linkLocal'] = $options['linkLocal'] ?? $classShortName . 'ID';
+        $options['linkLocal'] = $options['linkLocal'] ?? $classShortName.'ID';
         $options['linkForeign'] = $options['linkForeign'] ?? basename(str_replace('\\', '/', $options['class']::$rootClass)).'ID';
         $options['local'] = $options['local'] ?? 'ID';
         $options['foreign'] = $options['foreign'] ?? 'ID';
@@ -138,7 +138,7 @@ 
             $options['type'] = 'one-one';
         }
 
-        switch($options['type']) {
+        switch ($options['type']) {
             case 'one-one':
                 $options = static::_prepareOneOne($relationship, $options);
                 break;
@@ -152,7 +152,7 @@ 
                 $options = static::_prepareContextParent($options);
                 break;
             case 'many-many':
-                $options = static::_prepareManyMany($classShortName,$options);
+                $options = static::_prepareManyMany($classShortName, $options);
                 break;
         }
 

src/Models/Media/Media.php

Spacing +7 added lines, -7 removed lines

@@ -71,7 +71,7 @@ 
 
     public static $searchConditions = [
         'Caption' => [
-            'qualifiers' => ['any','caption'],
+            'qualifiers' => ['any', 'caption'],
             'points' => 2,
             'sql' => 'Caption LIKE "%%%s%%"',
         ],
@@ -100,7 +100,7 @@ 
     public static $defaultFilenameFormat = 'default.%s.jpg';
     public static $newDirectoryPermissions = 0775;
     public static $newFilePermissions = 0664;
-    public static $magicPath = null;//'/usr/share/misc/magic.mgc';
+    public static $magicPath = null; //'/usr/share/misc/magic.mgc';
     public static $useFaceDetection = true;
     public static $faceDetectionTimeLimit = 10;
 
@@ -469,10 +469,10 @@ 
 
     public function initializeFromAnalysis($mediaInfo)
     {
-        $this->setValue('MIMEType',$mediaInfo['mimeType']);
-        $this->setValue('Width',$mediaInfo['width']);
-        $this->setValue('Height',$mediaInfo['height']);
-        $this->setValue('Duration',$mediaInfo['duration']);
+        $this->setValue('MIMEType', $mediaInfo['mimeType']);
+        $this->setValue('Width', $mediaInfo['width']);
+        $this->setValue('Height', $mediaInfo['height']);
+        $this->setValue('Duration', $mediaInfo['duration']);
     }
 
 
@@ -520,7 +520,7 @@ 
         // determine handler
         $staticClass = get_called_class();
         if (!isset(static::$mimeHandlers[$mediaInfo['mimeType']]) || $staticClass != __CLASS__) {
-            throw new Exception('No class registered for mime type "' . $mediaInfo['mimeType'] . '"');
+            throw new Exception('No class registered for mime type "'.$mediaInfo['mimeType'].'"');
         } else {
             $className = $mediaInfo['className'] = static::$mimeHandlers[$mediaInfo['mimeType']];
 

src/Models/Media/Audio.php

Spacing +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
         $PreviewMedia = Media::createFromFile($previewPath, [
             'ContextClass' => 'Media'
             ,'ContextID' => $this->getValue('ID')
-            ,'Caption' => sprintf('%u sec preview (%us-%us)', static::$previewDuration, $startTime, $startTime+static::$previewDuration),
+            ,'Caption' => sprintf('%u sec preview (%us-%us)', static::$previewDuration, $startTime, $startTime + static::$previewDuration),
         ]);
 
         return $PreviewMedia;

src/Models/Getters.php

Indentation +12 added lines, -12 removed lines

@@ -51,24 +51,24 @@
         return $records;
     }
 
-   /**
-    * Uses ContextClass and ContextID to get an object.
-    * Quick way to attach things to other objects in a one-to-one relationship
-    *
-    * @param array $record An array of database rows.
-    * @return ActiveRecord|null An array of instantiated ActiveRecord models from the provided data.
-    */
+    /**
+     * Uses ContextClass and ContextID to get an object.
+     * Quick way to attach things to other objects in a one-to-one relationship
+     *
+     * @param array $record An array of database rows.
+     * @return ActiveRecord|null An array of instantiated ActiveRecord models from the provided data.
+     */
     public static function getByContextObject(ActiveRecord $Record, $options = [])
     {
         return static::getByContext($Record::$rootClass, $Record->getPrimaryKeyValue(), $options);
     }
 
     /**
-    * Same as getByContextObject but this method lets you specify the ContextClass manually.
-    *
-    * @param array $record An array of database rows.
-    * @return ActiveRecord|null An array of instantiated ActiveRecord models from the provided data.
-    */
+     * Same as getByContextObject but this method lets you specify the ContextClass manually.
+     *
+     * @param array $record An array of database rows.
+     * @return ActiveRecord|null An array of instantiated ActiveRecord models from the provided data.
+     */
     public static function getByContext($contextClass, $contextID, $options = [])
     {
         if (!static::fieldExists('ContextClass')) {

Spacing +10 added lines, -10 removed lines

@@ -185,7 +185,7 @@ 
         return DB::oneRecord(
             (new Select())->setTable(static::$tableName)->where(join(') AND (', $conditions))->order($order ? join(',', $order) : '')->limit('1'),
             null,
-            [static::class,'handleException']
+            [static::class, 'handleException']
         );
     }
 
@@ -198,7 +198,7 @@ 
      */
     public static function getByQuery($query, $params = [])
     {
-        return static::instantiateRecord(DB::oneRecord($query, $params, [static::class,'handleException']));
+        return static::instantiateRecord(DB::oneRecord($query, $params, [static::class, 'handleException']));
     }
 
     /**
@@ -309,9 +309,9 @@ 
             $select->limit(sprintf('%u,%u', $options['offset'], $options['limit']));
         }
         if ($options['indexField']) {
-            return DB::table(static::_cn($options['indexField']), $select, null, null, [static::class,'handleException']);
+            return DB::table(static::_cn($options['indexField']), $select, null, null, [static::class, 'handleException']);
         } else {
-            return DB::allRecords($select, null, [static::class,'handleException']);
+            return DB::allRecords($select, null, [static::class, 'handleException']);
         }
     }
 
@@ -324,7 +324,7 @@ 
      */
     public static function getAllByQuery($query, $params = [])
     {
-        return static::instantiateRecords(DB::allRecords($query, $params, [static::class,'handleException']));
+        return static::instantiateRecords(DB::allRecords($query, $params, [static::class, 'handleException']));
     }
 
     /**
@@ -337,7 +337,7 @@ 
      */
     public static function getTableByQuery($keyField, $query, $params = [])
     {
-        return static::instantiateRecords(DB::table($keyField, $query, $params, [static::class,'handleException']));
+        return static::instantiateRecords(DB::table($keyField, $query, $params, [static::class, 'handleException']));
     }
 
     /**
@@ -395,9 +395,9 @@ 
         }
 
         if ($options['indexField']) {
-            return DB::table(static::_cn($options['indexField']), $select, null, null, [static::class,'handleException']);
+            return DB::table(static::_cn($options['indexField']), $select, null, null, [static::class, 'handleException']);
         } else {
-            return DB::allRecords($select, null, [static::class,'handleException']);
+            return DB::allRecords($select, null, [static::class, 'handleException']);
         }
     }
 
@@ -467,7 +467,7 @@ 
                     return ', '.$value.' AS '.$key;
                 }
             } else {
-                return ', ' . $columns;
+                return ', '.$columns;
             }
         }
     }
@@ -481,7 +481,7 @@ 
     public static function buildHaving($having)
     {
         if (!empty($having)) {
-            return ' (' . (is_array($having) ? join(') AND (', static::_mapConditions($having)) : $having) . ')';
+            return ' ('.(is_array($having) ? join(') AND (', static::_mapConditions($having)) : $having).')';
         }
     }
 }