More linting

Author: Nik Barham

src/Orm/Collection.php

@@ -413,53 +413,56 @@ public function filter($filter, $invertAffix = false)
                     foreach ($valueList as $value) {
                         // Compare based on affix (else == )
                         switch ($affix) {
-                            
-                            case '=': case '==': default:
+                            case '=':
+                            case '==':
+                            default:
                                 if ($item->$property == $value) {
                                     // Found match - move on to next filter
                                     continue 3; // Back to foreach $filter
                                 }
-                            break;
+                                break;
 
-                            case '!=': case '!': case '<>':
+                            case '!=':
+                            case '!':
+                            case '<>':
                                 if ($item->$property == $value) {
                                     // Found a negative match, remove this item and move on to next property
                                     unset($copy[$itemKey]);
                                     continue 4; // Back to foreach $copy
                                 }
-                            break;
+                                break;
 
                             case '>':
                                 if ($item->$property <= $value) {
                                     // Found a negative match, remove this item and move on to next property
                                     unset($copy[$itemKey]);
                                     continue 4; // Back to foreach $copy
                                 }
-                            break;
+                                break;
 
                             case '>=':
                                 if ($item->$property < $value) {
                                     // Found a negative match, remove this item and move on to next property
                                     unset($copy[$itemKey]);
                                     continue 4; // Back to foreach $copy
                                 }
-                            break;
+                                break;
 
                             case '<':
                                 if ($item->$property >= $value) {
                                     // Found a negative match, remove this item and move on to next property
                                     unset($copy[$itemKey]);
                                     continue 4; // Back to foreach $copy
                                 }
-                            break;
+                                break;
 
                             case '<=':
                                 if ($item->$property > $value) {
                                     // Found a negative match, remove this item and move on to next property
                                     unset($copy[$itemKey]);
                                     continue 4; // Back to foreach $copy
                                 }
-                            break;
+                                break;
                         }
                     }
 

src/Orm/Model.php

@@ -118,10 +118,10 @@ final public static function factory($where, $classOrTablename = null, $schema =
         foreach ($data as $row) {
             if (!$obj = Model::$instance[$namespace][$table][$row['id']]) {
                 // Database data object unique to this object
-                $data_obj = Data::make($row, $table, $schema);
+                $dataObj = Data::make($row, $table, $schema);
 
                 // Create the object!!
-                $obj = new $class($data_obj);
+                $obj = new $class($dataObj);
 
                 // Store it in the object cache.
                 Model::$instance[$namespace][$table][$row['id']] = $obj;
@@ -229,13 +229,13 @@ public static function newData(Model $parentObject = null)
         // Make a new blank data object
         $data = new Data([], $table, $schema, false, true);
 
-        $table_schema = $schema->getTable($table);
+        $tableSchema = $schema->getTable($table);
         // "Foreign" tables use a "parent" table for their primary key. We need that parent object for it's id.
-        if ($table_schema['type'] == 'foreign') {
+        if ($tableSchema['type'] == 'foreign') {
             if (!$parentObject) {
                 throw new Exception\Model('NO_PARENT_OBJECT', [$namespace, $class, $table, static::$tablename]);
             }
-            $model_data->id = $parentObject->id;
+            $data->id = $parentObject->id;
         }
 
         return $data;