Merge branch '3.9' into 3

composer.json

@@ -25,8 +25,8 @@
         "silverstripe/framework": "^4.10",
         "monolog/monolog": "~1.15",
         "ptcinc/solr-php-client": "^1.0",
-        "symfony/process": "^3.2",
-        "tractorcow/silverstripe-proxy-db" : "~0.1"
+        "symfony/process": "^3.2 || ^4",
+        "tractorcow/silverstripe-proxy-db": "~0.1"
     },
     "require-dev": {
         "silverstripe/cms": "^4.0",
@@ -42,11 +42,7 @@
     "bin": [
         "bin/fulltextsearch_quickstart"
     ],
-    "extra": {
-        "branch-alias": {
-            "3.x-dev": "3.7.x-dev"
-        }
-    },
+    "extra": [],
     "scripts": {
         "lint": "phpcs -s src/ tests/",
         "lint-clean": "phpcbf src/ tests/"
@@ -57,4 +53,4 @@
     },
     "minimum-stability": "dev",
     "prefer-stable": true
-}
+}

src/Solr/Reindex/Handlers/SolrReindexImmediateHandler.php

@@ -95,9 +95,16 @@ class SolrReindexImmediateHandler extends SolrReindexBase
         $scriptPath = sprintf("%s%scli-script.php", $frameworkPath, DIRECTORY_SEPARATOR);
         $scriptTask = "{$php} {$scriptPath} dev/tasks/{$taskName}";
 
-        $cmd = "{$scriptTask} index={$indexClassEscaped} class={$class} group={$group} groups={$groups} variantstate={$statevar}";
-        $cmd .= " verbose=1";
-        $logger->info("Running '$cmd'");
+        $cmd = [
+            $scriptTask,
+            "index={$indexClassEscaped}",
+            "class={$class}",
+            "group={$group}",
+            "groups={$groups}",
+            "variantstate={$statevar}",
+            "verbose=1"
+        ];
+        $logger->info('Running ' . implode(' ', $cmd));
 
         // Execute script via shell
         $process = new Process($cmd);