chore: prepare for TYPO3_v12

AOEpeople · Jul 1, 2024 · a372e1d · a372e1d
1 parent 102d561
commit a372e1d
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 29 deletions.
diff --git a/Tests/Unit/Configuration/ExtensionConfigurationTest.php b/Tests/Unit/Configuration/ExtensionConfigurationTest.php
@@ -44,6 +44,8 @@ class ExtensionConfigurationTest extends BaseTestCase
      */
     protected function setUp(): void
     {
+        parent::setUp();
+
         $mockedExtConfig = [
             'refreshCache' => '0',
             'productionContext' => '1',

diff --git a/Tests/phpunit.xml b/Tests/phpunit.xml
@@ -1,31 +1,30 @@
-<phpunit
-        backupGlobals="true"
-        backupStaticAttributes="false"
-        bootstrap="../../../../typo3/sysext/core/Build/UnitTestsBootstrap.php"
-        colors="false"
-        convertErrorsToExceptions="true"
-        convertNoticesToExceptions="true"
-        convertWarningsToExceptions="true"
-        forceCoversAnnotation="false"
-        processIsolation="false"
-        stopOnError="false"
-        stopOnFailure="false"
-        stopOnIncomplete="false"
-        stopOnSkipped="false"
-        verbose="false"
-        >
+<?xml version="1.0"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         backupGlobals="true"
+         bootstrap="../.Build/vendor/typo3/testing-framework/Resources/Core/Build/UnitTestsBootstrap.php"
+         colors="false"
+         processIsolation="false"
+         stopOnError="false"
+         stopOnFailure="false"
+         stopOnIncomplete="false"
+         stopOnSkipped="false"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+         cacheDirectory=".phpunit.cache"
+         backupStaticProperties="false"
+         requireCoverageMetadata="false"
+>
     <testsuites>
         <testsuite name="restler">
             <directory suffix="Test.php">./</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">../Classes</directory>
-        </whitelist>
-    </filter>
     <php>
         <const name="RESTLER_PHPUNIT_CONTEXT" value="1"/>
         <env name="TYPO3_PATH_WEB" value="../../../.."/>
     </php>
-</phpunit>
+    <source>
+        <include>
+            <directory suffix=".php">../Classes</directory>
+        </include>
+    </source>
+</phpunit>
diff --git a/composer.json b/composer.json
@@ -18,12 +18,12 @@
         "ext-json": "*",
         "ext-mbstring": "*",
         "ext-iconv": "*",
-        "typo3/cms-core": "^11.5",
+        "typo3/cms-core": "^11.5 || ^12.4",
         "luracast/restler": "^5.0",
         "cweagans/composer-patches": "^1.7"
     },
     "require-dev": {
-        "typo3/testing-framework": "^7.0.4",
+        "typo3/testing-framework": "^7.0.4 || ^8.0",
         "phpspec/prophecy-phpunit": "^2.0",
         "phpunit/phpcov": "*",
         "phpcompatibility/php-compatibility": "^9.3",
@@ -65,11 +65,11 @@
         ],
         "test:unit": [
             "[ -e .Build/bin/phpunit ] || composer update",
-            "TYPO3_PATH_ROOT=.Build/Web .Build/bin/phpunit -c .Build/vendor/typo3/testing-framework/Resources/Core/Build/UnitTests-v10.xml Tests/Unit"
+            "XDEBUG_MODE=coverage TYPO3_PATH_ROOT=.Build/Web .Build/bin/phpunit -c Tests/phpunit.xml Tests/Unit"
         ],
         "test:unit-filter": [
             "[ -e .Build/bin/phpunit ] || composer update",
-            "TYPO3_PATH_ROOT=.Build/Web .Build/bin/phpunit -c .Build/vendor/typo3/testing-framework/Resources/Core/Build/UnitTests-v10.xml Tests/Unit --filter=ExceptionHandlerTest"
+            "TYPO3_PATH_ROOT=.Build/Web .Build/bin/phpunit -c Tests/phpunit.xml Tests/Unit --filter=ExceptionHandlerTest"
         ],
         "code-style": [
             "[ -e ./.Build/bin/rector ] || composer install",

diff --git a/ext_localconf.php b/ext_localconf.php
@@ -6,9 +6,7 @@
 use TYPO3\CMS\Core\Cache\Backend\SimpleFileBackend;
 use TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend;
 
-if (!defined('TYPO3_MODE')) {
-    die('Access denied.');
-}
+defined('TYPO3') or die();
 
 // base restler annotations
 $restlerAnnotations = ['url',