silverstripe-labs / silverstripe-sqlite3

code/SQLite3Database.php

Doc Comments +2 added lines, -1 removed lines

@@ -183,6 +183,7 @@ 
      * Gets pragma value.
      * 
      * @param string pragma name
+     * @param string $pragma
      * @return string the pragma value
      */
     public function getPragma($pragma)
@@ -238,7 +239,7 @@ 
      * for now we use the MySQL implementation with the MATCH()AGAINST() uglily replaced with LIKE
      * 
      * @param string $keywords Keywords as a space separated string
-     * @return object DataObjectSet of result pages
+     * @return PaginatedList DataObjectSet of result pages
      */
     public function searchEngine($classesToSearch, $keywords, $start, $pageLength, $sortBy = "Relevance DESC",
         $extraFilter = "", $booleanSearch = false, $alternativeFileFilter = "", $invertedMatch = false

Spacing +12 added lines, -12 removed lines

@@ -96,7 +96,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)) {
@@ -112,11 +112,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']);
@@ -267,7 +267,7 @@ 
             $extraFilters['File'] .= " AND ShowInSearch <> 0";
         }
 
-        $limit = $start . ", " . (int) $pageLength;
+        $limit = $start.", ".(int) $pageLength;
 
         $notMatch = $invertedMatch ? "NOT " : "";
         if ($keywords) {
@@ -291,7 +291,7 @@ 
         $baseClasses = array('SiteTree' => '', 'File' => '');
         $queries = array();
         foreach ($classesToSearch as $class) {
-            $queries[$class] = DataList::create($class)->where($notMatch . $match[$class] . $extraFilters[$class], "")->dataQuery()->query();
+            $queries[$class] = DataList::create($class)->where($notMatch.$match[$class].$extraFilters[$class], "")->dataQuery()->query();
             $fromArr = $queries[$class]->getFrom();
             $baseClasses[$class] = reset($fromArr);
         }
@@ -353,7 +353,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);
 
@@ -440,7 +440,7 @@ 
                 $comp = 'LIKE';
             }
             if ($negate) {
-                $comp = 'NOT ' . $comp;
+                $comp = 'NOT '.$comp;
             }
         }
 
@@ -456,7 +456,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);
             }
         }
 
@@ -481,7 +481,7 @@ 
             $date = "'$date'";
         }
 
-        $modifier = empty($modifiers) ? '' : ", '" . implode("', '", $modifiers) . "'";
+        $modifier = empty($modifiers) ? '' : ", '".implode("', '", $modifiers)."'";
         return "strftime('$format', $date$modifier)";
     }
 
@@ -498,7 +498,7 @@ 
             $date = "'$date'";
         }
 
-        $modifier = empty($modifiers) ? '' : ", '" . implode("', '", $modifiers) . "'";
+        $modifier = empty($modifiers) ? '' : ", '".implode("', '", $modifiers)."'";
         return "datetime($date$modifier, '$interval')";
     }
 
@@ -526,8 +526,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)";
     }

_register_database.php

Indentation +30 added lines, -30 removed lines

@@ -1,45 +1,45 @@
 <?php
 
 $sqliteDatabaseAdapterRegistryFields = array(
-	'path' => array(
-		'title' => 'Directory path<br /><small>Absolute path to directory, writeable by the webserver user.<br />'
-			. 'Recommended to be outside of your webroot</small>',
-		'default' => dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR . 'assets' . DIRECTORY_SEPARATOR . '.sqlitedb'
-	),
-	'database' => array(
-		'title' => 'Database filename (extension .sqlite)',
-		'default' => 'database.sqlite'
-	)
+    'path' => array(
+        'title' => 'Directory path<br /><small>Absolute path to directory, writeable by the webserver user.<br />'
+            . 'Recommended to be outside of your webroot</small>',
+        'default' => dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR . 'assets' . DIRECTORY_SEPARATOR . '.sqlitedb'
+    ),
+    'database' => array(
+        'title' => 'Database filename (extension .sqlite)',
+        'default' => 'database.sqlite'
+    )
 );
 
 // Basic SQLLite3 Database
 DatabaseAdapterRegistry::register(
-	array(
-		'class' => 'SQLite3Database',
-		'title' => 'SQLite 3.3+ (using SQLite3)',
-		'helperPath' => dirname(__FILE__).'/code/SQLiteDatabaseConfigurationHelper.php',
-		'supported' => class_exists('SQLite3'),
-		'missingExtensionText' => 'The <a href="http://php.net/manual/en/book.sqlite3.php">SQLite3</a> 
+    array(
+        'class' => 'SQLite3Database',
+        'title' => 'SQLite 3.3+ (using SQLite3)',
+        'helperPath' => dirname(__FILE__).'/code/SQLiteDatabaseConfigurationHelper.php',
+        'supported' => class_exists('SQLite3'),
+        'missingExtensionText' => 'The <a href="http://php.net/manual/en/book.sqlite3.php">SQLite3</a> 
 			PHP Extension is not available. Please install or enable it of them and refresh this page.',
-		'fields' => array_merge($sqliteDatabaseAdapterRegistryFields, array('key' => array(
-			'title' => 'Encryption key<br><small>This function is experimental and requires configuration of an '
-			. 'encryption module</small>',
-			'default' => ''
-		)))
-	)
+        'fields' => array_merge($sqliteDatabaseAdapterRegistryFields, array('key' => array(
+            'title' => 'Encryption key<br><small>This function is experimental and requires configuration of an '
+            . 'encryption module</small>',
+            'default' => ''
+        )))
+    )
 );
 
 // PDO database
 DatabaseAdapterRegistry::register(
-	array(
-		'class' => 'SQLite3PDODatabase',
-		'title' => 'SQLite 3.3+ (using PDO)',
-		'helperPath' => dirname(__FILE__).'/code/SQLiteDatabaseConfigurationHelper.php',
-		'supported' => (class_exists('PDO') && in_array('sqlite', PDO::getAvailableDrivers())),
-		'missingExtensionText' => 
-			'Either the <a href="http://php.net/manual/en/book.pdo.php">PDO Extension</a> or the
+    array(
+        'class' => 'SQLite3PDODatabase',
+        'title' => 'SQLite 3.3+ (using PDO)',
+        'helperPath' => dirname(__FILE__).'/code/SQLiteDatabaseConfigurationHelper.php',
+        'supported' => (class_exists('PDO') && in_array('sqlite', PDO::getAvailableDrivers())),
+        'missingExtensionText' => 
+            'Either the <a href="http://php.net/manual/en/book.pdo.php">PDO Extension</a> or the
 			<a href="http://php.net/manual/en/book.sqlite3.php">SQLite3 PDO Driver</a>
 			are unavailable. Please install or enable these and refresh this page.',
-		'fields' => $sqliteDatabaseAdapterRegistryFields
-	)
+        'fields' => $sqliteDatabaseAdapterRegistryFields
+    )
 );

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 	'path' => array(
 		'title' => 'Directory path<br /><small>Absolute path to directory, writeable by the webserver user.<br />'
 			. 'Recommended to be outside of your webroot</small>',
-		'default' => dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR . 'assets' . DIRECTORY_SEPARATOR . '.sqlitedb'
+		'default' => dirname(dirname(__FILE__)).DIRECTORY_SEPARATOR.'assets'.DIRECTORY_SEPARATOR.'.sqlitedb'
 	),
 	'database' => array(
 		'title' => 'Database filename (extension .sqlite)',

code/SQLite3Query.php

Spacing +2 added lines, -2 removed lines

@@ -43,7 +43,7 @@ 
     public function seek($row)
     {
         $this->handle->reset();
-        $i=0;
+        $i = 0;
         while ($i < $row && $row = @$this->handle->fetchArray()) {
             $i++;
         }
@@ -55,7 +55,7 @@ 
      */
     public function numRecords()
     {
-        $c=0;
+        $c = 0;
         while ($this->handle->fetchArray()) {
             $c++;
         }

code/SQLiteDatabaseConfigurationHelper.php

Spacing +2 added lines, -2 removed lines

@@ -26,7 +26,7 @@ 
                 self::create_db_dir($databaseConfig['path']);
                 self::secure_db_dir($databaseConfig['path']);
             }
-            $file = $databaseConfig['path'] . '/' . $databaseConfig['database'];
+            $file = $databaseConfig['path'].'/'.$databaseConfig['database'];
             $conn = null;
         
             switch ($databaseConfig['type']) {
@@ -212,7 +212,7 @@ 
      */
     public static function secure_db_dir($path)
     {
-        return (is_writeable($path)) ? file_put_contents($path . '/.htaccess', 'deny from all') : false;
+        return (is_writeable($path)) ? file_put_contents($path.'/.htaccess', 'deny from all') : false;
     }
     
     public function requireDatabaseAlterPermissions($databaseConfig)

code/SQLite3SchemaManager.php

Spacing +12 added lines, -12 removed lines

@@ -44,7 +44,7 @@ 
          
         // If using file based database ensure any existing file is removed
         $parameters = $this->database->getParameters();
-        $fullpath = $parameters['path'] . '/' . $name;
+        $fullpath = $parameters['path'].'/'.$name;
         if (is_writable($fullpath)) {
             unlink($fullpath);
         }
@@ -242,7 +242,7 @@ 
     public function alterField($tableName, $fieldName, $fieldSpec)
     {
         $oldFieldList = $this->fieldList($tableName);
-        $fieldNameList = '"' . implode('","', array_keys($oldFieldList)) . '"';
+        $fieldNameList = '"'.implode('","', array_keys($oldFieldList)).'"';
 
         if (!empty($_REQUEST['avoidConflict']) && Director::isDev()) {
             $fieldSpec = preg_replace('/\snot null\s/i', ' NOT NULL ON CONFLICT REPLACE ', $fieldSpec);
@@ -256,12 +256,12 @@ 
         // Update field spec
         $newColsSpec = array();
         foreach ($oldFieldList as $name => $oldSpec) {
-            $newColsSpec[] = "\"$name\" " . ($name == $fieldName ? $fieldSpec : $oldSpec);
+            $newColsSpec[] = "\"$name\" ".($name == $fieldName ? $fieldSpec : $oldSpec);
         }
 
         $queries = array(
             "BEGIN TRANSACTION",
-            "CREATE TABLE \"{$tableName}_alterfield_{$fieldName}\"(" . implode(',', $newColsSpec) . ")",
+            "CREATE TABLE \"{$tableName}_alterfield_{$fieldName}\"(".implode(',', $newColsSpec).")",
             "INSERT INTO \"{$tableName}_alterfield_{$fieldName}\" SELECT {$fieldNameList} FROM \"$tableName\"",
             "DROP TABLE \"$tableName\"",
             "ALTER TABLE \"{$tableName}_alterfield_{$fieldName}\" RENAME TO \"$tableName\"",
@@ -295,15 +295,15 @@ 
         $oldCols = array();
         $newColsSpec = array();
         foreach ($oldFieldList as $name => $spec) {
-            $oldCols[] = "\"$name\"" . (($name == $oldName) ? " AS $newName" : '');
-            $newColsSpec[] = "\"" . (($name == $oldName) ? $newName : $name) . "\" $spec";
+            $oldCols[] = "\"$name\"".(($name == $oldName) ? " AS $newName" : '');
+            $newColsSpec[] = "\"".(($name == $oldName) ? $newName : $name)."\" $spec";
         }
 
         // SQLite doesn't support direct renames through ALTER TABLE
         $queries = array(
             "BEGIN TRANSACTION",
-            "CREATE TABLE \"{$tableName}_renamefield_{$oldName}\" (" . implode(',', $newColsSpec) . ")",
-            "INSERT INTO \"{$tableName}_renamefield_{$oldName}\" SELECT " . implode(',', $oldCols) . " FROM \"$tableName\"",
+            "CREATE TABLE \"{$tableName}_renamefield_{$oldName}\" (".implode(',', $newColsSpec).")",
+            "INSERT INTO \"{$tableName}_renamefield_{$oldName}\" SELECT ".implode(',', $oldCols)." FROM \"$tableName\"",
             "DROP TABLE \"$tableName\"",
             "ALTER TABLE \"{$tableName}_renamefield_{$oldName}\" RENAME TO \"$tableName\"",
             "COMMIT"
@@ -455,7 +455,7 @@ 
      */
     public function boolean($values)
     {
-        $default = empty($values['default']) ? 0 : (int)$values['default'];
+        $default = empty($values['default']) ? 0 : (int) $values['default'];
         return "BOOL NOT NULL DEFAULT $default";
     }
 
@@ -499,7 +499,7 @@ 
      */
     public function enum($values)
     {
-        $tablefield = $values['table'] . '.' . $values['name'];
+        $tablefield = $values['table'].'.'.$values['name'];
         $enumValues = implode(',', $values['enums']);
         
         // Ensure the cache table exists
@@ -569,7 +569,7 @@ 
      */
     public function int($values, $asDbValue = false)
     {
-        return "INTEGER({$values['precision']}) " . strtoupper($values['null']) . " DEFAULT " . (int)$values['default'];
+        return "INTEGER({$values['precision']}) ".strtoupper($values['null'])." DEFAULT ".(int) $values['default'];
     }
 
     /**
@@ -644,7 +644,7 @@ 
 
     public function hasTable($tableName)
     {
-        return (bool)$this->preparedQuery(
+        return (bool) $this->preparedQuery(
             'SELECT name FROM sqlite_master WHERE type = ? AND name = ?',
             array('table', $tableName)
         )->first();

code/SQLite3QueryBuilder.php

Spacing +4 added lines, -4 removed lines

@@ -49,7 +49,7 @@ 
             $rowParts[] = implode(', ', $parts);
         }
         $columnSQL = implode(', ', $columns);
-        $sql = "INSERT INTO {$into}{$nl}($columnSQL){$nl}SELECT " . implode("{$nl}UNION ALL SELECT ", $rowParts);
+        $sql = "INSERT INTO {$into}{$nl}($columnSQL){$nl}SELECT ".implode("{$nl}UNION ALL SELECT ", $rowParts);
         
         return $sql;
     }
@@ -72,14 +72,14 @@ 
         }
 
         // For literal values return this as the limit SQL
-        if (! is_array($limit)) {
+        if (!is_array($limit)) {
             return "{$nl}LIMIT $limit";
         }
 
         // Assert that the array version provides the 'limit' key
-        if (! array_key_exists('limit', $limit) || ($limit['limit'] !== null && ! is_numeric($limit['limit']))) {
+        if (!array_key_exists('limit', $limit) || ($limit['limit'] !== null && !is_numeric($limit['limit']))) {
             throw new InvalidArgumentException(
-                'SQLite3QueryBuilder::buildLimitSQL(): Wrong format for $limit: '. var_export($limit, true)
+                'SQLite3QueryBuilder::buildLimitSQL(): Wrong format for $limit: '.var_export($limit, true)
             );
         }
 

_configure_database.php

Indentation +6 added lines, -6 removed lines

@@ -4,11 +4,11 @@
 global $databaseConfig;
 if(strpos($databaseConfig['type'], 'SQLite') === 0) {
 
-	if(defined('SS_SQLITE_DATABASE_PATH')) {
-		$databaseConfig['path'] = SS_SQLITE_DATABASE_PATH;
-	}
+    if(defined('SS_SQLITE_DATABASE_PATH')) {
+        $databaseConfig['path'] = SS_SQLITE_DATABASE_PATH;
+    }
 
-	if(defined('SS_SQLITE_DATABASE_KEY')) {
-		$databaseConfig['key'] = SS_SQLITE_DATABASE_KEY;
-	}
+    if(defined('SS_SQLITE_DATABASE_KEY')) {
+        $databaseConfig['key'] = SS_SQLITE_DATABASE_KEY;
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -2,13 +2,13 @@
 
 // Script called from ConfigureFromEnv.php
 global $databaseConfig;
-if(strpos($databaseConfig['type'], 'SQLite') === 0) {
+if (strpos($databaseConfig['type'], 'SQLite') === 0) {
 
-	if(defined('SS_SQLITE_DATABASE_PATH')) {
+	if (defined('SS_SQLITE_DATABASE_PATH')) {
 		$databaseConfig['path'] = SS_SQLITE_DATABASE_PATH;
 	}
 
-	if(defined('SS_SQLITE_DATABASE_KEY')) {
+	if (defined('SS_SQLITE_DATABASE_KEY')) {
 		$databaseConfig['key'] = SS_SQLITE_DATABASE_KEY;
 	}
 }