mirror of
https://github.com/Codappix/search_core.git
synced 2024-11-25 11:56:10 +01:00
Merge pull request #114 from Codappix/feature/support-php70
TASK: Support PHP 7.0
This commit is contained in:
commit
f997717d03
5 changed files with 7 additions and 6 deletions
|
@ -11,6 +11,7 @@ before_install:
|
||||||
language: php
|
language: php
|
||||||
|
|
||||||
php:
|
php:
|
||||||
|
- 7.0
|
||||||
- 7.1
|
- 7.1
|
||||||
|
|
||||||
env:
|
env:
|
||||||
|
|
|
@ -33,7 +33,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
|
||||||
*/
|
*/
|
||||||
class RelationResolver implements Singleton
|
class RelationResolver implements Singleton
|
||||||
{
|
{
|
||||||
public function resolveRelationsForRecord(TcaTableService $service, array &$record) : void
|
public function resolveRelationsForRecord(TcaTableService $service, array &$record)
|
||||||
{
|
{
|
||||||
foreach (array_keys($record) as $column) {
|
foreach (array_keys($record) as $column) {
|
||||||
// TODO: Define / configure fields to exclude?!
|
// TODO: Define / configure fields to exclude?!
|
||||||
|
|
|
@ -129,7 +129,7 @@ class TcaTableService
|
||||||
* @param array &$records
|
* @param array &$records
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function filterRecordsByRootLineBlacklist(array &$records) : void
|
public function filterRecordsByRootLineBlacklist(array &$records)
|
||||||
{
|
{
|
||||||
$records = array_filter(
|
$records = array_filter(
|
||||||
$records,
|
$records,
|
||||||
|
@ -142,7 +142,7 @@ class TcaTableService
|
||||||
/**
|
/**
|
||||||
* @param array &$record
|
* @param array &$record
|
||||||
*/
|
*/
|
||||||
public function prepareRecord(array &$record) : void
|
public function prepareRecord(array &$record)
|
||||||
{
|
{
|
||||||
$this->relationResolver->resolveRelationsForRecord($this, $record);
|
$this->relationResolver->resolveRelationsForRecord($this, $record);
|
||||||
|
|
||||||
|
|
2
Makefile
2
Makefile
|
@ -12,7 +12,7 @@ typo3DatabaseHost ?= "127.0.0.1"
|
||||||
|
|
||||||
.PHONY: install
|
.PHONY: install
|
||||||
install: clean
|
install: clean
|
||||||
COMPOSER_PROCESS_TIMEOUT=1000 composer require -vv --dev --prefer-dist --ignore-platform-reqs typo3/cms="$(TYPO3_VERSION)"
|
COMPOSER_PROCESS_TIMEOUT=1000 composer require -vv --dev --prefer-dist typo3/cms="$(TYPO3_VERSION)"
|
||||||
git checkout composer.json
|
git checkout composer.json
|
||||||
|
|
||||||
functionalTests:
|
functionalTests:
|
||||||
|
|
|
@ -15,8 +15,8 @@
|
||||||
"TYPO3\\CMS\\Core\\Tests\\": ".Build/vendor/typo3/cms/typo3/sysext/core/Tests/"
|
"TYPO3\\CMS\\Core\\Tests\\": ".Build/vendor/typo3/cms/typo3/sysext/core/Tests/"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"require" : {
|
"require": {
|
||||||
"php": ">=7.1.0",
|
"php": ">=7.0.0",
|
||||||
"typo3/cms": "~8.7",
|
"typo3/cms": "~8.7",
|
||||||
"ruflin/elastica": "~3.2"
|
"ruflin/elastica": "~3.2"
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in a new issue