From cf3165e64be779e0c0c15cdb9a11316bd08bc4b2 Mon Sep 17 00:00:00 2001 From: Benjamin Kott Date: Tue, 8 Oct 2024 15:49:39 +0200 Subject: [PATCH] [TASK] Update ci versions --- .github/workflows/ci.yml | 4 +- Build/phpstan-baseline-v13.neon | 184 ++++++++++++++++++++++++++++++++ Build/phpstan-baseline.neon | 2 - Build/phpstan.neon | 2 +- composer.json | 5 +- 5 files changed, 190 insertions(+), 7 deletions(-) create mode 100644 Build/phpstan-baseline-v13.neon delete mode 100644 Build/phpstan-baseline.neon diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2de919f61..8e3633de7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,9 +15,9 @@ jobs: runs-on: ubuntu-latest strategy: fail-fast: false - max-parallel: 4 + max-parallel: 5 matrix: - typo3: ['^12'] + typo3: ['^12', '^13', '13.4.x-dev'] php: ['8.2', '8.3'] include: - typo3: '^12' diff --git a/Build/phpstan-baseline-v13.neon b/Build/phpstan-baseline-v13.neon new file mode 100644 index 000000000..c922dd907 --- /dev/null +++ b/Build/phpstan-baseline-v13.neon @@ -0,0 +1,184 @@ +parameters: + ignoreErrors: + - + message: """ + #^Call to deprecated method getRequest\\(\\) of class TYPO3\\\\CMS\\\\Fluid\\\\Core\\\\Rendering\\\\RenderingContext\\: + since TYPO3 v13, will be removed in TYPO3 v14\\. + Use \\$renderingContext\\-\\>hasAttribute\\(ServerRequestInterface\\:\\:class\\) and + \\$renderingContext\\-\\>getAttribute\\(ServerRequestInterface\\:\\:class\\) instead\\.$# + """ + count: 3 + path: ../Classes/ViewHelpers/Data/PaginateViewHelper.php + + - + message: """ + #^Call to deprecated method setRequest\\(\\) of class TYPO3\\\\CMS\\\\Fluid\\\\Core\\\\Rendering\\\\RenderingContext\\: + since TYPO3 v13, will be removed in TYPO3 v14\\. + Use RenderingContextFactory\\-\\>create\\(\\$pathArray, \\$request\\) instead\\.$# + """ + count: 1 + path: ../Classes/ViewHelpers/Data/PaginateViewHelper.php + + - + message: """ + #^Fetching class constant class of deprecated class TYPO3\\\\CMS\\\\Fluid\\\\View\\\\StandaloneView\\: + \\: since TYPO3 v13, will be removed in v14\\. Use ext\\:core ViewFactoryInterface instead\\.$# + """ + count: 1 + path: ../Classes/ViewHelpers/Data/PaginateViewHelper.php + + - + message: """ + #^Return type of method BK2K\\\\BootstrapPackage\\\\ViewHelpers\\\\Data\\\\PaginateViewHelper\\:\\:getTemplateObject\\(\\) has typehint with deprecated class TYPO3\\\\CMS\\\\Fluid\\\\View\\\\StandaloneView\\: + \\: since TYPO3 v13, will be removed in v14\\. Use ext\\:core ViewFactoryInterface instead\\.$# + """ + count: 1 + path: ../Classes/ViewHelpers/Data/PaginateViewHelper.php + + - + message: """ + #^Fetching deprecated class constant FILETYPE_AUDIO of class TYPO3\\\\CMS\\\\Core\\\\Resource\\\\File\\: + will be removed in TYPO3 v14, use TYPO3\\\\CMS\\\\Core\\\\Resource\\\\FileType\\:\\:AUDIO instead$# + """ + count: 1 + path: ../Classes/ViewHelpers/File/IsAudioViewHelper.php + + - + message: """ + #^Fetching deprecated class constant FILETYPE_IMAGE of class TYPO3\\\\CMS\\\\Core\\\\Resource\\\\File\\: + will be removed in TYPO3 v14, use TYPO3\\\\CMS\\\\Core\\\\Resource\\\\FileType\\:\\:IMAGE instead$# + """ + count: 1 + path: ../Classes/ViewHelpers/File/IsImageViewHelper.php + + - + message: """ + #^Fetching deprecated class constant FILETYPE_VIDEO of class TYPO3\\\\CMS\\\\Core\\\\Resource\\\\File\\: + will be removed in TYPO3 v14, use TYPO3\\\\CMS\\\\Core\\\\Resource\\\\FileType\\:\\:VIDEO instead$# + """ + count: 1 + path: ../Classes/ViewHelpers/File/IsMediaViewHelper.php + + - + message: """ + #^Fetching class constant class of deprecated class TYPO3\\\\CMS\\\\Fluid\\\\View\\\\StandaloneView\\: + \\: since TYPO3 v13, will be removed in v14\\. Use ext\\:core ViewFactoryInterface instead\\.$# + """ + count: 1 + path: ../Classes/ViewHelpers/FrameViewHelper.php + + - + message: """ + #^Return type of method BK2K\\\\BootstrapPackage\\\\ViewHelpers\\\\FrameViewHelper\\:\\:getTemplateObject\\(\\) has typehint with deprecated class TYPO3\\\\CMS\\\\Fluid\\\\View\\\\StandaloneView\\: + \\: since TYPO3 v13, will be removed in v14\\. Use ext\\:core ViewFactoryInterface instead\\.$# + """ + count: 1 + path: ../Classes/ViewHelpers/FrameViewHelper.php + + - + message: """ + #^Call to deprecated method getRequest\\(\\) of class TYPO3\\\\CMS\\\\Fluid\\\\Core\\\\Rendering\\\\RenderingContext\\: + since TYPO3 v13, will be removed in TYPO3 v14\\. + Use \\$renderingContext\\-\\>hasAttribute\\(ServerRequestInterface\\:\\:class\\) and + \\$renderingContext\\-\\>getAttribute\\(ServerRequestInterface\\:\\:class\\) instead\\.$# + """ + count: 2 + path: ../Classes/ViewHelpers/Link/PaginateViewHelper.php + + - + message: """ + #^Call to deprecated method getRequest\\(\\) of class TYPO3\\\\CMS\\\\Fluid\\\\Core\\\\Rendering\\\\RenderingContext\\: + since TYPO3 v13, will be removed in TYPO3 v14\\. + Use \\$renderingContext\\-\\>hasAttribute\\(ServerRequestInterface\\:\\:class\\) and + \\$renderingContext\\-\\>getAttribute\\(ServerRequestInterface\\:\\:class\\) instead\\.$# + """ + count: 2 + path: ../Classes/ViewHelpers/TypoScript/ConstantViewHelper.php + + - + message: """ + #^Fetching deprecated class constant FILETYPE_IMAGE of class TYPO3\\\\CMS\\\\Core\\\\Resource\\\\File\\: + will be removed in TYPO3 v14, use TYPO3\\\\CMS\\\\Core\\\\Resource\\\\FileType\\:\\:IMAGE instead$# + """ + count: 2 + path: ../Configuration/TCA/Overrides/100_pages.php + + - + message: """ + #^Fetching deprecated class constant FILETYPE_IMAGE of class TYPO3\\\\CMS\\\\Core\\\\Resource\\\\File\\: + will be removed in TYPO3 v14, use TYPO3\\\\CMS\\\\Core\\\\Resource\\\\FileType\\:\\:IMAGE instead$# + """ + count: 1 + path: ../Configuration/TCA/Overrides/225_content_element_texticon.php + + - + message: """ + #^Fetching deprecated class constant FILETYPE_IMAGE of class TYPO3\\\\CMS\\\\Core\\\\Resource\\\\File\\: + will be removed in TYPO3 v14, use TYPO3\\\\CMS\\\\Core\\\\Resource\\\\FileType\\:\\:IMAGE instead$# + """ + count: 1 + path: ../Configuration/TCA/Overrides/300_content_general_columns.php + + - + message: """ + #^Fetching deprecated class constant FILETYPE_IMAGE of class TYPO3\\\\CMS\\\\Core\\\\Resource\\\\File\\: + will be removed in TYPO3 v14, use TYPO3\\\\CMS\\\\Core\\\\Resource\\\\FileType\\:\\:IMAGE instead$# + """ + count: 1 + path: ../Configuration/TCA/tx_bootstrappackage_accordion_item.php + + - + message: """ + #^Fetching deprecated class constant FILETYPE_VIDEO of class TYPO3\\\\CMS\\\\Core\\\\Resource\\\\File\\: + will be removed in TYPO3 v14, use TYPO3\\\\CMS\\\\Core\\\\Resource\\\\FileType\\:\\:VIDEO instead$# + """ + count: 1 + path: ../Configuration/TCA/tx_bootstrappackage_accordion_item.php + + - + message: """ + #^Fetching deprecated class constant FILETYPE_IMAGE of class TYPO3\\\\CMS\\\\Core\\\\Resource\\\\File\\: + will be removed in TYPO3 v14, use TYPO3\\\\CMS\\\\Core\\\\Resource\\\\FileType\\:\\:IMAGE instead$# + """ + count: 2 + path: ../Configuration/TCA/tx_bootstrappackage_card_group_item.php + + - + message: """ + #^Fetching deprecated class constant FILETYPE_IMAGE of class TYPO3\\\\CMS\\\\Core\\\\Resource\\\\File\\: + will be removed in TYPO3 v14, use TYPO3\\\\CMS\\\\Core\\\\Resource\\\\FileType\\:\\:IMAGE instead$# + """ + count: 2 + path: ../Configuration/TCA/tx_bootstrappackage_carousel_item.php + + - + message: """ + #^Fetching deprecated class constant FILETYPE_IMAGE of class TYPO3\\\\CMS\\\\Core\\\\Resource\\\\File\\: + will be removed in TYPO3 v14, use TYPO3\\\\CMS\\\\Core\\\\Resource\\\\FileType\\:\\:IMAGE instead$# + """ + count: 1 + path: ../Configuration/TCA/tx_bootstrappackage_icon_group_item.php + + - + message: """ + #^Fetching deprecated class constant FILETYPE_IMAGE of class TYPO3\\\\CMS\\\\Core\\\\Resource\\\\File\\: + will be removed in TYPO3 v14, use TYPO3\\\\CMS\\\\Core\\\\Resource\\\\FileType\\:\\:IMAGE instead$# + """ + count: 1 + path: ../Configuration/TCA/tx_bootstrappackage_tab_item.php + + - + message: """ + #^Fetching deprecated class constant FILETYPE_VIDEO of class TYPO3\\\\CMS\\\\Core\\\\Resource\\\\File\\: + will be removed in TYPO3 v14, use TYPO3\\\\CMS\\\\Core\\\\Resource\\\\FileType\\:\\:VIDEO instead$# + """ + count: 1 + path: ../Configuration/TCA/tx_bootstrappackage_tab_item.php + + - + message: """ + #^Fetching deprecated class constant FILETYPE_IMAGE of class TYPO3\\\\CMS\\\\Core\\\\Resource\\\\File\\: + will be removed in TYPO3 v14, use TYPO3\\\\CMS\\\\Core\\\\Resource\\\\FileType\\:\\:IMAGE instead$# + """ + count: 2 + path: ../Configuration/TCA/tx_bootstrappackage_timeline_item.php diff --git a/Build/phpstan-baseline.neon b/Build/phpstan-baseline.neon deleted file mode 100644 index 364905f71..000000000 --- a/Build/phpstan-baseline.neon +++ /dev/null @@ -1,2 +0,0 @@ -parameters: - ignoreErrors: diff --git a/Build/phpstan.neon b/Build/phpstan.neon index ed5e6286b..f425b9b4a 100644 --- a/Build/phpstan.neon +++ b/Build/phpstan.neon @@ -3,7 +3,7 @@ includes: - %currentWorkingDirectory%/.build/vendor/phpstan/phpstan-strict-rules/rules.neon - %currentWorkingDirectory%/.build/vendor/phpstan/phpstan-deprecation-rules/rules.neon - %currentWorkingDirectory%/.build/vendor/friendsoftypo3/phpstan-typo3/extension.neon - - %currentWorkingDirectory%/Build/phpstan-baseline.neon + - %currentWorkingDirectory%/Build/phpstan-baseline-v13.neon parameters: level: 8 diff --git a/composer.json b/composer.json index d30563ebb..3d55349d3 100644 --- a/composer.json +++ b/composer.json @@ -43,7 +43,7 @@ "typo3/cms-seo": "^12.4 || 13.*.*@dev" }, "require-dev": { - "b13/container": "^2.2", + "b13/container": "^2.3 || dev-task/dev-main", "bk2k/demo-package": "@dev", "bk2k/extension-helper": "^2.1", "friendsofphp/php-cs-fixer": "^3.64", @@ -62,7 +62,7 @@ "typo3/cms-lowlevel": "^12.4 || 13.*.*@dev", "typo3/cms-tstemplate": "^12.4 || 13.*.*@dev", "typo3/cms-workspaces": "^12.4 || 13.*.*@dev", - "typo3/testing-framework": "^8.2.2" + "typo3/testing-framework": "^8.2.3" }, "config": { "bin-dir": ".build/bin", @@ -99,6 +99,7 @@ "url": "Tests/Packages/*" } }, + "minimum-stability": "dev", "prefer-stable": true, "scripts": { "post-autoload-dump": [