Work-Related/search_core
Work-Related/search_core
1
0
mirror of https://github.com/Codappix/search_core.git synced 2024-11-22 08:56:47 +01:00
Code Releases Activity

Merge pull request #88 from Codappix/bugfix/do-not-fetch-non-existing-db-fields

Browse source 
BUGFIX: Do not add non existing db columns to fields array
This commit is contained in:
Daniel Siepmann 2017-10-14 16:01:39 +02:00 committed by GitHub
commit e321c424b4
2 changed files with 64 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Classes/Domain/Index/TcaIndexer/TcaTableService.php
View file

@ -201,7 +201,10 @@ class TcaTableService
array_filter(
array_keys($this->tca['columns']),
function ($columnName) {
return !$this->isSystemField($columnName);
return !$this->isSystemField($columnName)
&& !$this->isUserField($columnName)
&& !$this->isPassthroughField($columnName)
;
}
)
);
@ -269,6 +272,18 @@ class TcaTableService
return in_array($columnName, $systemFields);
}
protected function isUserField(string $columnName) : bool
{
$config = $this->getColumnConfig($columnName);
return isset($config['type']) && $config['type'] === 'user';
}
protected function isPassthroughField(string $columnName) : bool
{
$config = $this->getColumnConfig($columnName);
return isset($config['type']) && $config['type'] === 'passthrough';
}
/**
* @param string $columnName
* @return array

48
Tests/Unit/Domain/Index/TcaIndexer/TcaTableServiceTest.php
View file

@ -101,6 +101,54 @@ class TcaTableServiceTest extends AbstractUnitTestCase
);
}
/**
* @test
*/
public function allConfiguredAndAllowedTcaColumnsAreReturnedAsFields()
{
$GLOBALS['TCA']['test_table'] = [
'ctrl' => [
'languageField' => 'sys_language',
],
'columns' => [
'sys_language' => [],
't3ver_oid' => [],
'available_column' => [
'config' => [
'type' => 'input',
],
],
'user_column' => [
'config' => [
'type' => 'user',
],
],
'passthrough_column' => [
'config' => [
'type' => 'passthrough',
],
],
],
];
$subject = new TcaTableService(
'test_table',
$this->getMockBuilder(RelationResolver::class)->getMock(),
$this->configuration
);
$this->inject($subject, 'logger', $this->getMockedLogger());
$this->assertSame(
[
'test_table.uid',
'test_table.pid',
'test_table.available_column',
],
$subject->getFields(),
''
);
unset($GLOBALS['TCA']['test_table']);
}
/**
* @test
*/