chore: CD-327361 Added TYPO3 12 support, removed some deprecations an…

…d fixed code-style
AOEpeople · Sep 2, 2024 · 67de09b · 67de09b
1 parent 84cdccd
commit 67de09b
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 19 deletions.
diff --git a/.code-quality/phpstan.neon b/.code-quality/phpstan.neon
@@ -8,9 +8,11 @@ parameters:
     paths:
         - "../Classes/"
 
+    ignoreErrors:
+        - identifier: missingType.iterableValue
+        - identifier: missingType.generics
+
     inferPrivatePropertyTypeFromConstructor: true
-    checkMissingIterableValueType: false
-    checkGenericClassInNonGenericObjectType: false
 
 services:
     -

diff --git a/.code-quality/rector.php b/.code-quality/rector.php
@@ -5,7 +5,6 @@
 use Rector\CodeQuality\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector;
 use Rector\Config\RectorConfig;
 use Rector\DeadCode\Rector\Property\RemoveUnusedPrivatePropertyRector;
-use Rector\EarlyReturn\Rector\If_\ChangeAndIfToEarlyReturnRector;
 use Rector\Set\ValueObject\SetList;
 use Rector\PHPUnit\CodeQuality\Rector\Class_\YieldDataProviderRector;
 use Rector\PHPUnit\Set\PHPUnitSetList;
@@ -33,7 +32,6 @@
         PHPUnitSetList::PHPUNIT_CODE_QUALITY
     ])
     ->withSkip([
-        ChangeAndIfToEarlyReturnRector::class,
         TypedPropertyFromStrictSetUpRector::class,
         AddMethodCallBasedStrictParamTypeRector::class,
         FlipTypeControlToUseExclusiveTypeRector::class,

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        typo3: [ ^11.5, ^12.4 ]
+        typo3: [ ^12.4 ]
         php: [ '8.1', '8.2', '8.3' ]
         mysql: [ '5.7' ]
 

diff --git a/Configuration/Services.yaml b/Configuration/Services.yaml
@@ -16,4 +16,4 @@ services:
     AOE\HappyFeet\Domain\Repository\FootnoteRepository:
 
     AOE\HappyFeet\Typo3\Hook\HappyFeetLinkWizzard:
-        public: true
+        public: true
diff --git a/Tests/Unit/Typo3/Hooks/TcemainTest.php b/Tests/Unit/Typo3/Hooks/TcemainTest.php
@@ -47,12 +47,12 @@ class TcemainTest extends UnitTestCase
     /**
      * @var DataHandler
      */
-    protected $dataHandler;
+    protected MockObject $dataHandler;
 
     /**
      * @var FootnoteRepository|MockObject
      */
-    protected $footnoteRepository;
+    protected MockObject $footnoteRepository;
 
     protected function setUp(): void
     {

diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
     "require": {
         "php": ">8.0",
         "ext-pdo": "*",
-        "typo3/cms-core": "^11.5 || ^12.4",
+        "typo3/cms-core": "^12.4",
         "typo3/cms-extbase": "*"
     },
     "require-dev": {
@@ -82,11 +82,9 @@
             "./.Build/bin/phpstan analyse -c .code-quality/phpstan.neon --memory-limit=1G --generate-baseline"
         ],
         "code-compatibility": [
-            "[ -e ./.Build/vendor/symplify/easy-coding-standard/vendor/squizlabs/php_codesniffer/bin/phpcs ] || composer install",
+            "[ -e ./.Build/vendor/symplify/easy-coding-standard/vendor/squizlabs/php_codesniffer/bin/phpcs ] || composer update",
             "[ -d ./reports/php_checkstyle ] || mkdir -p reports/php_checkstyle/",
             "./.code-quality/configure-checkstyle.sh",
-            "./.Build/vendor/symplify/easy-coding-standard/vendor/squizlabs/php_codesniffer/bin/phpcs -d memory_limit=1G --standard=PHPCompatibility --colors --ignore=*/.Build/* -p . --runtime-set testVersion 7.4",
-            "./.Build/vendor/symplify/easy-coding-standard/vendor/squizlabs/php_codesniffer/bin/phpcs -d memory_limit=1G --standard=PHPCompatibility --colors --ignore=*/.Build/* -p . --runtime-set testVersion 8.0",
             "./.Build/vendor/symplify/easy-coding-standard/vendor/squizlabs/php_codesniffer/bin/phpcs -d memory_limit=1G --standard=PHPCompatibility --colors --ignore=*/.Build/* -p . --runtime-set testVersion 8.1",
             "./.Build/vendor/symplify/easy-coding-standard/vendor/squizlabs/php_codesniffer/bin/phpcs -d memory_limit=1G --standard=PHPCompatibility --colors --ignore=*/.Build/* -p . --runtime-set testVersion 8.2",
             "./.Build/vendor/symplify/easy-coding-standard/vendor/squizlabs/php_codesniffer/bin/phpcs -d memory_limit=1G --standard=PHPCompatibility --colors --ignore=*/.Build/* -p . --runtime-set testVersion 8.3"

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -19,10 +19,10 @@
     'clearCacheOnLoad' => 0,
     'lockType' => '',
     'author_company' => 'AOE GmbH',
-    'version' => '11.3.5',
+    'version' => '12.0.0',
     'constraints' => [
         'depends' => [
-            'typo3' => '11.5.0-11.5.99',
+            'typo3' => '12.4.0-12.4.99',
         ],
         'conflicts' => [],
         'suggests' => [],

diff --git a/ext_localconf.php b/ext_localconf.php
@@ -2,7 +2,6 @@
 
 use AOE\HappyFeet\Typo3\Hook\LinkHandler;
 use AOE\HappyFeet\Typo3\Hook\LinkRenderer;
-use AOE\HappyFeet\Typo3\Hook\Tcemain;
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 
 defined('TYPO3') or die();
@@ -15,8 +14,5 @@
     "@import 'EXT:happy_feet/Configuration/TsConfig/Page/TceMain.tsconfig'"
 );
 
-#$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processDatamapClass']['happy_feet'] =
-#    Tcemain::class;
-
 $GLOBALS['TYPO3_CONF_VARS']['FE']['typolinkBuilder']['happy_feet'] = LinkRenderer::class;
 $GLOBALS['TYPO3_CONF_VARS']['SYS']['linkHandler']['happy_feet'] = LinkHandler::class;
diff --git a/ext_tables.php b/ext_tables.php
@@ -7,4 +7,4 @@
     'lower' => mktime(0, 0, 0, date('m') - 1, date('d'), date('Y'))
 ];
 
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::allowTableOnStandardPages('tx_happyfeet_domain_model_footnote');
+$GLOBALS['TCA']['tx_happyfeet_domain_model_footnote']['ctrl']['security']['ignorePageTypeRestriction'] = true;