[BUGFIX] Minor code cleanups

A small series of minor cleanups:
* Setting a no longer existing property
* Slight variable type improvements
* Unused variable assignment

Resolves: #87267
Releases: master
Change-Id: I07c43b31b8fb2d8bacd80dc023595860fa77abf4
Reviewed-on: https://review.typo3.org/59269
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Alexander Schnitzler <typo3@alexanderschnitzler.de>
Tested-by: Alexander Schnitzler <typo3@alexanderschnitzler.de>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>

diff --git a/typo3/sysext/adminpanel/Classes/Utility/StateUtility.php b/typo3/sysext/adminpanel/Classes/Utility/StateUtility.php
index b04a26e..4149030 100644 (file)
--- a/typo3/sysext/adminpanel/Classes/Utility/StateUtility.php
+++ b/typo3/sysext/adminpanel/Classes/Utility/StateUtility.php
@@ -35,8 +35,6 @@ class StateUtility
         $beUser = $GLOBALS['BE_USER'] ?? null;
         if ($beUser instanceof FrontendBackendUserAuthentication) {
             $adminPanelConfiguration = $beUser->getTSConfig()['admPanel.'] ?? [];
         $beUser = $GLOBALS['BE_USER'] ?? null;
         if ($beUser instanceof FrontendBackendUserAuthentication) {
             $adminPanelConfiguration = $beUser->getTSConfig()['admPanel.'] ?? [];

-            // set legacy config
-            $beUser->extAdminConfig = $adminPanelConfiguration;

             if (isset($adminPanelConfiguration['enable.'])) {
                 // only enabled if at least one module is enabled.
                 return (bool)array_filter($adminPanelConfiguration['enable.']);
             if (isset($adminPanelConfiguration['enable.'])) {
                 // only enabled if at least one module is enabled.
                 return (bool)array_filter($adminPanelConfiguration['enable.']);

diff --git a/typo3/sysext/backend/Classes/Controller/EditDocumentController.php b/typo3/sysext/backend/Classes/Controller/EditDocumentController.php
index 4368192..fbf37a5 100644 (file)
--- a/typo3/sysext/backend/Classes/Controller/EditDocumentController.php
+++ b/typo3/sysext/backend/Classes/Controller/EditDocumentController.php
@@ -726,7 +726,7 @@ class EditDocumentController
             || isset($parsedBody['_saveandclosedok'])
         ) {
             // Redirect if element should be closed after save
             || isset($parsedBody['_saveandclosedok'])
         ) {
             // Redirect if element should be closed after save

-            return $this->closeDocument(abs($this->closeDoc), $request);
+            return $this->closeDocument((int)abs($this->closeDoc), $request);

         }
         return null;
     }
         }
         return null;
     }

diff --git a/typo3/sysext/core/Classes/Authentication/AbstractUserAuthentication.php b/typo3/sysext/core/Classes/Authentication/AbstractUserAuthentication.php
index ef481be..6d42bff 100644 (file)
--- a/typo3/sysext/core/Classes/Authentication/AbstractUserAuthentication.php
+++ b/typo3/sysext/core/Classes/Authentication/AbstractUserAuthentication.php
@@ -1409,8 +1409,8 @@ abstract class AbstractUserAuthentication implements LoggerAwareInterface
      * @param string $details Default text that follows the message
      * @param array $data Data that follows the log. Might be used to carry special information. If an array the first 5 entries (0-4) will be sprintf'ed the details-text...
      * @param string $tablename Special field used by tce_main.php. These ($tablename, $recuid, $recpid) holds the reference to the record which the log-entry is about. (Was used in attic status.php to update the interface.)
      * @param string $details Default text that follows the message
      * @param array $data Data that follows the log. Might be used to carry special information. If an array the first 5 entries (0-4) will be sprintf'ed the details-text...
      * @param string $tablename Special field used by tce_main.php. These ($tablename, $recuid, $recpid) holds the reference to the record which the log-entry is about. (Was used in attic status.php to update the interface.)

-     * @param int $recuid Special field used by tce_main.php. These ($tablename, $recuid, $recpid) holds the reference to the record which the log-entry is about. (Was used in attic status.php to update the interface.)
-     * @param int $recpid Special field used by tce_main.php. These ($tablename, $recuid, $recpid) holds the reference to the record which the log-entry is about. (Was used in attic status.php to update the interface.)
+     * @param int|string $recuid Special field used by tce_main.php. These ($tablename, $recuid, $recpid) holds the reference to the record which the log-entry is about. (Was used in attic status.php to update the interface.)
+     * @param int|string $recpid Special field used by tce_main.php. These ($tablename, $recuid, $recpid) holds the reference to the record which the log-entry is about. (Was used in attic status.php to update the interface.)

      */
     public function writelog($type, $action, $error, $details_nr, $details, $data, $tablename, $recuid, $recpid)
     {
      */
     public function writelog($type, $action, $error, $details_nr, $details, $data, $tablename, $recuid, $recpid)
     {

diff --git a/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php b/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php
index 17db690..8bc97ae 100644 (file)
--- a/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php
+++ b/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php
@@ -1299,7 +1299,6 @@ class BackendUserAuthentication extends AbstractUserAuthentication
             // Parsing the user TSconfig (or getting from cache)
             $hash = md5('userTS:' . $this->userTS_text);
             $cache = GeneralUtility::makeInstance(CacheManager::class)->getCache('cache_hash');
             // Parsing the user TSconfig (or getting from cache)
             $hash = md5('userTS:' . $this->userTS_text);
             $cache = GeneralUtility::makeInstance(CacheManager::class)->getCache('cache_hash');

-            $cachedContent = $cache->get($hash);

             $parseObj = GeneralUtility::makeInstance(\TYPO3\CMS\Core\TypoScript\Parser\TypoScriptParser::class);
             $parseObj->parse($this->userTS_text);
             $this->userTS = $parseObj->setup;
             $parseObj = GeneralUtility::makeInstance(\TYPO3\CMS\Core\TypoScript\Parser\TypoScriptParser::class);
             $parseObj->parse($this->userTS_text);
             $this->userTS = $parseObj->setup;