!!! [TASK] change requirements

* drop TYPO3 10 Support
* add TYPO3 13 Support

.github/workflows/ci.yml

@@ -13,21 +13,13 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: [ '7.4', '8.0', '8.1' ]
-        TYPO3: [ '11' ]
-        include:
-          - TYPO3: '10'
-            php: '7.4'
-          - TYPO3: '12'
-            php: '8.1'
+        php: [ '8.3' ]
+        TYPO3: [ '11', '12' , '13' ]
+
     steps:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Patch  10
-        if: matrix.TYPO3 == '10'
-        run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -t ${{ matrix.TYPO3 }} -s patchV10
-
       - name: Install testing system
         run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -t ${{ matrix.TYPO3 }} -s composerInstall
 
@@ -41,7 +33,7 @@ jobs:
         run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -s cgl -n
 
       - name: phpstan
-        run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -s phpstan
+        run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -t ${{ matrix.TYPO3 }} -s phpstan
 
       - name: Unit Tests
         run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -s unit

Build/Scripts/runTests.sh

@@ -241,12 +241,6 @@ case ${TEST_SUITE} in
         SUITE_EXIT_CODE=$?
         docker-compose down
         ;;
-    patchV10)
-        setUpDockerComposeDotEnv
-        docker-compose run patchV10
-        SUITE_EXIT_CODE=$?
-        docker-compose down
-        ;;
     functional)
         setUpDockerComposeDotEnv
         case ${DBMS} in

Build/phpstan11.neon

@@ -0,0 +1,7 @@
+parameters:
+  level: 5
+
+  paths:
+    - %currentWorkingDirectory%/Classes
+  ignoreErrors:
+    - '#.*unknown class TYPO3\\CMS\\Core\\TypoScript\\FrontendTypoScript.#'

Build/phpunit/UnitTestsBootstrap.php

@@ -12,28 +12,12 @@
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Core\Information\Typo3Version;
-
 call_user_func(function () {
     if (!class_exists(\TYPO3\CMS\Frontend\Page\PageRepository::class)) {
         class_alias(\TYPO3\CMS\Core\Domain\Repository\PageRepository::class, \TYPO3\CMS\Frontend\Page\PageRepository::class);
     }
     $testbase = new \TYPO3\TestingFramework\Core\Testbase();
 
-    // These if's are for core testing (package typo3/cms) only. cms-composer-installer does
-    // not create the autoload-include.php file that sets these env vars and sets composer
-    // mode to true. testing-framework can not be used without composer anyway, so it is safe
-    // to do this here. This way it does not matter if 'bin/phpunit' or 'vendor/phpunit/phpunit/phpunit'
-    // is called to run the tests since the 'relative to entry script' path calculation within
-    // SystemEnvironmentBuilder is not used. However, the binary must be called from the document
-    // root since getWebRoot() uses 'getcwd()'.
-    if (!getenv('TYPO3_PATH_ROOT')) {
-        putenv('TYPO3_PATH_ROOT=' . rtrim($testbase->getWebRoot(), '/'));
-    }
-    if (!getenv('TYPO3_PATH_WEB')) {
-        putenv('TYPO3_PATH_WEB=' . rtrim($testbase->getWebRoot(), '/'));
-    }
-
     $testbase->defineSitePath();
 
     $requestType = \TYPO3\CMS\Core\Core\SystemEnvironmentBuilder::REQUESTTYPE_BE | \TYPO3\CMS\Core\Core\SystemEnvironmentBuilder::REQUESTTYPE_CLI;
@@ -56,18 +40,12 @@ class_alias(\TYPO3\CMS\Core\Domain\Repository\PageRepository::class, \TYPO3\CMS\
         'core',
         new \TYPO3\CMS\Core\Cache\Backend\NullBackend('production', [])
     );
-    // Set all packages to active
-    if (version_compare((new Typo3Version())->getVersion(), '11.3.0', '>')) {
-        $packageManager = \TYPO3\CMS\Core\Core\Bootstrap::createPackageManager(
-            \TYPO3\CMS\Core\Package\UnitTestPackageManager::class,
-            \TYPO3\CMS\Core\Core\Bootstrap::createPackageCache($cache)
-        );
-    } else {
-        $packageManager = \TYPO3\CMS\Core\Core\Bootstrap::createPackageManager(
-            \TYPO3\CMS\Core\Package\UnitTestPackageManager::class,
-            $cache
-        );
-    }
+
+    $packageManager = \TYPO3\CMS\Core\Core\Bootstrap::createPackageManager(
+        \TYPO3\CMS\Core\Package\UnitTestPackageManager::class,
+        \TYPO3\CMS\Core\Core\Bootstrap::createPackageCache($cache)
+    );
+
     \TYPO3\CMS\Core\Utility\GeneralUtility::setSingletonInstance(\TYPO3\CMS\Core\Package\PackageManager::class, $packageManager);
     \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::setPackageManager($packageManager);
 

Build/testing-docker/docker-compose.yml

@@ -83,12 +83,11 @@ services:
         fi
         php -v | grep '^PHP';
         if [ ${TYPO3} -eq 11 ]; then
-          composer install --no-progress --no-interaction
-        elif [ ${TYPO3} -eq 10 ]; then
-          composer require friendsofphp/php-cs-fixer:~3.9.0 typo3/cms-fluid:^10.4 typo3/testing-framework:^6 --dev -W --no-progress --no-interaction
-          composer prepare-tests-10
-        else
+          composer require typo3/cms-fluid:^11.5 --dev -W --no-progress --no-interaction
+        elif [ ${TYPO3} -eq 12 ]; then
           composer require typo3/cms-fluid:^12.4 --dev -W --no-progress --no-interaction
+        else
+          composer install --dev --no-progress --no-interaction
         fi
       "
 
@@ -165,23 +164,6 @@ services:
         find . -name \\*.php ! -path "./.Build/\\*" -print0 | xargs -0 -n1 -P4 php -dxdebug.mode=off -l >/dev/null
       "
 
-  patchV10:
-    image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
-    user: ${HOST_UID}
-    volumes:
-      - ${ROOT_DIR}:${ROOT_DIR}
-      - ${HOST_HOME}:${HOST_HOME}
-      - /etc/passwd:/etc/passwd:ro
-      - /etc/group:/etc/group:ro
-    working_dir: ${ROOT_DIR}
-    command: >
-      /bin/sh -c "
-        find Tests -name \\*.php -print0 | xargs -0 sed -i 's/protected array \(.*\)testExtensionsToLoad = \[/protected \1testExtensionsToLoad = [/g';
-        find Tests -name \\*.php -print0 | xargs -0 sed -i 's/protected bool \(.*\)resetSingletonInstances = /protected \1resetSingletonInstances = /g';
-        find Tests -name \\*.php -print0 | xargs -0 sed -i 's/protected array \(.*\)coreExtensionsToLoad = \[/protected \1coreExtensionsToLoad = [/g';
-        find Tests -name \\*.php -print0 | xargs -0 sed -i 's/protected array \(.*\)pathsToLinkInTestInstance = \[/protected \1pathsToLinkInTestInstance = [/g';
-      "
-
   phpstan:
     image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
     user: ${HOST_UID}
@@ -197,7 +179,11 @@ services:
           set -x
         fi
         php -v | grep '^PHP';
+      if [ ${TYPO3} -eq 11 ]; then
+        php -dxdebug.mode=off .Build/bin/phpstan analyze -c Build/phpstan11.neon --no-progress --no-interaction
+      else
         php -dxdebug.mode=off .Build/bin/phpstan analyze -c Build/phpstan.neon --no-progress --no-interaction
+      fi
       "
 
   unit:

Classes/Domain/Model/PictureConfiguration.php

@@ -54,7 +54,7 @@ public function __construct(array $arguments, array $typoScriptSettings, FileInt
                 $this->lazyLoading = (string)$typoScriptSettings['lazyLoading'];
             }
             // do not add retina images for elements with variants (the browser should select the best-sized image)
-            if(!empty($arguments['sizes'])) {
+            if (!empty($arguments['sizes'])) {
                 $this->useRetina = false;
             }
         }

Classes/ViewHelpers/ImageViewHelper.php

@@ -13,9 +13,12 @@
  */
 
 use B13\Picture\Domain\Model\PictureConfiguration;
+use Psr\Http\Message\ServerRequestInterface;
 use TYPO3\CMS\Core\Imaging\ImageManipulation\CropVariantCollection;
+use TYPO3\CMS\Core\Information\Typo3Version;
 use TYPO3\CMS\Core\Resource\FileInterface;
 use TYPO3\CMS\Core\Resource\ProcessedFile;
+use TYPO3\CMS\Core\TypoScript\FrontendTypoScript;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\MathUtility;
 use TYPO3\CMS\Extbase\Service\ImageService;
@@ -461,13 +464,29 @@ protected function buildOutput(array $output): string
     protected function getTypoScriptSettings(): array
     {
         $settings = [];
-        $frontendController = $this->getFrontendController();
-        if ($frontendController instanceof TypoScriptFrontendController) {
-            $settings = $frontendController->tmpl->setup['plugin.']['tx_picture.'] ?? [];
+        if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() < 12) {
+            $frontendController = $this->getFrontendController();
+            if ($frontendController instanceof TypoScriptFrontendController) {
+                $settings = $frontendController->tmpl->setup['plugin.']['tx_picture.'] ?? [];
+            }
+            return $settings;
+        }
+        $request = $this->getServerRequest();
+        if ($request === null) {
+            return $settings;
         }
+        /** @var FrontendTypoScript $typoScript */
+        $typoScript = $request->getAttribute('frontend.typoscript');
+        $setup = $typoScript->getSetupArray();
+        $settings = $setup['plugin.']['tx_picture.'] ?? [];
         return $settings;
     }
 
+    protected function getServerRequest(): ?ServerRequestInterface
+    {
+        return $GLOBALS['TYPO3_REQUEST'] ?? null;
+    }
+
     protected function getFrontendController(): ?TypoScriptFrontendController
     {
         if (($GLOBALS['TSFE'] ?? null) instanceof TypoScriptFrontendController) {

Tests/Functional/Frontend/DemonstrationPageTest.php

@@ -12,11 +12,14 @@
  * of the License, or any later version.
  */
 
-use B13\Picture\Tests\Functional\Functional\AbstractFrontendTest;
 use TYPO3\TestingFramework\Core\Functional\Framework\Frontend\InternalRequest;
+use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
 
-class ImageViewHelperTest extends AbstractFrontendTest
+class DemonstrationPageTest extends FunctionalTestCase
 {
+    protected array $pathsToLinkInTestInstance = ['typo3conf/ext/picture/Build/sites' => 'typo3conf/sites'];
+    protected array $testExtensionsToLoad = ['typo3conf/ext/picture'];
+
     /**
      * @test
      */
@@ -30,7 +33,7 @@ public function callingPageReturns200ResponseCode(): void
                 'setup' => ['EXT:picture/Configuration/TypoScript/test.typoscript'],
             ]
         );
-        $response = $this->executeFrontendRequest(new InternalRequest('/?type=1573387706874'));
+        $response = $this->executeFrontendSubRequest(new InternalRequest('http://localhost/?type=1573387706874'));
         $status = $response->getStatusCode();
         self::assertSame(200, $status);
     }

Tests/Functional/Frontend/Fixtures/Templates/SimpleImage.html

@@ -5,4 +5,4 @@
 >
 <f:spaceless>
   <i:image src="EXT:picture/Resources/Public/Test/Picture.png" width="400" alt="Testimage 400px width" />
-</f:spaceless>
+</f:spaceless>

Tests/Functional/Frontend/Fixtures/image_with_multiple_sizes.csv

@@ -9,4 +9,5 @@ page.config.disableAllHeaderCode = 1
 page.10 = FLUIDTEMPLATE
 page.10.templateRootPaths.10 = EXT:picture/Tests/Functional/Frontend/Fixtures/Templates
 page.10.templateName = ImageWithMultipleSizes.html
-"
+config.absRefPrefix = /
+"

Tests/Functional/Frontend/Fixtures/image_with_multiple_sources.csv

@@ -9,4 +9,5 @@ page.config.disableAllHeaderCode = 1
 page.10 = FLUIDTEMPLATE
 page.10.templateRootPaths.10 = EXT:picture/Tests/Functional/Frontend/Fixtures/Templates
 page.10.templateName = ImageWithMultipleSources.html
-"
+config.absRefPrefix = /
+"

Tests/Functional/Frontend/Fixtures/image_with_multiple_sources_with_webp_option.csv

@@ -9,4 +9,5 @@ page.config.disableAllHeaderCode = 1
 page.10 = FLUIDTEMPLATE
 page.10.templateRootPaths.10 = EXT:picture/Tests/Functional/Frontend/Fixtures/Templates
 page.10.templateName = ImageWithMultipleSourcesWithWebpOption.html
-"
+config.absRefPrefix = /
+"

Tests/Functional/Frontend/Fixtures/image_with_picture_class.csv

@@ -9,4 +9,5 @@ page.config.disableAllHeaderCode = 1
 page.10 = FLUIDTEMPLATE
 page.10.templateRootPaths.10 = EXT:picture/Tests/Functional/Frontend/Fixtures/Templates
 page.10.templateName = ImageWithPictureClass.html
-"
+config.absRefPrefix = /
+"

Tests/Functional/Frontend/Fixtures/image_with_srcset_and_a_sizes_value_with_webp_option.csv

@@ -9,4 +9,5 @@ page.config.disableAllHeaderCode = 1
 page.10 = FLUIDTEMPLATE
 page.10.templateRootPaths.10 = EXT:picture/Tests/Functional/Frontend/Fixtures/Templates
 page.10.templateName = ImageWithSrcsetAndASizesValueWithWebpOption.html
-"
+config.absRefPrefix = /
+"

Tests/Functional/Frontend/Fixtures/image_with_three_sizes_for_three_given_breakpoints.csv

@@ -9,4 +9,5 @@ page.config.disableAllHeaderCode = 1
 page.10 = FLUIDTEMPLATE
 page.10.templateRootPaths.10 = EXT:picture/Tests/Functional/Frontend/Fixtures/Templates
 page.10.templateName = ImageWithThreeSizesForThreeGivenBreakpoints.html
-"
+config.absRefPrefix = /
+"

Tests/Functional/Frontend/Fixtures/image_with_two_sizes_and_retina_option.csv

@@ -9,4 +9,5 @@ page.config.disableAllHeaderCode = 1
 page.10 = FLUIDTEMPLATE
 page.10.templateRootPaths.10 = EXT:picture/Tests/Functional/Frontend/Fixtures/Templates
 page.10.templateName = ImageWithTwoSizesAndRetinaOption.html
-"
+config.absRefPrefix = /
+"

Tests/Functional/Frontend/Fixtures/simple_image.csv

@@ -9,4 +9,5 @@ page.config.disableAllHeaderCode = 1
 page.10 = FLUIDTEMPLATE
 page.10.templateRootPaths.10 = EXT:picture/Tests/Functional/Frontend/Fixtures/Templates
 page.10.templateName = SimpleImage.html
-"
+config.absRefPrefix = /
+"

Tests/Functional/Frontend/Fixtures/simple_image_as_webp.csv

@@ -9,4 +9,5 @@ page.config.disableAllHeaderCode = 1
 page.10 = FLUIDTEMPLATE
 page.10.templateRootPaths.10 = EXT:picture/Tests/Functional/Frontend/Fixtures/Templates
 page.10.templateName = SimpleImageAsWebp.html
-"
+config.absRefPrefix = /
+"

Tests/Functional/Frontend/Fixtures/simple_image_with_retina_and_webp_option.csv

@@ -9,4 +9,5 @@ page.config.disableAllHeaderCode = 1
 page.10 = FLUIDTEMPLATE
 page.10.templateRootPaths.10 = EXT:picture/Tests/Functional/Frontend/Fixtures/Templates
 page.10.templateName = SimpleImageWithRetinaAndWebpOption.html
-"
+config.absRefPrefix = /
+"

Tests/Functional/Frontend/Fixtures/simple_image_with_retina_option.csv

@@ -9,4 +9,5 @@ page.config.disableAllHeaderCode = 1
 page.10 = FLUIDTEMPLATE
 page.10.templateRootPaths.10 = EXT:picture/Tests/Functional/Frontend/Fixtures/Templates
 page.10.templateName = SimpleImageWithRetinaOption.html
-"
+config.absRefPrefix = /
+"

Tests/Functional/Frontend/Fixtures/simple_image_with_webp_option.csv

@@ -9,4 +9,5 @@ page.config.disableAllHeaderCode = 1
 page.10 = FLUIDTEMPLATE
 page.10.templateRootPaths.10 = EXT:picture/Tests/Functional/Frontend/Fixtures/Templates
 page.10.templateName = SimpleImageWithWebpOption.html
-"
+config.absRefPrefix = /
+"

Tests/Functional/Frontend/Fixtures/single_image_with_multiple_image_sizes_and_two_breakpoints.csv

@@ -9,4 +9,5 @@ page.config.disableAllHeaderCode = 1
 page.10 = FLUIDTEMPLATE
 page.10.templateRootPaths.10 = EXT:picture/Tests/Functional/Frontend/Fixtures/Templates
 page.10.templateName = SingleImageWithMultipleImageSizesAndTwoBreakpoints.html
-"
+config.absRefPrefix = /
+"

Tests/Functional/Frontend/Fixtures/single_image_with_multiple_image_sizes_as_srcset.csv

@@ -9,4 +9,5 @@ page.config.disableAllHeaderCode = 1
 page.10 = FLUIDTEMPLATE
 page.10.templateRootPaths.10 = EXT:picture/Tests/Functional/Frontend/Fixtures/Templates
 page.10.templateName = SingleImageWithMultipleImageSizesAsSrcset.html
-"
+config.absRefPrefix = /
+"