Commit 949e4de8 authored by Markus Hoelzle's avatar Markus Hoelzle Committed by Jan Helke
Browse files

[CLEANUP] Remove some unused variables and cleanup some code styles

Remove some unused variable and cleanup some PHP docs and some code styles

Resolves: #82364
Releases: master
Change-Id: I72f69a7c05514088bd318fed0e2c4ecc4710e183
Reviewed-on: https://review.typo3.org/53975


Tested-by: default avatarTYPO3com <no-reply@typo3.com>
Reviewed-by: default avatarSimon Praetorius <simon@praetorius.me>
Reviewed-by: Matthias Vogel's avatarMatthias Vogel <typo3@kanti.de>
Reviewed-by: Romain Canon's avatarRomain Canon <romain.hydrocanon@gmail.com>
Tested-by: Matthias Vogel's avatarMatthias Vogel <typo3@kanti.de>
Reviewed-by: Jan Helke's avatarJan Helke <typo3@helke.de>
Tested-by: Jan Helke's avatarJan Helke <typo3@helke.de>
parent a2b24cd1
...@@ -3062,7 +3062,6 @@ class DataHandler ...@@ -3062,7 +3062,6 @@ class DataHandler
} }
if ($DSelements[$key]['section']) { if ($DSelements[$key]['section']) {
$newIndexCounter = 0;
foreach ($dataValues[$key]['el'] as $ik => $el) { foreach ($dataValues[$key]['el'] as $ik => $el) {
if (!is_array($el)) { if (!is_array($el)) {
continue; continue;
......
...@@ -15,7 +15,6 @@ namespace TYPO3\CMS\Core\Database; ...@@ -15,7 +15,6 @@ namespace TYPO3\CMS\Core\Database;
* The TYPO3 project - inspiring people to share! * The TYPO3 project - inspiring people to share!
*/ */
use Doctrine\DBAL\Configuration;
use Doctrine\DBAL\DriverManager; use Doctrine\DBAL\DriverManager;
use Doctrine\DBAL\Events; use Doctrine\DBAL\Events;
use Doctrine\DBAL\Types\Type; use Doctrine\DBAL\Types\Type;
......
...@@ -2710,8 +2710,7 @@ class GraphicalFunctions ...@@ -2710,8 +2710,7 @@ class GraphicalFunctions
if ($this->setup['quality']) { if ($this->setup['quality']) {
$quality = MathUtility::forceIntegerInRange($this->setup['quality'], 10, 100); $quality = MathUtility::forceIntegerInRange($this->setup['quality'], 10, 100);
} }
if ($this->ImageWrite($this->im, $file, $quality)) { $this->ImageWrite($this->im, $file, $quality);
}
break; break;
} }
} }
......
...@@ -2368,12 +2368,6 @@ class IconRegistry implements SingletonInterface ...@@ -2368,12 +2368,6 @@ class IconRegistry implements SingletonInterface
'name' => 'plug' 'name' => 'plug'
] ]
], ],
'module-help' => [
'provider' => FontawesomeIconProvider::class,
'options' => [
'name' => 'question-circle'
]
],
'module-about' => [ 'module-about' => [
'provider' => SvgIconProvider::class, 'provider' => SvgIconProvider::class,
'options' => [ 'options' => [
...@@ -2640,12 +2634,6 @@ class IconRegistry implements SingletonInterface ...@@ -2640,12 +2634,6 @@ class IconRegistry implements SingletonInterface
'source' => 'EXT:core/Resources/Public/Icons/T3Icons/overlay/overlay-hidden.svg' 'source' => 'EXT:core/Resources/Public/Icons/T3Icons/overlay/overlay-hidden.svg'
] ]
], ],
'overlay-endtime' => [
'provider' => SvgIconProvider::class,
'options' => [
'source' => 'EXT:core/Resources/Public/Icons/T3Icons/overlay/overlay-endtime.svg'
]
],
'overlay-includes-subpages' => [ 'overlay-includes-subpages' => [
'provider' => SvgIconProvider::class, 'provider' => SvgIconProvider::class,
'options' => [ 'options' => [
......
...@@ -206,7 +206,6 @@ class TcaMigration ...@@ -206,7 +206,6 @@ class TcaMigration
'paletteName' => isset($fieldArray[2]) ? $fieldArray[2] : null, 'paletteName' => isset($fieldArray[2]) ? $fieldArray[2] : null,
'fieldExtra' => isset($fieldArray[3]) ? $fieldArray[3] : null, 'fieldExtra' => isset($fieldArray[3]) ? $fieldArray[3] : null,
]; ];
$fieldName = $fieldArray['fieldName'];
if (!empty($fieldArray['fieldExtra'])) { if (!empty($fieldArray['fieldExtra'])) {
// Move fieldExtra "specConf" to columnsOverrides "defaultExtras" // Move fieldExtra "specConf" to columnsOverrides "defaultExtras"
if (!isset($newTca[$table]['types'][$typeName]['columnsOverrides'])) { if (!isset($newTca[$table]['types'][$typeName]['columnsOverrides'])) {
......
...@@ -706,7 +706,6 @@ class GeneralUtility ...@@ -706,7 +706,6 @@ class GeneralUtility
{ {
$hashAlgorithm = 'sha1'; $hashAlgorithm = 'sha1';
$hashBlocksize = 64; $hashBlocksize = 64;
$hmac = '';
$secret = $GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey'] . $additionalSecret; $secret = $GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey'] . $additionalSecret;
if (extension_loaded('hash') && function_exists('hash_hmac') && function_exists('hash_algos') && in_array($hashAlgorithm, hash_algos())) { if (extension_loaded('hash') && function_exists('hash_hmac') && function_exists('hash_algos') && in_array($hashAlgorithm, hash_algos())) {
$hmac = hash_hmac($hashAlgorithm, $input, $secret); $hmac = hash_hmac($hashAlgorithm, $input, $secret);
......
...@@ -14,7 +14,6 @@ namespace TYPO3\CMS\Core\Tests\Functional\Resource; ...@@ -14,7 +14,6 @@ namespace TYPO3\CMS\Core\Tests\Functional\Resource;
* The TYPO3 project - inspiring people to share! * The TYPO3 project - inspiring people to share!
*/ */
use TYPO3\CMS\Core\Resource\File;
use TYPO3\CMS\Core\Resource\Folder; use TYPO3\CMS\Core\Resource\Folder;
use TYPO3\CMS\Core\Resource\FolderInterface; use TYPO3\CMS\Core\Resource\FolderInterface;
use TYPO3\CMS\Core\Resource\ResourceFactory; use TYPO3\CMS\Core\Resource\ResourceFactory;
......
...@@ -18,7 +18,6 @@ namespace TYPO3\CMS\Form\Domain\Factory; ...@@ -18,7 +18,6 @@ namespace TYPO3\CMS\Form\Domain\Factory;
*/ */
use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Extbase\Object\ObjectManager;
use TYPO3\CMS\Form\Domain\Model\FormDefinition; use TYPO3\CMS\Form\Domain\Model\FormDefinition;
/** /**
......
...@@ -21,7 +21,6 @@ use TYPO3\CMS\Core\Utility\GeneralUtility; ...@@ -21,7 +21,6 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Extbase\Object\ObjectManager; use TYPO3\CMS\Extbase\Object\ObjectManager;
use TYPO3\CMS\Fluid\View\TemplateView; use TYPO3\CMS\Fluid\View\TemplateView;
use TYPO3\CMS\Form\Domain\Exception\RenderingException; use TYPO3\CMS\Form\Domain\Exception\RenderingException;
use TYPO3\CMS\Form\Domain\Runtime\FormRuntime;
use TYPO3\CMS\Form\ViewHelpers\RenderRenderableViewHelper; use TYPO3\CMS\Form\ViewHelpers\RenderRenderableViewHelper;
/** /**
......
...@@ -333,7 +333,7 @@ class FormRuntime implements RootRenderableInterface, \ArrayAccess ...@@ -333,7 +333,7 @@ class FormRuntime implements RootRenderableInterface, \ArrayAccess
/** /**
* @param Page $page * @param Page $page
* return null|string * @return null|string
*/ */
protected function getHoneypotNameFromSession(Page $page) protected function getHoneypotNameFromSession(Page $page)
{ {
......
...@@ -35,6 +35,7 @@ class FormElementsOnSubmitHooks ...@@ -35,6 +35,7 @@ class FormElementsOnSubmitHooks
* @param RenderableInterface $renderable * @param RenderableInterface $renderable
* @param mixed $elementValue submitted value of the element *before post processing* * @param mixed $elementValue submitted value of the element *before post processing*
* @param array $requestArguments submitted raw request values * @param array $requestArguments submitted raw request values
* @return mixed
* @see FormRuntime::mapAndValidate() * @see FormRuntime::mapAndValidate()
* @internal * @internal
*/ */
......
...@@ -19,7 +19,6 @@ use TYPO3\CMS\Core\Utility\GeneralUtility; ...@@ -19,7 +19,6 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Extbase\Error\Result; use TYPO3\CMS\Extbase\Error\Result;
use TYPO3\CMS\Extbase\Object\ObjectManager; use TYPO3\CMS\Extbase\Object\ObjectManager;
use TYPO3\CMS\Extbase\Property\PropertyMappingConfiguration; use TYPO3\CMS\Extbase\Property\PropertyMappingConfiguration;
use TYPO3\CMS\Extbase\Validation\Validator\ConjunctionValidator;
use TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface; use TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface;
/** /**
......
...@@ -17,7 +17,6 @@ namespace TYPO3\CMS\Form\ViewHelpers; ...@@ -17,7 +17,6 @@ namespace TYPO3\CMS\Form\ViewHelpers;
* The TYPO3 project - inspiring people to share! * The TYPO3 project - inspiring people to share!
*/ */
use TYPO3\CMS\Extbase\Mvc\Web\Request;
use TYPO3\CMS\Fluid\ViewHelpers\FormViewHelper as FluidFormViewHelper; use TYPO3\CMS\Fluid\ViewHelpers\FormViewHelper as FluidFormViewHelper;
use TYPO3Fluid\Fluid\Core\ViewHelper\TagBuilder; use TYPO3Fluid\Fluid\Core\ViewHelper\TagBuilder;
......
...@@ -23,7 +23,6 @@ use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper; ...@@ -23,7 +23,6 @@ use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
use TYPO3\CMS\Form\Domain\Model\FormElements\FormElementInterface; use TYPO3\CMS\Form\Domain\Model\FormElements\FormElementInterface;
use TYPO3\CMS\Form\Domain\Model\Renderable\CompositeRenderableInterface; use TYPO3\CMS\Form\Domain\Model\Renderable\CompositeRenderableInterface;
use TYPO3\CMS\Form\Domain\Model\Renderable\RootRenderableInterface; use TYPO3\CMS\Form\Domain\Model\Renderable\RootRenderableInterface;
use TYPO3\CMS\Form\Domain\Runtime\FormRuntime;
use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface; use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic; use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment