@@ -27,6 +27,6 @@ |
||
27 | 27 | class MfaViewType extends Enumeration |
28 | 28 | { |
29 | 29 | public const SETUP = 'setup'; |
30 | - public const EDIT ='edit'; |
|
31 | - public const AUTH ='auth'; |
|
30 | + public const EDIT = 'edit'; |
|
31 | + public const AUTH = 'auth'; |
|
32 | 32 | } |
@@ -101,35 +101,35 @@ |
||
101 | 101 | |
102 | 102 | $html = []; |
103 | 103 | $html[] = '<div ' . GeneralUtility::implodeAttributes($containerAttributes, true) . '>'; |
104 | - $html[] = '<input class="t3js-flex-control-action" type="hidden" name="' . htmlspecialchars($actionFieldName) . '" value="" />'; |
|
105 | - $html[] = '<div ' . GeneralUtility::implodeAttributes($panelHeaderAttributes, true) . '>'; |
|
106 | - $html[] = '<div class="form-irre-header ' . ($flexFormContainerElementCollapsed ? ' collapsed' : '') . '">'; |
|
107 | - $html[] = '<div class="form-irre-header-cell form-irre-header-icon">'; |
|
108 | - $html[] = '<span class="caret"></span>'; |
|
109 | - $html[] = '</div>'; |
|
110 | - $html[] = '<button ' . GeneralUtility::implodeAttributes($toggleAttributes, true) . '>'; |
|
111 | - $html[] = '<div class="form-irre-header-cell form-irre-header-body">'; |
|
112 | - $html[] = htmlspecialchars($containerTitle); |
|
113 | - $html[] = '<output class="content-preview"></output>'; |
|
114 | - $html[] = '</div>'; |
|
115 | - $html[] = '</button>'; |
|
116 | - $html[] = '<div class="form-irre-header-cell form-irre-header-control t3js-formengine-irre-control">'; |
|
117 | - $html[] = '<div class="btn-group btn-group-sm">'; |
|
118 | - $html[] = implode(LF, $moveAndDeleteContent); |
|
119 | - $html[] = '</div>'; |
|
120 | - $html[] = '</div>'; |
|
121 | - $html[] = '</div>'; |
|
122 | - $html[] = '</div>'; |
|
123 | - $html[] = '<div id="' . htmlspecialchars($flexFormDomContainerId) . '" class="collapse t3js-flex-section-content ' . ($flexFormContainerElementCollapsed ? '' : 'show') . '">'; |
|
124 | - $html[] = $containerContentResult['html']; |
|
125 | - $html[] = '</div>'; |
|
126 | - $html[] = '<input'; |
|
127 | - $html[] = 'class="t3js-flex-control-toggle"'; |
|
128 | - $html[] = 'type="hidden"'; |
|
129 | - $html[] = 'id="flexform-toggle-container-' . htmlspecialchars($flexFormContainerIdentifier) . '"'; |
|
130 | - $html[] = 'name="' . htmlspecialchars($toggleFieldName) . '"'; |
|
131 | - $html[] = 'value="' . ($flexFormContainerElementCollapsed ? '1' : '0') . '"'; |
|
132 | - $html[] = '/>'; |
|
104 | + $html[] = '<input class="t3js-flex-control-action" type="hidden" name="' . htmlspecialchars($actionFieldName) . '" value="" />'; |
|
105 | + $html[] = '<div ' . GeneralUtility::implodeAttributes($panelHeaderAttributes, true) . '>'; |
|
106 | + $html[] = '<div class="form-irre-header ' . ($flexFormContainerElementCollapsed ? ' collapsed' : '') . '">'; |
|
107 | + $html[] = '<div class="form-irre-header-cell form-irre-header-icon">'; |
|
108 | + $html[] = '<span class="caret"></span>'; |
|
109 | + $html[] = '</div>'; |
|
110 | + $html[] = '<button ' . GeneralUtility::implodeAttributes($toggleAttributes, true) . '>'; |
|
111 | + $html[] = '<div class="form-irre-header-cell form-irre-header-body">'; |
|
112 | + $html[] = htmlspecialchars($containerTitle); |
|
113 | + $html[] = '<output class="content-preview"></output>'; |
|
114 | + $html[] = '</div>'; |
|
115 | + $html[] = '</button>'; |
|
116 | + $html[] = '<div class="form-irre-header-cell form-irre-header-control t3js-formengine-irre-control">'; |
|
117 | + $html[] = '<div class="btn-group btn-group-sm">'; |
|
118 | + $html[] = implode(LF, $moveAndDeleteContent); |
|
119 | + $html[] = '</div>'; |
|
120 | + $html[] = '</div>'; |
|
121 | + $html[] = '</div>'; |
|
122 | + $html[] = '</div>'; |
|
123 | + $html[] = '<div id="' . htmlspecialchars($flexFormDomContainerId) . '" class="collapse t3js-flex-section-content ' . ($flexFormContainerElementCollapsed ? '' : 'show') . '">'; |
|
124 | + $html[] = $containerContentResult['html']; |
|
125 | + $html[] = '</div>'; |
|
126 | + $html[] = '<input'; |
|
127 | + $html[] = 'class="t3js-flex-control-toggle"'; |
|
128 | + $html[] = 'type="hidden"'; |
|
129 | + $html[] = 'id="flexform-toggle-container-' . htmlspecialchars($flexFormContainerIdentifier) . '"'; |
|
130 | + $html[] = 'name="' . htmlspecialchars($toggleFieldName) . '"'; |
|
131 | + $html[] = 'value="' . ($flexFormContainerElementCollapsed ? '1' : '0') . '"'; |
|
132 | + $html[] = '/>'; |
|
133 | 133 | $html[] = '</div>'; |
134 | 134 | |
135 | 135 | $resultArray['html'] = implode(LF, $html); |
@@ -40,56 +40,56 @@ |
||
40 | 40 | public function getFactories(): array |
41 | 41 | { |
42 | 42 | return [ |
43 | - SymfonyEventDispatcher::class => [ static::class, 'getSymfonyEventDispatcher' ], |
|
44 | - Cache\CacheManager::class => [ static::class, 'getCacheManager' ], |
|
45 | - Charset\CharsetConverter::class => [ static::class, 'getCharsetConverter' ], |
|
46 | - Configuration\SiteConfiguration::class => [ static::class, 'getSiteConfiguration' ], |
|
47 | - Command\ListCommand::class => [ static::class, 'getListCommand' ], |
|
48 | - HelpCommand::class => [ static::class, 'getHelpCommand' ], |
|
49 | - Command\DumpAutoloadCommand::class => [ static::class, 'getDumpAutoloadCommand' ], |
|
50 | - Console\CommandApplication::class => [ static::class, 'getConsoleCommandApplication' ], |
|
51 | - Console\CommandRegistry::class => [ static::class, 'getConsoleCommandRegistry' ], |
|
52 | - Context\Context::class => [ static::class, 'getContext' ], |
|
53 | - Core\BootService::class => [ static::class, 'getBootService' ], |
|
54 | - Crypto\PasswordHashing\PasswordHashFactory::class => [ static::class, 'getPasswordHashFactory' ], |
|
55 | - EventDispatcher\EventDispatcher::class => [ static::class, 'getEventDispatcher' ], |
|
56 | - EventDispatcher\ListenerProvider::class => [ static::class, 'getEventListenerProvider' ], |
|
57 | - Http\MiddlewareStackResolver::class => [ static::class, 'getMiddlewareStackResolver' ], |
|
58 | - Http\RequestFactory::class => [ static::class, 'getRequestFactory' ], |
|
59 | - Imaging\IconFactory::class => [ static::class, 'getIconFactory' ], |
|
60 | - Imaging\IconProvider\FontawesomeIconProvider::class => [ static::class, 'getFontawesomeIconProvider' ], |
|
61 | - Imaging\IconRegistry::class => [ static::class, 'getIconRegistry' ], |
|
62 | - Localization\LanguageServiceFactory::class => [ static::class, 'getLanguageServiceFactory' ], |
|
63 | - Localization\LanguageStore::class => [ static::class, 'getLanguageStore' ], |
|
64 | - Localization\Locales::class => [ static::class, 'getLocales' ], |
|
65 | - Localization\LocalizationFactory::class => [ static::class, 'getLocalizationFactory' ], |
|
66 | - Mail\TransportFactory::class => [ static::class, 'getMailTransportFactory' ], |
|
67 | - Messaging\FlashMessageService::class => [ static::class, 'getFlashMessageService' ], |
|
68 | - Middleware\ResponsePropagation::class => [ static::class, 'getResponsePropagationMiddleware' ], |
|
69 | - Package\FailsafePackageManager::class => [ static::class, 'getFailsafePackageManager' ], |
|
70 | - Registry::class => [ static::class, 'getRegistry' ], |
|
71 | - Resource\Index\FileIndexRepository::class => [ static::class, 'getFileIndexRepository' ], |
|
72 | - Resource\Index\MetaDataRepository::class => [ static::class, 'getMetaDataRepository' ], |
|
73 | - Resource\Driver\DriverRegistry::class => [ static::class, 'getDriverRegistry' ], |
|
74 | - Resource\ProcessedFileRepository::class => [ static::class, 'getProcessedFileRepository' ], |
|
75 | - Resource\ResourceFactory::class => [ static::class, 'getResourceFactory' ], |
|
76 | - Resource\StorageRepository::class => [ static::class, 'getStorageRepository' ], |
|
77 | - Service\DependencyOrderingService::class => [ static::class, 'getDependencyOrderingService' ], |
|
78 | - Service\FlexFormService::class => [ static::class, 'getFlexFormService' ], |
|
79 | - Service\OpcodeCacheService::class => [ static::class, 'getOpcodeCacheService' ], |
|
80 | - TimeTracker\TimeTracker::class => [ static::class, 'getTimeTracker' ], |
|
81 | - TypoScript\Parser\ConstantConfigurationParser::class => [ static::class, 'getTypoScriptConstantConfigurationParser' ], |
|
82 | - TypoScript\TypoScriptService::class => [ static::class, 'getTypoScriptService' ], |
|
83 | - 'middlewares' => [ static::class, 'getMiddlewares' ], |
|
43 | + SymfonyEventDispatcher::class => [static::class, 'getSymfonyEventDispatcher'], |
|
44 | + Cache\CacheManager::class => [static::class, 'getCacheManager'], |
|
45 | + Charset\CharsetConverter::class => [static::class, 'getCharsetConverter'], |
|
46 | + Configuration\SiteConfiguration::class => [static::class, 'getSiteConfiguration'], |
|
47 | + Command\ListCommand::class => [static::class, 'getListCommand'], |
|
48 | + HelpCommand::class => [static::class, 'getHelpCommand'], |
|
49 | + Command\DumpAutoloadCommand::class => [static::class, 'getDumpAutoloadCommand'], |
|
50 | + Console\CommandApplication::class => [static::class, 'getConsoleCommandApplication'], |
|
51 | + Console\CommandRegistry::class => [static::class, 'getConsoleCommandRegistry'], |
|
52 | + Context\Context::class => [static::class, 'getContext'], |
|
53 | + Core\BootService::class => [static::class, 'getBootService'], |
|
54 | + Crypto\PasswordHashing\PasswordHashFactory::class => [static::class, 'getPasswordHashFactory'], |
|
55 | + EventDispatcher\EventDispatcher::class => [static::class, 'getEventDispatcher'], |
|
56 | + EventDispatcher\ListenerProvider::class => [static::class, 'getEventListenerProvider'], |
|
57 | + Http\MiddlewareStackResolver::class => [static::class, 'getMiddlewareStackResolver'], |
|
58 | + Http\RequestFactory::class => [static::class, 'getRequestFactory'], |
|
59 | + Imaging\IconFactory::class => [static::class, 'getIconFactory'], |
|
60 | + Imaging\IconProvider\FontawesomeIconProvider::class => [static::class, 'getFontawesomeIconProvider'], |
|
61 | + Imaging\IconRegistry::class => [static::class, 'getIconRegistry'], |
|
62 | + Localization\LanguageServiceFactory::class => [static::class, 'getLanguageServiceFactory'], |
|
63 | + Localization\LanguageStore::class => [static::class, 'getLanguageStore'], |
|
64 | + Localization\Locales::class => [static::class, 'getLocales'], |
|
65 | + Localization\LocalizationFactory::class => [static::class, 'getLocalizationFactory'], |
|
66 | + Mail\TransportFactory::class => [static::class, 'getMailTransportFactory'], |
|
67 | + Messaging\FlashMessageService::class => [static::class, 'getFlashMessageService'], |
|
68 | + Middleware\ResponsePropagation::class => [static::class, 'getResponsePropagationMiddleware'], |
|
69 | + Package\FailsafePackageManager::class => [static::class, 'getFailsafePackageManager'], |
|
70 | + Registry::class => [static::class, 'getRegistry'], |
|
71 | + Resource\Index\FileIndexRepository::class => [static::class, 'getFileIndexRepository'], |
|
72 | + Resource\Index\MetaDataRepository::class => [static::class, 'getMetaDataRepository'], |
|
73 | + Resource\Driver\DriverRegistry::class => [static::class, 'getDriverRegistry'], |
|
74 | + Resource\ProcessedFileRepository::class => [static::class, 'getProcessedFileRepository'], |
|
75 | + Resource\ResourceFactory::class => [static::class, 'getResourceFactory'], |
|
76 | + Resource\StorageRepository::class => [static::class, 'getStorageRepository'], |
|
77 | + Service\DependencyOrderingService::class => [static::class, 'getDependencyOrderingService'], |
|
78 | + Service\FlexFormService::class => [static::class, 'getFlexFormService'], |
|
79 | + Service\OpcodeCacheService::class => [static::class, 'getOpcodeCacheService'], |
|
80 | + TimeTracker\TimeTracker::class => [static::class, 'getTimeTracker'], |
|
81 | + TypoScript\Parser\ConstantConfigurationParser::class => [static::class, 'getTypoScriptConstantConfigurationParser'], |
|
82 | + TypoScript\TypoScriptService::class => [static::class, 'getTypoScriptService'], |
|
83 | + 'middlewares' => [static::class, 'getMiddlewares'], |
|
84 | 84 | ]; |
85 | 85 | } |
86 | 86 | |
87 | 87 | public function getExtensions(): array |
88 | 88 | { |
89 | 89 | return [ |
90 | - Console\CommandRegistry::class => [ static::class, 'configureCommands' ], |
|
91 | - EventDispatcherInterface::class => [ static::class, 'provideFallbackEventDispatcher' ], |
|
92 | - EventDispatcher\ListenerProvider::class => [ static::class, 'extendEventListenerProvider' ], |
|
90 | + Console\CommandRegistry::class => [static::class, 'configureCommands'], |
|
91 | + EventDispatcherInterface::class => [static::class, 'provideFallbackEventDispatcher'], |
|
92 | + EventDispatcher\ListenerProvider::class => [static::class, 'extendEventListenerProvider'], |
|
93 | 93 | ] + parent::getExtensions(); |
94 | 94 | } |
95 | 95 |
@@ -109,8 +109,7 @@ |
||
109 | 109 | |
110 | 110 | /** @var IconProviderInterface $iconProvider */ |
111 | 111 | $iconProvider = $this->container->has($iconConfiguration['provider']) ? |
112 | - $this->container->get($iconConfiguration['provider']) : |
|
113 | - GeneralUtility::makeInstance($iconConfiguration['provider']); |
|
112 | + $this->container->get($iconConfiguration['provider']) : GeneralUtility::makeInstance($iconConfiguration['provider']); |
|
114 | 113 | $iconProvider->prepareIconMarkup($icon, $iconConfiguration['options']); |
115 | 114 | |
116 | 115 | static::$iconCache[$cacheIdentifier] = $icon; |
@@ -972,7 +972,7 @@ |
||
972 | 972 | protected function escape(array $strings): array |
973 | 973 | { |
974 | 974 | return array_map( |
975 | - function (string $value): string { |
|
975 | + function(string $value): string { |
|
976 | 976 | return htmlspecialchars($value, ENT_QUOTES, 'UTF-8'); |
977 | 977 | }, |
978 | 978 | $strings |
@@ -135,7 +135,7 @@ |
||
135 | 135 | */ |
136 | 136 | protected function getAlternativeProviders(MfaProviderManifestInterface $mfaProvider): array |
137 | 137 | { |
138 | - return array_filter($this->allowedProviders, function ($provider) use ($mfaProvider) { |
|
138 | + return array_filter($this->allowedProviders, function($provider) use ($mfaProvider) { |
|
139 | 139 | return $provider !== $mfaProvider |
140 | 140 | && $provider->isActive(MfaProviderPropertyManager::create($provider, $this->getBackendUser())); |
141 | 141 | }); |
@@ -104,7 +104,7 @@ |
||
104 | 104 | } |
105 | 105 | |
106 | 106 | // Set up allowed providers based on user TSconfig and user groupData |
107 | - $this->allowedProviders = array_filter($this->mfaProviderRegistry->getProviders(), function ($identifier) use ($backendUser) { |
|
107 | + $this->allowedProviders = array_filter($this->mfaProviderRegistry->getProviders(), function($identifier) use ($backendUser) { |
|
108 | 108 | return $backendUser->check('mfa_providers', $identifier) |
109 | 109 | && !GeneralUtility::inList(($this->mfaTsConfig['disableProviders'] ?? ''), $identifier); |
110 | 110 | }, ARRAY_FILTER_USE_KEY); |
@@ -171,7 +171,7 @@ discard block |
||
171 | 171 | if (!empty($variableNames)) { |
172 | 172 | $aspects = array_filter( |
173 | 173 | $this->aspects, |
174 | - function (string $variableName) use ($variableNames) { |
|
174 | + function(string $variableName) use ($variableNames) { |
|
175 | 175 | return in_array($variableName, $variableNames, true); |
176 | 176 | }, |
177 | 177 | ARRAY_FILTER_USE_KEY |
@@ -179,7 +179,7 @@ discard block |
||
179 | 179 | } |
180 | 180 | return array_filter( |
181 | 181 | $aspects, |
182 | - function (AspectInterface $aspect) use ($classNames) { |
|
182 | + function(AspectInterface $aspect) use ($classNames) { |
|
183 | 183 | $uses = class_uses($aspect) ?: []; |
184 | 184 | foreach ($classNames as $className) { |
185 | 185 | if (!is_a($aspect, $className) |
@@ -973,7 +973,7 @@ |
||
973 | 973 | 'video/x-sgi-movie' => ['movie'], |
974 | 974 | 'video/x-smv' => ['smv'], |
975 | 975 | 'x-conference/x-cooltalk' => ['ice'], |
976 | - ]; |
|
976 | + ]; |
|
977 | 977 | |
978 | 978 | /** |
979 | 979 | * @return array<string, List<string>> |