silverstripe-labs / silverstripe-sqlite3

code/SQLite3Database.php

Spacing +12 added lines, -12 removed lines

@@ -107,7 +107,7 @@ 
 
         // Ensure database name is set
         if (empty($parameters['database'])) {
-            $parameters['database'] = 'database' . self::database_extension();
+            $parameters['database'] = 'database'.self::database_extension();
         }
         $dbName = $parameters['database'];
         if (!self::is_valid_database_name($dbName)) {
@@ -123,11 +123,11 @@ 
         } else {
             // Ensure path is given
             if (empty($parameters['path'])) {
-                $parameters['path'] = ASSETS_PATH . '/.sqlitedb';
+                $parameters['path'] = ASSETS_PATH.'/.sqlitedb';
             }
 
             //assumes that the path to dbname will always be provided:
-            $file = $parameters['path'] . '/' . $dbName;
+            $file = $parameters['path'].'/'.$dbName;
             if (!file_exists($parameters['path'])) {
                 SQLiteDatabaseConfigurationHelper::create_db_dir($parameters['path']);
                 SQLiteDatabaseConfigurationHelper::secure_db_dir($parameters['path']);
@@ -286,7 +286,7 @@ 
             $extraFilters['File'] .= " AND ShowInSearch <> 0";
         }
 
-        $limit = $start . ", " . (int) $pageLength;
+        $limit = $start.", ".(int) $pageLength;
 
         $notMatch = $invertedMatch ? "NOT " : "";
         if ($keywords) {
@@ -311,7 +311,7 @@ 
         $queries = array();
         foreach ($classesToSearch as $class) {
             $queries[$class] = DataList::create($class)
-                ->where($notMatch . $match[$class] . $extraFilters[$class])
+                ->where($notMatch.$match[$class].$extraFilters[$class])
                 ->dataQuery()
                 ->query();
             $fromArr = $queries[$class]->getFrom();
@@ -376,7 +376,7 @@ 
             $totalCount += $query->unlimitedRowCount();
         }
 
-        $fullQuery = implode(" UNION ", $querySQLs) . " ORDER BY $sortBy LIMIT $limit";
+        $fullQuery = implode(" UNION ", $querySQLs)." ORDER BY $sortBy LIMIT $limit";
         // Get records
         $records = $this->preparedQuery($fullQuery, $queryParameters);
 
@@ -463,7 +463,7 @@ 
                 $comp = 'LIKE';
             }
             if ($negate) {
-                $comp = 'NOT ' . $comp;
+                $comp = 'NOT '.$comp;
             }
         }
 
@@ -479,7 +479,7 @@ 
         preg_match_all('/%(.)/', $format, $matches);
         foreach ($matches[1] as $match) {
             if (array_search($match, array('Y', 'm', 'd', 'H', 'i', 's', 'U')) === false) {
-                user_error('formattedDatetimeClause(): unsupported format character %' . $match, E_USER_WARNING);
+                user_error('formattedDatetimeClause(): unsupported format character %'.$match, E_USER_WARNING);
             }
         }
 
@@ -504,7 +504,7 @@ 
             $date = "'$date'";
         }
 
-        $modifier = empty($modifiers) ? '' : ", '" . implode("', '", $modifiers) . "'";
+        $modifier = empty($modifiers) ? '' : ", '".implode("', '", $modifiers)."'";
         return "strftime('$format', $date$modifier)";
     }
 
@@ -521,7 +521,7 @@ 
             $date = "'$date'";
         }
 
-        $modifier = empty($modifiers) ? '' : ", '" . implode("', '", $modifiers) . "'";
+        $modifier = empty($modifiers) ? '' : ", '".implode("', '", $modifiers)."'";
         return "datetime($date$modifier, '$interval')";
     }
 
@@ -549,8 +549,8 @@ 
             $date2 = "'$date2'";
         }
 
-        $modifier1 = empty($modifiers1) ? '' : ", '" . implode("', '", $modifiers1) . "'";
-        $modifier2 = empty($modifiers2) ? '' : ", '" . implode("', '", $modifiers2) . "'";
+        $modifier1 = empty($modifiers1) ? '' : ", '".implode("', '", $modifiers1)."'";
+        $modifier2 = empty($modifiers2) ? '' : ", '".implode("', '", $modifiers2)."'";
 
         return "strftime('%s', $date1$modifier1) - strftime('%s', $date2$modifier2)";
     }