Merge branch 'release/12.1.1'

.github/workflows/test.yml

@@ -43,7 +43,7 @@ jobs:
         with:
           php-version: "${{ env.MAIN_PHP_VERSION }}"
       - run: |
-          bash .Build/bin/t3_check_codestyle.sh PSRHtml5mediakit
+          bash .Build/bin/t3_check_codestyle.sh PerCodeStyleT3Ext
 
   "check-codestyle-php-cs-fixer":
     name: "PHP CS Fixer check"

Build/php-cs-fixer/config.php

@@ -8,7 +8,7 @@
     exit('This script supports command line usage only. Please check your command.');
 }
 
-$rules = include __DIR__ . '/../../.Build/vendor/de-swebhosting/php-codestyle/PhpCsFixer/Psr12DefaultRules.php';
+$rules = include __DIR__ . '/../../.Build/vendor/de-swebhosting/php-codestyle/PhpCsFixer/PerCsDefaultRules.php';
 
 return (new Config())
     ->setFinder(

Classes/Exception/MediaException.php

@@ -21,6 +21,4 @@
  *
  * @codeCoverageIgnore No code to test.
  */
-class MediaException extends RuntimeException
-{
-}
+class MediaException extends RuntimeException {}

Configuration/Services.php

@@ -4,7 +4,7 @@
 
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
-return function (ContainerConfigurator $configurator): void {
+return static function (ContainerConfigurator $configurator): void {
     $configurator->services()
         ->defaults()->autowire()->autoconfigure()->public()
 

Configuration/TCA/Overrides/sys_file_reference.php

@@ -4,7 +4,7 @@
 
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 
-$lllPrefix = 'LLL:EXT:html5mediakit/Resources/Private/Language/locallang_db:sys_file_reference.';
+$lllPrefix = 'LLL:EXT:html5mediakit/Resources/Private/Language/locallang_db.xlf:sys_file_reference.';
 
 $additionalColumns = [
     'tx_html5mediakit_track_kind' => [

Configuration/TCA/tx_html5mediakit_domain_model_media.php

@@ -10,8 +10,8 @@
 $languagePrefixCsh = 'LLL:EXT:html5mediakit/Resources/Private/Language/locallang_csh_media.xlf:';
 $lllAddImageFileReference = 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:images.addFileReference';
 
-$buildFileFieldConfig = function (
-    string|array $allowedFileTypes,
+$buildFileFieldConfig = static function (
+    array|string $allowedFileTypes,
     int $maxitems = 1,
     string $showitem = '',
     string $createNewRelationLinkTitle = '',

Documentation/Settings.cfg

@@ -25,7 +25,7 @@ project     = html5mediakit
 # ...   (recommended) version, displayed next to title (desktop) and in <meta name="book-version"
 # .................................................................................
 
-release     = 12.1.0
+release     = 12.1.1
 
 # .................................................................................
 # ...  (recommended) displayed in footer

Tests/Acceptance/Support/Extension/BackendHtml5mediakitEnvironment.php

@@ -21,11 +21,9 @@ class BackendHtml5mediakitEnvironment extends BackendEnvironment
             'extbase',
             'fluid',
             'backend',
-            'about',
             'filelist',
             'install',
             'frontend',
-            'recordlist',
             'fluid_styled_content',
         ],
         'testExtensionsToLoad' => ['typo3conf/ext/html5mediakit'],

Tests/CodeSniffer/PSRHtml5mediakit/ruleset.xml → Tests/CodeSniffer/PerCodeStyleT3Ext/ruleset.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<ruleset name="PSRHtml5mediakit">
+<ruleset name="PerCodeStyleT3Ext">
     <description>Based on PSRDefault. Adjust only if REALLY neccessary!</description>
     <rule ref="PSRDefault"/>
     <rule ref="PSR2.Methods.MethodDeclaration.Underscore">
@@ -9,4 +9,11 @@
         <exclude-pattern>Tests/Acceptance/*</exclude-pattern>
         <exclude-pattern>ext_emconf.php</exclude-pattern>
     </rule>
+    <!-- Exceptions for classes with empty body -->
+    <rule ref="PSR2.Classes.ClassDeclaration">
+        <exclude-pattern>Classes/Exception/MediaException.php</exclude-pattern>
+    </rule>
+    <rule ref="Squiz.WhiteSpace.ScopeClosingBrace">
+        <exclude-pattern>Classes/Exception/MediaException.php</exclude-pattern>
+    </rule>
 </ruleset>

Tests/Unit/ViewHelpers/VideoViewHelperTest.php

@@ -47,7 +47,7 @@ private function assertRenderResult(string $expectedResult, ?Video $video = null
     {
         $this->arguments['video'] = $video ?: new Video();
 
-        $renderChildrenClosure = function () {
+        $renderChildrenClosure = static function () {
             return 'children';
         };
 

composer.json

@@ -10,13 +10,14 @@
 		"typo3/cms-frontend": "*"
 	},
 	"require-dev": {
-		"de-swebhosting/php-codestyle": "^5.0",
+		"de-swebhosting/php-codestyle": "^5.1",
 		"de-swebhosting/typo3-extension-buildtools": "dev-TYPO3_12",
 		"ergebnis/composer-normalize": "^2.28",
 		"friendsofphp/php-cs-fixer": "^3.14",
 		"michielroos/typo3scan": "^1.7",
 		"squizlabs/php_codesniffer": "^3.7",
 		"symfony/dom-crawler": "^6.3",
+		"typo3/cms-filelist": "*",
 		"typo3/cms-fluid-styled-content": "*"
 	},
 	"replace": {
@@ -35,9 +36,9 @@
 	},
 	"config": {
 		"allow-plugins": {
+			"ergebnis/composer-normalize": true,
 			"typo3/class-alias-loader": true,
-			"typo3/cms-composer-installers": true,
-			"ergebnis/composer-normalize": true
+			"typo3/cms-composer-installers": true
 		},
 		"bin-dir": ".Build/bin",
 		"vendor-dir": ".Build/vendor"

ext_emconf.php

@@ -12,7 +12,7 @@
     'author' => 'Alexander Stehlik',
     'author_email' => '[email protected]',
     'author_company' => '',
-    'version' => '12.1.0',
+    'version' => '12.1.1',
     'constraints' => [
         'depends' => [
             'typo3' => '12.4.0-12.4.99',