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

Tests/Functional/Connection/Elasticsearch/IndexTcaTableTest.php

@@ -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)

Tests/Functional/Hooks/DataHandler/AbstractDataHandlerTest.php

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

Tests/Functional/Indexing/TcaIndexer/RelationResolverTest.php

@@ -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);

Tests/Functional/Indexing/TcaIndexerTest.php

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

composer.json

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

ext_emconf.php

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