Minor Style Cleaning

Author: Nik Barham

src/Database/QueryBuilder.php

@@ -277,18 +277,18 @@ public function join($table, $rawtype = null)
         $type = 'JOIN';
         if ($rawtype) {
             switch (strtolower($rawtype)) {
-            case 'left':
-                $type = 'LEFT JOIN';
-                break;
-            case 'left outer':
-                $type = 'LEFT OUTER JOIN';
-                break;
-            case 'cross':
-                $type = 'CROSS JOIN';
-                break;
-            default:
-                throw new Exception\QueryBuilder('Unknown Join Type');
-        }
+                case 'left':
+                    $type = 'LEFT JOIN';
+                    break;
+                case 'left outer':
+                    $type = 'LEFT OUTER JOIN';
+                    break;
+                case 'cross':
+                    $type = 'CROSS JOIN';
+                    break;
+                default:
+                    throw new Exception\QueryBuilder('Unknown Join Type');
+            }
         }
 
         $this->joins[] = ['table' => $table, 'type' => $type, 'where' => [], 'on' => []];

src/Exception/Model.php

@@ -20,8 +20,8 @@ private function makeMessage($code, $data)
             case 'NO_GENERATED_SCHEMA':
                 return 'NO_GENERATED_SCHEMA: Could not find a schema definition for namespace: ' . $data;
             case 'NO_SCHEMA':
-                list($class_or_table, $normalised, $class) = $data;
-                return 'NO_SCHEMA: Could not find a schema definition for this object (' . $class_or_table . '). Are you sure the classname and table are the same (case-insensitive). Otherwise, try calling Model::generate_schema(true) to refresh the schema cache.';
+                list($classOrTable, $normalised, $class) = $data;
+                return 'NO_SCHEMA: Could not find a schema definition for this object (' . $classOrTable . '). Are you sure the classname and table are the same (case-insensitive). Otherwise, try calling Model::generate_schema(true) to refresh the schema cache.';
 
             case 'MODEL_DATA:SET_WHEN_LOCKED':
                 list($column, $value) = $data;
@@ -91,8 +91,8 @@ private function makeMessage($code, $data)
                 return 'MODEL_DATA:CANNOT_DELETE_UNCOMMITED_DATA: You cannot mark a Data object for deletion if it does not represent an existing row in the database.';
 
             case 'MODEL_DATA:INCORRECT_MODEL_FOR_RELATIONSHIP':
-                list($column, $supplied_table, $expected_table) = $data;
-                return 'MODEL_DATA:INCORRECT_MODEL_FOR_RELATIONSHIP: Property "'.$column.'" expected a Model relating to table "'.$expected_table.'" but a Model for "'.$supplied_table.'" was given instead.';
+                list($column, $suppliedTable, $expectedTable) = $data;
+                return 'MODEL_DATA:INCORRECT_MODEL_FOR_RELATIONSHIP: Property "'.$column.'" expected a Model relating to table "'.$expectedTable.'" but a Model for "'.$suppliedTable.'" was given instead.';
             default:
                 return "Unknown error code ({$code})";
         }

src/Orm/DataAccess.php

@@ -23,14 +23,14 @@ public function commit($mode, $table, $id, $data, $externalData, $schema)
 
         // Insert/Update the data, and store the insert id into a variable
         if ($mode == 'delete') {
-            $q = QueryBuilder::delete($table, ['id' => $id]);
-            $query->sql($q);
+            $sql = QueryBuilder::delete($table, ['id' => $id]);
+            $query->sql($sql);
         } elseif ($mode == 'insert') {
-            $q = QueryBuilder::insert($table, $data);
-            $query->sql($q)->sql("SELECT last_insert_id() into @id");
+            $sql = QueryBuilder::insert($table, $data);
+            $query->sql($sql)->sql("SELECT last_insert_id() into @id");
         } elseif ($mode == 'update') {
-            $q = QueryBuilder::update($table, $data)->where(['id' => $id]);
-            $query->sql($q)->sql("SELECT {$id} into @id");
+            $sql = QueryBuilder::update($table, $data)->where(['id' => $id]);
+            $query->sql($sql)->sql("SELECT {$id} into @id");
         }
 
         if ($mode != 'delete') {
@@ -66,7 +66,7 @@ public function commit($mode, $table, $id, $data, $externalData, $schema)
         }
 
         $query->transaction();
-        $values = $query->execute();
+        $query->execute();
         $query->commit();
 
         // Don't return anything if we just deleted this row.

src/Orm/Model.php

@@ -367,7 +367,7 @@ public function __sleep()
     public function __wakeup()
     {
         // Store the object in the object cache
-        Model::$instance[$namespace][$this->table][strtolower(get_called_class())][$this->id] = $this;
+        Model::$instance[$this->namespace][$this->table][strtolower(get_called_class())][$this->id] = $this;
 
         if (!$this->_data) {
             // If we don't have a data object, then this object wasn't cached, regenerate the Data object.

src/Orm/SchemaGenerator.php

@@ -10,6 +10,8 @@
 
 class SchemaGenerator implements SchemaGeneratorInterface
 {
+    protected $connection;
+    
     public function __construct(ConnectionInterface $connection)
     {
         $this->connection = $connection;
@@ -72,12 +74,12 @@ public function generate()
                     // Otherwise, append the column name to the table name to make sure it is unique.
                     // (e.g "your_account" table and "my_account_id" -> your_account_my_account)
                     if ($columnRoot == $row['referenced_table_name']) {
-                        $property_name = Schema::underscoreCase($tableName);
+                        $propertyName = Schema::underscoreCase($tableName);
                     } else {
-                        $property_name = Schema::underscoreCase($tableName) . '_' . $columnRoot;
+                        $propertyName = Schema::underscoreCase($tableName) . '_' . $columnRoot;
                     }
 
-                    $model[$refTableName]['one-to-many'][$property_name] = array('table' => $tableName, 'column_name' => $row['column_name']);
+                    $model[$refTableName]['one-to-many'][$propertyName] = array('table' => $tableName, 'column_name' => $row['column_name']);
                 }
             }
         }
@@ -97,18 +99,18 @@ public function generate()
                     // If the column name is named based on the foreign table name, then use the pivot table name as the property name
                     // This is the normal/usual case
                     if ($table['column'] == Schema::underscoreCase($table['table']) . '_id') {
-                        $property_name = Schema::underscoreCase($pivottablename);
+                        $propertyName = Schema::underscoreCase($pivottablename);
                     } else {
                         // Else append the column name to the pivot table name.
                         // This is mostly for when a pivot table references the same table twice, and so
                         // needs to have a unique name for at least one of the columns (which is not based on the table name)
-                        $property_name = Schema::underscoreCase($pivottablename) . '_' . $table['column_raw'];
+                        $propertyName = Schema::underscoreCase($pivottablename) . '_' . $table['column_raw'];
                     }
 
                     // Outersect of tables to create an array of all OTHER foreign keys in this table, for this foreign key.
                     $othertables = array_values(array_diff_assoc($tableinfo, array($i => $table)));
 
-                    $model[ $table['table'] ][ 'many-to-many' ][ $property_name ] = array(
+                    $model[ $table['table'] ][ 'many-to-many' ][ $propertyName ] = array(
                         'pivot' => $pivottablename,
                         'connections' => $othertables,
                         'id' => $table['column'],