[REMOVAL] Remove legacy version fallbacks

thomas-lepage · Jan 29, 2023 · ccde400 · ccde400
1 parent 43c71f9
commit ccde400
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 180 deletions.
diff --git a/Classes/ViewHelpers/Media/Image/AbstractImageViewHelper.php b/Classes/ViewHelpers/Media/Image/AbstractImageViewHelper.php
@@ -14,7 +14,6 @@
 use TYPO3\CMS\Core\Utility\CommandUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\MathUtility;
-use TYPO3\CMS\Core\Utility\VersionNumberUtility;
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
 use TYPO3\CMS\Extbase\Domain\Model\FileReference;
 use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
@@ -176,9 +175,7 @@ public function preprocessImage(?string $imageSource = null): void
             $canvasColor = str_replace('#', '', $this->arguments['canvasColor']);
             $originalFilename = $this->imageInfo[3];
             $originalExtension = mb_substr($originalFilename, -3);
-            $tempPath = (version_compare(VersionNumberUtility::getCurrentTypo3Version(), '8.0', '>='))
-                ? 'typo3temp/assets/'
-                : 'typo3temp/';
+            $tempPath = 'typo3temp/assets/';
             $destinationFilename = $tempPath . 'vhs-canvas-' .
                 md5($originalFilename.$canvasColor.$canvasWidth.$canvasHeight) . '.' . $originalExtension;
             $destinationFilepath = GeneralUtility::getFileAbsFileName($destinationFilename);

diff --git a/Classes/ViewHelpers/Media/PdfThumbnailViewHelper.php b/Classes/ViewHelpers/Media/PdfThumbnailViewHelper.php
@@ -10,7 +10,6 @@
 
 use TYPO3\CMS\Core\Utility\CommandUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Core\Utility\VersionNumberUtility;
 
 /**
  * Converts the provided PDF file into a PNG thumbnail and renders
@@ -86,9 +85,7 @@ public function render()
         } else {
             $colorspace = 'RGB';
         }
-        $tempPath = (version_compare(VersionNumberUtility::getCurrentTypo3Version(), '8.0', '>='))
-            ? 'typo3temp/assets/'
-            : 'typo3temp/';
+        $tempPath = 'typo3temp/assets/';
         $path = GeneralUtility::getFileAbsFileName(
             $tempPath
             . 'vhs-pdf-'

diff --git a/Classes/ViewHelpers/Page/LanguageMenuViewHelper.php b/Classes/ViewHelpers/Page/LanguageMenuViewHelper.php
@@ -19,7 +19,6 @@
 use TYPO3\CMS\Core\Site\Site;
 use TYPO3\CMS\Core\Site\SiteFinder;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Core\Utility\VersionNumberUtility;
 use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper;
 
@@ -446,9 +445,6 @@ protected function getLanguageUrl($languageId): string
                 'exclude' => 'id,L,cHash' . ($excludedVars ? ',' . $excludedVars : '')
             ]
         ];
-        if (version_compare(VersionNumberUtility::getCurrentTypo3Version(), '9.5', '<')) {
-            $config['useCacheHash'] = $this->arguments['useCHash'];
-        }
         if (true === is_array($this->arguments['configuration'])) {
             $config = $this->mergeArrays($config, $this->arguments['configuration']);
         }
@@ -489,13 +485,8 @@ protected function getSite()
      */
     protected function getSystemLanguageUids(): array
     {
-        if (version_compare(VersionNumberUtility::getCurrentTypo3Version(), '9.0', '<')) {
-            $table = 'pages_language_overlay';
-            $parentField = 'pid';
-        } else {
-            $table = 'pages';
-            $parentField = 'l10n_parent';
-        }
+        $table = 'pages';
+        $parentField = 'l10n_parent';
 
         /** @var ConnectionPool $connectionPool */
         $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);

diff --git a/Classes/ViewHelpers/Resource/AbstractImageViewHelper.php b/Classes/ViewHelpers/Resource/AbstractImageViewHelper.php
@@ -14,7 +14,6 @@
 use FluidTYPO3\Vhs\Utility\ResourceUtility;
 use TYPO3\CMS\Core\TypoScript\TemplateService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Core\Utility\VersionNumberUtility;
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
 use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
 use TYPO3Fluid\Fluid\Core\ViewHelper\Exception;
@@ -186,9 +185,6 @@ protected function simulateFrontendEnvironment(): void
         /** @var TemplateService $template */
         $template = GeneralUtility::makeInstance(TemplateService::class);
         $template->tt_track = false;
-        if (version_compare(VersionNumberUtility::getCurrentTypo3Version(), '9.4', '<')) {
-            $template->init();
-        }
         if (property_exists($template, 'getFileName_backPath')) {
             $template->getFileName_backPath = CoreUtility::getSitePath();
         }

diff --git a/Tests/Fixtures/Domain/Model/Bar.php b/Tests/Fixtures/Domain/Model/Bar.php
@@ -26,11 +26,6 @@ class Bar extends AbstractEntity
      */
     protected $foo;
 
-    /**
-     * @var \FluidTYPO3\Vhs\Tests\Fixtures\Domain\Model\LegacyFoo
-     */
-    protected $legacyFoo;
-
     /**
      * @var ObjectStorage<\FluidTYPO3\Vhs\Tests\Fixtures\Domain\Model\Bar>
      */
@@ -78,22 +73,6 @@ public function setFoo(Foo $foo)
         $this->foo = $foo;
     }
 
-    /**
-     * @return Foo
-     */
-    public function getLegacyFoo()
-    {
-        return $this->legacyFoo;
-    }
-
-    /**
-     * @param Foo $legacyFoo
-     */
-    public function setLegacyFoo(LegacyFoo $legacyFoo)
-    {
-        $this->legacyFoo = $legacyFoo;
-    }
-
     /**
      * @return ObjectStorage<Bar>
      */

diff --git a/Tests/Fixtures/Domain/Model/LegacyFoo.php b/Tests/Fixtures/Domain/Model/LegacyFoo.php
diff --git a/Tests/Unit/ViewHelpers/Condition/Form/HasValidatorViewHelperTest.php b/Tests/Unit/ViewHelpers/Condition/Form/HasValidatorViewHelperTest.php
@@ -10,16 +10,12 @@
 
 use FluidTYPO3\Vhs\Tests\Fixtures\Domain\Model\Bar;
 use FluidTYPO3\Vhs\Tests\Fixtures\Domain\Model\Foo;
-use FluidTYPO3\Vhs\Tests\Fixtures\Domain\Model\LegacyFoo;
 use FluidTYPO3\Vhs\Tests\Unit\ViewHelpers\AbstractViewHelperTest;
 use FluidTYPO3\Vhs\Tests\Unit\ViewHelpers\AbstractViewHelperTestCase;
 use TYPO3\CMS\Core\Resource\FileRepository;
 use TYPO3\CMS\Core\Resource\ResourceFactory;
 use TYPO3\CMS\Extbase\Reflection\ReflectionService;
 
-/**
- * Class HasValidatorViewHelperTest
- */
 class HasValidatorViewHelperTest extends AbstractViewHelperTestCase
 {
 
@@ -37,18 +33,12 @@ protected function setUp(): void
 
     protected function getInstanceOfFoo()
     {
-        if (version_compare(TYPO3_version, '9.3', '>=')) {
-            return new Foo();
-        }
-        return new LegacyFoo();
+        return new Foo();
     }
 
     protected function getNestedPathToFoo()
     {
-        if (version_compare(TYPO3_version, '9.3', '>=')) {
-            return 'foo';
-        }
-        return 'legacyFoo';
+        return 'foo';
     }
 
     public function testRenderElseWithSingleProperty()

diff --git a/Tests/Unit/ViewHelpers/Condition/Form/IsRequiredViewHelperTest.php b/Tests/Unit/ViewHelpers/Condition/Form/IsRequiredViewHelperTest.php
@@ -10,14 +10,10 @@
 
 use FluidTYPO3\Vhs\Tests\Fixtures\Domain\Model\Bar;
 use FluidTYPO3\Vhs\Tests\Fixtures\Domain\Model\Foo;
-use FluidTYPO3\Vhs\Tests\Fixtures\Domain\Model\LegacyFoo;
 use FluidTYPO3\Vhs\Tests\Unit\ViewHelpers\AbstractViewHelperTest;
 use FluidTYPO3\Vhs\Tests\Unit\ViewHelpers\AbstractViewHelperTestCase;
 use TYPO3\CMS\Extbase\Reflection\ReflectionService;
 
-/**
- * Class IsRequiredViewHelperTest
- */
 class IsRequiredViewHelperTest extends AbstractViewHelperTestCase
 {
     protected function setUp(): void
@@ -32,18 +28,12 @@ protected function setUp(): void
 
     protected function getInstanceOfFoo()
     {
-        if (version_compare(TYPO3_version, '9.3', '>=')) {
-            return new Foo();
-        }
-        return new LegacyFoo();
+        return new Foo();
     }
 
     protected function getNestedPathToFoo()
     {
-        if (version_compare(TYPO3_version, '9.3', '>=')) {
-            return 'foo';
-        }
-        return 'legacyFoo';
+        return 'foo';
     }
 
     public function testRenderElseWithSingleProperty()

diff --git a/Tests/Unit/ViewHelpers/Condition/Variable/IssetViewHelperTest.php b/Tests/Unit/ViewHelpers/Condition/Variable/IssetViewHelperTest.php
@@ -11,22 +11,8 @@
 use FluidTYPO3\Vhs\Tests\Unit\ViewHelpers\AbstractViewHelperTest;
 use FluidTYPO3\Vhs\Tests\Unit\ViewHelpers\AbstractViewHelperTestCase;
 
-/**
- * Class IssetViewHelperTest
- */
 class IssetViewHelperTest extends AbstractViewHelperTestCase
 {
-    /**
-     * @return void
-     */
-    public function setUp(): void
-    {
-        if (version_compare(TYPO3_version, '8.0', '<')) {
-            $this->markTestSkipped('Skipped, ViewHelper does not work on 7.6');
-        }
-        parent::setUp();
-    }
-
     /**
      * @test
      */

diff --git a/Tests/Unit/ViewHelpers/Format/Json/EncodeViewHelperTest.php b/Tests/Unit/ViewHelpers/Format/Json/EncodeViewHelperTest.php
@@ -9,7 +9,6 @@
  */
 
 use FluidTYPO3\Vhs\Tests\Fixtures\Domain\Model\Foo;
-use FluidTYPO3\Vhs\Tests\Fixtures\Domain\Model\LegacyFoo;
 use FluidTYPO3\Vhs\Tests\Unit\ViewHelpers\AbstractViewHelperTest;
 use FluidTYPO3\Vhs\Tests\Unit\ViewHelpers\AbstractViewHelperTestCase;
 use TYPO3\CMS\Extbase\Persistence\ObjectStorage;
@@ -33,10 +32,7 @@ protected function setUp(): void
 
     protected function getInstanceOfFoo()
     {
-        if (version_compare(TYPO3_version, '9.3', '>=')) {
-            return new Foo();
-        }
-        return new LegacyFoo();
+        return new Foo();
     }
 
     /**