|
1
|
|
|
<?php |
|
2
|
|
|
namespace ApacheSolrForTypo3\Solr\System\Service; |
|
3
|
|
|
|
|
4
|
|
|
/* |
|
5
|
|
|
* This file is part of the TYPO3 CMS project. |
|
6
|
|
|
* |
|
7
|
|
|
* It is free software; you can redistribute it and/or modify it under |
|
8
|
|
|
* the terms of the GNU General Public License, either version 2 |
|
9
|
|
|
* of the License, or any later version. |
|
10
|
|
|
* |
|
11
|
|
|
* For the full copyright and license information, please read the |
|
12
|
|
|
* LICENSE.txt file that was distributed with this source code. |
|
13
|
|
|
* |
|
14
|
|
|
* The TYPO3 project - inspiring people to share! |
|
15
|
|
|
*/ |
|
16
|
|
|
|
|
17
|
|
|
use ApacheSolrForTypo3\Solr\System\Configuration\ConfigurationManager; |
|
18
|
|
|
use ApacheSolrForTypo3\Solr\System\Configuration\TypoScriptConfiguration; |
|
19
|
|
|
use TYPO3\CMS\Core\TypoScript\TypoScriptService; |
|
20
|
|
|
use TYPO3\CMS\Core\Utility\GeneralUtility; |
|
21
|
|
|
use TYPO3\CMS\Extbase\Configuration\ConfigurationManager as ExtbaseConfigurationManager; |
|
22
|
|
|
use TYPO3\CMS\Extbase\Reflection\ObjectAccess; |
|
23
|
|
|
use TYPO3\CMS\Extbase\Service\FlexFormService; |
|
24
|
|
|
|
|
25
|
|
|
/** |
|
26
|
|
|
* Service to ease work with configurations. |
|
27
|
|
|
* |
|
28
|
|
|
* @author Daniel Siepmann <[email protected]> |
|
29
|
|
|
*/ |
|
30
|
|
|
class ConfigurationService |
|
31
|
|
|
{ |
|
32
|
|
|
/** |
|
33
|
|
|
* @var FlexFormService |
|
34
|
|
|
*/ |
|
35
|
|
|
protected $flexFormService; |
|
36
|
|
|
|
|
37
|
|
|
/** |
|
38
|
|
|
* @var TypoScriptService |
|
39
|
|
|
*/ |
|
40
|
|
|
protected $typoScriptService; |
|
41
|
|
|
|
|
42
|
34 |
|
public function __construct() |
|
43
|
|
|
{ |
|
44
|
34 |
|
$this->flexFormService = GeneralUtility::makeInstance(FlexFormService::class); |
|
45
|
34 |
|
$this->typoScriptService = GeneralUtility::makeInstance(TypoScriptService::class); |
|
46
|
34 |
|
} |
|
47
|
|
|
|
|
48
|
|
|
/** |
|
49
|
|
|
* @param FlexFormService $flexFormService |
|
50
|
|
|
*/ |
|
51
|
1 |
|
public function setFlexFormService($flexFormService) |
|
52
|
|
|
{ |
|
53
|
1 |
|
$this->flexFormService = $flexFormService; |
|
54
|
1 |
|
} |
|
55
|
|
|
|
|
56
|
|
|
/** |
|
57
|
|
|
* @param \TYPO3\CMS\Extbase\Service\TypoScriptService $typoScriptService |
|
58
|
|
|
*/ |
|
59
|
1 |
|
public function setTypoScriptService($typoScriptService) |
|
60
|
|
|
{ |
|
61
|
1 |
|
$this->typoScriptService = $typoScriptService; |
|
|
|
|
|
|
62
|
1 |
|
} |
|
63
|
|
|
|
|
64
|
|
|
/** |
|
65
|
|
|
* Override the given solrConfiguration with flex form configuration. |
|
66
|
|
|
* |
|
67
|
|
|
* @param string $flexFormData The raw data from database. |
|
68
|
|
|
* @param TypoScriptConfiguration $solrTypoScriptConfiguration |
|
69
|
|
|
* |
|
70
|
|
|
* @return void |
|
71
|
|
|
*/ |
|
72
|
34 |
|
public function overrideConfigurationWithFlexFormSettings($flexFormData, TypoScriptConfiguration $solrTypoScriptConfiguration) |
|
73
|
|
|
{ |
|
74
|
34 |
|
if (empty($flexFormData)) { |
|
75
|
32 |
|
return; |
|
76
|
|
|
} |
|
77
|
|
|
|
|
78
|
2 |
|
$flexFormConfiguration = $this->flexFormService->convertFlexFormContentToArray($flexFormData); |
|
79
|
2 |
|
$flexFormConfiguration = $this->overrideFilter($flexFormConfiguration); |
|
80
|
2 |
|
$flexFormConfiguration = $this->typoScriptService->convertPlainArrayToTypoScriptArray($flexFormConfiguration); |
|
81
|
|
|
|
|
82
|
2 |
|
$solrTypoScriptConfiguration->mergeSolrConfiguration($flexFormConfiguration, true, false); |
|
83
|
2 |
|
} |
|
84
|
|
|
|
|
85
|
|
|
/** |
|
86
|
|
|
* Override filter in configuration. |
|
87
|
|
|
* |
|
88
|
|
|
* Will parse the filter from flex form structure and rewrite it as typoscript structure. |
|
89
|
|
|
* |
|
90
|
|
|
* @param array $flexFormConfiguration |
|
91
|
|
|
* |
|
92
|
|
|
* @return array |
|
93
|
|
|
*/ |
|
94
|
2 |
|
protected function overrideFilter(array $flexFormConfiguration) |
|
95
|
|
|
{ |
|
96
|
2 |
|
$filter = $this->getFilterFromFlexForm($flexFormConfiguration); |
|
97
|
2 |
|
unset($flexFormConfiguration['search']['query']['filter']); |
|
98
|
2 |
|
if (empty($filter)) { |
|
99
|
|
|
return $flexFormConfiguration; |
|
100
|
|
|
} |
|
101
|
|
|
|
|
102
|
2 |
|
return array_merge_recursive( |
|
103
|
|
|
$flexFormConfiguration, |
|
104
|
|
|
[ |
|
105
|
|
|
'search' => [ |
|
106
|
|
|
'query' => [ |
|
107
|
2 |
|
'filter' => $filter, |
|
108
|
|
|
], |
|
109
|
|
|
], |
|
110
|
|
|
] |
|
111
|
|
|
); |
|
112
|
|
|
} |
|
113
|
|
|
|
|
114
|
|
|
/** |
|
115
|
|
|
* Returns filter in typoscript form from flex form. |
|
116
|
|
|
* |
|
117
|
|
|
* @param array $flexFormConfiguration |
|
118
|
|
|
* |
|
119
|
|
|
* @return array |
|
120
|
|
|
*/ |
|
121
|
2 |
|
protected function getFilterFromFlexForm(array $flexFormConfiguration) |
|
122
|
|
|
{ |
|
123
|
2 |
|
$filterConfiguration = []; |
|
124
|
2 |
|
$filters = ObjectAccess::getPropertyPath($flexFormConfiguration, 'search.query.filter'); |
|
125
|
|
|
|
|
126
|
2 |
|
if (empty($filters)) { |
|
127
|
|
|
return $filterConfiguration; |
|
128
|
|
|
} |
|
129
|
|
|
|
|
130
|
2 |
|
foreach ($filters as $filter) { |
|
131
|
2 |
|
$filter = $filter['field']; |
|
132
|
2 |
|
$filterConfiguration[] = $filter['field'] . ':' . $filter['value']; |
|
133
|
|
|
} |
|
134
|
2 |
|
return $filterConfiguration; |
|
135
|
|
|
} |
|
136
|
|
|
} |
|
137
|
|
|
|
timohund /
ext-solr
Our type inference engine has found an assignment to a property that is incompatible with the declared type of that property.
Either this assignment is in error or the assigned type should be added to the documentation/type hint for that property..