From 1c279406d0ce91aac4a5b39fc54cf3abbf655c3e Mon Sep 17 00:00:00 2001 From: Rune Piper Date: Wed, 20 Dec 2023 09:54:45 +0100 Subject: [PATCH 1/9] fix: add missing file extension, refs #15 --- Configuration/TCA/Overrides/sys_file_reference.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Configuration/TCA/Overrides/sys_file_reference.php b/Configuration/TCA/Overrides/sys_file_reference.php index fd255b80..66b7c08f 100644 --- a/Configuration/TCA/Overrides/sys_file_reference.php +++ b/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' => [ From ec0094ded4241da64fe407503be166d2c127e34a Mon Sep 17 00:00:00 2001 From: Alexander Stehlik Date: Wed, 20 Dec 2023 11:31:00 +0100 Subject: [PATCH 2/9] [CLEANUP] Normalize composer.json --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index dbb21128..2eced03a 100644 --- a/composer.json +++ b/composer.json @@ -35,9 +35,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" From 64d4236a322e0dc20e7d98bbfc96e882bf892752 Mon Sep 17 00:00:00 2001 From: Alexander Stehlik Date: Wed, 20 Dec 2023 11:31:45 +0100 Subject: [PATCH 3/9] [CLEANUP] Fix code style errors --- Classes/Exception/MediaException.php | 4 +--- Configuration/Services.php | 2 +- Configuration/TCA/tx_html5mediakit_domain_model_media.php | 4 ++-- Tests/Unit/ViewHelpers/VideoViewHelperTest.php | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Classes/Exception/MediaException.php b/Classes/Exception/MediaException.php index b2680dc2..73cf1fd5 100644 --- a/Classes/Exception/MediaException.php +++ b/Classes/Exception/MediaException.php @@ -21,6 +21,4 @@ * * @codeCoverageIgnore No code to test. */ -class MediaException extends RuntimeException -{ -} +class MediaException extends RuntimeException {} diff --git a/Configuration/Services.php b/Configuration/Services.php index c09ffac9..19b57652 100644 --- a/Configuration/Services.php +++ b/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() diff --git a/Configuration/TCA/tx_html5mediakit_domain_model_media.php b/Configuration/TCA/tx_html5mediakit_domain_model_media.php index 597a517c..4c25d71c 100644 --- a/Configuration/TCA/tx_html5mediakit_domain_model_media.php +++ b/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 = '', diff --git a/Tests/Unit/ViewHelpers/VideoViewHelperTest.php b/Tests/Unit/ViewHelpers/VideoViewHelperTest.php index ed479162..771ffd96 100644 --- a/Tests/Unit/ViewHelpers/VideoViewHelperTest.php +++ b/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'; }; From 42e429e8ef31bda917d114ecdbc1a74878ee9ac9 Mon Sep 17 00:00:00 2001 From: Alexander Stehlik Date: Wed, 20 Dec 2023 12:03:14 +0100 Subject: [PATCH 4/9] [TASK] Streamline code style checker rules --- .github/workflows/test.yml | 2 +- Build/php-cs-fixer/config.php | 2 +- .../{PSRHtml5mediakit => PerCodeStyleT3Ext}/ruleset.xml | 2 +- composer.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename Tests/CodeSniffer/{PSRHtml5mediakit => PerCodeStyleT3Ext}/ruleset.xml (93%) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6a292a41..878a06d1 100644 --- a/.github/workflows/test.yml +++ b/.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" diff --git a/Build/php-cs-fixer/config.php b/Build/php-cs-fixer/config.php index 13eb5916..1e86a259 100644 --- a/Build/php-cs-fixer/config.php +++ b/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( diff --git a/Tests/CodeSniffer/PSRHtml5mediakit/ruleset.xml b/Tests/CodeSniffer/PerCodeStyleT3Ext/ruleset.xml similarity index 93% rename from Tests/CodeSniffer/PSRHtml5mediakit/ruleset.xml rename to Tests/CodeSniffer/PerCodeStyleT3Ext/ruleset.xml index b62c17df..ce9a6139 100644 --- a/Tests/CodeSniffer/PSRHtml5mediakit/ruleset.xml +++ b/Tests/CodeSniffer/PerCodeStyleT3Ext/ruleset.xml @@ -1,5 +1,5 @@ - + Based on PSRDefault. Adjust only if REALLY neccessary! diff --git a/composer.json b/composer.json index 2eced03a..78080739 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ "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", From 662993cc38fae6a8f52ac4d925f4cc40749b3ffc Mon Sep 17 00:00:00 2001 From: Alexander Stehlik Date: Wed, 20 Dec 2023 13:02:38 +0100 Subject: [PATCH 5/9] [TASK] Fix code style rules for empty class --- Tests/CodeSniffer/PerCodeStyleT3Ext/ruleset.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Tests/CodeSniffer/PerCodeStyleT3Ext/ruleset.xml b/Tests/CodeSniffer/PerCodeStyleT3Ext/ruleset.xml index ce9a6139..64761aa0 100644 --- a/Tests/CodeSniffer/PerCodeStyleT3Ext/ruleset.xml +++ b/Tests/CodeSniffer/PerCodeStyleT3Ext/ruleset.xml @@ -9,4 +9,11 @@ Tests/Acceptance/* ext_emconf.php + + + Classes/Exception/MediaException.php + + + Classes/Exception/MediaException.php + From e79e9026e04f765b5d8caf950418a8bf12fa0e01 Mon Sep 17 00:00:00 2001 From: Alexander Stehlik Date: Wed, 20 Dec 2023 13:04:43 +0100 Subject: [PATCH 6/9] [BUGFIX] Require filelist Extension for testing --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 78080739..d5a507cc 100644 --- a/composer.json +++ b/composer.json @@ -7,6 +7,7 @@ "php": "^8.1", "typo3/cms-core": "^12.4", "typo3/cms-extbase": "*", + "typo3/cms-filelist": "*", "typo3/cms-frontend": "*" }, "require-dev": { From 98c6b1e1974b60f6fd1e099dac7cf4614e3cdcd2 Mon Sep 17 00:00:00 2001 From: Alexander Stehlik Date: Wed, 20 Dec 2023 13:20:15 +0100 Subject: [PATCH 7/9] [BUGFIX] Fix Extensions for acceptance tests --- .../Support/Extension/BackendHtml5mediakitEnvironment.php | 2 -- composer.json | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Tests/Acceptance/Support/Extension/BackendHtml5mediakitEnvironment.php b/Tests/Acceptance/Support/Extension/BackendHtml5mediakitEnvironment.php index 0c913e10..ffe00268 100644 --- a/Tests/Acceptance/Support/Extension/BackendHtml5mediakitEnvironment.php +++ b/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'], diff --git a/composer.json b/composer.json index d5a507cc..497e8313 100644 --- a/composer.json +++ b/composer.json @@ -7,7 +7,6 @@ "php": "^8.1", "typo3/cms-core": "^12.4", "typo3/cms-extbase": "*", - "typo3/cms-filelist": "*", "typo3/cms-frontend": "*" }, "require-dev": { @@ -18,7 +17,8 @@ "michielroos/typo3scan": "^1.7", "squizlabs/php_codesniffer": "^3.7", "symfony/dom-crawler": "^6.3", - "typo3/cms-fluid-styled-content": "*" + "typo3/cms-fluid-styled-content": "*", + "typo3/cms-filelist": "*" }, "replace": { "typo3-ter/html5mediakit": "self.version" From 3233060b980a9fdd5e7bb41a839e308cd8134e1b Mon Sep 17 00:00:00 2001 From: Alexander Stehlik Date: Wed, 20 Dec 2023 13:22:46 +0100 Subject: [PATCH 8/9] [CLEANUP] Normalize composer.json --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 497e8313..9049607f 100644 --- a/composer.json +++ b/composer.json @@ -17,8 +17,8 @@ "michielroos/typo3scan": "^1.7", "squizlabs/php_codesniffer": "^3.7", "symfony/dom-crawler": "^6.3", - "typo3/cms-fluid-styled-content": "*", - "typo3/cms-filelist": "*" + "typo3/cms-filelist": "*", + "typo3/cms-fluid-styled-content": "*" }, "replace": { "typo3-ter/html5mediakit": "self.version" From 1e4ae7e8690a6d077689a01e28e8d60b5609aacc Mon Sep 17 00:00:00 2001 From: Alexander Stehlik Date: Wed, 20 Dec 2023 16:41:50 +0100 Subject: [PATCH 9/9] [TASK] Release version 12.1.1 --- Documentation/Settings.cfg | 2 +- ext_emconf.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/Settings.cfg b/Documentation/Settings.cfg index 3fd8dce2..25624483 100644 --- a/Documentation/Settings.cfg +++ b/Documentation/Settings.cfg @@ -25,7 +25,7 @@ project = html5mediakit # ... (recommended) version, displayed next to title (desktop) and in 'Alexander Stehlik', 'author_email' => 'alexander.stehlik.deleteme@gmail.com', 'author_company' => '', - 'version' => '12.1.0', + 'version' => '12.1.1', 'constraints' => [ 'depends' => [ 'typo3' => '12.4.0-12.4.99',