Merge remote-tracking branch 'origin/master' into support/62

This commit is contained in:
Daniel Siepmann 2017-06-27 14:45:02 +02:00
commit 7552b4aba0
Signed by: Daniel Siepmann
GPG key ID: 33D6629915560EF4
6 changed files with 20 additions and 22 deletions

View file

@ -98,7 +98,10 @@ class IndexTcaTableTest extends AbstractFunctionalTestCase
*/
public function indexingRespectsUserWhereClause()
{
$this->setUpFrontendRootPage(1, ['EXT:search_core/Tests/Functional/Fixtures/Indexing/UserWhereClause.ts']);
$this->setUpFrontendRootPage(1, array_merge(
parent::getTypoScriptFilesForFrontendRootPage(),
['EXT:search_core/Tests/Functional/Fixtures/Indexing/UserWhereClause.ts']
));
$this->importDataSet('Tests/Functional/Fixtures/Indexing/UserWhereClause.xml');
\TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(ObjectManager::class)

View file

@ -41,15 +41,10 @@ abstract class AbstractDataHandlerTest extends AbstractFunctionalTestCase
$objectManager = GeneralUtility::makeInstance(ObjectManager::class);
$this->subject = $this->getAccessibleMock(
DataHandlerService::class,
[
'add',
'update',
'delete',
],
[$objectManager->get(ConfigurationContainerInterface::class)]
);
$this->subject = $this->getMockBuilder(DataHandlerService::class)
->setConstructorArgs([$objectManager->get(ConfigurationContainerInterface::class)])
->setMethods(['add', 'update', 'delete'])
->getMock();
// This way TYPO3 will use our mock instead of a new instance.
$GLOBALS['T3_VAR']['getUserObj']['&' . DataHandlerHook::class] = new DataHandlerHook($this->subject);

View file

@ -37,6 +37,10 @@ class RelationResolverTest extends AbstractFunctionalTestCase
$objectManager = GeneralUtility::makeInstance(ObjectManager::class);
$table = 'sys_file';
// Only by adding the field to showitem, it will be processed by FormEngine.
// We use this field to test inline relations, as there is only one alternative.
$GLOBALS['TCA']['sys_file']['types'][1]['showitem'] .= ',metadata';
$subject = $objectManager->get(TcaTableService::class, $table);
$record = BackendUtility::getRecord($table, 1);
$subject->prepareRecord($record);

View file

@ -44,15 +44,11 @@ class TcaIndexerTest extends AbstractFunctionalTestCase
$objectManager->get(RelationResolver::class),
$objectManager->get(ConfigurationContainerInterface::class)
);
$connection = $this->getAccessibleMock(
Elasticsearch::class,
[
'addDocuments',
],
[],
'',
false
);
$connection = $this->getMockBuilder(Elasticsearch::class)
->setMethods(['addDocuments'])
->disableOriginalConstructor()
->getMock();
$connection->expects($this->once())
->method('addDocuments')

View file

@ -21,7 +21,7 @@
"ruflin/elastica": "~3.2"
},
"require-dev": {
"phpunit/phpunit": "~4.8.0"
"phpunit/phpunit": "~5.7.0"
},
"config": {
"optimize-autoloader": true,

View file

@ -18,7 +18,7 @@ $EM_CONF[$_EXTKEY] = [
],
'state' => 'alpha',
'clearCacheOnLoad' => 1,
'author' => 'Justus Leon Moroni',
'author_email' => 'developer@leonmrni.com',
'author' => 'Daniel Siepmann',
'author_email' => 'coding@daniel-siepmann.de',
'version' => '1.0.0',
];