Merge remote-tracking branch 'origin/1.4' into 2.0

# Conflicts: # .travis.yml # code/SQLite3Database.php # composer.json
silverstripe · Dec 7, 2017 · e8f4e55 · e8f4e55
2 parents 7304708 + 2bde264
commit e8f4e55
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 20 deletions.
diff --git a/code/SQLite3Database.php b/code/SQLite3Database.php
@@ -178,7 +178,8 @@ public function getLivesInMemory()
      *
      * @return string|null
      */
-    public function getPath() {
+    public function getPath()
+    {
         if ($this->getLivesInMemory()) {
             return null;
         }
@@ -278,14 +279,24 @@ public function random()
      * @param bool $invertedMatch
      * @return PaginatedList DataObjectSet of result pages
      */
-    public function searchEngine($classesToSearch, $keywords, $start, $pageLength, $sortBy = "Relevance DESC",
-        $extraFilter = "", $booleanSearch = false, $alternativeFileFilter = "", $invertedMatch = false
+    public function searchEngine(
+        $classesToSearch,
+        $keywords,
+        $start,
+        $pageLength,
+        $sortBy = "Relevance DESC",
+        $extraFilter = "",
+        $booleanSearch = false,
+        $alternativeFileFilter = "",
+        $invertedMatch = false
     ) {
-        $keywords = $this->escapeString(str_replace(array('*', '+', '-', '"', '\''), '', $keywords));
+        $start = (int)$start;
+        $pageLength = (int)$pageLength;
+        $keywords = $this->escapeString(str_replace(array('*','+','-','"','\''), '', $keywords));
         $htmlEntityKeywords = htmlentities(utf8_decode($keywords));
 
         $pageClass = 'SilverStripe\\CMS\\Model\\SiteTree';
-		$fileClass = 'SilverStripe\\Assets\\File';
+        $fileClass = 'SilverStripe\\Assets\\File';
 
         $extraFilters = array($pageClass => '', $fileClass => '');
 
@@ -307,14 +318,14 @@ public function searchEngine($classesToSearch, $keywords, $start, $pageLength, $
             $extraFilters[$fileClass] .= " AND ShowInSearch <> 0";
         }
 
-        $limit = $start . ", " . (int) $pageLength;
+        $limit = $start . ", " . $pageLength;
 
         $notMatch = $invertedMatch ? "NOT " : "";
         if ($keywords) {
             $match[$pageClass] = "
-				(Title LIKE '%$keywords%' OR MenuTitle LIKE '%$keywords%' OR Content LIKE '%$keywords%' OR MetaDescription LIKE '%$keywords%' OR
-				Title LIKE '%$htmlEntityKeywords%' OR MenuTitle LIKE '%$htmlEntityKeywords%' OR Content LIKE '%$htmlEntityKeywords%' OR MetaDescription LIKE '%$htmlEntityKeywords%')
-			";
+                (Title LIKE '%$keywords%' OR MenuTitle LIKE '%$keywords%' OR Content LIKE '%$keywords%' OR MetaDescription LIKE '%$keywords%' OR
+                Title LIKE '%$htmlEntityKeywords%' OR MenuTitle LIKE '%$htmlEntityKeywords%' OR Content LIKE '%$htmlEntityKeywords%' OR MetaDescription LIKE '%$htmlEntityKeywords%')
+            ";
             $fileClassSQL = Convert::raw2sql($fileClass);
             $match[$fileClass] = "(Name LIKE '%$keywords%' OR Title LIKE '%$keywords%') AND ClassName = '$fileClassSQL'";
 
@@ -464,7 +475,12 @@ public function clearTable($table)
         $this->query("DELETE FROM \"$table\"");
     }
 
-    public function comparisonClause($field, $value, $exact = false, $negate = false, $caseSensitive = null,
+    public function comparisonClause(
+        $field,
+        $value,
+        $exact = false,
+        $negate = false,
+        $caseSensitive = null,
         $parameterised = false
     ) {
         if ($exact && !$caseSensitive) {

diff --git a/code/SQLite3SchemaManager.php b/code/SQLite3SchemaManager.php
@@ -74,7 +74,6 @@ public function databaseList()
         $databases = array();
         if ($files !== false) {
             foreach ($files as $file) {
-
                 // Filter non-files
                 if (!is_file("$directory/$file")) {
                     continue;
@@ -173,8 +172,14 @@ public function createTable($table, $fields = null, $indexes = null, $options =
         return $table;
     }
 
-    public function alterTable($tableName, $newFields = null, $newIndexes = null, $alteredFields = null,
-        $alteredIndexes = null, $alteredOptions = null, $advancedOptions = null
+    public function alterTable(
+        $tableName,
+        $newFields = null,
+        $newIndexes = null,
+        $alteredFields = null,
+        $alteredIndexes = null,
+        $alteredOptions = null,
+        $advancedOptions = null
     ) {
         if ($newFields) {
             foreach ($newFields as $fieldName => $fieldSpec) {
@@ -345,8 +350,10 @@ public function fieldList($table)
 
         $fieldList = array();
         if ($sqlCreate && $sqlCreate['sql']) {
-            preg_match('/^[\s]*CREATE[\s]+TABLE[\s]+[\'"]?[a-zA-Z0-9_\\\]+[\'"]?[\s]*\((.+)\)[\s]*$/ims',
-                $sqlCreate['sql'], $matches
+            preg_match(
+                '/^[\s]*CREATE[\s]+TABLE[\s]+[\'"]?[a-zA-Z0-9_\\\]+[\'"]?[\s]*\((.+)\)[\s]*$/ims',
+                $sqlCreate['sql'],
+                $matches
             );
             $fields = isset($matches[1])
                 ? preg_split('/,(?=(?:[^\'"]*$)|(?:[^\'"]*[\'"][^\'"]*[\'"][^\'"]*)*$)/x', $matches[1])
@@ -425,7 +432,6 @@ public function indexList($table)
 
         // Enumerate each index and related fields
         foreach ($this->query("PRAGMA index_list(\"$table\")") as $index) {
-
             // The SQLite internal index name, not the actual Silverstripe name
             $indexName = $index["name"];
             $indexType = $index['unique'] ? 'unique' : 'index';

diff --git a/code/SQLiteDatabaseConfigurationHelper.php b/code/SQLiteDatabaseConfigurationHelper.php
@@ -108,13 +108,13 @@ public function requireDatabaseConnection($databaseConfig)
             return array(
             'success' => false,
             'error' => "Missing directory path"
-        );
+            );
         }
         if (empty($databaseConfig['database'])) {
             return array(
             'success' => false,
             'error' => "Missing database filename"
-        );
+            );
         }
 
         // Create and secure db directory
@@ -124,14 +124,14 @@ public function requireDatabaseConnection($databaseConfig)
             return array(
             'success' => false,
             'error' => sprintf('Cannot create path: "%s"', $path)
-        );
+            );
         }
         $dirSecured = self::secure_db_dir($path);
         if (!$dirSecured) {
             return array(
             'success' => false,
             'error' => sprintf('Cannot secure path through .htaccess: "%s"', $path)
-        );
+            );
         }
 
         $conn = $this->createConnection($databaseConfig, $error);