Merge branch 'master' into cleanup-plugin-title

FriendsOfTYPO3 · Sep 16, 2020 · 7bebe67 · 7bebe67
2 parents ee5ec0e + 4501d1f
commit 7bebe67
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/Configuration/TCA/Overrides/tt_content.php b/Configuration/TCA/Overrides/tt_content.php
@@ -9,7 +9,7 @@
 
 $pluginSignature = 'ttaddress_listview';
 
-$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist'][$pluginSignature] = 'layout,select_key,pages,recursive';
+$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist'][$pluginSignature] = 'select_key,pages,recursive';
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist'][$pluginSignature] = 'pi_flexform';
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue($pluginSignature, 'FILE:EXT:tt_address/Configuration/FlexForms/List.xml');
 

diff --git a/Configuration/TCA/tt_address.php b/Configuration/TCA/tt_address.php
@@ -193,7 +193,7 @@
         'slug' => [
             'exclude' => true,
             'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_tca.xlf:pages.slug',
-            'displayCond' => 'USER:' . \TYPO3\CMS\Core\Compatibility\PseudoSiteTcaDisplayCondition::class . '->isInPseudoSite:pages:false',
+            'displayCond' => 'VERSION:IS:false',
             'config' => [
                 'type' => 'slug',
                 'size' => 50,

diff --git a/Tests/Functional/Service/GeocodeServiceTest.php b/Tests/Functional/Service/GeocodeServiceTest.php
@@ -37,7 +37,8 @@ public function properRecordsAreFound()
                 ['latitude' => 10.000, 'longitude' => 12.000],
                 ['latitude' => 10.000, 'longitude' => 12.000],
                 [],
-                ['latitude' => 13.000, 'longitude' => 14.000]);
+                ['latitude' => 13.000, 'longitude' => 14.000]
+            );
 
         $count = $subject->calculateCoordinatesForAllRecordsInTable('pid=100');
         $this->assertEquals(3, $count);

diff --git a/Tests/Unit/Utility/CacheUtilityTest.php b/Tests/Unit/Utility/CacheUtilityTest.php
@@ -18,8 +18,13 @@ class CacheUtilityTest extends BaseTestCase
 {
     protected function setUp():void
     {
-        $GLOBALS['TSFE'] = $this->getAccessibleMock(TypoScriptFrontendController::class, ['addCacheTags'], [], '',
-            false);
+        $GLOBALS['TSFE'] = $this->getAccessibleMock(
+            TypoScriptFrontendController::class,
+            ['addCacheTags'],
+            [],
+            '',
+            false
+        );
     }
 
     /**