tonyair
/
silverstripe-fulltextsearch
mirror of https://github.com/silverstripe/silverstripe-fulltextsearch
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch '3.9' into 3

This commit is contained in:
Steve Boyd 2021-12-15 14:41:40 +13:00
parent ec054c666b 95f50f6ce2
commit 573fbf9edc
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
composer.json
View File

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

13
src/Solr/Reindex/Handlers/SolrReindexImmediateHandler.php
View File

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