From 90ffdccbb18d1294f1434c32c0d4b66db974d557 Mon Sep 17 00:00:00 2001
From: Anja Leichsenring <aleichsenring@ab-softlab.de>
Date: Wed, 12 Aug 2020 18:10:42 +0200
Subject: [PATCH] [TASK] Remove workaround for testing-framework from
Services.yaml
By having testing-framework load ext:fluid by default for functional
tests, the workaround of disabling autowiring for TemplateView class
can be removed. DI is now available for TemplateView class as
expected.
used command:
composer require --dev typo3/testing-framework:^6.4
Resolves: #91990
Releases: master
Related: #88689
Change-Id: I4b525afbb271934f325ef6b8da83cec673dceb1b
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/65290
Tested-by: TYPO3com <noreply@typo3.com>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Benjamin Franzke <bfr@qbus.de>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Benjamin Franzke <bfr@qbus.de>
---
composer.lock | 368 +++++++++++++++++-
.../backend/Configuration/Services.yaml | 5 -
2 files changed, 359 insertions(+), 14 deletions(-)
diff --git a/composer.lock b/composer.lock
index ee115d128cb4..bdf102410720 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1495,6 +1495,20 @@
"caching",
"psr6"
],
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
"time": "2020-03-27T16:56:45+00:00"
},
{
@@ -1617,6 +1631,20 @@
],
"description": "Symfony Config Component",
"homepage": "https://symfony.com",
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
"time": "2020-03-27T16:56:45+00:00"
},
{
@@ -1693,6 +1721,20 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
"time": "2020-03-30T11:42:42+00:00"
},
{
@@ -1766,6 +1808,20 @@
],
"description": "Symfony DependencyInjection Component",
"homepage": "https://symfony.com",
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
"time": "2020-03-30T11:42:42+00:00"
},
{
@@ -1836,6 +1892,20 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
"time": "2020-03-27T16:56:45+00:00"
},
{
@@ -1945,6 +2015,20 @@
],
"description": "Symfony ExpressionLanguage Component",
"homepage": "https://symfony.com",
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
"time": "2020-03-27T16:56:45+00:00"
},
{
@@ -1995,6 +2079,20 @@
],
"description": "Symfony Filesystem Component",
"homepage": "https://symfony.com",
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
"time": "2020-03-27T16:56:45+00:00"
},
{
@@ -2044,6 +2142,20 @@
],
"description": "Symfony Finder Component",
"homepage": "https://symfony.com",
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
"time": "2020-03-27T16:56:45+00:00"
},
{
@@ -2099,6 +2211,20 @@
],
"description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com",
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
"time": "2020-03-30T14:14:32+00:00"
},
{
@@ -2157,6 +2283,20 @@
"symfony",
"words"
],
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
"time": "2020-03-27T16:56:45+00:00"
},
{
@@ -2232,6 +2372,20 @@
"l10n",
"localization"
],
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
"time": "2020-03-27T16:56:45+00:00"
},
{
@@ -2299,6 +2453,20 @@
],
"description": "Symfony Mailer Component",
"homepage": "https://symfony.com",
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
"time": "2020-03-27T16:56:45+00:00"
},
{
@@ -2361,6 +2529,20 @@
"mime",
"mime-type"
],
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
"time": "2020-03-27T16:56:45+00:00"
},
{
@@ -2778,6 +2960,20 @@
"property path",
"reflection"
],
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
"time": "2020-03-27T16:56:45+00:00"
},
{
@@ -2854,6 +3050,20 @@
"type",
"validator"
],
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
"time": "2020-03-27T16:56:45+00:00"
},
{
@@ -2930,6 +3140,20 @@
"uri",
"url"
],
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
"time": "2020-03-30T11:42:42+00:00"
},
{
@@ -3063,6 +3287,20 @@
"debug",
"dump"
],
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
"time": "2020-03-27T16:56:45+00:00"
},
{
@@ -3123,6 +3361,20 @@
"instantiate",
"serialize"
],
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
"time": "2020-03-27T16:56:45+00:00"
},
{
@@ -3182,6 +3434,20 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
"time": "2020-03-30T11:42:42+00:00"
},
{
@@ -5983,8 +6249,8 @@
"authors": [
{
"name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de",
- "role": "lead"
+ "role": "lead",
+ "email": "sebastian@phpunit.de"
}
],
"description": "Utility class for timing",
@@ -6906,8 +7172,8 @@
"authors": [
{
"name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de",
- "role": "lead"
+ "role": "lead",
+ "email": "sebastian@phpunit.de"
}
],
"description": "Collection of value objects that represent the types of the PHP type system",
@@ -7100,6 +7366,20 @@
],
"description": "Symfony CssSelector Component",
"homepage": "https://symfony.com",
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
"time": "2020-03-27T16:56:45+00:00"
},
{
@@ -7155,6 +7435,20 @@
],
"description": "Symfony ErrorHandler Component",
"homepage": "https://symfony.com",
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
"time": "2020-03-30T14:14:32+00:00"
},
{
@@ -7251,6 +7545,20 @@
],
"description": "Symfony HttpKernel Component",
"homepage": "https://symfony.com",
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
"time": "2020-03-30T15:04:59+00:00"
},
{
@@ -7305,6 +7613,20 @@
"configuration",
"options"
],
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
"time": "2020-03-27T16:56:45+00:00"
},
{
@@ -7354,6 +7676,20 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
"time": "2020-03-27T16:56:45+00:00"
},
{
@@ -7404,6 +7740,20 @@
],
"description": "Symfony Stopwatch Component",
"homepage": "https://symfony.com",
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
"time": "2020-03-27T16:56:45+00:00"
},
{
@@ -7922,16 +8272,16 @@
},
{
"name": "typo3/testing-framework",
- "version": "6.4.0",
+ "version": "6.4.1",
"source": {
"type": "git",
"url": "https://github.com/TYPO3/testing-framework.git",
- "reference": "a91870c3d093ad3b80eabf558425f51c6b22bc58"
+ "reference": "8ddaba4ca23c1a7b7e64044d450cb3e4956b68f0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/TYPO3/testing-framework/zipball/a91870c3d093ad3b80eabf558425f51c6b22bc58",
- "reference": "a91870c3d093ad3b80eabf558425f51c6b22bc58",
+ "url": "https://api.github.com/repos/TYPO3/testing-framework/zipball/8ddaba4ca23c1a7b7e64044d450cb3e4956b68f0",
+ "reference": "8ddaba4ca23c1a7b7e64044d450cb3e4956b68f0",
"shasum": ""
},
"require": {
@@ -7979,7 +8329,7 @@
"tests",
"typo3"
],
- "time": "2020-08-11T16:30:38+00:00"
+ "time": "2020-08-13T09:47:03+00:00"
}
],
"aliases": [],
diff --git a/typo3/sysext/backend/Configuration/Services.yaml b/typo3/sysext/backend/Configuration/Services.yaml
index e254c6c58450..f35415202efe 100644
--- a/typo3/sysext/backend/Configuration/Services.yaml
+++ b/typo3/sysext/backend/Configuration/Services.yaml
@@ -23,11 +23,6 @@ services:
tags:
- { name: 'console.command', command: 'backend:resetpassword', schedulable: false }
- # Temporary workaround until testing framework loads EXT:fluid in functional tests
- # @todo: Fix typo3/testing-framework and remove this
- TYPO3\CMS\Backend\View\BackendTemplateView:
- autoconfigure: false
-
TYPO3\CMS\Backend\Template\ModuleTemplate:
shared: false
public: true
--
GitLab