Skip to content

Commit

Permalink
Cleanup fix cs
Browse files Browse the repository at this point in the history
  • Loading branch information
hannesbochmann committed Mar 25, 2024
1 parent ec94b05 commit 0d47d6a
Show file tree
Hide file tree
Showing 18 changed files with 319 additions and 319 deletions.
2 changes: 1 addition & 1 deletion Configuration/TCA/tx_mksearch_indexerconfigs.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
'hidden' => [
'exclude' => 1,
'label' => 'LLL:EXT:mksearch/Resources/Private/Language/locallang_db.xlf:tx_mksearch_indexerconfigs.hidden',
'config' => [
'config' => [
'type' => 'check',
'default' => '0',
],
Expand Down
6 changes: 3 additions & 3 deletions ext_mksanitizedparameter_rules.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

$rulesForFrontend = [
'mksearch' => [
// wird in Solr verwendet und wird vor der eigentlichen Suche bereinigt.
// Also hier nix machen.
'term' => FILTER_UNSAFE_RAW,
// wird in Solr verwendet und wird vor der eigentlichen Suche bereinigt.
// Also hier nix machen.
'term' => FILTER_UNSAFE_RAW,
'fq' => [
\DMK\MkSanitizedParameters\Rules::DEFAULT_RULES_KEY => FILTER_UNSAFE_RAW,
],
Expand Down
16 changes: 8 additions & 8 deletions indexer/class.tx_mksearch_indexer_TtAddressAddress.php
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,11 @@ public function prepareSearchData($tableName, $rawData, tx_mksearch_interface_In
'mksearch',
'indexer_TtAddress_prepareData_beforeAddFields',
[
'rawData' => &$rawData,
'options' => $options,
'indexDoc' => &$indexDoc,
'boost' => &$boost,
'abort' => &$abort,
'rawData' => &$rawData,
'options' => $options,
'indexDoc' => &$indexDoc,
'boost' => &$boost,
'abort' => &$abort,
],
$this
);
Expand Down Expand Up @@ -145,9 +145,9 @@ public function prepareSearchData($tableName, $rawData, tx_mksearch_interface_In
'mksearch',
'indexer_TtAddress_prepareData_afterAddFields',
[
'rawData' => &$rawData,
'options' => $options,
'indexDoc' => &$indexDoc,
'rawData' => &$rawData,
'options' => $options,
'indexDoc' => &$indexDoc,
],
$this
);
Expand Down
12 changes: 6 additions & 6 deletions indexer/class.tx_mksearch_indexer_TxNewsNews.php
Original file line number Diff line number Diff line change
Expand Up @@ -295,12 +295,12 @@ protected function indexNews(

$bodyText = '';
foreach ([
$news->getBodytext(),
$news->getTeaser(),
$news->getTitle(),
$content,
$abstract,
] as $html) {
$news->getBodytext(),
$news->getTeaser(),
$news->getTitle(),
$content,
$abstract,
] as $html) {
if (empty($html)) {
continue;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -202,10 +202,10 @@ public function getResultList()
}

return [
'table' => $content,
'totalsize' => $cnt,
'pager' => '<div class="pager">'.$sPagerData.'</div>',
];
'table' => $content,
'totalsize' => $cnt,
'pager' => '<div class="pager">'.$sPagerData.'</div>',
];
}

/**
Expand Down
16 changes: 8 additions & 8 deletions service/engine/class.tx_mksearch_service_engine_ZendLucene.php
Original file line number Diff line number Diff line change
Expand Up @@ -350,15 +350,15 @@ public function search(array $fields = [], array $options = [])

// Re-Build new $fields by "AND"ing fe_groups
$fields = ['fe_groups_aware' => [
[
'term' => [self::FE_GROUP_FIELD => $fe_groups],
'sign' => true,
],
[
'term' => $fields, // Original fields
'sign' => true,
],
[
'term' => [self::FE_GROUP_FIELD => $fe_groups],
'sign' => true,
],
[
'term' => $fields, // Original fields
'sign' => true,
],
],
];
}
$queryString = $this->buildQuery($fields);
Expand Down
88 changes: 44 additions & 44 deletions service/ext_localconf.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,66 +64,66 @@
'mksearch',
'tx_mksearch_indexer_internal_index',
[
'title' => 'Index',
'description' => 'Service for indices',
'subtype' => 'int_index',
'available' => true,
'priority' => 50,
'quality' => 50,
'os' => '',
'exec' => '',
'classFile' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('mksearch').'service/internal/class.tx_mksearch_service_internal_Index.php',
'className' => 'tx_mksearch_service_internal_Index',
]
'title' => 'Index',
'description' => 'Service for indices',
'subtype' => 'int_index',
'available' => true,
'priority' => 50,
'quality' => 50,
'os' => '',
'exec' => '',
'classFile' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('mksearch').'service/internal/class.tx_mksearch_service_internal_Index.php',
'className' => 'tx_mksearch_service_internal_Index',
]
);
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addService(
'mksearch',
'mksearch',
'tx_mksearch_indexer_internal_composite',
[
'title' => 'Indexer configuration composites',
'description' => 'Service for indexer configuration composites',
'subtype' => 'int_composite',
'available' => true,
'priority' => 50,
'quality' => 50,
'os' => '',
'exec' => '',
'classFile' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('mksearch').'service/internal/class.tx_mksearch_service_internal_Composite.php',
'className' => 'tx_mksearch_service_internal_Composite',
]
'title' => 'Indexer configuration composites',
'description' => 'Service for indexer configuration composites',
'subtype' => 'int_composite',
'available' => true,
'priority' => 50,
'quality' => 50,
'os' => '',
'exec' => '',
'classFile' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('mksearch').'service/internal/class.tx_mksearch_service_internal_Composite.php',
'className' => 'tx_mksearch_service_internal_Composite',
]
);
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addService(
'mksearch',
'mksearch',
'tx_mksearch_indexer_internal_config',
[
'title' => 'Indexer configuration',
'description' => 'Service for indexer configurations',
'subtype' => 'int_config',
'available' => true,
'priority' => 50,
'quality' => 50,
'os' => '',
'exec' => '',
'classFile' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('mksearch').'service/internal/class.tx_mksearch_service_internal_Config.php',
'className' => 'tx_mksearch_service_internal_Config',
]
'title' => 'Indexer configuration',
'description' => 'Service for indexer configurations',
'subtype' => 'int_config',
'available' => true,
'priority' => 50,
'quality' => 50,
'os' => '',
'exec' => '',
'classFile' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('mksearch').'service/internal/class.tx_mksearch_service_internal_Config.php',
'className' => 'tx_mksearch_service_internal_Config',
]
);
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addService(
'mksearch',
'mksearch',
'tx_mksearch_service_internal_Keyword',
[
'title' => 'Keyword Service',
'description' => 'Service for keywords',
'subtype' => 'keyword',
'available' => true,
'priority' => 50,
'quality' => 50,
'os' => '',
'exec' => '',
'classFile' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('mksearch').'service/internal/class.tx_mksearch_service_internal_Keyword.php',
'className' => 'tx_mksearch_service_internal_Keyword',
]
'title' => 'Keyword Service',
'description' => 'Service for keywords',
'subtype' => 'keyword',
'available' => true,
'priority' => 50,
'quality' => 50,
'os' => '',
'exec' => '',
'classFile' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('mksearch').'service/internal/class.tx_mksearch_service_internal_Keyword.php',
'className' => 'tx_mksearch_service_internal_Keyword',
]
);
10 changes: 5 additions & 5 deletions service/internal/class.tx_mksearch_service_internal_Index.php
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,11 @@ public function indexRecord($tableName, $uid, $prefer = false, $resolver = false
}
// dummy record bauen!
$record = [
'recid' => $uid,
'tablename' => $tableName,
'resolver' => $resolver,
'data' => is_array($data) ? serialize($data) : $data,
];
'recid' => $uid,
'tablename' => $tableName,
'resolver' => $resolver,
'data' => is_array($data) ? serialize($data) : $data,
];
// Indizierung starten
$this->executeQueueData([$record]);
}
Expand Down
4 changes: 2 additions & 2 deletions tests/indexer/class.tx_mksearch_tests_indexer_BaseTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ public function testCheckOptionsIncludeReturnsCorrectDefaultValueWithEmptyCatego

list($extKey, $cType) = $indexer->getContentType();
$options = [
'include.' => ['categories.' => [3]],
'include.' => ['categories.' => [3]],
];

$aRawData = ['uid' => 1, 'pid' => 1];
Expand All @@ -200,7 +200,7 @@ public function testCheckOptionsExcludeReturnsCorrectDefaultValueWithEmptyCatego

list($extKey, $cType) = $indexer->getContentType();
$options = [
'exclude.' => ['categories.' => [3]],
'exclude.' => ['categories.' => [3]],
];

$aRawData = ['uid' => 1, 'pid' => 1];
Expand Down
Loading

0 comments on commit 0d47d6a

Please sign in to comment.