Skip to content
This repository was archived by the owner on Mar 20, 2024. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
1832555
Merge pull request #165 from Codappix/release/0.0.7
Sep 27, 2018
50baec9
[task] migrate array utility
Oct 17, 2018
0836c66
[task] remove no longer required like method
Oct 17, 2018
3659a15
[task] require legacy db because of huge refactoring of table service…
Oct 17, 2018
09167c0
[task] increase compatible typo3 version
Oct 17, 2018
01e2179
[task] change requirement of typo3 cms core
Oct 17, 2018
5ea0f34
[task] handle missing array path exceptions
Oct 17, 2018
f936d1f
[TASK] remove dblegacy
konnisoelch Oct 18, 2018
0a9cdd5
[TASK] bugfixes and error removal
konnisoelch Oct 18, 2018
6a69713
Merge branch 'feature/update-9' of github.com:bergwerk/search_core in…
Oct 22, 2018
fd78867
Add missing return statement
martinhummer Oct 22, 2018
962fe21
Merge pull request #2 from martinhummer/patch-2
konnisoelch Oct 22, 2018
94be3ca
[task] update version constraint
Oct 30, 2018
690e6a4
[task] drop typo3 7.6
Oct 30, 2018
fa74af3
[task] implement extension configuration interface
Oct 30, 2018
d1607ac
[task] resturcture compatibility layer
Oct 30, 2018
fbaa555
[task] catch wrong exceptions when accessing configuration
Oct 30, 2018
4606d76
[task] dont define multiple implementations with same class
Oct 30, 2018
5acdd91
[fix] v9 compatible extension configuration implementation
Oct 30, 2018
c940ac4
Fix CGL issues
DanielSiepmann May 5, 2019
2b91425
Remove unused debugger imports
DanielSiepmann May 5, 2019
5779cb9
Revert changes to configuration fetching
DanielSiepmann May 5, 2019
274844d
Do not introduce typo3 db legacy dependency
DanielSiepmann May 5, 2019
7270ae0
Adjust TYPO3 constraints also in ext_emconf
DanielSiepmann May 5, 2019
67c75ac
Update required versions and CI
DanielSiepmann May 5, 2019
4d976f6
Ignore TYPO3 CMS 9 var folder
DanielSiepmann May 5, 2019
b88869e
!!!|Fix unit tests for CMS 9 + PHP 7.3
DanielSiepmann May 5, 2019
c2f01b3
Remove unnecessary output during make commands
DanielSiepmann May 17, 2019
373505b
Extend new FunctionalTestCase provided by testing framework
DanielSiepmann May 17, 2019
c4e2821
Adjust dataset paths for import
DanielSiepmann May 17, 2019
6cfca1f
Respect cycler pages during indexing
DanielSiepmann May 17, 2019
95e8674
Remove supported TYPO3 version lower 9.5
DanielSiepmann May 17, 2019
ff6e721
Shorten long lines within tests to follow CGL
DanielSiepmann May 17, 2019
9946276
Remove compatibility layer, as only V9 is supported
DanielSiepmann May 17, 2019
b04ed99
TASK: Add changelog for V9 support and breaking changes
DanielSiepmann May 17, 2019
1f082ab
Do not change CGL
DanielSiepmann May 17, 2019
96a1db3
Remove unnecessary complexity from install
DanielSiepmann Jun 6, 2019
f7e7488
Fix pagination for CMS 9
DanielSiepmann Jun 6, 2019
32a04fb
Merge remote-tracking branch 'origin/develop' into feature/cms-9-update
DanielSiepmann Jun 6, 2019
2b888a2
Cleanup code base for CMS 9
DanielSiepmann Jun 6, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
composer.lock
.Build
/composer.lock
/.Build
/var/
6 changes: 2 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@ before_install:
language: php

php:
- 7.0
- 7.1
- 7.2
- 7.3

env:
global:
Expand All @@ -22,8 +21,7 @@ env:
- typo3DatabaseUsername="travis"
- typo3DatabasePassword=""
matrix:
- TYPO3_VERSION="~7.6"
- TYPO3_VERSION="~8.7"
- TYPO3_VERSION="^9.5"

matrix:
fast_finish: true
Expand Down
56 changes: 0 additions & 56 deletions Classes/Compatibility/ImplementationRegistrationService.php

This file was deleted.

31 changes: 0 additions & 31 deletions Classes/Compatibility/TypoScriptService.php

This file was deleted.

31 changes: 0 additions & 31 deletions Classes/Compatibility/TypoScriptService76.php

This file was deleted.

30 changes: 0 additions & 30 deletions Classes/Compatibility/TypoScriptServiceInterface.php

This file was deleted.

14 changes: 11 additions & 3 deletions Classes/Configuration/ConfigurationContainer.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
*/

use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
use TYPO3\CMS\Extbase\Utility\ArrayUtility;
use TYPO3\CMS\Core\Utility\ArrayUtility;

/**
* Container of all configurations for extension.
Expand Down Expand Up @@ -59,7 +59,11 @@ public function injectConfigurationManager(ConfigurationManagerInterface $config
*/
public function get(string $path)
{
$value = ArrayUtility::getValueByPath($this->settings, $path);
try {
$value = ArrayUtility::getValueByPath($this->settings, $path, '.');
} catch (\Exception $e) {
$value = null;
}

if ($value === null) {
throw new InvalidArgumentException(
Expand All @@ -77,6 +81,10 @@ public function get(string $path)
*/
public function getIfExists(string $path)
{
return ArrayUtility::getValueByPath($this->settings, $path);
try {
return ArrayUtility::getValueByPath($this->settings, $path, '.');
} catch (\Exception $exception) {
return null;
}
}
}
12 changes: 10 additions & 2 deletions Classes/Connection/SearchRequestInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
use Codappix\SearchCore\Connection\ConnectionInterface;
use Codappix\SearchCore\Connection\FacetRequestInterface;
use Codappix\SearchCore\Domain\Search\SearchService;
use TYPO3\CMS\Extbase\Persistence\QueryInterface;
use TYPO3\CMS\Extbase\Persistence\QueryResultInterface;

interface SearchRequestInterface extends QueryInterface
interface SearchRequestInterface extends QueryResultInterface
{
/**
* Returns the actual string the user searched for.
Expand All @@ -48,6 +48,14 @@ public function addFacet(FacetRequestInterface $facet);
*/
public function getFacets() : array;

public function setLimit(int $limit);

public function setOffset(int $offset);

public function getLimit() : int;

public function getOffset() : int;

/**
* Workaround for paginate widget support which will
* use the request to build another search.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* 02110-1301, USA.
*/

use Codappix\SearchCore\Compatibility\TypoScriptServiceInterface;
use TYPO3\CMS\Core\TypoScript\TypoScriptService;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;

Expand All @@ -30,11 +30,11 @@
class ContentObjectDataProcessorAdapterProcessor implements ProcessorInterface
{
/**
* @var TypoScriptServiceInterface
* @var TypoScriptService
*/
protected $typoScriptService;

public function __construct(TypoScriptServiceInterface $typoScriptService)
public function __construct(TypoScriptService $typoScriptService)
{
$this->typoScriptService = $typoScriptService;
}
Expand Down
3 changes: 3 additions & 0 deletions Classes/DataProcessing/GeoPointProcessor.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ public function processData(array $record, array $configuration) : array

protected function isApplyable(array $record, array $configuration) : bool
{
if (!isset($configuration['lat']) || !isset($configuration['lon'])) {
return false;
}
if (!isset($record[$configuration['lat']])
|| !is_numeric($record[$configuration['lat']])
|| trim($record[$configuration['lat']]) === ''
Expand Down
13 changes: 13 additions & 0 deletions Classes/Domain/Index/TcaIndexer/TcaTableService.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\RootlineUtility;
use TYPO3\CMS\Extbase\Object\ObjectManagerInterface;
use TYPO3\CMS\Frontend\Page\PageRepository;

/**
* Encapsulate logik related to TCA configuration.
Expand Down Expand Up @@ -324,6 +325,18 @@ protected function isRecordBlacklistedByRootline(array &$record) : bool
return true;
}

if ($pageInRootLine['doktype'] === PageRepository::DOKTYPE_RECYCLER) {
$this->logger->info(
sprintf(
'Record %u is black listed due to being within recycler page %u.',
$record['uid'],
$pageInRootLine['uid']
),
[$record, $pageInRootLine]
);
return true;
}

if ($pageInRootLine['extendToSubpages'] && (
($pageInRootLine['endtime'] > 0 && $pageInRootLine['endtime'] <= time())
|| ($pageInRootLine['starttime'] > 0 && $pageInRootLine['starttime'] >= time())
Expand Down
Loading