[TASK] Merge UnitDeprecated into Unit

Younger phpunit come with a happy little feature
to suppress E_DEPRECATED and E_USER_DEPRECATED
errors: The attribute `#[IgnoreDeprecations]` makes
a test not fail when such a deprecation is triggered
by the test subject, even when failOnDeprecation=true
is set in phpunit XML.

Using the attribute has been recommended by phpunit
maintainer Sebastian Bergmann.

This allows us to give up on the current strategy of
moving tests that test deprecated subjects to an own
directory. This simplifies maintenance, makes
patches that deprecate things more easy to review,
and saves some CI jobs.

During 'deprecation removal phase' at the beginning
of new major branches, we now simply look up usages
of the attribute to see what needs to be removed.

The patch takes care of 'UnitDeprecated' tests by
merging them back into 'Unit' and adding the
attribute. It also adapts runTests.sh to remove
the `-s unitDeprecated` test suite and adapts CI.
'FunctionalDeprecated' will follow with a separate
patch.

Resolves: #104582
Releases: main
Change-Id: I44473b04b3fe800a6fdd4032c6b2bd7682810979
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/85572


Tested-by: Stefan Bürk <stefan@buerk.tech>
Reviewed-by: Simon Praetorius <simon@praetorius.me>
Reviewed-by: Andreas Kienast <a.fernandez@scripting-base.de>
Tested-by: Simon Praetorius <simon@praetorius.me>
Reviewed-by: Stefan Bürk <stefan@buerk.tech>
Tested-by: Andreas Kienast <a.fernandez@scripting-base.de>
Tested-by: core-ci <typo3@b13.com>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>

Build/Scripts/phpIntegrityChecker.php

@@ -59,7 +59,6 @@ final class PhpIntegrityChecker extends Command
     private array $finderFindIn = [
         __DIR__ . '/../../typo3/sysext/*/Classes',
         __DIR__ . '/../../typo3/sysext/*/Tests/Unit',
-        __DIR__ . '/../../typo3/sysext/*/Tests/UnitDeprecated',
         __DIR__ . '/../../typo3/sysext/*/Tests/Functional',
         __DIR__ . '/../../typo3/sysext/*/Tests/FunctionalDeprecated',
         __DIR__ . '/../../typo3/sysext/core/Tests/Acceptance',

Build/Scripts/runTests.sh

@@ -230,7 +230,6 @@ Options:
             - phpstan: phpstan tests
             - phpstanGenerateBaseline: regenerate phpstan baseline, handy after phpstan updates
             - unit (default): PHP unit tests
-            - unitDeprecated: deprecated PHP unit tests
             - unitJavascript: JavaScript unit tests
             - unitRandom: PHP unit tests in random order, "-- --random-order-seed=<number>" to use specific seed
 
@@ -311,7 +310,7 @@ Options:
         http://localhost:7900/. A browser tab is opened automatically if xdg-open is installed.
 
     -x
-        Only with -s functional|functionalDeprecated|unit|unitDeprecated|unitRandom|acceptance|acceptanceComposer|acceptanceInstall
+        Only with -s functional|functionalDeprecated|unit|unitRandom|acceptance|acceptanceComposer|acceptanceInstall
         Send information to host instance for test or system under test break points. This is especially
         useful if a local PhpStorm instance is listening on default xdebug port 9003. A different port
         can be selected with -y
@@ -1055,10 +1054,6 @@ case ${TEST_SUITE} in
         ${CONTAINER_BIN} run ${CONTAINER_COMMON_PARAMS} --name unit-${SUFFIX} ${XDEBUG_MODE} -e XDEBUG_CONFIG="${XDEBUG_CONFIG}" ${IMAGE_PHP} bin/phpunit -c Build/phpunit/UnitTests.xml "$@"
         SUITE_EXIT_CODE=$?
         ;;
-    unitDeprecated)
-        ${CONTAINER_BIN} run ${CONTAINER_COMMON_PARAMS} --name unit-deprecated-${SUFFIX} ${XDEBUG_MODE} -e XDEBUG_CONFIG="${XDEBUG_CONFIG}" ${IMAGE_PHP} bin/phpunit -c Build/phpunit/UnitTestsDeprecated.xml "$@"
-        SUITE_EXIT_CODE=$?
-        ;;
     unitJavascript)
         COMMAND="cd Build; npm ci || exit 1; CHROME_SANDBOX=false BROWSERS=chrome npm run test"
         ${CONTAINER_BIN} run ${CONTAINER_COMMON_PARAMS} --name unit-javascript-${SUFFIX} -e HOME=${CORE_ROOT}/.cache ${IMAGE_NODEJS_CHROME} /bin/sh -c "${COMMAND}"

Build/gitlab-ci/nightly/unit.yml

@@ -23,16 +23,6 @@ unit php 8.3 locked:
   script:
     - Build/Scripts/runTests.sh -s composerInstall -p 8.3
     - Build/Scripts/runTests.sh -s unit -p 8.3
-unit php 8.3 deprecated locked:
-  stage: unit
-  tags:
-    - metal2
-  needs: []
-  only:
-    - schedules
-  script:
-    - Build/Scripts/runTests.sh -s composerInstall -p 8.3
-    - Build/Scripts/runTests.sh -s unitDeprecated -p 8.3
 
 unit php 8.2 max:
   stage: unit
@@ -44,16 +34,6 @@ unit php 8.2 max:
   script:
     - Build/Scripts/runTests.sh -s composerInstallMax -p 8.2
     - Build/Scripts/runTests.sh -s unit -p 8.2
-unit php 8.2 max deprecated:
-  stage: unit
-  tags:
-    - metal2
-  needs: []
-  only:
-    - schedules
-  script:
-    - Build/Scripts/runTests.sh -s composerInstallMax -p 8.2
-    - Build/Scripts/runTests.sh -s unitDeprecated -p 8.2
 unit php 8.2 max random:
   stage: unit
   tags:
@@ -75,16 +55,6 @@ unit php 8.3 max:
   script:
     - Build/Scripts/runTests.sh -s composerInstallMax -p 8.3
     - Build/Scripts/runTests.sh -s unit -p 8.3
-unit php 8.3 max deprecated:
-  stage: unit
-  tags:
-    - metal2
-  needs: []
-  only:
-    - schedules
-  script:
-    - Build/Scripts/runTests.sh -s composerInstallMax -p 8.3
-    - Build/Scripts/runTests.sh -s unitDeprecated -p 8.3
 unit php 8.3 max random:
   stage: unit
   tags:
@@ -106,16 +76,6 @@ unit php 8.4 max:
   script:
     - Build/Scripts/runTests.sh -s composerInstallMax -p 8.4
     - Build/Scripts/runTests.sh -s unit -p 8.4
-unit php 8.4 max deprecated:
-  stage: unit
-  tags:
-    - metal2
-  needs: []
-  only:
-    - schedules
-  script:
-    - Build/Scripts/runTests.sh -s composerInstallMax -p 8.4
-    - Build/Scripts/runTests.sh -s unitDeprecated -p 8.4
 unit php 8.4 max random:
   stage: unit
   tags:
@@ -137,16 +97,6 @@ unit php 8.2 min:
   script:
     - Build/Scripts/runTests.sh -s composerInstallMin -p 8.2
     - Build/Scripts/runTests.sh -s unit -p 8.2
-unit php 8.2 min deprecated:
-  stage: unit
-  tags:
-    - metal2
-  needs: []
-  only:
-    - schedules
-  script:
-    - Build/Scripts/runTests.sh -s composerInstallMin -p 8.2
-    - Build/Scripts/runTests.sh -s unitDeprecated -p 8.2
 unit php 8.2 min random:
   stage: unit
   tags:
@@ -170,16 +120,6 @@ unit php 8.3 min:
   script:
     - Build/Scripts/runTests.sh -s composerInstallMin -p 8.3
     - Build/Scripts/runTests.sh -s unit -p 8.3
-unit php 8.3 min deprecated:
-  stage: unit
-  tags:
-    - metal2
-  needs: []
-  only:
-    - schedules
-  script:
-    - Build/Scripts/runTests.sh -s composerInstallMin -p 8.3
-    - Build/Scripts/runTests.sh -s unitDeprecated -p 8.3
 unit php 8.3 min random:
   stage: unit
   tags:

Build/gitlab-ci/pre-merge/unit.yml

@@ -25,29 +25,6 @@ unit php 8.2 random pre-merge:
     - Build/Scripts/runTests.sh -s composerInstall -p 8.2
     - Build/Scripts/runTests.sh -s unitRandom -p 8.2
 
-unit php 8.2 deprecated pre-merge:
-  stage: main
-  tags:
-    - metal2
-  except:
-    refs:
-      - schedules
-      - main
-  script:
-    - Build/Scripts/runTests.sh -s composerInstall -p 8.2
-    - Build/Scripts/runTests.sh -s unitDeprecated -p 8.2
-unit php 8.4 deprecated pre-merge:
-  stage: main
-  tags:
-    - metal2
-  except:
-    refs:
-      - schedules
-      - main
-  script:
-    - Build/Scripts/runTests.sh -s composerInstall -p 8.4
-    - Build/Scripts/runTests.sh -s unitDeprecated -p 8.4
-
 unit php 8.2 pre-merge:
   stage: main
   tags:

Build/phpstan/phpstan-baseline.neon

@@ -790,31 +790,6 @@ parameters:
 			count: 1
 			path: ../../typo3/sysext/core/Tests/Unit/Tree/TableConfiguration/TreeDataProviderFactoryTest.php
 
-		-
-			message: "#^Call to an undefined method TYPO3\\\\CMS\\\\Core\\\\Tests\\\\UnitDeprecated\\\\Compatibility\\\\Fixtures\\\\PublicMethodDeprecationTraitTextFixture\\:\\:doesNotExist\\(\\)\\.$#"
-			count: 1
-			path: ../../typo3/sysext/core/Tests/UnitDeprecated/Compatibility/PublicMethodDeprecationTraitTest.php
-
-		-
-			message: "#^Call to protected method methodMadeProtected\\(\\) of class TYPO3\\\\CMS\\\\Core\\\\Tests\\\\UnitDeprecated\\\\Compatibility\\\\Fixtures\\\\PublicMethodDeprecationTraitTextFixture\\.$#"
-			count: 1
-			path: ../../typo3/sysext/core/Tests/UnitDeprecated/Compatibility/PublicMethodDeprecationTraitTest.php
-
-		-
-			message: "#^Call to protected method methodMadeProtectedWithArguments\\(\\) of class TYPO3\\\\CMS\\\\Core\\\\Tests\\\\UnitDeprecated\\\\Compatibility\\\\Fixtures\\\\PublicMethodDeprecationTraitTextFixture\\.$#"
-			count: 1
-			path: ../../typo3/sysext/core/Tests/UnitDeprecated/Compatibility/PublicMethodDeprecationTraitTest.php
-
-		-
-			message: "#^Call to protected method methodMadeProtectedWithReturn\\(\\) of class TYPO3\\\\CMS\\\\Core\\\\Tests\\\\UnitDeprecated\\\\Compatibility\\\\Fixtures\\\\PublicMethodDeprecationTraitTextFixture\\.$#"
-			count: 1
-			path: ../../typo3/sysext/core/Tests/UnitDeprecated/Compatibility/PublicMethodDeprecationTraitTest.php
-
-		-
-			message: "#^Call to protected method standardProtectedMethod\\(\\) of class TYPO3\\\\CMS\\\\Core\\\\Tests\\\\UnitDeprecated\\\\Compatibility\\\\Fixtures\\\\PublicMethodDeprecationTraitTextFixture\\.$#"
-			count: 1
-			path: ../../typo3/sysext/core/Tests/UnitDeprecated/Compatibility/PublicMethodDeprecationTraitTest.php
-
 		-
 			message: "#^Parameter \\#2 \\$widgets of method TYPO3\\\\CMS\\\\Dashboard\\\\DashboardRepository\\:\\:updateWidgetConfig\\(\\) expects array\\<string\\>, array\\<string, array\\<string, string\\>\\> given\\.$#"
 			count: 1
@@ -1060,21 +1035,6 @@ parameters:
 			count: 1
 			path: ../../typo3/sysext/extbase/Tests/Unit/Persistence/Generic/QueryTest.php
 
-		-
-			message: "#^Call to an undefined method TYPO3\\\\CMS\\\\Extbase\\\\Persistence\\\\Generic\\\\Session\\:\\:method\\(\\)\\.$#"
-			count: 1
-			path: ../../typo3/sysext/extbase/Tests/Unit/Persistence/RepositoryTest.php
-
-		-
-			message: "#^Call to an undefined method TYPO3\\\\CMS\\\\Extbase\\\\Persistence\\\\QueryInterface\\:\\:expects\\(\\)\\.$#"
-			count: 2
-			path: ../../typo3/sysext/extbase/Tests/Unit/Persistence/RepositoryTest.php
-
-		-
-			message: "#^Call to an undefined method TYPO3\\\\CMS\\\\Extbase\\\\Persistence\\\\QueryInterface\\:\\:method\\(\\)\\.$#"
-			count: 1
-			path: ../../typo3/sysext/extbase/Tests/Unit/Persistence/RepositoryTest.php
-
 		-
 			message: "#^Parameter \\#1 \\$modifiedObject of method TYPO3\\\\CMS\\\\Extbase\\\\Persistence\\\\Repository\\<TYPO3\\\\CMS\\\\Extbase\\\\DomainObject\\\\DomainObjectInterface\\>\\:\\:update\\(\\) expects TYPO3\\\\CMS\\\\Extbase\\\\DomainObject\\\\DomainObjectInterface, stdClass given\\.$#"
 			count: 3
@@ -1155,31 +1115,6 @@ parameters:
 			count: 5
 			path: ../../typo3/sysext/extbase/Tests/Unit/Utility/ExtensionUtilityTest.php
 
-		-
-			message: "#^Call to an undefined method PHPUnit\\\\Framework\\\\MockObject\\\\MockObject&TYPO3\\\\CMS\\\\Extbase\\\\Persistence\\\\Repository&TYPO3\\\\TestingFramework\\\\Core\\\\AccessibleObjectInterface\\:\\:findOneByFoo\\(\\)\\.$#"
-			count: 2
-			path: ../../typo3/sysext/extbase/Tests/UnitDeprecated/Persistence/RepositoryTest.php
-
-		-
-			message: "#^Call to an undefined method PHPUnit\\\\Framework\\\\MockObject\\\\MockObject&TYPO3\\\\CMS\\\\Extbase\\\\Persistence\\\\Repository\\:\\:countByFoo\\(\\)\\.$#"
-			count: 1
-			path: ../../typo3/sysext/extbase/Tests/UnitDeprecated/Persistence/RepositoryTest.php
-
-		-
-			message: "#^Call to an undefined method PHPUnit\\\\Framework\\\\MockObject\\\\MockObject&TYPO3\\\\CMS\\\\Extbase\\\\Persistence\\\\Repository\\:\\:findByFoo\\(\\)\\.$#"
-			count: 1
-			path: ../../typo3/sysext/extbase/Tests/UnitDeprecated/Persistence/RepositoryTest.php
-
-		-
-			message: "#^Call to an undefined method PHPUnit\\\\Framework\\\\MockObject\\\\MockObject&TYPO3\\\\CMS\\\\Extbase\\\\Persistence\\\\Repository\\:\\:findOneByFoo\\(\\)\\.$#"
-			count: 1
-			path: ../../typo3/sysext/extbase/Tests/UnitDeprecated/Persistence/RepositoryTest.php
-
-		-
-			message: "#^Call to an undefined method TYPO3\\\\CMS\\\\Extbase\\\\Persistence\\\\QueryInterface\\:\\:expects\\(\\)\\.$#"
-			count: 8
-			path: ../../typo3/sysext/extbase/Tests/UnitDeprecated/Persistence/RepositoryTest.php
-
 		-
 			message: "#^Parameter \\#2 \\$messageTitle of method TYPO3\\\\CMS\\\\Extbase\\\\Mvc\\\\Controller\\\\ActionController\\:\\:addFlashMessage\\(\\) expects string, int given\\.$#"
 			count: 1

Build/phpunit/UnitTestsDeprecated.xml

-<?xml version="1.0"?>
-<!--
-    Unit test deprecated suite setup.
-
-    This suite allows tests to trigger E_USER_DEPRECATED errors
-    without making the tests fail. Used to test deprecated core
-    functionality.
-
-    Unit tests should extend \TYPO3\TestingFramework\Core\Tests\UnitTestCase,
-    take a look at this class for further documentation on how to run the suite.
-
-    TYPO3 CMS unit test suite also needs phpunit bootstrap code, the
-    file is located next to this .xml as UnitTestsBootstrap.php
-
-    The recommended way to execute the suite is "runTests.sh -s unitDeprecated"
-    execute "Build/Scripts/runTests.sh -h" for more details.
--->
-<phpunit
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.2/phpunit.xsd"
-    beStrictAboutTestsThatDoNotTestAnything="false"
-    bootstrap="UnitTestsBootstrap.php"
-    cacheDirectory=".phpunit.cache"
-    cacheResult="false"
-    colors="true"
-    displayDetailsOnTestsThatTriggerDeprecations="true"
-    displayDetailsOnTestsThatTriggerErrors="true"
-    displayDetailsOnTestsThatTriggerNotices="true"
-    displayDetailsOnTestsThatTriggerWarnings="true"
-    failOnNotice="true"
-    failOnRisky="true"
-    failOnWarning="true"
->
-    <testsuites>
-        <testsuite name="Core tests">
-            <directory>../../typo3/sysext/*/Tests/UnitDeprecated/</directory>
-        </testsuite>
-    </testsuites>
-    <php>
-        <ini name="display_errors" value="1"/>
-        <ini name="error_reporting" value="E_ALL"/>
-        <env name="TYPO3_CONTEXT" value="Testing"/>
-    </php>
-</phpunit>

typo3/sysext/core/Tests/UnitDeprecated/Compatibility/Fixtures/PublicMethodDeprecationTraitTextFixture.php → typo3/sysext/core/Tests/Unit/Compatibility/Fixtures/PublicMethodDeprecationTraitTextFixture.php

@@ -15,7 +15,7 @@ declare(strict_types=1);
  * The TYPO3 project - inspiring people to share!
  */
 
-namespace TYPO3\CMS\Core\Tests\UnitDeprecated\Compatibility\Fixtures;
+namespace TYPO3\CMS\Core\Tests\Unit\Compatibility\Fixtures;
 
 use TYPO3\CMS\Core\Compatibility\PublicMethodDeprecationTrait;
 

typo3/sysext/core/Tests/UnitDeprecated/Compatibility/PublicMethodDeprecationTraitTest.php → typo3/sysext/core/Tests/Unit/Compatibility/PublicMethodDeprecationTraitTest.php

@@ -15,10 +15,11 @@ declare(strict_types=1);
  * The TYPO3 project - inspiring people to share!
  */
 
-namespace TYPO3\CMS\Core\Tests\UnitDeprecated\Compatibility;
+namespace TYPO3\CMS\Core\Tests\Unit\Compatibility;
 
+use PHPUnit\Framework\Attributes\IgnoreDeprecations;
 use PHPUnit\Framework\Attributes\Test;
-use TYPO3\CMS\Core\Tests\UnitDeprecated\Compatibility\Fixtures\PublicMethodDeprecationTraitTextFixture;
+use TYPO3\CMS\Core\Tests\Unit\Compatibility\Fixtures\PublicMethodDeprecationTraitTextFixture;
 use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 
 final class PublicMethodDeprecationTraitTest extends UnitTestCase
@@ -35,6 +36,7 @@ final class PublicMethodDeprecationTraitTest extends UnitTestCase
     public function protectedMethodNotHandledByTraitThrowsError(): void
     {
         $this->expectException(\Error::class);
+        /** @phpstan-ignore-next-line */
         (new PublicMethodDeprecationTraitTextFixture())->standardProtectedMethod();
     }
 
@@ -42,28 +44,47 @@ final class PublicMethodDeprecationTraitTest extends UnitTestCase
     public function notExistingMethodThrowsError(): void
     {
         $this->expectException(\Error::class);
+        /** @phpstan-ignore-next-line */
         (new PublicMethodDeprecationTraitTextFixture())->doesNotExist();
     }
 
+    /**
+     * Do NOT remove this test, even though it has IgnoreDeprecations attribute,
+     * we're testing the core's deprecation strategy here.
+     */
     #[Test]
+    #[IgnoreDeprecations]
     public function methodMadeProtectedCanBeCalled(): void
     {
         $this->expectException(\RuntimeException::class);
         $this->expectExceptionCode(1528822485);
+        /** @phpstan-ignore-next-line */
         (new PublicMethodDeprecationTraitTextFixture())->methodMadeProtected();
     }
 
+    /**
+     * Do NOT remove this test, even though it has IgnoreDeprecations attribute,
+     * we're testing the core's deprecation strategy here.
+     */
     #[Test]
+    #[IgnoreDeprecations]
     public function methodMadeProtectedReturnsValue(): void
     {
+        /** @phpstan-ignore-next-line */
         self::assertEquals('foo', (new PublicMethodDeprecationTraitTextFixture())->methodMadeProtectedWithReturn());
     }
 
+    /**
+     * Do NOT remove this test, even though it has IgnoreDeprecations attribute,
+     * we're testing the core's deprecation strategy here.
+     */
     #[Test]
+    #[IgnoreDeprecations]
     public function methodMadeProtectedCanBeCalledWithArguments(): void
     {
         $this->expectException(\RuntimeException::class);
         $this->expectExceptionCode(1528822486);
+        /** @phpstan-ignore-next-line */
         (new PublicMethodDeprecationTraitTextFixture())->methodMadeProtectedWithArguments('foo', 'bar');
     }
 }

typo3/sysext/core/Tests/UnitDeprecated/Compatibility/PublicPropertyDeprecationTraitTest.php → typo3/sysext/core/Tests/Unit/Compatibility/PublicPropertyDeprecationTraitTest.php

@@ -15,9 +15,10 @@ declare(strict_types=1);
  * The TYPO3 project - inspiring people to share!
  */
 
-namespace TYPO3\CMS\Core\Tests\UnitDeprecated\Compatibility;
+namespace TYPO3\CMS\Core\Tests\Unit\Compatibility;
 
 use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\IgnoreDeprecations;
 use PHPUnit\Framework\Attributes\Test;
 use TYPO3\CMS\Core\Compatibility\PublicPropertyDeprecationTrait;
 use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
@@ -79,14 +80,24 @@ final class PublicPropertyDeprecationTraitTest extends UnitTestCase
         ];
     }
 
+    /**
+     * Do NOT remove this test, even though it has IgnoreDeprecations attribute,
+     * we're testing the core's deprecation strategy here.
+     */
     #[DataProvider('issetDataProvider')]
     #[Test]
+    #[IgnoreDeprecations]
     public function issetWorksAsExpected(bool $expected, string $property): void
     {
         self::assertSame($expected, isset($this->fixture->$property));
     }
 
+    /**
+     * Do NOT remove this test, even though it has IgnoreDeprecations attribute,
+     * we're testing the core's deprecation strategy here.
+     */
     #[Test]
+    #[IgnoreDeprecations]
     public function unknownPropertyCanBeHandledAsUsual(): void
     {
         // Uses __isset()
@@ -114,7 +125,12 @@ final class PublicPropertyDeprecationTraitTest extends UnitTestCase
         self::assertFalse(isset($this->fixture->unsetPublicProperty));
     }
 
+    /**
+     * Do NOT remove this test, even though it has IgnoreDeprecations attribute,
+     * we're testing the core's deprecation strategy here.
+     */
     #[Test]
+    #[IgnoreDeprecations]
     public function taggedPropertyCanBeHandledLikePublicProperty(): void
     {
         self::assertFalse(isset($this->fixture->unsetTaggedProperty));
@@ -124,15 +140,4 @@ final class PublicPropertyDeprecationTraitTest extends UnitTestCase
         unset($this->fixture->unsetTaggedProperty);
         self::assertFalse(isset($this->fixture->unsetTaggedProperty));
     }
-
-    /**
-     * @return array [[$property],]
-     */
-    public function invalidPropertiesDataProvider(): array
-    {
-        return [
-            'untagged' => ['untaggedProperty'],
-            'unknown' => ['unknownProperty'],
-        ];
-    }
 }

typo3/sysext/core/Tests/Unit/Imaging/IconTest.php

@@ -18,6 +18,7 @@ declare(strict_types=1);
 namespace TYPO3\CMS\Core\Tests\Unit\Imaging;
 
 use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\IgnoreDeprecations;
 use PHPUnit\Framework\Attributes\Test;
 use Psr\Container\ContainerInterface;
 use TYPO3\CMS\Core\Cache\Frontend\FrontendInterface;
@@ -32,47 +33,47 @@ use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 
 final class IconTest extends UnitTestCase
 {
-    protected ?Icon $subject;
-    protected string $iconIdentifier = 'actions-close';
-    protected string $overlayIdentifier = 'overlay-readonly';
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-        $containerMock = $this->createMock(ContainerInterface::class);
-        $containerMock->method('has')->with(self::anything())->willReturn(false);
-        $iconFactory = new IconFactory(new NoopEventDispatcher(), new IconRegistry(new NullFrontend('test'), 'BackendIcons'), $containerMock, $this->createMock(FrontendInterface::class));
-        $this->subject = $iconFactory->getIcon($this->iconIdentifier, IconSize::SMALL, $this->overlayIdentifier, IconState::STATE_DISABLED);
-    }
+    private const iconIdentifier = 'actions-close';
+    private const overlayIdentifier = 'overlay-readonly';
 
     #[Test]
     public function renderAndCastToStringReturnsTheSameCode(): void
     {
-        self::assertEquals($this->subject->render(), (string)$this->subject);
+        $iconFactory = new IconFactory(new NoopEventDispatcher(), new IconRegistry(new NullFrontend('test'), 'BackendIcons'), $this->createMock(ContainerInterface::class), $this->createMock(FrontendInterface::class));
+        $subject = $iconFactory->getIcon(self::iconIdentifier, IconSize::SMALL, self::overlayIdentifier, IconState::STATE_DISABLED);
+        self::assertEquals($subject->render(), (string)$subject);
     }
 
     #[Test]
     public function getIdentifierReturnsCorrectIdentifier(): void
     {
-        self::assertEquals($this->iconIdentifier, $this->subject->getIdentifier());
+        $iconFactory = new IconFactory(new NoopEventDispatcher(), new IconRegistry(new NullFrontend('test'), 'BackendIcons'), $this->createMock(ContainerInterface::class), $this->createMock(FrontendInterface::class));
+        $subject = $iconFactory->getIcon(self::iconIdentifier, IconSize::SMALL, self::overlayIdentifier, IconState::STATE_DISABLED);
+        self::assertEquals(self::iconIdentifier, $subject->getIdentifier());
     }
 
     #[Test]
     public function getOverlayIdentifierReturnsCorrectIdentifier(): void
     {
-        self::assertEquals($this->overlayIdentifier, $this->subject->getOverlayIcon()->getIdentifier());
+        $iconFactory = new IconFactory(new NoopEventDispatcher(), new IconRegistry(new NullFrontend('test'), 'BackendIcons'), $this->createMock(ContainerInterface::class), $this->createMock(FrontendInterface::class));
+        $subject = $iconFactory->getIcon(self::iconIdentifier, IconSize::SMALL, self::overlayIdentifier, IconState::STATE_DISABLED);
+        self::assertEquals(self::overlayIdentifier, $subject->getOverlayIcon()->getIdentifier());
     }
 
     #[Test]
     public function getSizeIdentifierReturnsCorrectIdentifier(): void
     {
-        self::assertEquals(IconSize::SMALL->value, $this->subject->getSize());
+        $iconFactory = new IconFactory(new NoopEventDispatcher(), new IconRegistry(new NullFrontend('test'), 'BackendIcons'), $this->createMock(ContainerInterface::class), $this->createMock(FrontendInterface::class));
+        $subject = $iconFactory->getIcon(self::iconIdentifier, IconSize::SMALL, self::overlayIdentifier, IconState::STATE_DISABLED);
+        self::assertEquals(IconSize::SMALL->value, $subject->getSize());
     }
 
     #[Test]
     public function getStateReturnsCorrectIdentifier(): void
     {
-        self::assertSame($this->subject->getState(), IconState::STATE_DISABLED);
+        $iconFactory = new IconFactory(new NoopEventDispatcher(), new IconRegistry(new NullFrontend('test'), 'BackendIcons'), $this->createMock(ContainerInterface::class), $this->createMock(FrontendInterface::class));
+        $subject = $iconFactory->getIcon(self::iconIdentifier, IconSize::SMALL, self::overlayIdentifier, IconState::STATE_DISABLED);
+        self::assertSame($subject->getState(), IconState::STATE_DISABLED);
     }
 
     public static function setSizeSetsExpectedValuesDataProvider(): \Generator
@@ -115,4 +116,82 @@ final class IconTest extends UnitTestCase
         self::assertSame($width, $icon->getDimension()->getWidth());
         self::assertSame($height, $icon->getDimension()->getHeight());
     }
+
+    #[Test]
+    #[IgnoreDeprecations]
+    public function renderAndCastToStringReturnsTheSameCodeDeprecated(): void
+    {
+        $iconFactory = new IconFactory(new NoopEventDispatcher(), new IconRegistry(new NullFrontend('test'), 'BackendIcons'), $this->createMock(ContainerInterface::class), $this->createMock(FrontendInterface::class));
+        $subject = $iconFactory->getIcon(self::iconIdentifier, IconSize::SMALL, self::overlayIdentifier, \TYPO3\CMS\Core\Type\Icon\IconState::cast(\TYPO3\CMS\Core\Type\Icon\IconState::STATE_DISABLED));
+        self::assertEquals($subject->render(), (string)$subject);
+    }
+
+    #[Test]
+    #[IgnoreDeprecations]
+    public function getIdentifierReturnsCorrectIdentifierDeprecated(): void
+    {
+        $iconFactory = new IconFactory(new NoopEventDispatcher(), new IconRegistry(new NullFrontend('test'), 'BackendIcons'), $this->createMock(ContainerInterface::class), $this->createMock(FrontendInterface::class));
+        $subject = $iconFactory->getIcon(self::iconIdentifier, IconSize::SMALL, self::overlayIdentifier, \TYPO3\CMS\Core\Type\Icon\IconState::cast(\TYPO3\CMS\Core\Type\Icon\IconState::STATE_DISABLED));
+        self::assertEquals(self::iconIdentifier, $subject->getIdentifier());
+    }
+
+    #[Test]
+    #[IgnoreDeprecations]
+    public function getOverlayIdentifierReturnsCorrectIdentifierDeprecated(): void
+    {
+        $iconFactory = new IconFactory(new NoopEventDispatcher(), new IconRegistry(new NullFrontend('test'), 'BackendIcons'), $this->createMock(ContainerInterface::class), $this->createMock(FrontendInterface::class));
+        $subject = $iconFactory->getIcon(self::iconIdentifier, IconSize::SMALL, self::overlayIdentifier, \TYPO3\CMS\Core\Type\Icon\IconState::cast(\TYPO3\CMS\Core\Type\Icon\IconState::STATE_DISABLED));
+        self::assertEquals(self::overlayIdentifier, $subject->getOverlayIcon()->getIdentifier());
+    }
+
+    #[Test]
+    #[IgnoreDeprecations]
+    public function getSizeIdentifierReturnsCorrectIdentifierDeprecated(): void
+    {
+        $iconFactory = new IconFactory(new NoopEventDispatcher(), new IconRegistry(new NullFrontend('test'), 'BackendIcons'), $this->createMock(ContainerInterface::class), $this->createMock(FrontendInterface::class));
+        $subject = $iconFactory->getIcon(self::iconIdentifier, IconSize::SMALL, self::overlayIdentifier, \TYPO3\CMS\Core\Type\Icon\IconState::cast(\TYPO3\CMS\Core\Type\Icon\IconState::STATE_DISABLED));
+        self::assertEquals(IconSize::SMALL->value, $subject->getSize());
+    }
+
+    public static function setSizeSetsExpectedValuesDataProviderDeprecated(): \Generator
+    {
+        yield 'SIZE_DEFAULT' => [
+            Icon::SIZE_DEFAULT,
+            [16, 16],
+        ];
+        yield 'SIZE_SMALL' => [
+            Icon::SIZE_DEFAULT,
+            [16, 16],
+        ];
+        yield 'SIZE_OVERLAY' => [
+            Icon::SIZE_OVERLAY,
+            [16, 16],
+        ];
+        yield 'SIZE_MEDIUM' => [
+            Icon::SIZE_MEDIUM,
+            [32, 32],
+        ];
+        yield 'SIZE_LARGE' => [
+            Icon::SIZE_LARGE,
+            [48, 48],
+        ];
+        yield 'SIZE_MEGA' => [
+            Icon::SIZE_MEGA,
+            [64, 64],
+        ];
+    }
+
+    #[DataProvider('setSizeSetsExpectedValuesDataProviderDeprecated')]
+    #[Test]
+    #[IgnoreDeprecations]
+    public function setSizeSetsExpectedValuesDeprecated(string $size, array $expectedDimensions): void
+    {
+        $icon = new Icon();
+        $icon->setSize($size);
+
+        [$width, $height] = $expectedDimensions;
+
+        self::assertSame($width, $icon->getDimension()->getWidth());
+        self::assertSame($height, $icon->getDimension()->getHeight());
+    }
 }

typo3/sysext/core/Tests/UnitDeprecated/Type/EnumerationTest.php → typo3/sysext/core/Tests/Unit/Type/EnumerationTest.php

@@ -15,72 +15,76 @@ declare(strict_types=1);
  * The TYPO3 project - inspiring people to share!
  */
 
-namespace TYPO3\CMS\Core\Tests\UnitDeprecated\Type;
+namespace TYPO3\CMS\Core\Tests\Unit\Type;
 
 use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\IgnoreDeprecations;
 use PHPUnit\Framework\Attributes\Test;
-use TYPO3\CMS\Core\Tests\UnitDeprecated\Type\Fixture\Enumeration\CompleteEnumeration;
-use TYPO3\CMS\Core\Tests\UnitDeprecated\Type\Fixture\Enumeration\DuplicateConstantValueEnumeration;
-use TYPO3\CMS\Core\Tests\UnitDeprecated\Type\Fixture\Enumeration\InvalidConstantEnumeration;
-use TYPO3\CMS\Core\Tests\UnitDeprecated\Type\Fixture\Enumeration\MissingConstantsEnumeration;
-use TYPO3\CMS\Core\Tests\UnitDeprecated\Type\Fixture\Enumeration\MissingDefaultEnumeration;
+use TYPO3\CMS\Core\Tests\Unit\Type\Fixture\Enumeration\CompleteEnumeration;
+use TYPO3\CMS\Core\Tests\Unit\Type\Fixture\Enumeration\DuplicateConstantValueEnumeration;
+use TYPO3\CMS\Core\Tests\Unit\Type\Fixture\Enumeration\InvalidConstantEnumeration;
+use TYPO3\CMS\Core\Tests\Unit\Type\Fixture\Enumeration\MissingConstantsEnumeration;
+use TYPO3\CMS\Core\Tests\Unit\Type\Fixture\Enumeration\MissingDefaultEnumeration;
 use TYPO3\CMS\Core\Type\Exception\InvalidEnumerationDefinitionException;
 use TYPO3\CMS\Core\Type\Exception\InvalidEnumerationValueException;
 use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 
+/**
+ * @deprecated Remove fixture files in Fixture/Enumeration in v14 as well.
+ */
 final class EnumerationTest extends UnitTestCase
 {
     #[Test]
+    #[IgnoreDeprecations]
     public function constructorThrowsExceptionIfNoConstantsAreDefined(): void
     {
         $this->expectException(InvalidEnumerationValueException::class);
         $this->expectExceptionCode(1381512753);
-
         new MissingConstantsEnumeration();
     }
 
     #[Test]
+    #[IgnoreDeprecations]
     public function constructorThrowsExceptionIfInvalidValueIsRequested(): void
     {
         $this->expectException(InvalidEnumerationValueException::class);
         $this->expectExceptionCode(1381512761);
-
         new CompleteEnumeration('bar');
     }
 
     #[Test]
+    #[IgnoreDeprecations]
     public function loadValuesThrowsExceptionIfGivenValueIsNotAvailableInEnumeration(): void
     {
         $this->expectException(InvalidEnumerationValueException::class);
         $this->expectExceptionCode(1381512807);
-
         new MissingConstantsEnumeration(2);
     }
 
     #[Test]
+    #[IgnoreDeprecations]
     public function loadValuesThrowsExceptionIfDisallowedTypeIsDefinedAsConstant(): void
     {
         $this->expectException(InvalidEnumerationDefinitionException::class);
         $this->expectExceptionCode(1381512797);
-
         new InvalidConstantEnumeration(1);
     }
 
     #[Test]
+    #[IgnoreDeprecations]
     public function loadValuesThrowsExceptionIfNoDefaultConstantIsDefinedAndNoValueIsGiven(): void
     {
         $this->expectException(InvalidEnumerationValueException::class);
         $this->expectExceptionCode(1381512753);
-
         new MissingDefaultEnumeration();
     }
 
     #[Test]
+    #[IgnoreDeprecations]
     public function loadValuesThrowsExceptionIfValueIsDefinedMultipleTimes(): void
     {
         $this->expectException(InvalidEnumerationDefinitionException::class);
         $this->expectExceptionCode(1381512859);
-
         new DuplicateConstantValueEnumeration(1);
     }
 
@@ -115,10 +119,10 @@ final class EnumerationTest extends UnitTestCase
 
     #[DataProvider('looseEnumerationValues')]
     #[Test]
+    #[IgnoreDeprecations]
     public function doesTypeLooseComparison(string|int $testValue, string|int $expectedValue): void
     {
         $value = new CompleteEnumeration($testValue);
-
         self::assertEquals((string)$expectedValue, (string)$value);
     }
 
@@ -130,7 +134,6 @@ final class EnumerationTest extends UnitTestCase
             'STRING_INTEGER_VALUE' => '2',
             'STRING_VALUE' => 'foo',
         ];
-
         self::assertEquals($expected, CompleteEnumeration::getConstants());
     }
 
@@ -143,11 +146,11 @@ final class EnumerationTest extends UnitTestCase
             'STRING_VALUE' => 'foo',
             '__default' => 1,
         ];
-
         self::assertEquals($expected, CompleteEnumeration::getConstants(true));
     }
 
     #[Test]
+    #[IgnoreDeprecations]
     public function getConstantsCanBeCalledOnInstances(): void
     {
         $enumeration = new CompleteEnumeration();
@@ -156,11 +159,11 @@ final class EnumerationTest extends UnitTestCase
             'STRING_INTEGER_VALUE' => '2',
             'STRING_VALUE' => 'foo',
         ];
-
         self::assertEquals($expected, $enumeration::getConstants());
     }
 
     #[Test]
+    #[IgnoreDeprecations]
     public function toStringReturnsValueAsString(): void
     {
         $enumeration = new CompleteEnumeration();
@@ -168,6 +171,7 @@ final class EnumerationTest extends UnitTestCase
     }
 
     #[Test]
+    #[IgnoreDeprecations]
     public function castReturnsObjectOfEnumerationTypeIfSimpleValueIsGiven(): void
     {
         $enumeration = CompleteEnumeration::cast(1);
@@ -175,6 +179,7 @@ final class EnumerationTest extends UnitTestCase
     }
 
     #[Test]
+    #[IgnoreDeprecations]
     public function castReturnsObjectOfCalledEnumerationTypeIfCalledWithValueOfDifferentType(): void
     {
         $initialEnumeration = new MissingDefaultEnumeration(1);
@@ -183,6 +188,7 @@ final class EnumerationTest extends UnitTestCase
     }
 
     #[Test]
+    #[IgnoreDeprecations]
     public function castReturnsGivenObjectIfCalledWithValueOfSameType(): void
     {
         $initialEnumeration = new CompleteEnumeration(1);
@@ -191,22 +197,23 @@ final class EnumerationTest extends UnitTestCase
     }
 
     #[Test]
+    #[IgnoreDeprecations]
     public function castCastsStringToEnumerationWithCorrespondingValue(): void
     {
         $value = new CompleteEnumeration(CompleteEnumeration::STRING_VALUE);
-
         self::assertSame(CompleteEnumeration::STRING_VALUE, (string)$value);
     }
 
     #[Test]
+    #[IgnoreDeprecations]
     public function castCastsIntegerToEnumerationWithCorrespondingValue(): void
     {
         $value = new CompleteEnumeration(CompleteEnumeration::INTEGER_VALUE);
-
         self::assertSame((int)(string)CompleteEnumeration::INTEGER_VALUE, (int)(string)$value);
     }
 
     #[Test]
+    #[IgnoreDeprecations]
     public function equalsReturnsTrueIfIntegerIsGivenThatEqualsEnumerationsIntegerValue(): void
     {
         $enumeration = new CompleteEnumeration(1);
@@ -214,6 +221,7 @@ final class EnumerationTest extends UnitTestCase
     }
 
     #[Test]
+    #[IgnoreDeprecations]
     public function equalsReturnsTrueIfStringIsGivenThatEqualsEnumerationsIntegerValue(): void
     {
         $enumeration = new CompleteEnumeration(1);
@@ -221,6 +229,7 @@ final class EnumerationTest extends UnitTestCase
     }
 
     #[Test]
+    #[IgnoreDeprecations]
     public function equalsReturnsTrueIfEqualEnumerationIsGiven(): void
     {
         $enumerationFoo = new CompleteEnumeration(1);
@@ -229,6 +238,7 @@ final class EnumerationTest extends UnitTestCase
     }
 
     #[Test]
+    #[IgnoreDeprecations]
     public function equalsReturnsTrueIfDifferentEnumerationWithSameValueIsGiven(): void
     {
         $enumerationFoo = new CompleteEnumeration(1);
@@ -237,6 +247,7 @@ final class EnumerationTest extends UnitTestCase
     }
 
     #[Test]
+    #[IgnoreDeprecations]
     public function equalsReturnsFalseIfDifferentEnumerationWithDifferentValueIsGiven(): void
     {
         $enumerationFoo = new CompleteEnumeration('foo');
@@ -245,6 +256,7 @@ final class EnumerationTest extends UnitTestCase
     }
 
     #[Test]
+    #[IgnoreDeprecations]
     public function equalsReturnsFalseIfEnumerationOfSameTypeWithDifferentValueIsGiven(): void
     {
         $enumerationFoo = new CompleteEnumeration(1);

typo3/sysext/core/Tests/UnitDeprecated/Type/Fixture/Enumeration/CompleteEnumeration.php → typo3/sysext/core/Tests/Unit/Type/Fixture/Enumeration/CompleteEnumeration.php

@@ -15,12 +15,12 @@ declare(strict_types=1);
  * The TYPO3 project - inspiring people to share!
  */
 
-namespace TYPO3\CMS\Core\Tests\UnitDeprecated\Type\Fixture\Enumeration;
+namespace TYPO3\CMS\Core\Tests\Unit\Type\Fixture\Enumeration;
 
 use TYPO3\CMS\Core\Type\Enumeration;
 
 /**
- * This is a complete enumeration with all possible constant values
+ * @deprecated Remove together with EnumerationTest and Enumeration
  */
 final class CompleteEnumeration extends Enumeration
 {

typo3/sysext/core/Tests/UnitDeprecated/Type/Fixture/Enumeration/DuplicateConstantValueEnumeration.php → typo3/sysext/core/Tests/Unit/Type/Fixture/Enumeration/DuplicateConstantValueEnumeration.php

@@ -15,12 +15,12 @@ declare(strict_types=1);
  * The TYPO3 project - inspiring people to share!
  */
 
-namespace TYPO3\CMS\Core\Tests\UnitDeprecated\Type\Fixture\Enumeration;
+namespace TYPO3\CMS\Core\Tests\Unit\Type\Fixture\Enumeration;
 
 use TYPO3\CMS\Core\Type\Enumeration;
 
 /**
- * This is an invalid enumeration because the constant values are not unique
+ * @deprecated Remove together with EnumerationTest and Enumeration
  */
 final class DuplicateConstantValueEnumeration extends Enumeration
 {

typo3/sysext/core/Tests/UnitDeprecated/Type/Fixture/Enumeration/InvalidConstantEnumeration.php → typo3/sysext/core/Tests/Unit/Type/Fixture/Enumeration/InvalidConstantEnumeration.php

@@ -15,12 +15,12 @@ declare(strict_types=1);
  * The TYPO3 project - inspiring people to share!
  */
 
-namespace TYPO3\CMS\Core\Tests\UnitDeprecated\Type\Fixture\Enumeration;
+namespace TYPO3\CMS\Core\Tests\Unit\Type\Fixture\Enumeration;
 
 use TYPO3\CMS\Core\Type\Enumeration;
 
 /**
- * This is an invalid enumeration because an unsupported constant value is used
+ * @deprecated Remove together with EnumerationTest and Enumeration
  */
 final class InvalidConstantEnumeration extends Enumeration
 {

typo3/sysext/core/Tests/UnitDeprecated/Type/Fixture/Enumeration/MissingConstantsEnumeration.php → typo3/sysext/core/Tests/Unit/Type/Fixture/Enumeration/MissingConstantsEnumeration.php

@@ -15,11 +15,11 @@ declare(strict_types=1);
  * The TYPO3 project - inspiring people to share!
  */
 
-namespace TYPO3\CMS\Core\Tests\UnitDeprecated\Type\Fixture\Enumeration;
+namespace TYPO3\CMS\Core\Tests\Unit\Type\Fixture\Enumeration;
 
 use TYPO3\CMS\Core\Type\Enumeration;
 
 /**
- * This is an invalid enumeration because no constants are defined
+ * @deprecated Remove together with EnumerationTest and Enumeration
  */
 final class MissingConstantsEnumeration extends Enumeration {}

typo3/sysext/core/Tests/UnitDeprecated/Type/Fixture/Enumeration/MissingDefaultEnumeration.php → typo3/sysext/core/Tests/Unit/Type/Fixture/Enumeration/MissingDefaultEnumeration.php

@@ -15,12 +15,12 @@ declare(strict_types=1);
  * The TYPO3 project - inspiring people to share!
  */
 
-namespace TYPO3\CMS\Core\Tests\UnitDeprecated\Type\Fixture\Enumeration;
+namespace TYPO3\CMS\Core\Tests\Unit\Type\Fixture\Enumeration;
 
 use TYPO3\CMS\Core\Type\Enumeration;
 
 /**
- * This is an enumeration without a default value so it must be called with a value
+ * @deprecated Remove together with EnumerationTest and Enumeration
  */
 final class MissingDefaultEnumeration extends Enumeration
 {

typo3/sysext/core/Tests/Unit/Utility/GeneralUtilityTest.php

@@ -18,6 +18,7 @@ declare(strict_types=1);
 namespace TYPO3\CMS\Core\Tests\Unit\Utility;
 
 use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\IgnoreDeprecations;
 use PHPUnit\Framework\Attributes\Test;
 use Psr\Log\LoggerInterface;
 use TYPO3\CMS\Core\Cache\CacheManager;
@@ -3602,4 +3603,34 @@ final class GeneralUtilityTest extends UnitTestCase
         $result = GeneralUtility::getMaxUploadFileSize();
         self::assertGreaterThan(0, $result);
     }
+
+    #[Test]
+    #[IgnoreDeprecations]
+    public function hmacReturnsHashOfProperLength(): void
+    {
+        $GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey'] = '';
+        $hmac = GeneralUtility::hmac('message');
+        self::assertTrue(!empty($hmac) && is_string($hmac));
+        self::assertEquals(strlen($hmac), 40);
+    }
+
+    #[Test]
+    #[IgnoreDeprecations]
+    public function hmacReturnsEqualHashesForEqualInput(): void
+    {
+        $GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey'] = '';
+        $msg0 = 'message';
+        $msg1 = 'message';
+        self::assertEquals(GeneralUtility::hmac($msg0), GeneralUtility::hmac($msg1));
+    }
+
+    #[Test]
+    #[IgnoreDeprecations]
+    public function hmacReturnsNoEqualHashesForNonEqualInput(): void
+    {
+        $GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey'] = '';
+        $msg0 = 'message0';
+        $msg1 = 'message1';
+        self::assertNotEquals(GeneralUtility::hmac($msg0), GeneralUtility::hmac($msg1));
+    }
 }

typo3/sysext/core/Tests/Unit/Utility/MathUtilityTest.php

@@ -18,6 +18,7 @@ declare(strict_types=1);
 namespace TYPO3\CMS\Core\Tests\Unit\Utility;
 
 use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\IgnoreDeprecations;
 use PHPUnit\Framework\Attributes\Test;
 use TYPO3\CMS\Core\Tests\Unit\Utility\Fixtures\MathUtilityTestClassWithStringRepresentationFixture;
 use TYPO3\CMS\Core\Utility\MathUtility;
@@ -264,4 +265,18 @@ final class MathUtilityTest extends UnitTestCase
     {
         self::assertFalse(MathUtility::isIntegerInRange($inputValue, 0, 10));
     }
+
+    #[Test]
+    #[IgnoreDeprecations]
+    public function convertToPositiveIntegerReturnsZeroForNegativeValues(): void
+    {
+        self::assertEquals(0, MathUtility::convertToPositiveInteger(-123));
+    }
+
+    #[Test]
+    #[IgnoreDeprecations]
+    public function convertToPositiveIntegerReturnsTheInputValueForPositiveValues(): void
+    {
+        self::assertEquals(123, MathUtility::convertToPositiveInteger(123));
+    }
 }

typo3/sysext/core/Tests/Unit/Utility/PathUtilityPublicPathsTest.php

@@ -18,6 +18,7 @@ declare(strict_types=1);
 namespace TYPO3\CMS\Core\Tests\Unit\Utility;
 
 use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\IgnoreDeprecations;
 use PHPUnit\Framework\Attributes\Test;
 use TYPO3\CMS\Core\Core\Environment;
 use TYPO3\CMS\Core\Resource\Exception\InvalidFileException;
@@ -131,17 +132,36 @@ final class PathUtilityPublicPathsTest extends UnitTestCase
         ];
     }
 
-    /**
-     * @throws InvalidFileException
-     */
     #[DataProvider('getPublicResourceWebPathResolvesUrlsCorrectlyDataProvider')]
     #[Test]
     public function getPublicResourceWebPathResolvesUrlsCorrectly(string $pathReference, string $expectedUrl, callable $setup): void
     {
         $setup();
-        self::assertSame(
-            $expectedUrl,
-            PathUtility::getPublicResourceWebPath($pathReference)
-        );
+        self::assertSame($expectedUrl, PathUtility::getPublicResourceWebPath($pathReference));
+    }
+
+    public static function getPublicResourceWebPathResolvesUrlsCorrectlyDataProviderDeprecated(): array
+    {
+        return [
+            'private assets are resolved to absolute url' => [
+                'EXT:core/Resources/Private/Font/nimbus.ttf',
+                '/typo3/sysext/core/Resources/Private/Font/nimbus.ttf',
+                fn() => self::simulateTraditionalWebRequest(),
+            ],
+            'private assets are resolved to absolute url with sub directory prefixed' => [
+                'EXT:core/Resources/Private/Font/nimbus.ttf',
+                '/cms/typo3/sysext/core/Resources/Private/Font/nimbus.ttf',
+                fn() => self::simulateTraditionalWebRequestInSubDirectory('/cms/'),
+            ],
+        ];
+    }
+
+    #[DataProvider('getPublicResourceWebPathResolvesUrlsCorrectlyDataProviderDeprecated')]
+    #[Test]
+    #[IgnoreDeprecations]
+    public function getPublicResourceWebPathResolvesUrlsCorrectlyDeprecated(string $pathReference, string $expectedUrl, callable $setup): void
+    {
+        $setup();
+        self::assertSame($expectedUrl, PathUtility::getPublicResourceWebPath($pathReference));
     }
 }

typo3/sysext/core/Tests/UnitDeprecated/Versioning/VersionStateTest.php → typo3/sysext/core/Tests/Unit/Versioning/VersionStateTest.php

@@ -15,9 +15,10 @@ declare(strict_types=1);
  * The TYPO3 project - inspiring people to share!
  */
 
-namespace TYPO3\CMS\Core\Tests\UnitDeprecated\Versioning;
+namespace TYPO3\CMS\Core\Tests\Unit\Versioning;
 
 use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\IgnoreDeprecations;
 use PHPUnit\Framework\Attributes\Test;
 use TYPO3\CMS\Core\Versioning\VersionState;
 use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
@@ -42,6 +43,7 @@ final class VersionStateTest extends UnitTestCase
 
     #[DataProvider('canBeCastedDataProvider')]
     #[Test]
+    #[IgnoreDeprecations]
     public function canBeCasted(mixed $value, ?int $expectation): void
     {
         self::assertSame($expectation, VersionState::cast($value)?->value);
@@ -60,6 +62,7 @@ final class VersionStateTest extends UnitTestCase
 
     #[DataProvider('canBeComparedDataProvider')]
     #[Test]
+    #[IgnoreDeprecations]
     public function canBeCompared(mixed $value, bool $expectation): void
     {
         self::assertSame($expectation, VersionState::MOVE_POINTER->equals($value));