Work-Related/search_core
Work-Related/search_core
1
0
mirror of https://github.com/Codappix/search_core.git synced 2024-09-21 15:56:14 +02:00
Code Releases Activity

TASK: Fix merge conflict issue

Browse source
This commit is contained in:
Daniel Siepmann 2018-03-14 20:23:40 +01:00
parent ec8362b934
commit 56bfc4f75a
Signed by: Daniel Siepmann
GPG key ID: 33D6629915560EF4
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Tests/Functional/Hooks/DataHandler/ProcessesAllowedTablesTest.php
View file

@ -73,7 +73,6 @@ class ProcessesAllowedTablesTest extends AbstractDataHandlerTest
*/ */
public function updateWillBeTriggeredForExistingTtContent() public function updateWillBeTriggeredForExistingTtContent()
{ {
<<<<<<< HEAD
$this->subject->expects($this->exactly(2))->method('update') $this->subject->expects($this->exactly(2))->method('update')
->withConsecutive( ->withConsecutive(
[ [
@ -98,7 +97,7 @@ class ProcessesAllowedTablesTest extends AbstractDataHandlerTest
return isset($record['uid']) && $record['uid'] === 1; return isset($record['uid']) && $record['uid'] === 1;
}) })
] ]
}); );
$tce = GeneralUtility::makeInstance(Typo3DataHandler::class); $tce = GeneralUtility::makeInstance(Typo3DataHandler::class);
$tce->stripslashes_values = 0; $tce->stripslashes_values = 0;