diff --git a/Build/.php_cs b/Build/.php_cs
index fff84fe5277710a2e1b15ea1953cf4063562f3fc..725989376c311af6e29a2fe10c70d57c9fa93c40 100644
--- a/Build/.php_cs
+++ b/Build/.php_cs
@@ -74,6 +74,9 @@ return PhpCsFixer\Config::create()
         'native_function_casing' => true,
         'self_accessor' => true,
         'no_short_bool_cast' => true,
-        'no_unneeded_control_parentheses' => true
+        'no_unneeded_control_parentheses' => true,
+        'phpdoc_no_empty_return' => true,
+        'no_blank_lines_after_phpdoc' => true,
+        'phpdoc_trim' => true
     ])
     ->setFinder($finder);
diff --git a/components/testing_framework/Classes/Core/Acceptance/AcceptanceCoreEnvironment.php b/components/testing_framework/Classes/Core/Acceptance/AcceptanceCoreEnvironment.php
index 0d09246164dc71f2305b61912ce965f0cbd47d8c..7dbf205599238abaea95c642720f6bf9fb504df7 100644
--- a/components/testing_framework/Classes/Core/Acceptance/AcceptanceCoreEnvironment.php
+++ b/components/testing_framework/Classes/Core/Acceptance/AcceptanceCoreEnvironment.php
@@ -267,8 +267,6 @@ class AcceptanceCoreEnvironment extends Extension
 
     /**
      * Method executed after each test
-     *
-     * @return void
      */
     public function cleanupTypo3Environment()
     {
diff --git a/components/testing_framework/Classes/Core/AccessibleObjectInterface.php b/components/testing_framework/Classes/Core/AccessibleObjectInterface.php
index 83e86ea8de2162bea4d92f49e7d601c9437fea35..02e4e45362ba4906aabc8ef8d92d68e56fab0ec5 100644
--- a/components/testing_framework/Classes/Core/AccessibleObjectInterface.php
+++ b/components/testing_framework/Classes/Core/AccessibleObjectInterface.php
@@ -54,8 +54,6 @@ interface AccessibleObjectInterface
      *
      * @param string $propertyName name of property to set value for, must not be empty
      * @param mixed $value the new value for the property defined in $propertyName
-     *
-     * @return void
      */
     public function _set($propertyName, $value);
 
@@ -64,8 +62,6 @@ interface AccessibleObjectInterface
      *
      * @param string $propertyName name of property to set value for, must not be empty
      * @param mixed &$value the new value for the property defined in $propertyName
-     *
-     * @return void
      */
     public function _setRef($propertyName, &$value);
 
@@ -74,8 +70,6 @@ interface AccessibleObjectInterface
      *
      * @param string $propertyName name of property to set value for, must not be empty
      * @param mixed $value the new value for the property defined in $propertyName
-     *
-     * @return void
      */
     public function _setStatic($propertyName, $value);
 
diff --git a/components/testing_framework/Classes/Core/BaseTestCase.php b/components/testing_framework/Classes/Core/BaseTestCase.php
index ae9c326a55ebd665a58b978d237fca9cd77137e8..f91fdcfc4487c7458d8a6623499d4deba7b4fdcb 100644
--- a/components/testing_framework/Classes/Core/BaseTestCase.php
+++ b/components/testing_framework/Classes/Core/BaseTestCase.php
@@ -19,7 +19,6 @@ namespace TYPO3\TestingFramework\Core;
  *
  * Don't sub class this test case but rather choose a more specialized base test case,
  * such as UnitTestCase or FunctionalTestCase
- *
  */
 abstract class BaseTestCase extends \PHPUnit_Framework_TestCase
 {
@@ -97,7 +96,6 @@ abstract class BaseTestCase extends \PHPUnit_Framework_TestCase
      * @throws \InvalidArgumentException
      *
      * @return \PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
-     *
      */
     protected function getAccessibleMockForAbstractClass(
         $originalClassName, array $arguments = [], $mockClassName = '',
@@ -252,7 +250,6 @@ abstract class BaseTestCase extends \PHPUnit_Framework_TestCase
      * @param object $target The instance which needs the dependency
      * @param string $name Name of the property to be injected
      * @param mixed $dependency The dependency to inject – usually an object but can also be any other type
-     * @return void
      * @throws \RuntimeException
      * @throws \InvalidArgumentException
      */
diff --git a/components/testing_framework/Classes/Core/FileStreamWrapper.php b/components/testing_framework/Classes/Core/FileStreamWrapper.php
index 88a1d464f330f2fd721e813ed281d62896618fe9..765b12286f9441e672f9064a356e8c8b7b9e6beb 100644
--- a/components/testing_framework/Classes/Core/FileStreamWrapper.php
+++ b/components/testing_framework/Classes/Core/FileStreamWrapper.php
@@ -92,7 +92,6 @@ class FileStreamWrapper
      * Initialize the stream wrapper with a root path and register itself
      *
      * @param $rootPath
-     * @return void
      */
     public static function init($rootPath)
     {
@@ -102,7 +101,6 @@ class FileStreamWrapper
 
     /**
      * Unregister the stream wrapper and reset all static members to their default values
-     * @return void
      */
     public static function destroy()
     {
@@ -119,7 +117,6 @@ class FileStreamWrapper
      * @param string $overlay Relative path to the root folder
      * @param string $replace The path that should replace the overlay path
      * @param bool $createFolder TRUE of the folder should be created (mkdir)
-     * @return void
      */
     public static function registerOverlayPath($overlay, $replace, $createFolder = true)
     {
@@ -165,7 +162,6 @@ class FileStreamWrapper
      * file:// scheme a \BadFunctionCallException will be thrown.
      *
      * @throws \BadFunctionCallException
-     * @return void
      */
     protected static function register()
     {
@@ -185,8 +181,6 @@ class FileStreamWrapper
 
     /**
      * Restore the file handler
-     *
-     * @return void
      */
     protected static function restore()
     {
@@ -341,7 +335,6 @@ class FileStreamWrapper
 
     /**
      * Close a file
-     *
      */
     public function stream_close()
     {
diff --git a/components/testing_framework/Classes/Core/Functional/Framework/Frontend/Collector.php b/components/testing_framework/Classes/Core/Functional/Framework/Frontend/Collector.php
index a907824752584b2ada2de85ba6e9b9795d1c25f9..80bf10b0ed19ba7913dba2bf582916f4b9df6364 100644
--- a/components/testing_framework/Classes/Core/Functional/Framework/Frontend/Collector.php
+++ b/components/testing_framework/Classes/Core/Functional/Framework/Frontend/Collector.php
@@ -125,7 +125,6 @@ class Collector implements \TYPO3\CMS\Core\SingletonInterface
     /**
      * @param string $content
      * @param NULL|array $configuration
-     * @return void
      */
     public function attachSection($content, array $configuration = null)
     {
@@ -189,8 +188,6 @@ class Collector implements \TYPO3\CMS\Core\SingletonInterface
 
     /**
      * Collector needs to be reset after attaching a section, otherwise records will pile up.
-     *
-     * @return void
      */
     protected function reset()
     {
diff --git a/components/testing_framework/Classes/Core/Functional/Framework/Frontend/Renderer.php b/components/testing_framework/Classes/Core/Functional/Framework/Frontend/Renderer.php
index 52b6787c232e27dda2d3d3d652725a188b7196d6..8172b0684e78314213ad4c92b4c3586396e596f3 100644
--- a/components/testing_framework/Classes/Core/Functional/Framework/Frontend/Renderer.php
+++ b/components/testing_framework/Classes/Core/Functional/Framework/Frontend/Renderer.php
@@ -27,7 +27,6 @@ class Renderer implements \TYPO3\CMS\Core\SingletonInterface
     /**
      * @param string $content
      * @param NULL|array $configuration
-     * @return void
      */
     public function parseValues($content, array $configuration = null)
     {
diff --git a/components/testing_framework/Classes/Core/Functional/Framework/Frontend/RequestBootstrap.php b/components/testing_framework/Classes/Core/Functional/Framework/Frontend/RequestBootstrap.php
index 683c0ab6d915d33d6a9178b94055742ef30069e6..8e4304d5ebcc02405de5bc15c887cc922645803b 100644
--- a/components/testing_framework/Classes/Core/Functional/Framework/Frontend/RequestBootstrap.php
+++ b/components/testing_framework/Classes/Core/Functional/Framework/Frontend/RequestBootstrap.php
@@ -24,7 +24,6 @@ class RequestBootstrap
      * to start clean for a functional test.
      *
      * @param array $requestArguments usually JSON encoded arguments, should include "documentRoot" and "requestUrl"
-     * @return void
      */
     public static function setGlobalVariables(array $requestArguments = null)
     {
diff --git a/components/testing_framework/Classes/Core/Functional/FunctionalTestCase.php b/components/testing_framework/Classes/Core/Functional/FunctionalTestCase.php
index 42700a5e7110e02aba6667a78b63ab60a6ee4264..aee6c40b269f82eba2ba85d899fa78d33ad9d949 100644
--- a/components/testing_framework/Classes/Core/Functional/FunctionalTestCase.php
+++ b/components/testing_framework/Classes/Core/Functional/FunctionalTestCase.php
@@ -205,7 +205,6 @@ abstract class FunctionalTestCase extends BaseTestCase
      *
      * This method should be called with parent::setUp() in your test cases!
      *
-     * @return void
      * @throws \Doctrine\DBAL\DBALException
      */
     protected function setUp()
@@ -354,7 +353,6 @@ abstract class FunctionalTestCase extends BaseTestCase
      * Imports a data set represented as XML into the test database,
      *
      * @param string $path Absolute path to the XML file containing the data set to load
-     * @return void
      * @throws Exception
      */
     protected function importDataSet($path)
diff --git a/components/testing_framework/Classes/Core/Testbase.php b/components/testing_framework/Classes/Core/Testbase.php
index 9917e890954cbdc2077635282a4397d13ccd4ef9..24b1ef3ec521e7c821198516e141956ec516e44b 100644
--- a/components/testing_framework/Classes/Core/Testbase.php
+++ b/components/testing_framework/Classes/Core/Testbase.php
@@ -52,8 +52,6 @@ class Testbase
 
     /**
      * Makes sure error messages during the tests get displayed no matter what is set in php.ini.
-     *
-     * @return void
      */
     public function enableDisplayErrors()
     {
@@ -65,7 +63,6 @@ class Testbase
      * helpers during tests setup. Those are sanitized in SystemEnvironmentBuilder
      * to be not defined again.
      *
-     * @return void
      * @see SystemEnvironmentBuilder::defineBaseConstants()
      */
     public function defineBaseConstants()
@@ -92,8 +89,6 @@ class Testbase
     /**
      * Defines the PATH_site and PATH_thisScript constant and sets $_SERVER['SCRIPT_NAME'].
      * For unit tests only
-     *
-     * @return void
      */
     public function defineSitePath()
     {
@@ -110,8 +105,6 @@ class Testbase
      * Defines the constant ORIGINAL_ROOT for the path to the original TYPO3 document root.
      * For functional / acceptance tests only
      * If ORIGINAL_ROOT already is defined, this method is a no-op.
-     *
-     * @return void
      */
     public function defineOriginalRootPath()
     {
@@ -126,8 +119,6 @@ class Testbase
 
     /**
      * Define TYPO3_MODE to BE
-     *
-     * @return void
      */
     public function defineTypo3ModeBe()
     {
@@ -136,8 +127,6 @@ class Testbase
 
     /**
      * Sets the environment variable TYPO3_CONTEXT to testing.
-     *
-     * @return void
      */
     public function setTypo3TestingContext()
     {
@@ -148,7 +137,6 @@ class Testbase
      * Creates directories, recursively if required.
      *
      * @param string $directory Absolute path to directories to create
-     * @return void
      * @throws Exception
      */
     public function createDirectory($directory)
@@ -185,7 +173,6 @@ class Testbase
      * This may happen if a functional test before threw a fatal or is too old
      *
      * @param string $instancePath Absolute path to test instance
-     * @return void
      * @throws Exception
      */
     public function removeOldInstanceIfExists($instancePath)
@@ -206,7 +193,6 @@ class Testbase
      * Used in functional tests to reuse an instance for multiple tests in one test case.
      *
      * @param string $instancePath Absolute path to test instance
-     * @return void
      */
     public function createLastRunTextfile($instancePath)
     {
@@ -220,7 +206,6 @@ class Testbase
      *
      * @param string $instancePath Absolute path to test instance
      * @throws Exception
-     * @return void
      */
     public function setUpInstanceCoreLinks($instancePath)
     {
@@ -246,7 +231,6 @@ class Testbase
      * @param string $instancePath Absolute path to test instance
      * @param array $extensionPaths Contains paths to extensions relative to document root
      * @throws Exception
-     * @return void
      */
     public function linkTestExtensionsToInstance($instancePath, array $extensionPaths)
     {
@@ -277,7 +261,6 @@ class Testbase
      * @param string $instancePath Absolute path to test instance
      * @param array $pathsToLinkInTestInstance Contains paths as array of source => destination in key => value pairs of folders relative to test instance root
      * @throws Exception if a source path could not be found and on failing creating the symlink
-     * @return void
      */
     public function linkPathsInTestInstance($instancePath, array $pathsToLinkInTestInstance)
     {
@@ -396,7 +379,6 @@ class Testbase
      * @param array $configuration Base configuration array
      * @param array $overruleConfiguration Overrule factory and base configuration
      * @throws Exception
-     * @return void
      */
     public function setUpLocalConfiguration($instancePath, array $configuration, array $overruleConfiguration)
     {
@@ -485,7 +467,6 @@ class Testbase
      * @param string $databaseName Database name of this test instance
      * @param string $originalDatabaseName Original database name before suffix was added
      * @throws \TYPO3\TestingFramework\Core\Exception
-     * @return void
      */
     public function setUpTestDatabase($databaseName, $originalDatabaseName)
     {
@@ -521,7 +502,6 @@ class Testbase
      * For functional and acceptance tests.
      *
      * @param string $instancePath Absolute path to test instance
-     * @return void
      */
     public function setUpBasicTypo3Bootstrap($instancePath)
     {
@@ -545,7 +525,6 @@ class Testbase
      * For functional and acceptance tests.
      *
      * @throws Exception
-     * @return void
      */
     public function initializeTestDatabaseAndTruncateTables()
     {
@@ -564,8 +543,6 @@ class Testbase
     /**
      * Load ext_tables.php files.
      * For functional and acceptance tests.
-     *
-     * @return void
      */
     public function loadExtensionTables()
     {
@@ -575,8 +552,6 @@ class Testbase
     /**
      * Create tables and import static rows.
      * For functional and acceptance tests.
-     *
-     * @return void
      */
     public function createDatabaseStructure()
     {
@@ -596,7 +571,6 @@ class Testbase
      * Imports a data set represented as XML into the test database,
      *
      * @param string $path Absolute path to the XML file containing the data set to load
-     * @return void
      * @throws \Doctrine\DBAL\DBALException
      * @throws \InvalidArgumentException
      * @throws \RuntimeException
diff --git a/components/testing_framework/Classes/Core/Unit/UnitTestCase.php b/components/testing_framework/Classes/Core/Unit/UnitTestCase.php
index 911828a822b31dfb0b6f1ab768e349266881b63b..5cadd9a533de274130d39a51481ea4e630870eca 100644
--- a/components/testing_framework/Classes/Core/Unit/UnitTestCase.php
+++ b/components/testing_framework/Classes/Core/Unit/UnitTestCase.php
@@ -25,7 +25,6 @@ use TYPO3\TestingFramework\Core\BaseTestCase;
  * to extend this class for unit test cases instead of the base test case because if,
  * at some point, specific behavior needs to be implemented for unit tests, your test cases
  * will profit from it automatically.
- *
  */
 abstract class UnitTestCase extends BaseTestCase
 {
@@ -55,7 +54,6 @@ abstract class UnitTestCase extends BaseTestCase
      * is not needed this way.
      *
      * @throws \RuntimeException
-     * @return void
      */
     protected function tearDown()
     {
diff --git a/components/testing_framework/Classes/Fluid/Unit/ViewHelpers/ViewHelperBaseTestcase.php b/components/testing_framework/Classes/Fluid/Unit/ViewHelpers/ViewHelperBaseTestcase.php
index 7a0611849a8491e73850e2f9d523818278d6f658..d49d0802166d59962b6cc9e0eeb25eeb50aa0c01 100644
--- a/components/testing_framework/Classes/Fluid/Unit/ViewHelpers/ViewHelperBaseTestcase.php
+++ b/components/testing_framework/Classes/Fluid/Unit/ViewHelpers/ViewHelperBaseTestcase.php
@@ -75,7 +75,6 @@ abstract class ViewHelperBaseTestcase extends \TYPO3\TestingFramework\Core\Unit\
 
     /**
      * Sets up all properties of a viewhelper needed to test a viewhelper
-     * @return void
      */
     protected function setUp()
     {
@@ -110,7 +109,6 @@ abstract class ViewHelperBaseTestcase extends \TYPO3\TestingFramework\Core\Unit\
 
     /**
      * @param ViewHelperInterface $viewHelper
-     * @return void
      */
     protected function injectDependenciesIntoViewHelper(ViewHelperInterface $viewHelper)
     {
diff --git a/typo3/sysext/about/Classes/Controller/AboutController.php b/typo3/sysext/about/Classes/Controller/AboutController.php
index 8525af808b0e1e0c47697ba0e8881212bf9d3b40..159efa2cf267af479dcb27fab46308fa86962391 100644
--- a/typo3/sysext/about/Classes/Controller/AboutController.php
+++ b/typo3/sysext/about/Classes/Controller/AboutController.php
@@ -57,8 +57,6 @@ class AboutController extends ActionController
 
     /**
      * Main action: Show standard information
-     *
-     * @return void
      */
     public function indexAction()
     {
diff --git a/typo3/sysext/about/Classes/Controller/ModulesController.php b/typo3/sysext/about/Classes/Controller/ModulesController.php
index 94853b5bfbfb50f7a5c609b87077f340890a4724..50de1fc15c49c2132f15c0c27e9bd946bffe9218 100644
--- a/typo3/sysext/about/Classes/Controller/ModulesController.php
+++ b/typo3/sysext/about/Classes/Controller/ModulesController.php
@@ -68,8 +68,6 @@ class ModulesController extends ActionController
 
     /**
      * Show general information and the installed modules
-     *
-     * @return void
      */
     public function indexAction()
     {
diff --git a/typo3/sysext/backend/Classes/Backend/Avatar/Avatar.php b/typo3/sysext/backend/Classes/Backend/Avatar/Avatar.php
index 98fb169cb1d9eaac11e0da4f64fb3eecd15b324d..6c1b925d29577848179d6e7e2ce05767a2909fcf 100644
--- a/typo3/sysext/backend/Classes/Backend/Avatar/Avatar.php
+++ b/typo3/sysext/backend/Classes/Backend/Avatar/Avatar.php
@@ -129,7 +129,6 @@ class Avatar
     /**
      * Validates the registered avatar providers
      *
-     * @return void
      * @throws \RuntimeException
      */
     protected function validateSortAndInitiateAvatarProviders()
diff --git a/typo3/sysext/backend/Classes/Backend/ToolbarItems/SystemInformationToolbarItem.php b/typo3/sysext/backend/Classes/Backend/ToolbarItems/SystemInformationToolbarItem.php
index 1beb1211731634e199c78ebea768b613c7cececc..60cdbf66e466d09d1aa1c899eaa9a418eaba0f49 100644
--- a/typo3/sysext/backend/Classes/Backend/ToolbarItems/SystemInformationToolbarItem.php
+++ b/typo3/sysext/backend/Classes/Backend/ToolbarItems/SystemInformationToolbarItem.php
@@ -150,8 +150,6 @@ class SystemInformationToolbarItem implements ToolbarItemInterface
 
     /**
      * Gets the PHP version
-     *
-     * @return void
      */
     protected function getPhpVersion()
     {
@@ -164,8 +162,6 @@ class SystemInformationToolbarItem implements ToolbarItemInterface
 
     /**
      * Get the database info
-     *
-     * @return void
      */
     protected function getDatabase()
     {
@@ -184,8 +180,6 @@ class SystemInformationToolbarItem implements ToolbarItemInterface
 
     /**
      * Gets the application context
-     *
-     * @return void
      */
     protected function getApplicationContext()
     {
@@ -217,8 +211,6 @@ class SystemInformationToolbarItem implements ToolbarItemInterface
 
     /**
      * Gets the current GIT revision and branch
-     *
-     * @return void
      */
     protected function getGitRevision()
     {
@@ -245,8 +237,6 @@ class SystemInformationToolbarItem implements ToolbarItemInterface
 
     /**
      * Gets the system kernel and version
-     *
-     * @return void
      */
     protected function getOperatingSystem()
     {
@@ -294,8 +284,6 @@ class SystemInformationToolbarItem implements ToolbarItemInterface
 
     /**
      * Emits the "getSystemInformation" signal
-     *
-     * @return void
      */
     protected function emitGetSystemInformation()
     {
@@ -304,8 +292,6 @@ class SystemInformationToolbarItem implements ToolbarItemInterface
 
     /**
      * Emits the "loadMessages" signal
-     *
-     * @return void
      */
     protected function emitLoadMessages()
     {
diff --git a/typo3/sysext/backend/Classes/Clipboard/Clipboard.php b/typo3/sysext/backend/Classes/Clipboard/Clipboard.php
index 2eb3eb5ce9889ad0d5faec2145c42c08fb53d756..c2550673f0c98ecb137732034220deed80db151a 100644
--- a/typo3/sysext/backend/Classes/Clipboard/Clipboard.php
+++ b/typo3/sysext/backend/Classes/Clipboard/Clipboard.php
@@ -109,8 +109,6 @@ class Clipboard
      ****************************************/
     /**
      * Initialize the clipboard from the be_user session
-     *
-     * @return void
      */
     public function initializeClipboard()
     {
@@ -134,8 +132,6 @@ class Clipboard
      * Call this method after initialization if you want to lock the clipboard to operate on the normal pad only.
      * Trying to switch pad through ->setCmd will not work.
      * This is used by the clickmenu since it only allows operation on single elements at a time (that is the "normal" pad)
-     *
-     * @return void
      */
     public function lockToNormal()
     {
@@ -153,7 +149,6 @@ class Clipboard
      * Selecting elements for 'copy' should be done by simultaneously setting setCopyMode.
      *
      * @param array $cmd Array of actions, see function description
-     * @return void
      */
     public function setCmd($cmd)
     {
@@ -195,7 +190,6 @@ class Clipboard
      * Setting the current pad on clipboard
      *
      * @param string $padIdent Key in the array $this->clipData
-     * @return void
      */
     public function setCurrentPad($padIdent)
     {
@@ -215,8 +209,6 @@ class Clipboard
     /**
      * Call this after initialization and setCmd in order to save the clipboard to the user session.
      * The function will check if the internal flag ->changed has been set and if so, save the clipboard. Else not.
-     *
-     * @return void
      */
     public function endClipboard()
     {
@@ -803,7 +795,6 @@ class Clipboard
      * Removes element on clipboard
      *
      * @param string $el Key of element in ->clipData array
-     * @return void
      */
     public function removeElement($el)
     {
@@ -816,7 +807,6 @@ class Clipboard
      * Use ->endClipboard normally (as it checks if changes has been done so saving is necessary)
      *
      * @access private
-     * @return void
      */
     public function saveClipboard()
     {
@@ -836,8 +826,6 @@ class Clipboard
     /**
      * This traverses the elements on the current clipboard pane
      * and unsets elements which does not exist anymore or are disabled.
-     *
-     * @return void
      */
     public function cleanCurrent()
     {
diff --git a/typo3/sysext/backend/Classes/Command/LockBackendCommand.php b/typo3/sysext/backend/Classes/Command/LockBackendCommand.php
index 07d1748962fd455622bb7da401b3cf505aa54ae5..918127da8d5056752d28fc36461ff2241c3fa8fb 100644
--- a/typo3/sysext/backend/Classes/Command/LockBackendCommand.php
+++ b/typo3/sysext/backend/Classes/Command/LockBackendCommand.php
@@ -44,7 +44,6 @@ class LockBackendCommand extends Command
      *
      * @param InputInterface $input
      * @param OutputInterface $output
-     * @return void
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
diff --git a/typo3/sysext/backend/Classes/Command/ReferenceIndexUpdateCommand.php b/typo3/sysext/backend/Classes/Command/ReferenceIndexUpdateCommand.php
index 02fef2e9f4c9044a37ebda5218bfd39ee2848b89..31c6c8a35cf9e167c62aef32ca2d285c6d508a04 100644
--- a/typo3/sysext/backend/Classes/Command/ReferenceIndexUpdateCommand.php
+++ b/typo3/sysext/backend/Classes/Command/ReferenceIndexUpdateCommand.php
@@ -46,7 +46,6 @@ class ReferenceIndexUpdateCommand extends Command
      *
      * @param InputInterface $input
      * @param OutputInterface $output
-     * @return void
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
diff --git a/typo3/sysext/backend/Classes/Command/UnlockBackendCommand.php b/typo3/sysext/backend/Classes/Command/UnlockBackendCommand.php
index 71ae5fdb44fd08c5d65f8771a7472a02655fac19..b072d80455c9e64c82cdaa0fd9464b9c80dde6cc 100644
--- a/typo3/sysext/backend/Classes/Command/UnlockBackendCommand.php
+++ b/typo3/sysext/backend/Classes/Command/UnlockBackendCommand.php
@@ -36,7 +36,6 @@ class UnlockBackendCommand extends Command
      *
      * @param InputInterface $input
      * @param OutputInterface $output
-     * @return void
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
diff --git a/typo3/sysext/backend/Classes/Configuration/TypoScript/ConditionMatching/ConditionMatcher.php b/typo3/sysext/backend/Classes/Configuration/TypoScript/ConditionMatching/ConditionMatcher.php
index 149cf44b72b4b5d2d61605ce3ae4965ee2560988..834d2b04d96b408c3195b4f6898a511db21b13ec 100644
--- a/typo3/sysext/backend/Classes/Configuration/TypoScript/ConditionMatching/ConditionMatcher.php
+++ b/typo3/sysext/backend/Classes/Configuration/TypoScript/ConditionMatching/ConditionMatcher.php
@@ -277,7 +277,6 @@ class ConditionMatcher extends AbstractConditionMatcher
      * Set/write a log message.
      *
      * @param string $message The log message to set/write
-     * @return void
      */
     protected function log($message)
     {
diff --git a/typo3/sysext/backend/Classes/Console/Application.php b/typo3/sysext/backend/Classes/Console/Application.php
index edc09321a42b5e2b24a9daa873209b1e0e3df951..070b54c8c4c8c37906b12075163474013d188ef4 100644
--- a/typo3/sysext/backend/Classes/Console/Application.php
+++ b/typo3/sysext/backend/Classes/Console/Application.php
@@ -71,7 +71,6 @@ class Application implements ApplicationInterface
      * Set up the application and shut it down afterwards
      *
      * @param callable $execute
-     * @return void
      */
     public function run(callable $execute = null)
     {
@@ -94,8 +93,6 @@ class Application implements ApplicationInterface
 
     /**
      * Check the script is called from a cli environment.
-     *
-     * @return void
      */
     protected function checkEnvironmentOrDie()
     {
@@ -109,8 +106,6 @@ class Application implements ApplicationInterface
     /**
      * Set up cgi sapi as de facto cli, but check no HTTP
      * environment variables are set.
-     *
-     * @return void
      */
     protected function initializeCgiCompatibilityLayerOrDie()
     {
diff --git a/typo3/sysext/backend/Classes/Console/CliRequestHandler.php b/typo3/sysext/backend/Classes/Console/CliRequestHandler.php
index a623bde425c673a431047585c619cfaf3ac22e11..6f25a655060665e0b9153ccf838fd078ef9edcda 100644
--- a/typo3/sysext/backend/Classes/Console/CliRequestHandler.php
+++ b/typo3/sysext/backend/Classes/Console/CliRequestHandler.php
@@ -52,7 +52,6 @@ class CliRequestHandler implements RequestHandlerInterface
      * Handles any commandline request
      *
      * @param InputInterface $input
-     * @return void
      */
     public function handleRequest(InputInterface $input)
     {
diff --git a/typo3/sysext/backend/Classes/ContextMenu/ItemProviders/RecordProvider.php b/typo3/sysext/backend/Classes/ContextMenu/ItemProviders/RecordProvider.php
index 2a8c3b48b8eaedc3c6cd5321ce5cccdee9ccca36..6519f927ef6f6415b8f4807ad68106d19fd26910 100644
--- a/typo3/sysext/backend/Classes/ContextMenu/ItemProviders/RecordProvider.php
+++ b/typo3/sysext/backend/Classes/ContextMenu/ItemProviders/RecordProvider.php
@@ -23,7 +23,6 @@ use TYPO3\CMS\Core\Versioning\VersionState;
 
 /**
  * Class responsible for providing click menu items for db records which don't have custom provider (as e.g. pages)
- *
  */
 class RecordProvider extends AbstractProvider
 {
diff --git a/typo3/sysext/backend/Classes/Controller/BackendController.php b/typo3/sysext/backend/Classes/Controller/BackendController.php
index 1e65fe5a6273acdf711a14dbf93dabe385e8b696..685d7c2d973d2ca2c960b087f7bb69816fc57817 100644
--- a/typo3/sysext/backend/Classes/Controller/BackendController.php
+++ b/typo3/sysext/backend/Classes/Controller/BackendController.php
@@ -218,7 +218,6 @@ class BackendController
      * Initialize toolbar item objects
      *
      * @throws \RuntimeException
-     * @return void
      */
     protected function initializeToolbarItems()
     {
@@ -267,8 +266,6 @@ class BackendController
 
     /**
      * Main function generating the BE scaffolding
-     *
-     * @return void
      */
     public function render()
     {
@@ -438,8 +435,6 @@ class BackendController
 
     /**
      * Loads the css and javascript files of all registered navigation widgets
-     *
-     * @return void
      */
     protected function loadResourcesForRegisteredNavigationComponents()
     {
@@ -659,8 +654,6 @@ class BackendController
 
     /**
      * Generates the JavaScript code for the backend.
-     *
-     * @return void
      */
     protected function generateJavascript()
     {
@@ -719,8 +712,6 @@ class BackendController
 
     /**
      * Checking if the "&edit" variable was sent so we can open it for editing the page.
-     *
-     * @return void
      */
     protected function handlePageEditing()
     {
@@ -837,7 +828,6 @@ class BackendController
      * Adds a javascript snippet to the backend
      *
      * @param string $javascript Javascript snippet
-     * @return void
      * @throws \InvalidArgumentException
      * @deprecated since TYPO3 v8, will be removed in TYPO3 v9. Use the "constructPostProcess" hook within BackendController instead.
      */
@@ -874,7 +864,6 @@ class BackendController
      * Adds a css snippet to the backend
      *
      * @param string $css Css snippet
-     * @return void
      * @throws \InvalidArgumentException
      */
     public function addCss($css)
@@ -914,7 +903,6 @@ class BackendController
      *
      * @param string $identifier Specific hook identifier
      * @param array $hookConfiguration Additional configuration passed to hook functions
-     * @return void
      */
     protected function executeHook($identifier, array $hookConfiguration = [])
     {
diff --git a/typo3/sysext/backend/Classes/Controller/ContentElement/ElementHistoryController.php b/typo3/sysext/backend/Classes/Controller/ContentElement/ElementHistoryController.php
index 9b924521f8782e8caf77ce75250be67253895a3f..79c83d90f3ccb252c7ba338216459fd66a7cb041 100644
--- a/typo3/sysext/backend/Classes/Controller/ContentElement/ElementHistoryController.php
+++ b/typo3/sysext/backend/Classes/Controller/ContentElement/ElementHistoryController.php
@@ -77,8 +77,6 @@ class ElementHistoryController extends AbstractModule
 
     /**
      * Initialize the module output
-     *
-     * @return void
      */
     protected function init()
     {
@@ -90,8 +88,6 @@ class ElementHistoryController extends AbstractModule
 
     /**
      * Generate module output
-     *
-     * @return void
      */
     public function main()
     {
diff --git a/typo3/sysext/backend/Classes/Controller/ContentElement/ElementInformationController.php b/typo3/sysext/backend/Classes/Controller/ContentElement/ElementInformationController.php
index a8c301743d0b41cf4ce4ad1d40130ee08a135b07..038a8d7c9b557150fc30528bdb9d78f42de621c9 100644
--- a/typo3/sysext/backend/Classes/Controller/ContentElement/ElementInformationController.php
+++ b/typo3/sysext/backend/Classes/Controller/ContentElement/ElementInformationController.php
@@ -115,8 +115,6 @@ class ElementInformationController
     /**
      * Determines if table/uid point to database record or file and
      * if user has access to view information
-     *
-     * @return void
      */
     public function init()
     {
diff --git a/typo3/sysext/backend/Classes/Controller/ContentElement/MoveElementController.php b/typo3/sysext/backend/Classes/Controller/ContentElement/MoveElementController.php
index e3d744303da927801c59344de764b1ff70d472b0..89529d697f7729b4fe10eb27218ce4b6224fd17c 100644
--- a/typo3/sysext/backend/Classes/Controller/ContentElement/MoveElementController.php
+++ b/typo3/sysext/backend/Classes/Controller/ContentElement/MoveElementController.php
@@ -91,8 +91,6 @@ class MoveElementController extends AbstractModule
 
     /**
      * Constructor, initializing internal variables.
-     *
-     * @return void
      */
     public function init()
     {
@@ -127,8 +125,6 @@ class MoveElementController extends AbstractModule
 
     /**
      * Creating the module output.
-     *
-     * @return void
      */
     public function main()
     {
diff --git a/typo3/sysext/backend/Classes/Controller/ContentElement/NewContentElementController.php b/typo3/sysext/backend/Classes/Controller/ContentElement/NewContentElementController.php
index 1d1f6456dc79de758ebe8f085cd09a33ff312874..68d40192483934095bf9cf2a1255acc15e303ec5 100644
--- a/typo3/sysext/backend/Classes/Controller/ContentElement/NewContentElementController.php
+++ b/typo3/sysext/backend/Classes/Controller/ContentElement/NewContentElementController.php
@@ -139,8 +139,6 @@ class NewContentElementController extends AbstractModule
 
     /**
      * Constructor, initializing internal variables.
-     *
-     * @return void
      */
     public function init()
     {
@@ -192,7 +190,6 @@ class NewContentElementController extends AbstractModule
      * Creating the module output.
      *
      * @throws \UnexpectedValueException
-     * @return void
      */
     public function main()
     {
@@ -457,7 +454,6 @@ class NewContentElementController extends AbstractModule
      * The values will be added to the "params" key of the array (which should probably be unset or empty by default).
      *
      * @param array $wizardItems Wizard items, passed by reference
-     * @return void
      */
     public function removeInvalidElements(&$wizardItems)
     {
@@ -537,8 +533,6 @@ class NewContentElementController extends AbstractModule
      *
      * @param array  $wizardGroup TypoScript wizard tab configuration
      * @param string $key         Which array key should be prepared
-     *
-     * @return void
      */
     protected function prepareDependencyOrdering(&$wizardGroup, $key)
     {
diff --git a/typo3/sysext/backend/Classes/Controller/DummyController.php b/typo3/sysext/backend/Classes/Controller/DummyController.php
index 4045250f29c9d9f62f0c3699cfb7db972d58df29..5635c19c8923072943479705d79a3ccef270a93b 100644
--- a/typo3/sysext/backend/Classes/Controller/DummyController.php
+++ b/typo3/sysext/backend/Classes/Controller/DummyController.php
@@ -53,8 +53,6 @@ class DummyController
 
     /**
      * Create content for the dummy script - outputting a blank page.
-     *
-     * @return void
      */
     public function main()
     {
diff --git a/typo3/sysext/backend/Classes/Controller/EditDocumentController.php b/typo3/sysext/backend/Classes/Controller/EditDocumentController.php
index c93173b05f67a912c8bf418cffe56a33db47b369..598989dcb8f0e96f79ad18be308b57b11034ccf7 100644
--- a/typo3/sysext/backend/Classes/Controller/EditDocumentController.php
+++ b/typo3/sysext/backend/Classes/Controller/EditDocumentController.php
@@ -440,8 +440,6 @@ class EditDocumentController extends AbstractModule
 
     /**
      * First initialization.
-     *
-     * @return void
      */
     public function preInit()
     {
@@ -514,8 +512,6 @@ class EditDocumentController extends AbstractModule
 
     /**
      * Do processing of data, submitting it to DataHandler.
-     *
-     * @return void
      */
     public function processData()
     {
@@ -707,8 +703,6 @@ class EditDocumentController extends AbstractModule
 
     /**
      * Initialize the normal module operation
-     *
-     * @return void
      */
     public function init()
     {
@@ -932,8 +926,6 @@ class EditDocumentController extends AbstractModule
 
     /**
      * Main module operation
-     *
-     * @return void
      */
     public function main()
     {
@@ -1636,7 +1628,6 @@ class EditDocumentController extends AbstractModule
      * Redirects to FormEngine with new parameters to edit a just created localized record
      *
      * @param string $justLocalized String passed by GET &justLocalized=
-     * @return void
      */
     public function localizationRedirect($justLocalized)
     {
@@ -1752,7 +1743,6 @@ class EditDocumentController extends AbstractModule
      * Fix $this->editconf if versioning applies to any of the records
      *
      * @param array|bool $mapArray Mapping between old and new ids if auto-versioning has been performed.
-     * @return void
      */
     public function fixWSversioningInEditConf($mapArray = false)
     {
@@ -1845,7 +1835,6 @@ class EditDocumentController extends AbstractModule
     /**
      * Populates the variables $this->storeArray, $this->storeUrl, $this->storeUrlMd5
      *
-     * @return void
      * @see makeDocSel()
      */
     public function compileStoreDat()
@@ -1882,7 +1871,6 @@ class EditDocumentController extends AbstractModule
      * - other values will call setDocument with ->retUrl
      *
      * @param int $mode the close mode: one of self::DOCUMENT_CLOSE_MODE_*
-     * @return void
      */
     public function closeDocument($mode = self::DOCUMENT_CLOSE_MODE_DEFAULT)
     {
@@ -1933,7 +1921,6 @@ class EditDocumentController extends AbstractModule
      *
      * @param string $currentDocFromHandlerMD5 Pointer to the document in the docHandler array
      * @param string $retUrl Alternative/Default retUrl
-     * @return void
      */
     public function setDocument($currentDocFromHandlerMD5 = '', $retUrl = '')
     {
diff --git a/typo3/sysext/backend/Classes/Controller/File/CreateFolderController.php b/typo3/sysext/backend/Classes/Controller/File/CreateFolderController.php
index 694657ecfcd41d6ee3a93ca90d9c553bf54ac3cf..c6c80ed9425125ecc2a7616adeb669d798e17231 100644
--- a/typo3/sysext/backend/Classes/Controller/File/CreateFolderController.php
+++ b/typo3/sysext/backend/Classes/Controller/File/CreateFolderController.php
@@ -164,8 +164,6 @@ class CreateFolderController extends AbstractModule
 
     /**
      * Main function, rendering the main module content
-     *
-     * @return void
      */
     public function main()
     {
diff --git a/typo3/sysext/backend/Classes/Controller/File/EditFileController.php b/typo3/sysext/backend/Classes/Controller/File/EditFileController.php
index d6cf9e25a0a9080878dc9a8aaf6982eabd3348b3..1842e3f0f42e08c55c2e5a26a7e6ea627b88a62f 100644
--- a/typo3/sysext/backend/Classes/Controller/File/EditFileController.php
+++ b/typo3/sysext/backend/Classes/Controller/File/EditFileController.php
@@ -139,8 +139,6 @@ class EditFileController extends AbstractModule
 
     /**
      * Main function, redering the actual content of the editing page
-     *
-     * @return void
      */
     public function main()
     {
diff --git a/typo3/sysext/backend/Classes/Controller/File/FileController.php b/typo3/sysext/backend/Classes/Controller/File/FileController.php
index f2ffb3449b51264c35818ff771cdac471b809074..49be98ca727f261590d1e7cf43b9e9fdfd666380 100644
--- a/typo3/sysext/backend/Classes/Controller/File/FileController.php
+++ b/typo3/sysext/backend/Classes/Controller/File/FileController.php
@@ -88,8 +88,6 @@ class FileController
 
     /**
      * Registering incoming data
-     *
-     * @return void
      */
     protected function init()
     {
@@ -110,8 +108,6 @@ class FileController
 
     /**
      * Initialize the Clipboard. This will fetch the data about files to paste/delete if such an action has been sent.
-     *
-     * @return void
      */
     public function initClipboard()
     {
@@ -132,8 +128,6 @@ class FileController
     /**
      * Performing the file admin action:
      * Initializes the objects, setting permissions, sending data to object.
-     *
-     * @return void
      */
     public function main()
     {
@@ -154,8 +148,6 @@ class FileController
     /**
      * Redirecting the user after the processing has been done.
      * Might also display error messages directly, if any.
-     *
-     * @return void
      */
     public function finish()
     {
diff --git a/typo3/sysext/backend/Classes/Controller/File/FileUploadController.php b/typo3/sysext/backend/Classes/Controller/File/FileUploadController.php
index 31c45f26c22cb3684dd3ea8f88815d0e8cebe020..0aabc016783a5e9070b7d410fa83382b7f85ebd3 100644
--- a/typo3/sysext/backend/Classes/Controller/File/FileUploadController.php
+++ b/typo3/sysext/backend/Classes/Controller/File/FileUploadController.php
@@ -120,8 +120,6 @@ class FileUploadController extends AbstractModule
 
     /**
      * Main function, rendering the upload file form fields
-     *
-     * @return void
      */
     public function main()
     {
diff --git a/typo3/sysext/backend/Classes/Controller/File/RenameFileController.php b/typo3/sysext/backend/Classes/Controller/File/RenameFileController.php
index d73e87aea674824595cbb7add3c3fdff65d8fd20..a9a08a5b7438736c6a2ec8423ba17fae27c32e2a 100644
--- a/typo3/sysext/backend/Classes/Controller/File/RenameFileController.php
+++ b/typo3/sysext/backend/Classes/Controller/File/RenameFileController.php
@@ -131,8 +131,6 @@ class RenameFileController extends AbstractModule
 
     /**
      * Main function, rendering the content of the rename form
-     *
-     * @return void
      */
     public function main()
     {
diff --git a/typo3/sysext/backend/Classes/Controller/File/ReplaceFileController.php b/typo3/sysext/backend/Classes/Controller/File/ReplaceFileController.php
index d2be4a1f36a0a2f0783476b9c1a8a925ed7f7d2f..f3dd16ffb03a2e1045586a6b64333dda7e17462b 100644
--- a/typo3/sysext/backend/Classes/Controller/File/ReplaceFileController.php
+++ b/typo3/sysext/backend/Classes/Controller/File/ReplaceFileController.php
@@ -86,7 +86,6 @@ class ReplaceFileController extends AbstractModule
     /**
      * Init
      *
-     * @return void
      * @throws \RuntimeException
      * @throws InsufficientFileAccessPermissionsException
      */
@@ -143,8 +142,6 @@ class ReplaceFileController extends AbstractModule
 
     /**
      * Main function, rendering the content of the rename form
-     *
-     * @return void
      */
     public function main()
     {
diff --git a/typo3/sysext/backend/Classes/Controller/FileSystemNavigationFrameController.php b/typo3/sysext/backend/Classes/Controller/FileSystemNavigationFrameController.php
index d11735346e9b825e07d5620fb2ae3100749f7078..ee1311cd11c2896a0f53c3a1d748be9fba7f5560 100644
--- a/typo3/sysext/backend/Classes/Controller/FileSystemNavigationFrameController.php
+++ b/typo3/sysext/backend/Classes/Controller/FileSystemNavigationFrameController.php
@@ -90,8 +90,6 @@ class FileSystemNavigationFrameController
 
     /**
      * Initialiation of the script class
-     *
-     * @return void
      */
     protected function init()
     {
@@ -136,8 +134,6 @@ class FileSystemNavigationFrameController
     /**
      * initialization for the visual parts of the class
      * Use template rendering only if this is a non-AJAX call
-     *
-     * @return void
      */
     public function initPage()
     {
@@ -186,8 +182,6 @@ class FileSystemNavigationFrameController
 
     /**
      * Main function, rendering the folder tree
-     *
-     * @return void
      */
     public function main()
     {
diff --git a/typo3/sysext/backend/Classes/Controller/LinkBrowserController.php b/typo3/sysext/backend/Classes/Controller/LinkBrowserController.php
index c3efba3a5deb003fca9768d04e494ca9a4dd148d..8b28d1558131f37505af813985d2e6aa1f883604 100644
--- a/typo3/sysext/backend/Classes/Controller/LinkBrowserController.php
+++ b/typo3/sysext/backend/Classes/Controller/LinkBrowserController.php
@@ -30,8 +30,6 @@ class LinkBrowserController extends AbstractLinkBrowserController
 {
     /**
      * Initialize $this->currentLinkParts
-     *
-     * @return void
      */
     protected function initCurrentUrl()
     {
@@ -55,8 +53,6 @@ class LinkBrowserController extends AbstractLinkBrowserController
 
     /**
      * Initialize document template object
-     *
-     * @return void
      */
     protected function initDocumentTemplate()
     {
diff --git a/typo3/sysext/backend/Classes/Controller/LoginController.php b/typo3/sysext/backend/Classes/Controller/LoginController.php
index 0b40f23c695e6952e869ed3038264eed6f4ec0b9..8361bd9fc3e91b808ccf8a7f51c88cab1b859925 100644
--- a/typo3/sysext/backend/Classes/Controller/LoginController.php
+++ b/typo3/sysext/backend/Classes/Controller/LoginController.php
@@ -322,8 +322,6 @@ class LoginController
 
     /**
      * Making interface selector:
-     *
-     * @return void
      */
     public function makeInterfaceSelectorBox()
     {
diff --git a/typo3/sysext/backend/Classes/Controller/LoginFramesetController.php b/typo3/sysext/backend/Classes/Controller/LoginFramesetController.php
index 2a87586d1fe24d611292f968f8006d119e422700..5c3e0df3433a2153d80b284af618745783dfabec 100644
--- a/typo3/sysext/backend/Classes/Controller/LoginFramesetController.php
+++ b/typo3/sysext/backend/Classes/Controller/LoginFramesetController.php
@@ -56,8 +56,6 @@ class LoginFramesetController
     /**
      * Main function.
      * Creates the header code and the frameset for the two frames.
-     *
-     * @return void
      */
     public function main()
     {
diff --git a/typo3/sysext/backend/Classes/Controller/LogoutController.php b/typo3/sysext/backend/Classes/Controller/LogoutController.php
index dced7fa253d2656ecc7616799ef49885a4fc0f6d..7df8aa36b2181871bf9a2e76886491e24b3bf073 100644
--- a/typo3/sysext/backend/Classes/Controller/LogoutController.php
+++ b/typo3/sysext/backend/Classes/Controller/LogoutController.php
@@ -52,8 +52,6 @@ class LogoutController
 
     /**
      * Performs the logout processing
-     *
-     * @return void
      */
     public function logout()
     {
diff --git a/typo3/sysext/backend/Classes/Controller/NewRecordController.php b/typo3/sysext/backend/Classes/Controller/NewRecordController.php
index e460e7bd14f1d982ca6ae3103f40c61374a3b83b..104671ab84490a6f62d78d5b8727be8765e488d9 100644
--- a/typo3/sysext/backend/Classes/Controller/NewRecordController.php
+++ b/typo3/sysext/backend/Classes/Controller/NewRecordController.php
@@ -159,8 +159,6 @@ class NewRecordController extends AbstractModule
 
     /**
      * Constructor function for the class
-     *
-     * @return void
      */
     protected function init()
     {
@@ -241,8 +239,6 @@ class NewRecordController extends AbstractModule
 
     /**
      * Main processing, creating the list of new record tables to select from
-     *
-     * @return void
      */
     public function main()
     {
@@ -382,8 +378,6 @@ class NewRecordController extends AbstractModule
 
     /**
      * Creates the position map for pages wizard
-     *
-     * @return void
      */
     public function pagesOnly()
     {
@@ -429,8 +423,6 @@ class NewRecordController extends AbstractModule
 
     /**
      * Create a regular new element (pages and records)
-     *
-     * @return void
      */
     public function regularNew()
     {
diff --git a/typo3/sysext/backend/Classes/Controller/OnlineMediaController.php b/typo3/sysext/backend/Classes/Controller/OnlineMediaController.php
index 2e2601d955c8292fc40ea69ec119a28eeb00177f..37e4dc7d8e8280becf6ac813f37b2021c5c2999b 100644
--- a/typo3/sysext/backend/Classes/Controller/OnlineMediaController.php
+++ b/typo3/sysext/backend/Classes/Controller/OnlineMediaController.php
@@ -132,7 +132,6 @@ class OnlineMediaController
      * Add flash message to message queue
      *
      * @param FlashMessage $flashMessage
-     * @return void
      */
     protected function addFlashMessage(FlashMessage $flashMessage)
     {
diff --git a/typo3/sysext/backend/Classes/Controller/PageLayoutController.php b/typo3/sysext/backend/Classes/Controller/PageLayoutController.php
index fcf7d08b1ee9a3dc227aa8110cc2daa96ae1f27a..4d03ce9200d0349f1c14983c9180397834e30e0b 100644
--- a/typo3/sysext/backend/Classes/Controller/PageLayoutController.php
+++ b/typo3/sysext/backend/Classes/Controller/PageLayoutController.php
@@ -275,8 +275,6 @@ class PageLayoutController
 
     /**
      * Initializing the module
-     *
-     * @return void
      */
     public function init()
     {
@@ -318,8 +316,6 @@ class PageLayoutController
 
     /**
      * Initialize menu array
-     *
-     * @return void
      */
     public function menuConfig()
     {
@@ -489,7 +485,6 @@ class PageLayoutController
      * For now they are Columns, Quick Edit and Languages.
      *
      * @param array $actions array with the available actions
-     * @return void
      */
     protected function makeActionMenu(array $actions)
     {
@@ -523,8 +518,6 @@ class PageLayoutController
 
     /**
      * Clears page cache for the current id, $this->id
-     *
-     * @return void
      */
     public function clearCache()
     {
@@ -689,7 +682,6 @@ class PageLayoutController
     }
 
     /**
-     *
      * @return string $title
      */
     protected function getLocalizedPageTitle()
@@ -741,8 +733,6 @@ class PageLayoutController
     /**
      * Main function.
      * Creates some general objects and calls other functions for the main rendering of module content.
-     *
-     * @return void
      */
     public function main()
     {
@@ -1014,7 +1004,6 @@ class PageLayoutController
      * Print accumulated content of module
      *
      * @deprecated since TYPO3 v8, will be removed in TYPO3 v9
-     * @return void
      */
     public function printContent()
     {
@@ -1029,8 +1018,6 @@ class PageLayoutController
      ***************************/
     /**
      * This creates the buttons for the modules
-     *
-     * @return void
      */
     protected function makeButtons()
     {
@@ -1283,8 +1270,6 @@ class PageLayoutController
 
     /**
      * Make the LanguageMenu
-     *
-     * @return void
      */
     protected function makeLanguageMenu()
     {
diff --git a/typo3/sysext/backend/Classes/Controller/SimpleDataHandlerController.php b/typo3/sysext/backend/Classes/Controller/SimpleDataHandlerController.php
index 77b4799ff037efd858aa7ea1a8be07e841416f65..6cfb1368b9928f438dadd5dd0ff0360076e3db04 100644
--- a/typo3/sysext/backend/Classes/Controller/SimpleDataHandlerController.php
+++ b/typo3/sysext/backend/Classes/Controller/SimpleDataHandlerController.php
@@ -116,8 +116,6 @@ class SimpleDataHandlerController
 
     /**
      * Initialization of the class
-     *
-     * @return void
      */
     public function init()
     {
@@ -158,8 +156,6 @@ class SimpleDataHandlerController
 
     /**
      * Clipboard pasting and deleting.
-     *
-     * @return void
      */
     public function initClipboard()
     {
@@ -183,8 +179,6 @@ class SimpleDataHandlerController
 
     /**
      * Executing the posted actions ...
-     *
-     * @return void
      */
     public function main()
     {
diff --git a/typo3/sysext/backend/Classes/Controller/UserSettingsController.php b/typo3/sysext/backend/Classes/Controller/UserSettingsController.php
index 91aed307af2342e824916fc31bac69f2d00c8a53..64cac5aad3df9b0efd0b76396b7e32587fa9a235 100644
--- a/typo3/sysext/backend/Classes/Controller/UserSettingsController.php
+++ b/typo3/sysext/backend/Classes/Controller/UserSettingsController.php
@@ -116,7 +116,6 @@ class UserSettingsController
      *
      * @param string $key
      * @param mixed $value
-     * @return void
      */
     protected function set($key, $value)
     {
@@ -135,7 +134,6 @@ class UserSettingsController
      *
      * @param string $key
      * @param mixed $value
-     * @return void
      */
     protected function addToList($key, $value)
     {
@@ -156,7 +154,6 @@ class UserSettingsController
      *
      * @param string $key
      * @param mixed $value
-     * @return void
      */
     protected function removeFromList($key, $value)
     {
@@ -170,8 +167,6 @@ class UserSettingsController
 
     /**
      * Resets the user settings to the default
-     *
-     * @return void
      */
     protected function clear()
     {
@@ -182,7 +177,6 @@ class UserSettingsController
      * Unsets a key in user settings
      *
      * @param string $key
-     * @return void
      */
     protected function unsetOption($key)
     {
@@ -219,7 +213,6 @@ class UserSettingsController
      *
      * @param string $key
      * @param mixed $value
-     * @return void
      */
     protected function setFromDottedNotation($key, $value)
     {
diff --git a/typo3/sysext/backend/Classes/Controller/Wizard/AddController.php b/typo3/sysext/backend/Classes/Controller/Wizard/AddController.php
index 514ccb5894641330ea0c68953248d0dde7cca18b..27a776b35501a3a7024b3f8032c8a6328f768494 100644
--- a/typo3/sysext/backend/Classes/Controller/Wizard/AddController.php
+++ b/typo3/sysext/backend/Classes/Controller/Wizard/AddController.php
@@ -95,8 +95,6 @@ class AddController extends AbstractWizardController
 
     /**
      * Initialization of the class.
-     *
-     * @return void
      */
     protected function init()
     {
@@ -171,8 +169,6 @@ class AddController extends AbstractWizardController
     /**
      * Main function
      * Will issue a location-header, redirecting either BACK or to a new FormEngine instance...
-     *
-     * @return void
      */
     public function main()
     {
diff --git a/typo3/sysext/backend/Classes/Controller/Wizard/ColorpickerController.php b/typo3/sysext/backend/Classes/Controller/Wizard/ColorpickerController.php
index 67c5b8e780e8059dd02ba02b0e3294a2a37832c9..91cb1e908f6e46cc1a1fa8f0f6f860081f229e24 100644
--- a/typo3/sysext/backend/Classes/Controller/Wizard/ColorpickerController.php
+++ b/typo3/sysext/backend/Classes/Controller/Wizard/ColorpickerController.php
@@ -138,8 +138,6 @@ class ColorpickerController extends AbstractWizardController
 
     /**
      * Initialises the Class
-     *
-     * @return void
      */
     protected function init()
     {
@@ -207,8 +205,6 @@ class ColorpickerController extends AbstractWizardController
 
     /**
      * Main Method, rendering either colorpicker or frameset depending on ->showPicker
-     *
-     * @return void
      */
     public function main()
     {
@@ -258,8 +254,6 @@ class ColorpickerController extends AbstractWizardController
      * Returns a frameset so our JavaScript Reference isn't lost
      * Took some brains to figure this one out ;-)
      * If Peter wouldn't have been I would've gone insane...
-     *
-     * @return void
      */
     public function frameSet()
     {
diff --git a/typo3/sysext/backend/Classes/Controller/Wizard/EditController.php b/typo3/sysext/backend/Classes/Controller/Wizard/EditController.php
index 423e65e21f8366d41de9257377b58a2e69836025..4e5066e951583c281fc9747ac2dbe49e3efa1937 100644
--- a/typo3/sysext/backend/Classes/Controller/Wizard/EditController.php
+++ b/typo3/sysext/backend/Classes/Controller/Wizard/EditController.php
@@ -62,8 +62,6 @@ class EditController extends AbstractWizardController
 
     /**
      * Initialization of the script
-     *
-     * @return void
      */
     protected function init()
     {
diff --git a/typo3/sysext/backend/Classes/Controller/Wizard/ListController.php b/typo3/sysext/backend/Classes/Controller/Wizard/ListController.php
index a9e7e2064fd4ee61ca208ccc087d68c7c6af5d47..f9f994b05107bcb1edae67e67a6ae44f0ba56555 100644
--- a/typo3/sysext/backend/Classes/Controller/Wizard/ListController.php
+++ b/typo3/sysext/backend/Classes/Controller/Wizard/ListController.php
@@ -81,8 +81,6 @@ class ListController extends AbstractWizardController
     /**
      * Main function
      * Will issue a location-header, redirecting either BACK or to a new FormEngine instance...
-     *
-     * @return void
      */
     public function main()
     {
diff --git a/typo3/sysext/backend/Classes/Controller/Wizard/TableController.php b/typo3/sysext/backend/Classes/Controller/Wizard/TableController.php
index ba7289eb594698230c9b05a6d768ee02719ee89c..4d15127575ef58de7e4d2a6025409a05db6d53af 100644
--- a/typo3/sysext/backend/Classes/Controller/Wizard/TableController.php
+++ b/typo3/sysext/backend/Classes/Controller/Wizard/TableController.php
@@ -117,8 +117,6 @@ class TableController extends AbstractWizardController
 
     /**
      * Initialization of the class
-     *
-     * @return void
      */
     protected function init()
     {
@@ -151,8 +149,6 @@ class TableController extends AbstractWizardController
 
     /**
      * Main function, rendering the table wizard
-     *
-     * @return void
      */
     public function main()
     {
@@ -453,7 +449,6 @@ class TableController extends AbstractWizardController
      * Detects if a control button (up/down/around/delete) has been pressed for an item and accordingly it will
      * manipulate the internal TABLECFG array
      *
-     * @return void
      * @internal
      */
     public function changeFunc()
diff --git a/typo3/sysext/backend/Classes/Domain/Model/Module/BackendModule.php b/typo3/sysext/backend/Classes/Domain/Model/Module/BackendModule.php
index b7267bbab8bf6839acc02f03ff543e19f044de19..7db3a741e4baff8c189220b3bae7ca62562b273a 100644
--- a/typo3/sysext/backend/Classes/Domain/Model/Module/BackendModule.php
+++ b/typo3/sysext/backend/Classes/Domain/Model/Module/BackendModule.php
@@ -81,7 +81,6 @@ class BackendModule
      * Set children
      *
      * @param \SplObjectStorage $children
-     * @return void
      */
     public function setChildren($children)
     {
@@ -102,7 +101,6 @@ class BackendModule
      * Add Child
      *
      * @param \TYPO3\CMS\Backend\Domain\Model\Module\BackendModule $child
-     * @return void
      */
     public function addChild(\TYPO3\CMS\Backend\Domain\Model\Module\BackendModule $child)
     {
@@ -113,7 +111,6 @@ class BackendModule
      * Set icon
      *
      * @param string $icon
-     * @return void
      */
     public function setIcon($icon)
     {
@@ -134,7 +131,6 @@ class BackendModule
      * Set name
      *
      * @param string $name
-     * @return void
      */
     public function setName($name)
     {
@@ -155,7 +151,6 @@ class BackendModule
      * Set title
      *
      * @param string $title
-     * @return void
      */
     public function setTitle($title)
     {
@@ -176,7 +171,6 @@ class BackendModule
      * Set Link
      *
      * @param string $link
-     * @return void
      */
     public function setLink($link)
     {
@@ -197,7 +191,6 @@ class BackendModule
      * Set Description
      *
      * @param string $description
-     * @return void
      */
     public function setDescription($description)
     {
@@ -218,7 +211,6 @@ class BackendModule
      * Set Navigation Component Id
      *
      * @param string $navigationComponentId
-     * @return void
      */
     public function setNavigationComponentId($navigationComponentId)
     {
@@ -271,7 +263,6 @@ class BackendModule
      * Set onClick
      *
      * @param string $onClick
-     * @return void
      */
     public function setOnClick($onClick)
     {
diff --git a/typo3/sysext/backend/Classes/Domain/Repository/Module/BackendModuleRepository.php b/typo3/sysext/backend/Classes/Domain/Repository/Module/BackendModuleRepository.php
index 785f5a97064bfe508b317e6bb699c5b341374e53..d91c88d535893a8ea7c733749b8ab9919c4995e9 100644
--- a/typo3/sysext/backend/Classes/Domain/Repository/Module/BackendModuleRepository.php
+++ b/typo3/sysext/backend/Classes/Domain/Repository/Module/BackendModuleRepository.php
@@ -125,7 +125,6 @@ class BackendModuleRepository implements \TYPO3\CMS\Core\SingletonInterface
      * Creates the module menu object structure from the raw data array
      *
      * @param array $rawModuleData
-     * @return void
      */
     protected function convertRawModuleDataToModuleMenuObject(array $rawModuleData)
     {
@@ -188,8 +187,6 @@ class BackendModuleRepository implements \TYPO3\CMS\Core\SingletonInterface
     /**
      * Creates the "third level" menu entries (submodules for the info module for
      * example) from the TBE_MODULES_EXT array
-     *
-     * @return void
      */
     protected function createMenuEntriesForTbeModulesExt()
     {
diff --git a/typo3/sysext/backend/Classes/Form/Container/InlineRecordContainer.php b/typo3/sysext/backend/Classes/Form/Container/InlineRecordContainer.php
index d201118f87d5ca14bcb84306ab3f5861ca8f6c1c..97c28942fa96e7f69046f51dda8efb63e457f995 100644
--- a/typo3/sysext/backend/Classes/Form/Container/InlineRecordContainer.php
+++ b/typo3/sysext/backend/Classes/Form/Container/InlineRecordContainer.php
@@ -587,7 +587,6 @@ class InlineRecordContainer extends AbstractContainer
      * \TYPO3\CMS\Backend\Form\Element\InlineElementHookInterface
      *
      * @throws \UnexpectedValueException
-     * @return void
      */
     protected function initHookObjects()
     {
diff --git a/typo3/sysext/backend/Classes/Form/DatabaseFileIconsHookInterface.php b/typo3/sysext/backend/Classes/Form/DatabaseFileIconsHookInterface.php
index e528480ae81f6f8c05e12fb114acf2ad24ccbf13..39458179981ec5cdd2c1eba839d6c147b95c4503 100644
--- a/typo3/sysext/backend/Classes/Form/DatabaseFileIconsHookInterface.php
+++ b/typo3/sysext/backend/Classes/Form/DatabaseFileIconsHookInterface.php
@@ -34,7 +34,6 @@ interface DatabaseFileIconsHookInterface
      * @param array $uidList The array of item-uids. Have a look at \TYPO3\CMS\Backend\Form\FormEngine::dbFileIcons parameter "$itemArray
      * @param array $additionalParams Array with additional parameters which are be available at method call. Includes $mode, $allowed, $itemArray, $onFocus, $table, $field, $uid.
      * @param object $parentObject Parent object
-     * @return void
      */
     public function dbFileIcons_postProcess(array &$params, &$selector, &$thumbnails, array &$icons, &$rightbox, &$fName, array &$uidList, array $additionalParams, $parentObject);
 }
diff --git a/typo3/sysext/backend/Classes/Form/Element/InlineElementHookInterface.php b/typo3/sysext/backend/Classes/Form/Element/InlineElementHookInterface.php
index b5226f3d4e7eb44520d3fe7a647ff6fb380ef481..13b7661be4accbbdf04925f7a76218cede0bf3e1 100644
--- a/typo3/sysext/backend/Classes/Form/Element/InlineElementHookInterface.php
+++ b/typo3/sysext/backend/Classes/Form/Element/InlineElementHookInterface.php
@@ -28,7 +28,6 @@ interface InlineElementHookInterface
      * @param array $childConfig TCA configuration of the current field of the child record
      * @param bool $isVirtual Defines whether the current records is only virtually shown and not physically part of the parent record
      * @param array &$enabledControls (reference) Associative array with the enabled control items
-     * @return void
      */
     public function renderForeignRecordHeaderControl_preProcess($parentUid, $foreignTable, array $childRecord, array $childConfig, $isVirtual, array &$enabledControls);
 
@@ -41,7 +40,6 @@ interface InlineElementHookInterface
      * @param array $childConfig TCA configuration of the current field of the child record
      * @param bool $isVirtual Defines whether the current records is only virtually shown and not physically part of the parent record
      * @param array &$controlItems (reference) Associative array with the currently available control items
-     * @return void
      */
     public function renderForeignRecordHeaderControl_postProcess($parentUid, $foreignTable, array $childRecord, array $childConfig, $isVirtual, array &$controlItems);
 }
diff --git a/typo3/sysext/backend/Classes/Form/FormDataProvider/TcaFlexProcess.php b/typo3/sysext/backend/Classes/Form/FormDataProvider/TcaFlexProcess.php
index c0450cec22d3db37f95699e2a29eedf51ee5e1cf..0f4f7b25f850d9be2488ad253f88280371acdc68 100644
--- a/typo3/sysext/backend/Classes/Form/FormDataProvider/TcaFlexProcess.php
+++ b/typo3/sysext/backend/Classes/Form/FormDataProvider/TcaFlexProcess.php
@@ -76,7 +76,6 @@ class TcaFlexProcess implements FormDataProviderInterface
      *
      * @param array $result Result array
      * @param string $fieldName Handled field name
-     * @return void
      * @throws \UnexpectedValueException
      */
     protected function scanForInvalidSectionContainerTca(array $result, string $fieldName)
diff --git a/typo3/sysext/backend/Classes/Form/FormResultCompiler.php b/typo3/sysext/backend/Classes/Form/FormResultCompiler.php
index ef30cfa5820f048ebedcebbc768d097b4c42b5a2..97d70bcadebfcdc44102300cf44a21314b989ebc 100644
--- a/typo3/sysext/backend/Classes/Form/FormResultCompiler.php
+++ b/typo3/sysext/backend/Classes/Form/FormResultCompiler.php
@@ -93,7 +93,6 @@ class FormResultCompiler
      * Merge existing data with the given result array
      *
      * @param array $resultArray Array returned by child
-     * @return void
      * @internal Temporary method to use FormEngine class as final data merger
      */
     public function mergeResult(array $resultArray)
diff --git a/typo3/sysext/backend/Classes/Form/InlineStackProcessor.php b/typo3/sysext/backend/Classes/Form/InlineStackProcessor.php
index 95a68d6aacd9e5bdf23fab8e1ce73f21a72492fc..e0e5b0798633a2ce7457dc9cb449269aee027861 100644
--- a/typo3/sysext/backend/Classes/Form/InlineStackProcessor.php
+++ b/typo3/sysext/backend/Classes/Form/InlineStackProcessor.php
@@ -54,7 +54,6 @@ class InlineStackProcessor
      * - 'unstable': Containing partly filled data (e.g. only table and possibly field)
      *
      * @param string $domObjectId The DOM object-id
-     * @return void
      */
     public function initializeByParsingDomObjectIdString($domObjectId)
     {
@@ -110,7 +109,6 @@ class InlineStackProcessor
      * This is used by inline ajax calls that transfer configuration options back to the stack for initialization
      *
      * @param array $config Given config extracted from ajax call
-     * @return void
      * @todo: Review this construct - Why can't the ajax call fetch these data on its own and transfers it to client instead?
      */
     public function injectAjaxConfiguration(array $config)
@@ -141,7 +139,6 @@ class InlineStackProcessor
      * Add a stable structure to the stack
      *
      * @param array $structureItem
-     * @return void
      */
     public function pushStableStructureItem(array $structureItem = [])
     {
diff --git a/typo3/sysext/backend/Classes/Form/Utility/FormEngineUtility.php b/typo3/sysext/backend/Classes/Form/Utility/FormEngineUtility.php
index ce61084de6dcf6ebed32456e084d42379258425e..72ed5018a930d196c9a1ae90bbf209378a67e364 100644
--- a/typo3/sysext/backend/Classes/Form/Utility/FormEngineUtility.php
+++ b/typo3/sysext/backend/Classes/Form/Utility/FormEngineUtility.php
@@ -148,7 +148,6 @@ class FormEngineUtility
      *
      * @param array $uc The uc array to be processed and saved (by reference)
      * @param \TYPO3\CMS\Core\DataHandling\DataHandler $tce Instance of FormEngine that saved data before
-     * @return void
      * @internal
      */
     public static function updateInlineView(&$uc, $tce)
diff --git a/typo3/sysext/backend/Classes/Form/Wizard/SuggestWizardDefaultReceiver.php b/typo3/sysext/backend/Classes/Form/Wizard/SuggestWizardDefaultReceiver.php
index fe022ae76136fc0bb8b6722a12300d9d3c7a5e13..7ab1feb0750c9ac876f54ab5c2f7d1f549663607 100644
--- a/typo3/sysext/backend/Classes/Form/Wizard/SuggestWizardDefaultReceiver.php
+++ b/typo3/sysext/backend/Classes/Form/Wizard/SuggestWizardDefaultReceiver.php
@@ -210,8 +210,6 @@ class SuggestWizardDefaultReceiver
     /**
      * Prepare the statement for selecting the records which will be returned to the selector. May also return some
      * other records (e.g. from a mm-table) which will be used later on to select the real records
-     *
-     * @return void
      */
     protected function prepareSelectStatement()
     {
@@ -293,8 +291,6 @@ class SuggestWizardDefaultReceiver
     /**
      * Prepares the clause by which the result elements are sorted. See description of ORDER BY in
      * SQL standard for reference.
-     *
-     * @return void
      */
     protected function prepareOrderByStatement()
     {
@@ -346,7 +342,6 @@ class SuggestWizardDefaultReceiver
      * Overlay the given record with its workspace-version, if any
      *
      * @param array $row The record to get the workspace version for
-     * @return void (passed by reference)
      */
     protected function makeWorkspaceOverlay(&$row)
     {
diff --git a/typo3/sysext/backend/Classes/FrontendBackendUserAuthentication.php b/typo3/sysext/backend/Classes/FrontendBackendUserAuthentication.php
index 0717e13cca813865fcca191d299a32c1af94925e..1b7c0c06d2b78c60c1fce3d62f5ed26945f94e45 100644
--- a/typo3/sysext/backend/Classes/FrontendBackendUserAuthentication.php
+++ b/typo3/sysext/backend/Classes/FrontendBackendUserAuthentication.php
@@ -97,8 +97,6 @@ class FrontendBackendUserAuthentication extends BackendUserAuthentication
 
     /**
      * Initializes the admin panel.
-     *
-     * @return void
      */
     public function initializeAdminPanel()
     {
@@ -116,8 +114,6 @@ class FrontendBackendUserAuthentication extends BackendUserAuthentication
 
     /**
      * Initializes frontend editing.
-     *
-     * @return void
      */
     public function initializeFrontendEdit()
     {
diff --git a/typo3/sysext/backend/Classes/History/RecordHistory.php b/typo3/sysext/backend/Classes/History/RecordHistory.php
index ef05e97a35acaf36fba18fbb6ee2996afff4f12a..8ea27893f8f22b1042659ce8173f3a4ac91d1bdd 100644
--- a/typo3/sysext/backend/Classes/History/RecordHistory.php
+++ b/typo3/sysext/backend/Classes/History/RecordHistory.php
@@ -169,7 +169,6 @@ class RecordHistory
      * Toggles highlight state of record
      *
      * @param int $uid Uid of sys_history entry
-     * @return void
      */
     public function toggleHighlight($uid)
     {
@@ -916,8 +915,6 @@ class RecordHistory
 
     /**
      * Resolve sh_uid (used from log)
-     *
-     * @return void
      */
     public function resolveShUid()
     {
diff --git a/typo3/sysext/backend/Classes/Http/Application.php b/typo3/sysext/backend/Classes/Http/Application.php
index c23833a8bbc374070e288f034831de214a86d37f..859e382e4b2ff62274a2f7b29ea50097b5134341 100644
--- a/typo3/sysext/backend/Classes/Http/Application.php
+++ b/typo3/sysext/backend/Classes/Http/Application.php
@@ -78,7 +78,6 @@ class Application implements ApplicationInterface
      * Set up the application and shut it down afterwards
      *
      * @param callable $execute
-     * @return void
      */
     public function run(callable $execute = null)
     {
diff --git a/typo3/sysext/backend/Classes/Http/BackendModuleRequestHandler.php b/typo3/sysext/backend/Classes/Http/BackendModuleRequestHandler.php
index 809c1c72ad7bb23651cbaca076db2a11568e4108..5ee8c2c424ac528ad9d01119f2d1495db02d6cff 100644
--- a/typo3/sysext/backend/Classes/Http/BackendModuleRequestHandler.php
+++ b/typo3/sysext/backend/Classes/Http/BackendModuleRequestHandler.php
@@ -91,8 +91,6 @@ class BackendModuleRequestHandler implements RequestHandlerInterface
 
     /**
      * Execute TYPO3 bootstrap
-     *
-     * @return void
      */
     protected function boot()
     {
diff --git a/typo3/sysext/backend/Classes/Http/RequestHandler.php b/typo3/sysext/backend/Classes/Http/RequestHandler.php
index 0381794e05a642ce818be1a6bd03c15750e39719..94373c39cca4db4ca693d8824ce4472bc1ed2f68 100644
--- a/typo3/sysext/backend/Classes/Http/RequestHandler.php
+++ b/typo3/sysext/backend/Classes/Http/RequestHandler.php
@@ -82,7 +82,6 @@ class RequestHandler implements RequestHandlerInterface
      * Does the main work for setting up the backend environment for any Backend request
      *
      * @param bool $proceedIfNoUserIsLoggedIn option to allow to render the request even if no user is logged in
-     * @return void
      */
     protected function boot($proceedIfNoUserIsLoggedIn)
     {
diff --git a/typo3/sysext/backend/Classes/LoginProvider/LoginProviderInterface.php b/typo3/sysext/backend/Classes/LoginProvider/LoginProviderInterface.php
index e9cbd638817ba9cd50d753d0b4cd220d7a5e359b..510072d06f5fa8bb1f8f13ab8e8cb384577e3c09 100644
--- a/typo3/sysext/backend/Classes/LoginProvider/LoginProviderInterface.php
+++ b/typo3/sysext/backend/Classes/LoginProvider/LoginProviderInterface.php
@@ -39,8 +39,6 @@ interface LoginProviderInterface
      * @param StandaloneView $view
      * @param PageRenderer $pageRenderer
      * @param LoginController $loginController
-     *
-     * @return void
      */
     public function render(StandaloneView $view, PageRenderer $pageRenderer, LoginController $loginController);
 }
diff --git a/typo3/sysext/backend/Classes/Module/AbstractFunctionModule.php b/typo3/sysext/backend/Classes/Module/AbstractFunctionModule.php
index 35b50ef5a3cddd24645cd088ead2849ad08a3c0f..b1fe9053239ee0572cf36a200934c77e07c12bfb 100644
--- a/typo3/sysext/backend/Classes/Module/AbstractFunctionModule.php
+++ b/typo3/sysext/backend/Classes/Module/AbstractFunctionModule.php
@@ -187,7 +187,6 @@ abstract class AbstractFunctionModule
      * If $this->function_key is set (which means there are two levels of object connectivity) then
      * $this->extClassConf is loaded with the TBE_MODULES_EXT configuration for that sub-sub-module
      *
-     * @return void
      * @see $function_key, \TYPO3\CMS\FuncWizards\Controller\WebFunctionWizardsBaseController::init()
      */
     public function handleExternalFunctionValue()
@@ -202,8 +201,6 @@ abstract class AbstractFunctionModule
     /**
      * Including any locallang file configured and merging its content over
      * the current global LOCAL_LANG array (which is EXPECTED to exist!!!)
-     *
-     * @return void
      */
     public function incLocalLang()
     {
@@ -225,7 +222,6 @@ abstract class AbstractFunctionModule
     /**
      * Same as \TYPO3\CMS\Backend\Module\BaseScriptClass::checkExtObj()
      *
-     * @return void
      * @see \TYPO3\CMS\Backend\Module\BaseScriptClass::checkExtObj()
      */
     public function checkExtObj()
@@ -240,8 +236,6 @@ abstract class AbstractFunctionModule
 
     /**
      * Calls the main function inside ANOTHER sub-submodule which might exist.
-     *
-     * @return void
      */
     public function extObjContent()
     {
diff --git a/typo3/sysext/backend/Classes/Module/BaseScriptClass.php b/typo3/sysext/backend/Classes/Module/BaseScriptClass.php
index ddd7f69397a5f491fd8c23055fdac75fcd3225ee..cde5bfab1c8fa19978286b7daef80df351581c77 100644
--- a/typo3/sysext/backend/Classes/Module/BaseScriptClass.php
+++ b/typo3/sysext/backend/Classes/Module/BaseScriptClass.php
@@ -189,7 +189,6 @@ class BaseScriptClass
     /**
      * Initializes the backend module by setting internal variables, initializing the menu.
      *
-     * @return void
      * @see menuConfig()
      */
     public function init()
@@ -210,7 +209,6 @@ class BaseScriptClass
      * Then MOD_SETTINGS array is cleaned up (see \TYPO3\CMS\Backend\Utility\BackendUtility::getModuleData()) so it contains only valid values. It's also updated with any SET[] values submitted.
      * Also loads the modTSconfig internal variable.
      *
-     * @return void
      * @see init(), $MOD_MENU, $MOD_SETTINGS, \TYPO3\CMS\Backend\Utility\BackendUtility::getModuleData(), mergeExternalItems()
      */
     public function menuConfig()
@@ -250,7 +248,6 @@ class BaseScriptClass
      *
      * @param string $MM_key The key to MOD_MENU for which to fetch configuration. 'function' is default since it is first and foremost used to get information per "extension object" (I think that is what its called)
      * @param string $MS_value The value-key to fetch from the config array. If NULL (default) MOD_SETTINGS[$MM_key] will be used. This is useful if you want to force another function than the one defined in MOD_SETTINGS[function]. Call this in init() function of your Script Class: handleExternalFunctionValue('function', $forcedSubModKey)
-     * @return void
      * @see getExternalItemConfig(), init()
      */
     public function handleExternalFunctionValue($MM_key = 'function', $MS_value = null)
@@ -285,7 +282,6 @@ class BaseScriptClass
      * The array $this->extClassConf is set in handleExternalFunctionValue() based on the value of MOD_SETTINGS[function]
      * If an instance is created it is initiated with $this passed as value and $this->extClassConf as second argument. Further the $this->MOD_SETTING is cleaned up again after calling the init function.
      *
-     * @return void
      * @see handleExternalFunctionValue(), \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::insertModuleFunction(), $extObj
      */
     public function checkExtObj()
@@ -300,8 +296,6 @@ class BaseScriptClass
 
     /**
      * Calls the checkExtObj function in sub module if present.
-     *
-     * @return void
      */
     public function checkSubExtObj()
     {
@@ -313,8 +307,6 @@ class BaseScriptClass
     /**
      * Calls the 'header' function inside the "Function menu module" if present.
      * A header function might be needed to add JavaScript or other stuff in the head. This can't be done in the main function because the head is already written.
-     *
-     * @return void
      */
     public function extObjHeader()
     {
@@ -325,8 +317,6 @@ class BaseScriptClass
 
     /**
      * Calls the 'main' function inside the "Function menu module" if present
-     *
-     * @return void
      */
     public function extObjContent()
     {
diff --git a/typo3/sysext/backend/Classes/Module/ModuleLoader.php b/typo3/sysext/backend/Classes/Module/ModuleLoader.php
index d4109fd6a3a4546efde3b807e292cff9acc31707..e03b01f8ced329b4346cef1bdabac2d7d24be34e 100644
--- a/typo3/sysext/backend/Classes/Module/ModuleLoader.php
+++ b/typo3/sysext/backend/Classes/Module/ModuleLoader.php
@@ -86,7 +86,6 @@ class ModuleLoader
      *
      * @param array $modulesArray Should be the global var $TBE_MODULES, $BE_USER can optionally be set to an alternative Backend user object than the global var $BE_USER (which is the currently logged in user)
      * @param BackendUserAuthentication $beUser Optional backend user object to use. If not set, the global BE_USER object is used.
-     * @return void
      */
     public function load($modulesArray, BackendUserAuthentication $beUser = null)
     {
diff --git a/typo3/sysext/backend/Classes/Module/ModuleStorage.php b/typo3/sysext/backend/Classes/Module/ModuleStorage.php
index 51b2f15f5f144d860382f46695f794b7aaec891d..c1b4d2be2d26192860e345989ae8f50bd7b6b5ba 100644
--- a/typo3/sysext/backend/Classes/Module/ModuleStorage.php
+++ b/typo3/sysext/backend/Classes/Module/ModuleStorage.php
@@ -38,7 +38,6 @@ class ModuleStorage implements \TYPO3\CMS\Core\SingletonInterface
      * Set Entries
      *
      * @param \SplObjectStorage $entries
-     * @return void
      */
     public function setEntries($entries)
     {
@@ -59,7 +58,6 @@ class ModuleStorage implements \TYPO3\CMS\Core\SingletonInterface
      * Attach Entry
      *
      * @param BackendModule $entry
-     * @return void
      */
     public function attachEntry(BackendModule $entry)
     {
diff --git a/typo3/sysext/backend/Classes/Provider/PageTsBackendLayoutDataProvider.php b/typo3/sysext/backend/Classes/Provider/PageTsBackendLayoutDataProvider.php
index 5c85d232d83f4a93a4aaf4d50402c79b0c99e201..6c75aca9a0a2777fb39d7ac536b0d55f13ca23b4 100644
--- a/typo3/sysext/backend/Classes/Provider/PageTsBackendLayoutDataProvider.php
+++ b/typo3/sysext/backend/Classes/Provider/PageTsBackendLayoutDataProvider.php
@@ -61,7 +61,6 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
  * 		}
  * 	}
  * }
- *
  */
 class PageTsBackendLayoutDataProvider implements DataProviderInterface
 {
@@ -90,7 +89,6 @@ class PageTsBackendLayoutDataProvider implements DataProviderInterface
      * Set PageTsConfig
      *
      * @param array $pageTsConfig
-     * @return void
      */
     protected function setPageTsConfig(array $pageTsConfig)
     {
@@ -111,7 +109,6 @@ class PageTsBackendLayoutDataProvider implements DataProviderInterface
      * Set PageId
      *
      * @param int $pageId
-     * @return void
      */
     protected function setPageId($pageId)
     {
@@ -133,7 +130,6 @@ class PageTsBackendLayoutDataProvider implements DataProviderInterface
      * if not it will be generated for the current Page.
      *
      * @param DataProviderContext $dataProviderContext
-     * @return void
      */
     protected function generatePageTsConfig($dataProviderContext = null)
     {
@@ -151,7 +147,6 @@ class PageTsBackendLayoutDataProvider implements DataProviderInterface
      * Generate the Backend Layout configs
      *
      * @param DataProviderContext $dataProviderContext
-     * @return void
      */
     protected function generateBackendLayouts($dataProviderContext = null)
     {
@@ -203,7 +198,6 @@ class PageTsBackendLayoutDataProvider implements DataProviderInterface
     /**
      * @param DataProviderContext $dataProviderContext
      * @param BackendLayoutCollection $backendLayoutCollection
-     * @return void
      */
     public function addBackendLayouts(DataProviderContext $dataProviderContext, BackendLayoutCollection $backendLayoutCollection)
     {
diff --git a/typo3/sysext/backend/Classes/RecordList/AbstractRecordList.php b/typo3/sysext/backend/Classes/RecordList/AbstractRecordList.php
index e4cc6c6d20c43df3314d5d9bd4803f31922ea098..bdfdab135d1ffeabe60ecddbe2e38065413f905e 100644
--- a/typo3/sysext/backend/Classes/RecordList/AbstractRecordList.php
+++ b/typo3/sysext/backend/Classes/RecordList/AbstractRecordList.php
@@ -303,8 +303,6 @@ abstract class AbstractRecordList
 
     /**
      * Dummy function, used to write the top of a table listing.
-     *
-     * @return void
      */
     public function writeTop()
     {
@@ -420,8 +418,6 @@ abstract class AbstractRecordList
 
     /**
      * Initializes page languages and icons
-     *
-     * @return void
      */
     public function initializeLanguages()
     {
diff --git a/typo3/sysext/backend/Classes/RecordList/ElementBrowserRecordList.php b/typo3/sysext/backend/Classes/RecordList/ElementBrowserRecordList.php
index 0411c50afee7d12b59c65a857bd497edbc417d25..fbdb8c427bde3ccccfc0b2b11196ab758bd78ea1 100644
--- a/typo3/sysext/backend/Classes/RecordList/ElementBrowserRecordList.php
+++ b/typo3/sysext/backend/Classes/RecordList/ElementBrowserRecordList.php
@@ -117,7 +117,6 @@ class ElementBrowserRecordList extends DatabaseRecordList
     /**
      * Local version that sets allFields to TRUE to support userFieldSelect
      *
-     * @return void
      * @see fieldSelectBox
      */
     public function generateList()
diff --git a/typo3/sysext/backend/Classes/RecordList/RecordListGetTableHookInterface.php b/typo3/sysext/backend/Classes/RecordList/RecordListGetTableHookInterface.php
index b3da25725d6add18d7f6bd98f8d14afc1a029bd7..f1311be0f95c901535d593e54c34ffc455a57de9 100644
--- a/typo3/sysext/backend/Classes/RecordList/RecordListGetTableHookInterface.php
+++ b/typo3/sysext/backend/Classes/RecordList/RecordListGetTableHookInterface.php
@@ -28,7 +28,6 @@ interface RecordListGetTableHookInterface
      * @param string $additionalWhereClause An additional WHERE clause
      * @param string $selectedFieldsList Comma separated list of selected fields
      * @param \TYPO3\CMS\Recordlist\RecordList\DatabaseRecordList $parentObject Parent \TYPO3\CMS\Recordlist\RecordList\DatabaseRecordList object
-     * @return void
      */
     public function getDBlistQuery($table, $pageId, &$additionalWhereClause, &$selectedFieldsList, &$parentObject);
 }
diff --git a/typo3/sysext/backend/Classes/Search/LiveSearch/LiveSearch.php b/typo3/sysext/backend/Classes/Search/LiveSearch/LiveSearch.php
index 4ba8f3818807299f2e685cf8fa7c3011208e6039..847934aebce9f69357733f39215d9622e8e6b9eb 100644
--- a/typo3/sysext/backend/Classes/Search/LiveSearch/LiveSearch.php
+++ b/typo3/sysext/backend/Classes/Search/LiveSearch/LiveSearch.php
@@ -424,7 +424,6 @@ class LiveSearch
      * Setter for limit value.
      *
      * @param int $limitCount
-     * @return void
      */
     public function setLimitCount($limitCount)
     {
@@ -438,7 +437,6 @@ class LiveSearch
      * Setter for start count value.
      *
      * @param int $startCount
-     * @return void
      */
     public function setStartCount($startCount)
     {
@@ -449,7 +447,6 @@ class LiveSearch
      * Setter for the search query string.
      *
      * @param string $queryString
-     * @return void
      */
     public function setQueryString($queryString)
     {
diff --git a/typo3/sysext/backend/Classes/Security/CategoryPermissionsAspect.php b/typo3/sysext/backend/Classes/Security/CategoryPermissionsAspect.php
index e385d0841247b068c5d0babd5440971ab683651c..3154e5af4e65dc1f964fa9eb33ce60cfa20d6a5e 100644
--- a/typo3/sysext/backend/Classes/Security/CategoryPermissionsAspect.php
+++ b/typo3/sysext/backend/Classes/Security/CategoryPermissionsAspect.php
@@ -51,7 +51,6 @@ class CategoryPermissionsAspect
      *
      * @param DatabaseTreeDataProvider $dataProvider
      * @param TreeNode $treeData
-     * @return void
      */
     public function addUserPermissionsToCategoryTreeData(DatabaseTreeDataProvider $dataProvider, $treeData)
     {
diff --git a/typo3/sysext/backend/Classes/Template/Components/DocHeaderComponent.php b/typo3/sysext/backend/Classes/Template/Components/DocHeaderComponent.php
index 80d05f45dbdfbfde1ccc42eb228f22cb955ac6f1..5aba36412ea9376c019d46ae9b1cbfebd8cd3263 100644
--- a/typo3/sysext/backend/Classes/Template/Components/DocHeaderComponent.php
+++ b/typo3/sysext/backend/Classes/Template/Components/DocHeaderComponent.php
@@ -61,8 +61,6 @@ class DocHeaderComponent
      * Set page information
      *
      * @param array $metaInformation Record array
-     *
-     * @return void
      */
     public function setMetaInformation(array $metaInformation)
     {
diff --git a/typo3/sysext/backend/Classes/Template/Components/Menu/Menu.php b/typo3/sysext/backend/Classes/Template/Components/Menu/Menu.php
index 54d5aeac6e4cc9247ac5b5185c2b760d9ecc5e70..fbaaf0c9093e3d58741cb672e957136d58106936 100644
--- a/typo3/sysext/backend/Classes/Template/Components/Menu/Menu.php
+++ b/typo3/sysext/backend/Classes/Template/Components/Menu/Menu.php
@@ -84,8 +84,6 @@ class Menu
      * @param MenuItem $menuItem The menuItem to add to the menu
      *
      * @throws \InvalidArgumentException In case a menuItem is not valid
-     *
-     * @return void
      */
     public function addMenuItem(MenuItem $menuItem)
     {
diff --git a/typo3/sysext/backend/Classes/Template/Components/MenuRegistry.php b/typo3/sysext/backend/Classes/Template/Components/MenuRegistry.php
index dcc600a575beb635dd613d58b6b25c83138ede46..6c8dacda7a60ed0622f9487e1869d8ae2bbf2a4f 100644
--- a/typo3/sysext/backend/Classes/Template/Components/MenuRegistry.php
+++ b/typo3/sysext/backend/Classes/Template/Components/MenuRegistry.php
@@ -35,8 +35,6 @@ class MenuRegistry
      * @param Menu $menu Menu object to add to the menuRegistry
      *
      * @throws \InvalidArgumentException In case a menu is not valid
-     *
-     * @return void
      */
     public function addMenu(Menu $menu)
     {
diff --git a/typo3/sysext/backend/Classes/Template/Components/MetaInformation.php b/typo3/sysext/backend/Classes/Template/Components/MetaInformation.php
index a5f4e513068ea5cc8652f96a2e836d811ca8d6c4..0fcf6a20a4a6dbc929aa3117476ee96870958c7b 100644
--- a/typo3/sysext/backend/Classes/Template/Components/MetaInformation.php
+++ b/typo3/sysext/backend/Classes/Template/Components/MetaInformation.php
@@ -41,8 +41,6 @@ class MetaInformation
      * Set the RecordArray
      *
      * @param array $recordArray RecordArray
-     *
-     * @return void
      */
     public function setRecordArray(array $recordArray)
     {
diff --git a/typo3/sysext/backend/Classes/Template/DocumentTemplate.php b/typo3/sysext/backend/Classes/Template/DocumentTemplate.php
index f62b3798c0c7d6599797312b6726fe3d5c15347c..9d736a6e0465b3f324ce1c3f7fb3050230c75859 100644
--- a/typo3/sysext/backend/Classes/Template/DocumentTemplate.php
+++ b/typo3/sysext/backend/Classes/Template/DocumentTemplate.php
@@ -534,7 +534,6 @@ function jumpToUrl(URL) {
      * Defines whether to use the X-UA-Compatible meta tag.
      *
      * @param bool $useCompatibilityTag Whether to use the tag
-     * @return void
      */
     public function useCompatibilityTag($useCompatibilityTag = true)
     {
@@ -877,7 +876,6 @@ function jumpToUrl(URL) {
      * @param string $href uri to the style sheet file
      * @param string $title value for the title attribute of the link element
      * @param string $relation value for the rel attribute of the link element
-     * @return void
      */
     public function addStyleSheet($key, $href, $title = '', $relation = 'stylesheet')
     {
@@ -888,7 +886,6 @@ function jumpToUrl(URL) {
      * Add all *.css files of the directory $path to the stylesheets
      *
      * @param string $path directory to add
-     * @return void
      */
     public function addStyleSheetDirectory($path)
     {
@@ -1106,7 +1103,6 @@ function jumpToUrl(URL) {
      * Includes a javascript library that exists in the core /typo3/ directory
      *
      * @param string $lib: Library name. Call it with the full path like "sysext/core/Resources/Public/JavaScript/QueryGenerator.js" to load it
-     * @return void
      * @deprecated since TYPO3 v8, will be removed in TYPO3 v9
      */
     public function loadJavascriptLib($lib)
@@ -1118,7 +1114,6 @@ function jumpToUrl(URL) {
     /**
      * Includes the necessary Javascript function for the clickmenu (context sensitive menus) in the document
      *
-     * @return void
      * @deprecated since TYPO3 v8, will be removed in TYPO3 v9
      */
     public function getContextMenuCode()
@@ -1134,7 +1129,6 @@ function jumpToUrl(URL) {
      *
      * @param string $table indicator of which table the drag and drop function should work on (pages or folders)
      * @param string $additionalJavaScriptCode adds more code to the additional javascript code
-     * @return void
      * @deprecated since TYPO3 CMS 8, will be removed in TYPO3 CMS 9.
      */
     public function getDragDropCode($table, $additionalJavaScriptCode = '')
@@ -1268,7 +1262,6 @@ function jumpToUrl(URL) {
      * Define the template for the module
      *
      * @param string $filename filename
-     * @return void
      */
     public function setModuleTemplate($filename)
     {
diff --git a/typo3/sysext/backend/Classes/Template/ModuleTemplate.php b/typo3/sysext/backend/Classes/Template/ModuleTemplate.php
index c828a0ca3bd2a4ef3d9141a7f45799c98702162e..66b8ac0297cb93c05274c9e6ae6096907d013a26 100644
--- a/typo3/sysext/backend/Classes/Template/ModuleTemplate.php
+++ b/typo3/sysext/backend/Classes/Template/ModuleTemplate.php
@@ -204,7 +204,6 @@ class ModuleTemplate
      * Set content
      *
      * @param string $content Content of the module
-     * @return void
      */
     public function setContent($content)
     {
@@ -251,8 +250,6 @@ class ModuleTemplate
 
     /**
      * Loads all necessary Javascript Files
-     *
-     * @return void
      */
     protected function loadJavaScripts()
     {
@@ -265,8 +262,6 @@ class ModuleTemplate
 
     /**
      * Loads all necessary stylesheets
-     *
-     * @return void
      */
     protected function loadStylesheets()
     {
@@ -280,8 +275,6 @@ class ModuleTemplate
 
     /**
      * Sets mandatory parameters for the view (pageRenderer)
-     *
-     * @return void
      */
     protected function setupPage()
     {
@@ -294,8 +287,6 @@ class ModuleTemplate
 
     /**
      * Wrapper function for adding JS inline blocks
-     *
-     * @return void
      */
     protected function setJavaScriptCodeArray()
     {
@@ -309,8 +300,6 @@ class ModuleTemplate
      *
      * @param string $name Javascript code block name
      * @param string $code Inline Javascript
-     *
-     * @return void
      */
     public function addJavaScriptCode($name = '', $code = '')
     {
@@ -371,8 +360,6 @@ class ModuleTemplate
      * Set form tag
      *
      * @param string $formTag Form tag to add
-     *
-     * @return void
      */
     public function setForm($formTag = '')
     {
@@ -383,8 +370,6 @@ class ModuleTemplate
      * Sets the ModuleId
      *
      * @param string $moduleId ID of the module
-     *
-     * @return void
      */
     public function setModuleId($moduleId)
     {
@@ -396,8 +381,6 @@ class ModuleTemplate
      * Sets the ModuleName
      *
      * @param string $moduleName Name of the module
-     *
-     * @return void
      */
     public function setModuleName($moduleName)
     {
@@ -479,7 +462,6 @@ class ModuleTemplate
      * @param string $lib Library name. Call it with the full path like
      * "sysext/core/Resources/Public/JavaScript/QueryGenerator.js" to load it
      *
-     * @return void
      * @internal
      */
     public function loadJavascriptLib($lib)
@@ -710,7 +692,6 @@ class ModuleTemplate
      * @param string $messageTitle Optional message title
      * @param int $severity Optional severity, must be one of \TYPO3\CMS\Core\Messaging\FlashMessage constants
      * @param bool $storeInSession Optional, defines whether the message should be stored in the session (default)
-     * @return void
      * @throws \InvalidArgumentException if the message body is no string
      */
     public function addFlashMessage($messageBody, $messageTitle = '', $severity = AbstractMessage::OK, $storeInSession = true)
diff --git a/typo3/sysext/backend/Classes/Tree/AbstractTree.php b/typo3/sysext/backend/Classes/Tree/AbstractTree.php
index b327f7314b5317ab51ad47534370a97b98bfefa9..b512f9acacc697681d01a765904ceadc085f0beb 100644
--- a/typo3/sysext/backend/Classes/Tree/AbstractTree.php
+++ b/typo3/sysext/backend/Classes/Tree/AbstractTree.php
@@ -35,7 +35,6 @@ abstract class AbstractTree
 
     /**
      * @param \TYPO3\CMS\Backend\Tree\AbstractTreeDataProvider $dataProvider
-     * @return void
      */
     public function setDataProvider(\TYPO3\CMS\Backend\Tree\AbstractTreeDataProvider $dataProvider)
     {
@@ -52,7 +51,6 @@ abstract class AbstractTree
 
     /**
      * @param \TYPO3\CMS\Backend\Tree\Renderer\AbstractTreeRenderer $nodeRenderer
-     * @return void
      */
     public function setNodeRenderer(\TYPO3\CMS\Backend\Tree\Renderer\AbstractTreeRenderer $nodeRenderer)
     {
diff --git a/typo3/sysext/backend/Classes/Tree/DraggableAndDropableNodeInterface.php b/typo3/sysext/backend/Classes/Tree/DraggableAndDropableNodeInterface.php
index c001ffd4c0f81cbee1cbbb3e0d4c247298b203cb..163f7eb8e59a167a64efa0a65f5502ac688f7b3e 100644
--- a/typo3/sysext/backend/Classes/Tree/DraggableAndDropableNodeInterface.php
+++ b/typo3/sysext/backend/Classes/Tree/DraggableAndDropableNodeInterface.php
@@ -25,7 +25,6 @@ interface DraggableAndDropableNodeInterface
      *
      * @param \TYPO3\CMS\Backend\Tree\TreeNode $node
      * @param \TYPO3\CMS\Backend\Tree\TreeNode $destination
-     * @return void
      */
     public function moveNodeInDestinationNode($node, $destination);
 
@@ -34,7 +33,6 @@ interface DraggableAndDropableNodeInterface
      *
      * @param \TYPO3\CMS\Backend\Tree\TreeNode $node
      * @param \TYPO3\CMS\Backend\Tree\TreeNode $destination
-     * @return void
      */
     public function moveNodeAfterDestinationNode($node, $destination);
 
@@ -43,7 +41,6 @@ interface DraggableAndDropableNodeInterface
      *
      * @param \TYPO3\CMS\Backend\Tree\TreeNode $node
      * @param \TYPO3\CMS\Backend\Tree\TreeNode $destination
-     * @return void
      */
     public function copyNodeInDestinationNode($node, $destination);
 
@@ -52,7 +49,6 @@ interface DraggableAndDropableNodeInterface
      *
      * @param \TYPO3\CMS\Backend\Tree\TreeNode $node
      * @param \TYPO3\CMS\Backend\Tree\TreeNode $destination
-     * @return void
      */
     public function copyNodeAfterDestinationNode($node, $destination);
 }
diff --git a/typo3/sysext/backend/Classes/Tree/EditableNodeLabelInterface.php b/typo3/sysext/backend/Classes/Tree/EditableNodeLabelInterface.php
index 223ada467f815473ae4128b6d14fd932f0e38dee..32754815addebf8f1a68c6e3981078ac4697ace9 100644
--- a/typo3/sysext/backend/Classes/Tree/EditableNodeLabelInterface.php
+++ b/typo3/sysext/backend/Classes/Tree/EditableNodeLabelInterface.php
@@ -24,7 +24,6 @@ interface EditableNodeLabelInterface
      * Sets the new label
      *
      * @param string $label
-     * @return void
      */
     public function setLabel($label);
 }
diff --git a/typo3/sysext/backend/Classes/Tree/ExtDirectNode.php b/typo3/sysext/backend/Classes/Tree/ExtDirectNode.php
index f9717248500865cf37f1bd58f10e5376d00befdb..808903bad1f68247caec4a2fe90e23b3e499ad6a 100644
--- a/typo3/sysext/backend/Classes/Tree/ExtDirectNode.php
+++ b/typo3/sysext/backend/Classes/Tree/ExtDirectNode.php
@@ -163,7 +163,6 @@ class ExtDirectNode extends \TYPO3\CMS\Backend\Tree\TreeNode
      * Set's the node type
      *
      * @param string $type
-     * @return void
      */
     public function setType($type)
     {
@@ -184,7 +183,6 @@ class ExtDirectNode extends \TYPO3\CMS\Backend\Tree\TreeNode
      * Sets the leaf node indicator
      *
      * @param bool $isLeaf
-     * @return void
      */
     public function setLeaf($isLeaf)
     {
@@ -205,7 +203,6 @@ class ExtDirectNode extends \TYPO3\CMS\Backend\Tree\TreeNode
      * Sets the expandable indicator
      *
      * @param bool $expandable
-     * @return void
      */
     public function setExpandable($expandable)
     {
@@ -226,7 +223,6 @@ class ExtDirectNode extends \TYPO3\CMS\Backend\Tree\TreeNode
      * Sets the expanded indicator
      *
      * @param bool $expanded
-     * @return void
      */
     public function setExpanded($expanded)
     {
@@ -250,7 +246,6 @@ class ExtDirectNode extends \TYPO3\CMS\Backend\Tree\TreeNode
      * Sets the draggable indicator
      *
      * @param bool $draggable
-     * @return void
      */
     public function setDraggable($draggable)
     {
@@ -271,7 +266,6 @@ class ExtDirectNode extends \TYPO3\CMS\Backend\Tree\TreeNode
      * Sets the indicator if the node can be a drop target
      *
      * @param bool $isDropTarget
-     * @return void
      */
     public function setIsDropTarget($isDropTarget)
     {
@@ -295,7 +289,6 @@ class ExtDirectNode extends \TYPO3\CMS\Backend\Tree\TreeNode
      * @param string $textSourceField
      * @param string $prefix
      * @param string $suffix
-     * @return void
      */
     public function setText($text, $textSourceField = 'title', $prefix = '', $suffix = '')
     {
@@ -319,7 +312,6 @@ class ExtDirectNode extends \TYPO3\CMS\Backend\Tree\TreeNode
      * Sets the editable text
      *
      * @param string $editableText
-     * @return void
      */
     public function setEditableText($editableText)
     {
@@ -350,7 +342,6 @@ class ExtDirectNode extends \TYPO3\CMS\Backend\Tree\TreeNode
      * Sets the paste copy indicator
      *
      * @param bool $inCopyMode
-     * @return void
      */
     public function setInCopyMode($inCopyMode)
     {
@@ -371,7 +362,6 @@ class ExtDirectNode extends \TYPO3\CMS\Backend\Tree\TreeNode
      * Sets the paste cut indicator
      *
      * @param bool $inCutMode
-     * @return void
      */
     public function setInCutMode($inCutMode)
     {
@@ -412,7 +402,6 @@ class ExtDirectNode extends \TYPO3\CMS\Backend\Tree\TreeNode
      * Sets the css class(es)
      *
      * @param string $class
-     * @return void
      */
     public function setCls($class)
     {
@@ -433,7 +422,6 @@ class ExtDirectNode extends \TYPO3\CMS\Backend\Tree\TreeNode
      * Sets the quick tip
      *
      * @param string $qtip
-     * @return void
      */
     public function setQTip($qtip)
     {
@@ -454,7 +442,6 @@ class ExtDirectNode extends \TYPO3\CMS\Backend\Tree\TreeNode
      * Sets the sprite icon code
      *
      * @param string $spriteIcon
-     * @return void
      */
     public function setSpriteIconCode($spriteIcon)
     {
@@ -475,7 +462,6 @@ class ExtDirectNode extends \TYPO3\CMS\Backend\Tree\TreeNode
      * Sets the indicator if the label is editable
      *
      * @param bool $labelIsEditable
-     * @return void
      */
     public function setLabelIsEditable($labelIsEditable)
     {
@@ -496,7 +482,6 @@ class ExtDirectNode extends \TYPO3\CMS\Backend\Tree\TreeNode
      * Sets the database record array
      *
      * @param array $record
-     * @return void
      */
     public function setRecord($record)
     {
@@ -517,7 +502,6 @@ class ExtDirectNode extends \TYPO3\CMS\Backend\Tree\TreeNode
      * Sets the context info
      *
      * @param array $contextInfo
-     * @return void
      */
     public function setContextInfo($contextInfo)
     {
@@ -538,7 +522,6 @@ class ExtDirectNode extends \TYPO3\CMS\Backend\Tree\TreeNode
      * Sets the child nodes collection
      *
      * @param \TYPO3\CMS\Backend\Tree\TreeNodeCollection $childNodes
-     * @return void
      */
     public function setChildNodes(\TYPO3\CMS\Backend\Tree\TreeNodeCollection $childNodes)
     {
@@ -552,7 +535,6 @@ class ExtDirectNode extends \TYPO3\CMS\Backend\Tree\TreeNode
      * Sets the indicator if the node can have child nodes
      *
      * @param bool $allowChildren
-     * @return void
      */
     public function setAllowChildren($allowChildren)
     {
@@ -618,7 +600,6 @@ class ExtDirectNode extends \TYPO3\CMS\Backend\Tree\TreeNode
      * Sets data of the node by a given data array
      *
      * @param array $data
-     * @return void
      */
     public function dataFromArray($data)
     {
diff --git a/typo3/sysext/backend/Classes/Tree/Pagetree/CollectionProcessorInterface.php b/typo3/sysext/backend/Classes/Tree/Pagetree/CollectionProcessorInterface.php
index 1d7a470d4d8c1d720cf44c1e656705714fb043ff..0a55bbc58af6a1a49e5d581acadd9ee85787c238 100644
--- a/typo3/sysext/backend/Classes/Tree/Pagetree/CollectionProcessorInterface.php
+++ b/typo3/sysext/backend/Classes/Tree/Pagetree/CollectionProcessorInterface.php
@@ -26,7 +26,6 @@ interface CollectionProcessorInterface
      * @param int $mountPoint
      * @param int $level
      * @param \TYPO3\CMS\Backend\Tree\Pagetree\PagetreeNodeCollection $nodeCollection
-     * @return void
      */
     public function postProcessGetNodes($node, $mountPoint, $level, $nodeCollection);
 
@@ -37,7 +36,6 @@ interface CollectionProcessorInterface
      * @param string $searchFilter
      * @param int $mountPoint
      * @param \TYPO3\CMS\Backend\Tree\Pagetree\PagetreeNodeCollection $nodeCollection
-     * @return void
      */
     public function postProcessFilteredNodes($node, $searchFilter, $mountPoint, $nodeCollection);
 
@@ -46,7 +44,6 @@ interface CollectionProcessorInterface
      *
      * @param string $searchFilter
      * @param \TYPO3\CMS\Backend\Tree\Pagetree\PagetreeNodeCollection $nodeCollection
-     * @return void
      */
     public function postProcessGetTreeMounts($searchFilter, $nodeCollection);
 }
diff --git a/typo3/sysext/backend/Classes/Tree/Pagetree/Commands.php b/typo3/sysext/backend/Classes/Tree/Pagetree/Commands.php
index 4f252e98daef9ab9f32b7d99558686bddaa35fdc..45f721a14864ce8c228c14b106b2d4cde451849c 100644
--- a/typo3/sysext/backend/Classes/Tree/Pagetree/Commands.php
+++ b/typo3/sysext/backend/Classes/Tree/Pagetree/Commands.php
@@ -56,7 +56,6 @@ class Commands
      * Visibly the page
      *
      * @param \TYPO3\CMS\Backend\Tree\Pagetree\PagetreeNode $node
-     * @return void
      */
     public static function visiblyNode(\TYPO3\CMS\Backend\Tree\Pagetree\PagetreeNode $node)
     {
@@ -68,7 +67,6 @@ class Commands
      * Hide the page
      *
      * @param \TYPO3\CMS\Backend\Tree\Pagetree\PagetreeNode $node
-     * @return void
      */
     public static function disableNode(\TYPO3\CMS\Backend\Tree\Pagetree\PagetreeNode $node)
     {
@@ -80,7 +78,6 @@ class Commands
      * Delete the page
      *
      * @param \TYPO3\CMS\Backend\Tree\Pagetree\PagetreeNode $node
-     * @return void
      */
     public static function deleteNode(\TYPO3\CMS\Backend\Tree\Pagetree\PagetreeNode $node)
     {
@@ -93,7 +90,6 @@ class Commands
      *
      * @param \TYPO3\CMS\Backend\Tree\Pagetree\PagetreeNode $node
      * @param int $targetId
-     * @return void
      */
     public static function restoreNode(\TYPO3\CMS\Backend\Tree\Pagetree\PagetreeNode $node, $targetId)
     {
@@ -109,7 +105,6 @@ class Commands
      *
      * @param \TYPO3\CMS\Backend\Tree\Pagetree\PagetreeNode $node
      * @param string $updatedLabel
-     * @return void
      */
     public static function updateNodeLabel(\TYPO3\CMS\Backend\Tree\Pagetree\PagetreeNode $node, $updatedLabel)
     {
@@ -144,7 +139,6 @@ class Commands
      *
      * @param \TYPO3\CMS\Backend\Tree\Pagetree\PagetreeNode $sourceNode
      * @param int $targetId
-     * @return void
      */
     public static function moveNode(\TYPO3\CMS\Backend\Tree\Pagetree\PagetreeNode $sourceNode, $targetId)
     {
diff --git a/typo3/sysext/backend/Classes/Tree/Pagetree/ExtdirectTreeCommands.php b/typo3/sysext/backend/Classes/Tree/Pagetree/ExtdirectTreeCommands.php
index 1358607be8f6731dde4abf6504da99c390267433..a611d841190279658444fbb2b108858ab6e3f7b7 100644
--- a/typo3/sysext/backend/Classes/Tree/Pagetree/ExtdirectTreeCommands.php
+++ b/typo3/sysext/backend/Classes/Tree/Pagetree/ExtdirectTreeCommands.php
@@ -160,7 +160,6 @@ class ExtdirectTreeCommands
      * Clear cache of the page
      *
      * @param \stdClass $nodeData
-     * @return void
      */
     public static function clearCacheOfPage($nodeData)
     {
diff --git a/typo3/sysext/backend/Classes/Tree/Pagetree/ExtdirectTreeDataProvider.php b/typo3/sysext/backend/Classes/Tree/Pagetree/ExtdirectTreeDataProvider.php
index 17890be44fd1d4cd09ed7c7363068d26c042e7ad..d60ad3805637dafefce41599c19bc2d202fac311 100644
--- a/typo3/sysext/backend/Classes/Tree/Pagetree/ExtdirectTreeDataProvider.php
+++ b/typo3/sysext/backend/Classes/Tree/Pagetree/ExtdirectTreeDataProvider.php
@@ -46,8 +46,6 @@ class ExtdirectTreeDataProvider extends \TYPO3\CMS\Backend\Tree\AbstractTree
 
     /**
      * Sets the data provider
-     *
-     * @return void
      */
     protected function initDataProvider()
     {
diff --git a/typo3/sysext/backend/Classes/Tree/Pagetree/PagetreeNode.php b/typo3/sysext/backend/Classes/Tree/Pagetree/PagetreeNode.php
index a417585013c3fad585c16497f9e5fda5c1ccd9ad..c6ed33c7b8496765aa5e7b6128f5e7b13acd3ac4 100644
--- a/typo3/sysext/backend/Classes/Tree/Pagetree/PagetreeNode.php
+++ b/typo3/sysext/backend/Classes/Tree/Pagetree/PagetreeNode.php
@@ -74,7 +74,6 @@ class PagetreeNode extends \TYPO3\CMS\Backend\Tree\ExtDirectNode
      * Sets the background color
      *
      * @param string $backgroundColor
-     * @return void
      */
     public function setBackgroundColor($backgroundColor)
     {
@@ -95,7 +94,6 @@ class PagetreeNode extends \TYPO3\CMS\Backend\Tree\ExtDirectNode
      * Set's the original id of the element
      *
      * @param int $workspaceId
-     * @return void
      */
     public function setWorkspaceId($workspaceId)
     {
@@ -136,7 +134,6 @@ class PagetreeNode extends \TYPO3\CMS\Backend\Tree\ExtDirectNode
      * Sets the mount point id
      *
      * @param int $mountPoint
-     * @return void
      */
     public function setMountPoint($mountPoint)
     {
@@ -157,7 +154,6 @@ class PagetreeNode extends \TYPO3\CMS\Backend\Tree\ExtDirectNode
      * Sets the indicator if the node is a mount point
      *
      * @param bool $isMountPoint
-     * @return void
      */
     public function setIsMountPoint($isMountPoint)
     {
@@ -178,7 +174,6 @@ class PagetreeNode extends \TYPO3\CMS\Backend\Tree\ExtDirectNode
      * Sets the readable rootline
      *
      * @param string $rootline
-     * @return void
      */
     public function setReadableRootline($rootline)
     {
@@ -438,7 +433,6 @@ class PagetreeNode extends \TYPO3\CMS\Backend\Tree\ExtDirectNode
      * Sets data of the node by a given data array
      *
      * @param array $data
-     * @return void
      */
     public function dataFromArray($data)
     {
diff --git a/typo3/sysext/backend/Classes/Tree/SortedTreeNodeCollection.php b/typo3/sysext/backend/Classes/Tree/SortedTreeNodeCollection.php
index 78e939d7a6ce9803e697672129f27dd2318bd71e..8f46e581bd75f8896607f31113a86c4668b05629 100644
--- a/typo3/sysext/backend/Classes/Tree/SortedTreeNodeCollection.php
+++ b/typo3/sysext/backend/Classes/Tree/SortedTreeNodeCollection.php
@@ -76,8 +76,6 @@ class SortedTreeNodeCollection extends \TYPO3\CMS\Backend\Tree\TreeNodeCollectio
 
     /**
      * Normalizes the array by reordering the keys
-     *
-     * @return void
      */
     protected function normalize()
     {
@@ -92,7 +90,6 @@ class SortedTreeNodeCollection extends \TYPO3\CMS\Backend\Tree\TreeNodeCollectio
      * Adds a node to the internal list in a sorted approach
      *
      * @param \TYPO3\CMS\Backend\Tree\TreeNode $node
-     * @return void
      */
     public function append($node)
     {
diff --git a/typo3/sysext/backend/Classes/Tree/TreeNode.php b/typo3/sysext/backend/Classes/Tree/TreeNode.php
index 26200c2ae6cc7064d3f49808a04b619de3e04630..c46e38e12651a90c191a700c2d0dbf2af8e37db2 100644
--- a/typo3/sysext/backend/Classes/Tree/TreeNode.php
+++ b/typo3/sysext/backend/Classes/Tree/TreeNode.php
@@ -61,7 +61,6 @@ class TreeNode implements \TYPO3\CMS\Backend\Tree\ComparableNodeInterface, \Seri
      * Sets the child nodes collection
      *
      * @param \TYPO3\CMS\Backend\Tree\TreeNodeCollection $childNodes
-     * @return void
      */
     public function setChildNodes(\TYPO3\CMS\Backend\Tree\TreeNodeCollection $childNodes)
     {
@@ -70,8 +69,6 @@ class TreeNode implements \TYPO3\CMS\Backend\Tree\ComparableNodeInterface, \Seri
 
     /**
      * Removes child nodes collection
-     *
-     * @return void
      */
     public function removeChildNodes()
     {
@@ -108,7 +105,6 @@ class TreeNode implements \TYPO3\CMS\Backend\Tree\ComparableNodeInterface, \Seri
      * Sets the identifier
      *
      * @param string $id
-     * @return void
      */
     public function setId($id)
     {
@@ -129,7 +125,6 @@ class TreeNode implements \TYPO3\CMS\Backend\Tree\ComparableNodeInterface, \Seri
      * Sets the parent node
      *
      * @param NULL|\TYPO3\CMS\Backend\Tree\TreeNode $parentNode
-     * @return void
      */
     public function setParentNode(\TYPO3\CMS\Backend\Tree\TreeNode $parentNode = null)
     {
@@ -205,7 +200,6 @@ class TreeNode implements \TYPO3\CMS\Backend\Tree\ComparableNodeInterface, \Seri
      * Sets data of the node by a given data array
      *
      * @param array $data
-     * @return void
      */
     public function dataFromArray($data)
     {
@@ -233,7 +227,6 @@ class TreeNode implements \TYPO3\CMS\Backend\Tree\ComparableNodeInterface, \Seri
      *
      * @throws \TYPO3\CMS\Core\Exception if the deserialized object type is not identical to the current one
      * @param string $serializedString
-     * @return void
      */
     public function unserialize($serializedString)
     {
diff --git a/typo3/sysext/backend/Classes/Tree/TreeNodeCollection.php b/typo3/sysext/backend/Classes/Tree/TreeNodeCollection.php
index e04ee1e3b2133891c8443c50677d2f1a3390cd6a..1dc338a5fa5bcfaf6b7622118f2eda54173a741d 100644
--- a/typo3/sysext/backend/Classes/Tree/TreeNodeCollection.php
+++ b/typo3/sysext/backend/Classes/Tree/TreeNodeCollection.php
@@ -37,8 +37,6 @@ class TreeNodeCollection extends \ArrayObject
 
     /**
      * Sorts the internal nodes array
-     *
-     * @return void
      */
     public function asort()
     {
@@ -49,7 +47,6 @@ class TreeNodeCollection extends \ArrayObject
      * Compares a node with another one
      *
      * @see \TYPO3\CMS\Backend\Tree\TreeNode::compareTo
-     * @return void
      * @noapi
      */
     public function nodeCompare(\TYPO3\CMS\Backend\Tree\TreeNode $node, \TYPO3\CMS\Backend\Tree\TreeNode $otherNode)
@@ -71,7 +68,6 @@ class TreeNodeCollection extends \ArrayObject
      * Initializes the current object with a serialized instance
      *
      * @param string $serializedString
-     * @return void
      * @throws \TYPO3\CMS\Core\Exception if the deserialized is not identical to the current class
      */
     public function unserialize($serializedString)
@@ -105,7 +101,6 @@ class TreeNodeCollection extends \ArrayObject
      * Sets the data of the node collection by a given array
      *
      * @param array $data
-     * @return void
      */
     public function dataFromArray($data)
     {
diff --git a/typo3/sysext/backend/Classes/Tree/TreeRepresentationNode.php b/typo3/sysext/backend/Classes/Tree/TreeRepresentationNode.php
index 53a80a8d1428d2dec64454ea2567feeb99fe3f1f..667392fdebc6e677fde025fbf7c8b20d23988b7f 100644
--- a/typo3/sysext/backend/Classes/Tree/TreeRepresentationNode.php
+++ b/typo3/sysext/backend/Classes/Tree/TreeRepresentationNode.php
@@ -57,7 +57,6 @@ class TreeRepresentationNode extends \TYPO3\CMS\Backend\Tree\TreeNode
 
     /**
      * @param string $class
-     * @return void
      */
     public function setClass($class)
     {
@@ -74,7 +73,6 @@ class TreeRepresentationNode extends \TYPO3\CMS\Backend\Tree\TreeNode
 
     /**
      * @param string|Icon $icon
-     * @return void
      */
     public function setIcon($icon)
     {
@@ -107,7 +105,6 @@ class TreeRepresentationNode extends \TYPO3\CMS\Backend\Tree\TreeNode
 
     /**
      * @param string $type
-     * @return void
      */
     public function setType($type)
     {
@@ -126,7 +123,6 @@ class TreeRepresentationNode extends \TYPO3\CMS\Backend\Tree\TreeNode
      * Sets the callback action
      *
      * @param string $callbackAction
-     * @return void
      */
     public function setCallbackAction($callbackAction)
     {
@@ -166,7 +162,6 @@ class TreeRepresentationNode extends \TYPO3\CMS\Backend\Tree\TreeNode
      * Sets data of the node by a given data array
      *
      * @param array $data
-     * @return void
      */
     public function dataFromArray($data)
     {
diff --git a/typo3/sysext/backend/Classes/Tree/View/AbstractTreeView.php b/typo3/sysext/backend/Classes/Tree/View/AbstractTreeView.php
index 7d7a8b3d16ee569a46129c9222b33a31bc5a5bba..15d0d00509a48b4ab2445dcc3873824221d82773 100644
--- a/typo3/sysext/backend/Classes/Tree/View/AbstractTreeView.php
+++ b/typo3/sysext/backend/Classes/Tree/View/AbstractTreeView.php
@@ -313,7 +313,6 @@ abstract class AbstractTreeView
      *
      * @param string $clause Record WHERE clause
      * @param string $orderByFields Record ORDER BY field
-     * @return void
      */
     public function init($clause = '', $orderByFields = '')
     {
@@ -342,7 +341,6 @@ abstract class AbstractTreeView
      *
      * @param string $field Field name to
      * @param bool $noCheck If set, the fieldname will be set no matter what. Otherwise the field name must either be found as key in $GLOBALS['TCA'][$table]['columns'] or in the list ->defaultList
-     * @return void
      */
     public function addField($field, $noCheck = false)
     {
@@ -353,8 +351,6 @@ abstract class AbstractTreeView
 
     /**
      * Resets the tree, recs, ids, ids_hierarchy and orig_ids_hierarchy internal variables. Use it if you need it.
-     *
-     * @return void
      */
     public function reset()
     {
@@ -620,7 +616,6 @@ abstract class AbstractTreeView
     /**
      * Get stored tree structure AND updating it if needed according to incoming PM GET var.
      *
-     * @return void
      * @access private
      */
     public function initializePositionSaving()
@@ -650,7 +645,6 @@ abstract class AbstractTreeView
      * Saves the content of ->stored (keeps track of expanded positions in the tree)
      * $this->treeName will be used as key for BE_USER->uc[] to store it in
      *
-     * @return void
      * @access private
      */
     public function savePosition()
@@ -997,7 +991,6 @@ abstract class AbstractTreeView
      * Getting the tree data: frees data handle
      *
      * @param mixed $res Data handle
-     * @return void
      * @access private
      */
     public function getDataFree(&$res)
@@ -1017,7 +1010,6 @@ abstract class AbstractTreeView
      * @param array $dataArr The input array, see examples below in this script.
      * @param bool $traverse Internal, for recursion.
      * @param int $pid Internal, for recursion.
-     * @return void
      */
     public function setDataFromArray(&$dataArr, $traverse = false, $pid = 0)
     {
@@ -1043,7 +1035,6 @@ abstract class AbstractTreeView
      *
      * @param array $treeArr Content for $this->data
      * @param array $treeLookupArr Content for $this->dataLookup
-     * @return void
      */
     public function setDataFromTreeArray(&$treeArr, &$treeLookupArr)
     {
diff --git a/typo3/sysext/backend/Classes/Tree/View/BrowseTreeView.php b/typo3/sysext/backend/Classes/Tree/View/BrowseTreeView.php
index 9e5068f4b7e35486fa32cc70479767e0effd6e68..a6298979e7f04b47b5fd8653306bd3a7c3100c45 100644
--- a/typo3/sysext/backend/Classes/Tree/View/BrowseTreeView.php
+++ b/typo3/sysext/backend/Classes/Tree/View/BrowseTreeView.php
@@ -77,7 +77,6 @@ class BrowseTreeView extends AbstractTreeView
      *
      * @param string $clause Additional clause for selecting pages.
      * @param string $orderByFields record ORDER BY field
-     * @return void
      */
     public function init($clause = '', $orderByFields = '')
     {
diff --git a/typo3/sysext/backend/Classes/Tree/View/ElementBrowserFolderTreeView.php b/typo3/sysext/backend/Classes/Tree/View/ElementBrowserFolderTreeView.php
index 75e3b6c8d0bb94d1af56c6a96ec1815edfb360aa..37963cd187fed23e3b2d324804fac0c4fa8c771c 100644
--- a/typo3/sysext/backend/Classes/Tree/View/ElementBrowserFolderTreeView.php
+++ b/typo3/sysext/backend/Classes/Tree/View/ElementBrowserFolderTreeView.php
@@ -40,8 +40,6 @@ class ElementBrowserFolderTreeView extends FolderTreeView
 
     /**
      * @param LinkParameterProviderInterface $linkParameterProvider
-     *
-     * @return void
      */
     public function setLinkParameterProvider(LinkParameterProviderInterface $linkParameterProvider)
     {
diff --git a/typo3/sysext/backend/Classes/Tree/View/ElementBrowserPageTreeView.php b/typo3/sysext/backend/Classes/Tree/View/ElementBrowserPageTreeView.php
index ff54f52338c320ad5a53b4540eef2c6370134958..dc6fe6fb721228c90840b2c99fb684b353557c97 100644
--- a/typo3/sysext/backend/Classes/Tree/View/ElementBrowserPageTreeView.php
+++ b/typo3/sysext/backend/Classes/Tree/View/ElementBrowserPageTreeView.php
@@ -56,8 +56,6 @@ class ElementBrowserPageTreeView extends BrowseTreeView
 
     /**
      * @param LinkParameterProviderInterface $linkParameterProvider
-     *
-     * @return void
      */
     public function setLinkParameterProvider(LinkParameterProviderInterface $linkParameterProvider)
     {
diff --git a/typo3/sysext/backend/Classes/Tree/View/FolderTreeView.php b/typo3/sysext/backend/Classes/Tree/View/FolderTreeView.php
index 8b01790a9e3c61dd23d22ea1f253913593c5650c..9468de8122ed239250f79c7328e9fd499c11100e 100644
--- a/typo3/sysext/backend/Classes/Tree/View/FolderTreeView.php
+++ b/typo3/sysext/backend/Classes/Tree/View/FolderTreeView.php
@@ -286,7 +286,6 @@ class FolderTreeView extends AbstractTreeView
      * Get a tree for one storage
      *
      * @param ResourceStorage $storageObject
-     * @return void
      */
     public function getBrowseableTreeForStorage(ResourceStorage $storageObject)
     {
@@ -590,7 +589,6 @@ class FolderTreeView extends AbstractTreeView
     /**
      * Get stored tree structure AND updating it if needed according to incoming PM GET var.
      *
-     * @return void
      * @access private
      */
     public function initializePositionSaving()
diff --git a/typo3/sysext/backend/Classes/Tree/View/PageTreeView.php b/typo3/sysext/backend/Classes/Tree/View/PageTreeView.php
index 335208615e99b75b73079e4c8b688cfbfcdc521e..35e4a504b835b44d037bbfff59336b39ed15f252 100644
--- a/typo3/sysext/backend/Classes/Tree/View/PageTreeView.php
+++ b/typo3/sysext/backend/Classes/Tree/View/PageTreeView.php
@@ -67,7 +67,6 @@ class PageTreeView extends AbstractTreeView
      *
      * @param string $clause Part of where query which will filter out non-readable pages.
      * @param string $orderByFields Record ORDER BY field
-     * @return void
      */
     public function init($clause = '', $orderByFields = '')
     {
@@ -107,7 +106,6 @@ class PageTreeView extends AbstractTreeView
      * Get stored tree structure AND updating it if needed according to incoming PM GET var.
      * - Here we just set it to nothing since we want to just render the tree, nothing more.
      *
-     * @return void
      * @access private
      */
     public function initializePositionSaving()
diff --git a/typo3/sysext/backend/Classes/Utility/BackendUtility.php b/typo3/sysext/backend/Classes/Utility/BackendUtility.php
index 26ac94960abd96233bff120a0abaa9f6a7abf00e..eaf10a9d9409169cd2a9e56dc1c34a9182865438 100644
--- a/typo3/sysext/backend/Classes/Utility/BackendUtility.php
+++ b/typo3/sysext/backend/Classes/Utility/BackendUtility.php
@@ -565,7 +565,6 @@ class BackendUtility
      *
      * @param int $pid Page id.
      * @param bool $clearExpansion If set, then other open branches are closed.
-     * @return void
      */
     public static function openPageTree($pid, $clearExpansion)
     {
@@ -1136,7 +1135,6 @@ class BackendUtility
      * @param string $hash 32 bit hash string (eg. a md5 hash of a serialized array identifying the data being stored)
      * @param mixed $data The data to store
      * @param string $ident $ident is just a textual identification in order to inform about the content!
-     * @return void
      */
     public static function storeHash($hash, $data, $ident)
     {
@@ -3457,7 +3455,6 @@ class BackendUtility
      *
      * @param string $set Key to set the update signal. When setting, this value contains strings telling WHAT to set. At this point it seems that the value "updatePageTree" is the only one it makes sense to set. If empty, all update signals will be removed.
      * @param mixed $params Additional information for the update signal, used to only refresh a branch of the tree
-     * @return void
      * @see BackendUtility::getUpdateSignalCode()
      */
     public static function setUpdateSignal($set = '', $params = '')
@@ -3701,7 +3698,6 @@ class BackendUtility
      * @param string $table Table name
      * @param int $uid Record uid
      * @param int $pid Record pid
-     * @return void
      * @internal
      */
     public static function lockRecords($table = '', $uid = 0, $pid = 0)
@@ -4403,7 +4399,6 @@ class BackendUtility
      * @param string $table Table name
      * @param array $rr Record array passed by reference. As minimum, "pid" and "uid" fields must exist! "t3ver_oid" and "t3ver_wsid" is nice and will save you a DB query.
      * @param bool $ignoreWorkspaceMatch Ignore workspace match
-     * @return void
      * @see PageRepository::fixVersioningPid()
      */
     public static function fixVersioningPid($table, &$rr, $ignoreWorkspaceMatch = false)
@@ -4466,7 +4461,6 @@ class BackendUtility
      * @param array $row Record array passed by reference. As minimum, the "uid" and  "pid" fields must exist! Fake fields cannot exist since the fields in the array is used as field names in the SQL look up. It would be nice to have fields like "t3ver_state" and "t3ver_mode_id" as well to avoid a new lookup inside movePlhOL().
      * @param int $wsid Workspace ID, if not specified will use static::getBackendUserAuthentication()->workspace
      * @param bool $unsetMovePointers If TRUE the function does not return a "pointer" row for moved records in a workspace
-     * @return void
      * @see fixVersioningPid()
      */
     public static function workspaceOL($table, &$row, $wsid = -99, $unsetMovePointers = false)
diff --git a/typo3/sysext/backend/Classes/View/BackendLayout/DataProviderInterface.php b/typo3/sysext/backend/Classes/View/BackendLayout/DataProviderInterface.php
index 3a2f23b467627d1ae4f9f6a06a991ecadf86f91f..8839d98e5d7334ad0be04f10dd4fbc8b746aa455 100644
--- a/typo3/sysext/backend/Classes/View/BackendLayout/DataProviderInterface.php
+++ b/typo3/sysext/backend/Classes/View/BackendLayout/DataProviderInterface.php
@@ -25,7 +25,6 @@ interface DataProviderInterface
      *
      * @param DataProviderContext $dataProviderContext
      * @param BackendLayoutCollection $backendLayoutCollection
-     * @return void
      */
     public function addBackendLayouts(DataProviderContext $dataProviderContext, BackendLayoutCollection $backendLayoutCollection);
 
diff --git a/typo3/sysext/backend/Classes/View/BackendLayout/DefaultDataProvider.php b/typo3/sysext/backend/Classes/View/BackendLayout/DefaultDataProvider.php
index 0083b7dc3f8a49afafefddf3ceea7b738004895c..45e6d4b2525185f503a1d25c96d71399810c3bd6 100644
--- a/typo3/sysext/backend/Classes/View/BackendLayout/DefaultDataProvider.php
+++ b/typo3/sysext/backend/Classes/View/BackendLayout/DefaultDataProvider.php
@@ -37,7 +37,6 @@ class DefaultDataProvider implements DataProviderInterface
      *
      * @param DataProviderContext $dataProviderContext
      * @param BackendLayoutCollection $backendLayoutCollection
-     * @return void
      */
     public function addBackendLayouts(
         DataProviderContext $dataProviderContext,
diff --git a/typo3/sysext/backend/Classes/View/BackendLayoutView.php b/typo3/sysext/backend/Classes/View/BackendLayoutView.php
index 349af7d99f00df0e9aecbea5d7b9d0dcb87ad4f2..ddcef7eaa6656a56c029736401d85e1ceccbdc17 100644
--- a/typo3/sysext/backend/Classes/View/BackendLayoutView.php
+++ b/typo3/sysext/backend/Classes/View/BackendLayoutView.php
@@ -49,8 +49,6 @@ class BackendLayoutView implements \TYPO3\CMS\Core\SingletonInterface
 
     /**
      * Initializes data providers
-     *
-     * @return void
      */
     protected function initializeDataProviderCollection()
     {
@@ -240,7 +238,6 @@ class BackendLayoutView implements \TYPO3\CMS\Core\SingletonInterface
      * for tt_content.colPos.
      *
      * @param array $parameters
-     * @return void
      */
     public function colPosListItemProcFunc(array $parameters)
     {
diff --git a/typo3/sysext/backend/Classes/View/BackendTemplateView.php b/typo3/sysext/backend/Classes/View/BackendTemplateView.php
index 17c42a4b33bc5fb2af050af2bb99f68b545892de..c715627b89163c7b29a4c71ac565c01c620c5889 100644
--- a/typo3/sysext/backend/Classes/View/BackendTemplateView.php
+++ b/typo3/sysext/backend/Classes/View/BackendTemplateView.php
@@ -82,7 +82,6 @@ class BackendTemplateView implements ViewInterface
      * Sets the current controller context
      *
      * @param \TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext $controllerContext Controller context which is available inside the view
-     * @return void
      * @api
      */
     public function setControllerContext(\TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext $controllerContext)
@@ -142,7 +141,6 @@ class BackendTemplateView implements ViewInterface
      * Set the root path(s) to the templates.
      *
      * @param array $templateRootPaths Root path(s) to the templates.
-     * @return void
      * @api
      */
     public function setTemplateRootPaths(array $templateRootPaths)
@@ -154,7 +152,6 @@ class BackendTemplateView implements ViewInterface
      * Set the root path(s) to the partials.
      *
      * @param array $partialRootPaths Root paths to the partials.
-     * @return void
      * @api
      */
     public function setPartialRootPaths(array $partialRootPaths)
@@ -166,7 +163,6 @@ class BackendTemplateView implements ViewInterface
      * Set the root path(s) to the layouts.
      *
      * @param array $layoutRootPaths Root path to the layouts.
-     * @return void
      * @api
      */
     public function setLayoutRootPaths(array $layoutRootPaths)
diff --git a/typo3/sysext/backend/Classes/View/PageLayoutView.php b/typo3/sysext/backend/Classes/View/PageLayoutView.php
index d790422423127197879dff835c7c66974b2161f2..77bafe25ee135b04f8cb8df7885d753b349c5623 100644
--- a/typo3/sysext/backend/Classes/View/PageLayoutView.php
+++ b/typo3/sysext/backend/Classes/View/PageLayoutView.php
@@ -2239,7 +2239,6 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
     /**
      * Initializes the clipboard for generating paste links
      *
-     * @return void
      *
      * @see \TYPO3\CMS\Recordlist\RecordList::main()
      * @see \TYPO3\CMS\Backend\Controller\ContextMenuController::clipboardAction()
@@ -2267,7 +2266,6 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
      * Generates the data for previous and next elements which is needed for movements.
      *
      * @param array $rowArray
-     * @return void
      */
     protected function generateTtContentDataArray(array $rowArray)
     {
@@ -2371,7 +2369,6 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
      * @param string $fieldList Comma separated list of fields.
      * @param array $row Record from which to take values for processing.
      * @param array $info Array to which the processed values are added.
-     * @return void
      */
     public function getProcessedValue($table, $fieldList, array $row, array &$info)
     {
diff --git a/typo3/sysext/backend/Classes/View/PageLayoutViewDrawFooterHookInterface.php b/typo3/sysext/backend/Classes/View/PageLayoutViewDrawFooterHookInterface.php
index ca249305e80c662afade3501edab96321f8c82e3..2257922eefe7e5bf6318ca2a6e342fc507eeff16 100644
--- a/typo3/sysext/backend/Classes/View/PageLayoutViewDrawFooterHookInterface.php
+++ b/typo3/sysext/backend/Classes/View/PageLayoutViewDrawFooterHookInterface.php
@@ -17,7 +17,6 @@ namespace TYPO3\CMS\Backend\View;
 /**
  * Interface for classes which hook into PageLayoutView and do additional
  * tt_content_drawFooter processing.
- *
  */
 interface PageLayoutViewDrawFooterHookInterface
 {
@@ -27,7 +26,6 @@ interface PageLayoutViewDrawFooterHookInterface
      * @param \TYPO3\CMS\Backend\View\PageLayoutView $parentObject Calling parent object
      * @param string $info Processed values
      * @param array $row Record row of tt_content
-     * @return void
      */
     public function preProcess(\TYPO3\CMS\Backend\View\PageLayoutView &$parentObject, &$info, array &$row);
 }
diff --git a/typo3/sysext/backend/Classes/View/PageLayoutViewDrawItemHookInterface.php b/typo3/sysext/backend/Classes/View/PageLayoutViewDrawItemHookInterface.php
index 1a715761f88a6606492337158c2b5d46103d3a86..45c2c60c3dc84fd5e068c97d9e0aa05b53ce6ce2 100644
--- a/typo3/sysext/backend/Classes/View/PageLayoutViewDrawItemHookInterface.php
+++ b/typo3/sysext/backend/Classes/View/PageLayoutViewDrawItemHookInterface.php
@@ -28,7 +28,6 @@ interface PageLayoutViewDrawItemHookInterface
      * @param string $headerContent Header content
      * @param string $itemContent Item content
      * @param array $row Record row of tt_content
-     * @return void
      */
     public function preProcess(\TYPO3\CMS\Backend\View\PageLayoutView &$parentObject, &$drawItem, &$headerContent, &$itemContent, array &$row);
 }
diff --git a/typo3/sysext/backend/Classes/Wizard/NewContentElementWizardHookInterface.php b/typo3/sysext/backend/Classes/Wizard/NewContentElementWizardHookInterface.php
index 325837859f994b51568a7cd4517597a256b31d61..da4769f24c9a2fcb301f7073d549f06afae82e32 100644
--- a/typo3/sysext/backend/Classes/Wizard/NewContentElementWizardHookInterface.php
+++ b/typo3/sysext/backend/Classes/Wizard/NewContentElementWizardHookInterface.php
@@ -25,7 +25,6 @@ interface NewContentElementWizardHookInterface
      *
      * @param array $wizardItems Array of Wizard Items
      * @param \TYPO3\CMS\Backend\Controller\ContentElement\NewContentElementController $parentObject Parent object New Content element wizard
-     * @return void
      */
     public function manipulateWizardItems(&$wizardItems, &$parentObject);
 }
diff --git a/typo3/sysext/backend/Tests/Functional/Controller/Page/LocalizationControllerTest.php b/typo3/sysext/backend/Tests/Functional/Controller/Page/LocalizationControllerTest.php
index 5f5979935d2cf0ce337e92ac00b8b07433fefcd4..bd0a31fefa5a9f674e69b6e898a4a63d9064aef5 100644
--- a/typo3/sysext/backend/Tests/Functional/Controller/Page/LocalizationControllerTest.php
+++ b/typo3/sysext/backend/Tests/Functional/Controller/Page/LocalizationControllerTest.php
@@ -31,8 +31,6 @@ class LocalizationControllerTest extends \TYPO3\TestingFramework\Core\Functional
 
     /**
      * Sets up this test case.
-     *
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/backend/Tests/Functional/Domain/Repository/Localization/LocalizationRepositoryTest.php b/typo3/sysext/backend/Tests/Functional/Domain/Repository/Localization/LocalizationRepositoryTest.php
index 92a504a84d6b232265aa0286ca6fb8441d30bd3f..70d42be6e26e8e7165e7e46f837b39f716d86c7b 100644
--- a/typo3/sysext/backend/Tests/Functional/Domain/Repository/Localization/LocalizationRepositoryTest.php
+++ b/typo3/sysext/backend/Tests/Functional/Domain/Repository/Localization/LocalizationRepositoryTest.php
@@ -29,8 +29,6 @@ class LocalizationRepositoryTest extends \TYPO3\TestingFramework\Core\Functional
 
     /**
      * Sets up this test case.
-     *
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/backend/Tests/Functional/Utility/BackendUtilityTest.php b/typo3/sysext/backend/Tests/Functional/Utility/BackendUtilityTest.php
index 6d0b903dc1cf84ebbcb7d7b563247c58be3b371f..2a7caed33c0cc1e5990f96119c6974cb433f5c9e 100644
--- a/typo3/sysext/backend/Tests/Functional/Utility/BackendUtilityTest.php
+++ b/typo3/sysext/backend/Tests/Functional/Utility/BackendUtilityTest.php
@@ -25,8 +25,6 @@ class BackendUtilityTest extends \TYPO3\TestingFramework\Core\Functional\Functio
 {
     /**
      * Sets up this test case.
-     *
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/backend/Tests/Unit/Template/Components/Button/FullyRenderedButtonTest.php b/typo3/sysext/backend/Tests/Unit/Template/Components/Button/FullyRenderedButtonTest.php
index cfd5b5f9dbe55e802a4d1475a898115144eca777..68e0d2b72c54be48d31c974b7a34b41c3e6b236d 100644
--- a/typo3/sysext/backend/Tests/Unit/Template/Components/Button/FullyRenderedButtonTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Template/Components/Button/FullyRenderedButtonTest.php
@@ -25,7 +25,6 @@ class FullyRenderedButtonTest extends \TYPO3\TestingFramework\Core\Unit\UnitTest
      * Try to valide an empty button
      *
      * @test
-     * @return void
      */
     public function isButtonValidBlankCallExpectFalse()
     {
@@ -38,7 +37,6 @@ class FullyRenderedButtonTest extends \TYPO3\TestingFramework\Core\Unit\UnitTest
      * Tests a valid HTML Button
      *
      * @test
-     * @return void
      */
     public function isButtonValidHtmlSourceGivenExpectTrue()
     {
diff --git a/typo3/sysext/backend/Tests/Unit/Template/Components/Button/InputButtonTest.php b/typo3/sysext/backend/Tests/Unit/Template/Components/Button/InputButtonTest.php
index 3a79bda4c2dc53b39d63cc7009759a880f2f724a..365fe4b69f0df7dadfaae524cf92667a0e5f5082 100644
--- a/typo3/sysext/backend/Tests/Unit/Template/Components/Button/InputButtonTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Template/Components/Button/InputButtonTest.php
@@ -26,7 +26,6 @@ class InputButtonTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
      * Try to validate an empty button
      *
      * @test
-     * @return void
      */
     public function isButtonValidBlankCallExpectFalse()
     {
@@ -39,7 +38,6 @@ class InputButtonTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
      * Omit the Icon
      *
      * @test
-     * @return void
      */
     public function isButtonValidOmittedIconExpectFalse()
     {
@@ -53,7 +51,6 @@ class InputButtonTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
      * Omit the title
      *
      * @test
-     * @return void
      */
     public function isButtonValidOmittedTitleExpectFalse()
     {
@@ -68,7 +65,6 @@ class InputButtonTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
      * Omit the name
      *
      * @test
-     * @return void
      */
     public function isButtonValidOmittedNameExpectFalse()
     {
@@ -83,7 +79,6 @@ class InputButtonTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
      * Omit the Value
      *
      * @test
-     * @return void
      */
     public function isButtonValidOmittedValueExpectFalse()
     {
@@ -98,7 +93,6 @@ class InputButtonTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
      * Set a 100% valid button
      *
      * @test
-     * @return void
      */
     public function isButtonValidAllValuesSetExpectTrue()
     {
diff --git a/typo3/sysext/backend/Tests/Unit/Template/Components/Button/LinkButtonTest.php b/typo3/sysext/backend/Tests/Unit/Template/Components/Button/LinkButtonTest.php
index 23d111321147ffb18f6b0cf8532166c84b34ec0a..ef7200c8a939ae65b29295256320c26ade42b400 100644
--- a/typo3/sysext/backend/Tests/Unit/Template/Components/Button/LinkButtonTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Template/Components/Button/LinkButtonTest.php
@@ -26,7 +26,6 @@ class LinkButtonTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
      * Try validating an empty button
      *
      * @test
-     * @return void
      */
     public function isButtonValidBlankCallExpectFalse()
     {
@@ -39,7 +38,6 @@ class LinkButtonTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
      * Omit the Icon
      *
      * @test
-     * @return void
      */
     public function isButtonValidOmittedIconExpectFalse()
     {
@@ -53,7 +51,6 @@ class LinkButtonTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
      * Omit the title
      *
      * @test
-     * @return void
      */
     public function isButtonValidOmittedTitleExpectFalse()
     {
@@ -68,7 +65,6 @@ class LinkButtonTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
      * Omit Href
      *
      * @test
-     * @return void
      */
     public function isButtonValidOmittedHrefExpectFalse()
     {
@@ -83,7 +79,6 @@ class LinkButtonTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
      * Send a valid button
      *
      * @test
-     * @return void
      */
     public function isButtonValidAllValuesSetExpectTrue()
     {
diff --git a/typo3/sysext/backend/Tests/Unit/Template/Components/Button/SplitButtonTest.php b/typo3/sysext/backend/Tests/Unit/Template/Components/Button/SplitButtonTest.php
index 93ae339a0d9e653ac65cebe0533d6880db60ff4f..c922a6c366c92ad53769eebdba53801d7ac6b0e4 100644
--- a/typo3/sysext/backend/Tests/Unit/Template/Components/Button/SplitButtonTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Template/Components/Button/SplitButtonTest.php
@@ -27,7 +27,6 @@ class SplitButtonTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
      * Try to validate an empty button
      *
      * @test
-     * @return void
      */
     public function isButtonValidBlankCallExpectFalse()
     {
@@ -40,7 +39,6 @@ class SplitButtonTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
      * Try adding an invalid button to a splitButton
      *
      * @test
-     * @return void
      */
     public function isButtonValidInvalidButtonGivenExpectFalse()
     {
@@ -59,7 +57,6 @@ class SplitButtonTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
      * Try to add multiple primary actions
      *
      * @test
-     * @return void
      */
     public function isButtonValidBrokenSetupMultiplePrimaryActionsGivenExpectFalse()
     {
@@ -84,7 +81,6 @@ class SplitButtonTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
      * Try to add an invalid button as second parameter
      *
      * @test
-     * @return void
      */
     public function isButtonValidBrokenSetupInvalidButtonAsSecondParametersGivenExpectFalse()
     {
@@ -109,7 +105,6 @@ class SplitButtonTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
      * Send in a valid button
      *
      * @test
-     * @return void
      */
     public function isButtonValidValidSetupExpectTrue()
     {
diff --git a/typo3/sysext/backend/Tests/Unit/Template/Components/Menu/MenuItemTest.php b/typo3/sysext/backend/Tests/Unit/Template/Components/Menu/MenuItemTest.php
index 81bf400e76f0d4c4db2b05a09fd2c1c4c4bae6b9..358bb4daa5c57c07f8d53ff551587821eead9497 100644
--- a/typo3/sysext/backend/Tests/Unit/Template/Components/Menu/MenuItemTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Template/Components/Menu/MenuItemTest.php
@@ -25,7 +25,6 @@ class MenuItemTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
      * Try a blank menu Item
      *
      * @test
-     * @return void
      */
     public function isMenuItemValidBlankCallExpectFalse()
     {
@@ -38,7 +37,6 @@ class MenuItemTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
      * Try omitting the title and a Href
      *
      * @test
-     * @return void
      */
     public function isMenuItemValidOmittedHrefAndRouteExpectFalse()
     {
@@ -52,7 +50,6 @@ class MenuItemTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
      * Try omitting the title
      *
      * @test
-     * @return void
      */
     public function isMenuItemValidOmittedTitleExpectFalse()
     {
@@ -66,7 +63,6 @@ class MenuItemTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
      * Set a valid title and href
      *
      * @test
-     * @return void
      */
     public function isMenuItemValidSetValidHrefAndTitleExpectTrue()
     {
diff --git a/typo3/sysext/backend/Tests/Unit/Template/Components/MenuTest.php b/typo3/sysext/backend/Tests/Unit/Template/Components/MenuTest.php
index d3425dd2b08fcc46b838535e5b60c4a8be06143f..7da3c26b21e62f621fe93979d9c857f8488f48cc 100644
--- a/typo3/sysext/backend/Tests/Unit/Template/Components/MenuTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Template/Components/MenuTest.php
@@ -26,7 +26,6 @@ class MenuTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
      * Try setting an empty menu
      *
      * @test
-     * @return void
      */
     public function isMenuValidBlankCallExpectFalse()
     {
@@ -39,7 +38,6 @@ class MenuTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
      * Set a valid menu
      *
      * @test
-     * @return void
      */
     public function isMenuValidValidMenuWithDefaultsExpectTrue()
     {
@@ -53,7 +51,6 @@ class MenuTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
      * Set a valid menu
      *
      * @test
-     * @return void
      */
     public function makeMenuAllGoodExpectTrue()
     {
@@ -69,7 +66,6 @@ class MenuTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
      * Tests if empty menus get removed from the stack
      *
      * @test
-     * @return void
      */
     public function getMenusremovedEmptyMenusExpectsEquals()
     {
diff --git a/typo3/sysext/belog/Classes/Controller/AbstractController.php b/typo3/sysext/belog/Classes/Controller/AbstractController.php
index c35405057c73097159e147f0998de1cb314f3bc5..8e21899e60e4683701150a0c1dbec3c707731ed7 100644
--- a/typo3/sysext/belog/Classes/Controller/AbstractController.php
+++ b/typo3/sysext/belog/Classes/Controller/AbstractController.php
@@ -94,7 +94,6 @@ abstract class AbstractController extends ActionController
      * Initialize the view
      *
      * @param ViewInterface $view The view
-     * @return void
      */
     protected function initializeView(ViewInterface $view)
     {
@@ -107,7 +106,6 @@ abstract class AbstractController extends ActionController
 
     /**
      * init all actions
-     * @return void
      */
     public function initializeAction()
     {
@@ -119,7 +117,6 @@ abstract class AbstractController extends ActionController
     /**
      * Initialize index action
      *
-     * @return void
      * @throws \RuntimeException
      */
     public function initializeIndexAction()
@@ -147,7 +144,6 @@ abstract class AbstractController extends ActionController
      * Show general information and the installed modules
      *
      * @param \TYPO3\CMS\Belog\Domain\Model\Constraint $constraint
-     * @return void
      */
     public function indexAction(\TYPO3\CMS\Belog\Domain\Model\Constraint $constraint = null)
     {
@@ -188,7 +184,6 @@ abstract class AbstractController extends ActionController
      * Save current constraint object in be user settings (uC)
      *
      * @param \TYPO3\CMS\Belog\Domain\Model\Constraint $constraint
-     * @return void
      */
     protected function persistConstraintInBeUserData(\TYPO3\CMS\Belog\Domain\Model\Constraint $constraint)
     {
@@ -290,7 +285,6 @@ abstract class AbstractController extends ActionController
      * and the workspace selector is not shown.
      *
      * @param \TYPO3\CMS\Belog\Domain\Model\Constraint $constraint
-     * @return void
      */
     protected function forceWorkspaceSelectionIfInWorkspace(\TYPO3\CMS\Belog\Domain\Model\Constraint $constraint)
     {
@@ -325,7 +319,6 @@ abstract class AbstractController extends ActionController
      * Calculate the start- and end timestamp from the different time selector options
      *
      * @param \TYPO3\CMS\Belog\Domain\Model\Constraint $constraint
-     * @return void
      */
     protected function setStartAndEndTimeFromTimeSelector(\TYPO3\CMS\Belog\Domain\Model\Constraint $constraint)
     {
diff --git a/typo3/sysext/belog/Classes/Controller/WebInfoController.php b/typo3/sysext/belog/Classes/Controller/WebInfoController.php
index 54675cc74d0e4ed30ea717d7bb34918e30c3cd32..c0085d0560fd501cd585eeec6f99d7c96fb852ae 100644
--- a/typo3/sysext/belog/Classes/Controller/WebInfoController.php
+++ b/typo3/sysext/belog/Classes/Controller/WebInfoController.php
@@ -21,8 +21,6 @@ class WebInfoController extends \TYPO3\CMS\Belog\Controller\AbstractController
 {
     /**
      * Set context to 'in page mode'
-     *
-     * @return void
      */
     public function initializeAction()
     {
diff --git a/typo3/sysext/belog/Classes/Domain/Model/Constraint.php b/typo3/sysext/belog/Classes/Domain/Model/Constraint.php
index 64073afdb8c61116a29c2bbf9b67f99a2b7cde02..de629c1691343f1566f23434cb179dcf939b4759 100644
--- a/typo3/sysext/belog/Classes/Domain/Model/Constraint.php
+++ b/typo3/sysext/belog/Classes/Domain/Model/Constraint.php
@@ -130,7 +130,6 @@ class Constraint extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Set user
      *
      * @param string $user
-     * @return void
      */
     public function setUserOrGroup($user)
     {
@@ -151,7 +150,6 @@ class Constraint extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Set number of log rows to show
      *
      * @param int $number
-     * @return void
      */
     public function setNumber($number)
     {
@@ -172,7 +170,6 @@ class Constraint extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Set workspace
      *
      * @param string $workspace
-     * @return void
      */
     public function setWorkspaceUid($workspace)
     {
@@ -193,7 +190,6 @@ class Constraint extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Set time frame
      *
      * @param int $timeFrame
-     * @return void
      */
     public function setTimeFrame($timeFrame)
     {
@@ -214,7 +210,6 @@ class Constraint extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Set action
      *
      * @param int $action
-     * @return void
      */
     public function setAction($action)
     {
@@ -235,7 +230,6 @@ class Constraint extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Set group by page
      *
      * @param bool $groupByPage
-     * @return void
      */
     public function setGroupByPage($groupByPage)
     {
@@ -256,7 +250,6 @@ class Constraint extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Set calculated start timestamp from query constraints
      *
      * @param int $timestamp
-     * @return void
      */
     public function setStartTimestamp($timestamp)
     {
@@ -277,7 +270,6 @@ class Constraint extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Set calculated end timestamp from query constraints
      *
      * @param int $timestamp
-     * @return void
      */
     public function setEndTimestamp($timestamp)
     {
@@ -298,7 +290,6 @@ class Constraint extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Set page context
      *
      * @param bool $pageContext
-     * @return void
      */
     public function setIsInPageContext($pageContext)
     {
@@ -319,7 +310,6 @@ class Constraint extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Set page id
      *
      * @param int $id
-     * @return void
      */
     public function setPageId($id)
     {
@@ -340,7 +330,6 @@ class Constraint extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Set page level depth
      *
      * @param int $depth
-     * @return void
      */
     public function setDepth($depth)
     {
@@ -361,7 +350,6 @@ class Constraint extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Set manual date start
      *
      * @param \DateTime $manualDateStart
-     * @return void
      */
     public function setManualDateStart(\DateTime $manualDateStart = null)
     {
@@ -382,7 +370,6 @@ class Constraint extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Set manual date stop
      *
      * @param \DateTime $manualDateStop
-     * @return void
      */
     public function setManualDateStop(\DateTime $manualDateStop = null)
     {
diff --git a/typo3/sysext/belog/Classes/Domain/Model/HistoryEntry.php b/typo3/sysext/belog/Classes/Domain/Model/HistoryEntry.php
index 3c7c808b1afffcc458b03201c455d0b0c2f7a424..348901cba7ccff34b2e0522ac72fc05506581822 100644
--- a/typo3/sysext/belog/Classes/Domain/Model/HistoryEntry.php
+++ b/typo3/sysext/belog/Classes/Domain/Model/HistoryEntry.php
@@ -30,7 +30,6 @@ class HistoryEntry extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Set list of changed fields
      *
      * @param string $fieldlist
-     * @return void
      */
     public function setFieldlist($fieldlist)
     {
diff --git a/typo3/sysext/belog/Classes/Domain/Model/LogEntry.php b/typo3/sysext/belog/Classes/Domain/Model/LogEntry.php
index ed1d17ee0d4edfdfd01ae3eaad5365f3af80fde1..ab1ea1e2988feb3869b4a23f006a9eae53fc3949 100644
--- a/typo3/sysext/belog/Classes/Domain/Model/LogEntry.php
+++ b/typo3/sysext/belog/Classes/Domain/Model/LogEntry.php
@@ -142,7 +142,6 @@ class LogEntry extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Set pid
      *
      * @param int $pid
-     * @return void
      */
     public function setPid($pid)
     {
@@ -163,7 +162,6 @@ class LogEntry extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Set backend user uid
      *
      * @param int $beUserUid
-     * @return void
      */
     public function setBackendUserUid($beUserUid)
     {
@@ -184,7 +182,6 @@ class LogEntry extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Set action
      *
      * @param int $action
-     * @return void
      */
     public function setAction($action)
     {
@@ -205,7 +202,6 @@ class LogEntry extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Set record uid
      *
      * @param int $recordUid
-     * @return void
      */
     public function setRecordUid($recordUid)
     {
@@ -226,7 +222,6 @@ class LogEntry extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Set table name
      *
      * @param string $tableName
-     * @return void
      */
     public function setTableName($tableName)
     {
@@ -247,7 +242,6 @@ class LogEntry extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Set record pid
      *
      * @param int $recordPid
-     * @return void
      */
     public function setRecordPid($recordPid)
     {
@@ -268,7 +262,6 @@ class LogEntry extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Set error
      *
      * @param int $error
-     * @return void
      */
     public function setError($error)
     {
@@ -289,7 +282,6 @@ class LogEntry extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Set details
      *
      * @param string $details
-     * @return void
      */
     public function setDetails($details)
     {
@@ -310,7 +302,6 @@ class LogEntry extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Set tstamp
      *
      * @param int $tstamp
-     * @return void
      */
     public function setTstamp($tstamp)
     {
@@ -331,7 +322,6 @@ class LogEntry extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Set type
      *
      * @param int $type
-     * @return void
      */
     public function setType($type)
     {
@@ -352,7 +342,6 @@ class LogEntry extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Set details number
      *
      * @param int $detailsNumber
-     * @return void
      */
     public function setDetailsNumber($detailsNumber)
     {
@@ -373,7 +362,6 @@ class LogEntry extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Set ip
      *
      * @param string $ip
-     * @return void
      */
     public function setIp($ip)
     {
@@ -394,7 +382,6 @@ class LogEntry extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Set log data
      *
      * @param string $logData
-     * @return void
      */
     public function setLogData($logData)
     {
@@ -422,7 +409,6 @@ class LogEntry extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Set event pid
      *
      * @param int $eventPid
-     * @return void
      */
     public function setEventPid($eventPid)
     {
@@ -443,7 +429,6 @@ class LogEntry extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Set workspace uid
      *
      * @param int $workspaceUid
-     * @return void
      */
     public function setWorkspaceUid($workspaceUid)
     {
@@ -464,7 +449,6 @@ class LogEntry extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Set new id
      *
      * @param string $newId
-     * @return void
      */
     public function setNewId($newId)
     {
diff --git a/typo3/sysext/belog/Classes/Domain/Model/Workspace.php b/typo3/sysext/belog/Classes/Domain/Model/Workspace.php
index a688a7a34b7a4c6baf97a89bec5b28f5791cc3a8..4e6075666a11dfe96f4662f65da7f88d2f0da3f1 100644
--- a/typo3/sysext/belog/Classes/Domain/Model/Workspace.php
+++ b/typo3/sysext/belog/Classes/Domain/Model/Workspace.php
@@ -42,7 +42,6 @@ class Workspace extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Set workspace title
      *
      * @param string $title
-     * @return void
      */
     public function setTitle($title)
     {
diff --git a/typo3/sysext/belog/Classes/Domain/Repository/HistoryEntryRepository.php b/typo3/sysext/belog/Classes/Domain/Repository/HistoryEntryRepository.php
index 437b821f9adc4cf64429336e3a3612c624fe8a7d..d0764b9f1eaef6d2ce404860d8c7cd5e6d83255c 100644
--- a/typo3/sysext/belog/Classes/Domain/Repository/HistoryEntryRepository.php
+++ b/typo3/sysext/belog/Classes/Domain/Repository/HistoryEntryRepository.php
@@ -21,8 +21,6 @@ class HistoryEntryRepository extends \TYPO3\CMS\Extbase\Persistence\Repository
 {
     /**
      * Initializes the repository.
-     *
-     * @return void
      */
     public function initializeObject()
     {
diff --git a/typo3/sysext/belog/Classes/Domain/Repository/LogEntryRepository.php b/typo3/sysext/belog/Classes/Domain/Repository/LogEntryRepository.php
index bd8d1039849bf4d978ff0d804aa7211ac369f95b..5aacb46e0bf8740b504c6e94eca9e61bfb332237 100644
--- a/typo3/sysext/belog/Classes/Domain/Repository/LogEntryRepository.php
+++ b/typo3/sysext/belog/Classes/Domain/Repository/LogEntryRepository.php
@@ -31,8 +31,6 @@ class LogEntryRepository extends \TYPO3\CMS\Extbase\Persistence\Repository
 
     /**
      * Initialize some local variables to be used during creation of objects
-     *
-     * @return void
      */
     public function initializeObject()
     {
@@ -99,7 +97,6 @@ class LogEntryRepository extends \TYPO3\CMS\Extbase\Persistence\Repository
      * @param \TYPO3\CMS\Belog\Domain\Model\Constraint $constraint
      * @param \TYPO3\CMS\Extbase\Persistence\QueryInterface $query
      * @param array &$queryConstraints the query constraints to add to, will be modified
-     * @return void
      */
     protected function addPageTreeConstraintsToQuery(\TYPO3\CMS\Belog\Domain\Model\Constraint $constraint, \TYPO3\CMS\Extbase\Persistence\QueryInterface $query, array &$queryConstraints)
     {
@@ -127,7 +124,6 @@ class LogEntryRepository extends \TYPO3\CMS\Extbase\Persistence\Repository
      * @param \TYPO3\CMS\Belog\Domain\Model\Constraint $constraint
      * @param \TYPO3\CMS\Extbase\Persistence\QueryInterface $query
      * @param array &$queryConstraints the query constraints to add to, will be modified
-     * @return void
      */
     protected function addUsersAndGroupsToQueryConstraints(\TYPO3\CMS\Belog\Domain\Model\Constraint $constraint, \TYPO3\CMS\Extbase\Persistence\QueryInterface $query, array &$queryConstraints)
     {
diff --git a/typo3/sysext/belog/Classes/Domain/Repository/WorkspaceRepository.php b/typo3/sysext/belog/Classes/Domain/Repository/WorkspaceRepository.php
index d0c514b965f84bfcf593aa7d24da4c0b56d24ba0..7fa850e4b2200cdc78454c36b2faadd6380e8483 100644
--- a/typo3/sysext/belog/Classes/Domain/Repository/WorkspaceRepository.php
+++ b/typo3/sysext/belog/Classes/Domain/Repository/WorkspaceRepository.php
@@ -22,8 +22,6 @@ class WorkspaceRepository extends \TYPO3\CMS\Extbase\Persistence\Repository
 {
     /**
      * Initializes the repository.
-     *
-     * @return void
      */
     public function initializeObject()
     {
diff --git a/typo3/sysext/belog/Classes/Module/BackendLogModuleBootstrap.php b/typo3/sysext/belog/Classes/Module/BackendLogModuleBootstrap.php
index f001ce81be807a65401d245d69c8a6fe73bf0d10..13f366b8a02ffca8174a256f67bff8e8a7afc9e5 100644
--- a/typo3/sysext/belog/Classes/Module/BackendLogModuleBootstrap.php
+++ b/typo3/sysext/belog/Classes/Module/BackendLogModuleBootstrap.php
@@ -26,8 +26,6 @@ class BackendLogModuleBootstrap
 {
     /**
      * Dummy method, called by SCbase external object handling
-     *
-     * @return void
      */
     public function init()
     {
@@ -35,8 +33,6 @@ class BackendLogModuleBootstrap
 
     /**
      * Dummy method, called by SCbase external object handling
-     *
-     * @return void
      */
     public function checkExtObj()
     {
diff --git a/typo3/sysext/belog/Classes/ViewHelpers/Form/TranslateLabelSelectViewHelper.php b/typo3/sysext/belog/Classes/ViewHelpers/Form/TranslateLabelSelectViewHelper.php
index d37c1082b43e940e328f33be86cc109464180a82..1a9e60b7ea0552b0c8698d094641dfbc7762dea2 100644
--- a/typo3/sysext/belog/Classes/ViewHelpers/Form/TranslateLabelSelectViewHelper.php
+++ b/typo3/sysext/belog/Classes/ViewHelpers/Form/TranslateLabelSelectViewHelper.php
@@ -29,7 +29,6 @@ class TranslateLabelSelectViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Form\S
     /**
      * Initialize arguments.
      *
-     * @return void
      * @api
      */
     public function initializeArguments()
diff --git a/typo3/sysext/belog/Tests/Unit/Domain/Model/ConstraintTest.php b/typo3/sysext/belog/Tests/Unit/Domain/Model/ConstraintTest.php
index ae7d87d08d319a7c52052ff4dc572a65adc2c8a9..ff0edbb3deff4126858e1934fd2acc9cab7d8b99 100644
--- a/typo3/sysext/belog/Tests/Unit/Domain/Model/ConstraintTest.php
+++ b/typo3/sysext/belog/Tests/Unit/Domain/Model/ConstraintTest.php
@@ -16,7 +16,6 @@ namespace TYPO3\CMS\Belog\Tests\Unit\Domain\Model;
 
 /**
  * Test case
- *
  */
 class ConstraintTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 {
diff --git a/typo3/sysext/belog/Tests/Unit/Domain/Model/LogEntryTest.php b/typo3/sysext/belog/Tests/Unit/Domain/Model/LogEntryTest.php
index fc00247a2537e219b94762f6986979eb76c27493..590028438938435fb660cd99eb1e0723f289a49d 100644
--- a/typo3/sysext/belog/Tests/Unit/Domain/Model/LogEntryTest.php
+++ b/typo3/sysext/belog/Tests/Unit/Domain/Model/LogEntryTest.php
@@ -16,7 +16,6 @@ namespace TYPO3\CMS\Belog\Tests\Unit\Domain\Model;
 
 /**
  * Test case
- *
  */
 class LogEntryTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 {
diff --git a/typo3/sysext/beuser/Classes/Controller/BackendUserActionController.php b/typo3/sysext/beuser/Classes/Controller/BackendUserActionController.php
index eab02dcc2a19fd92cb18711640562e25434ca869..cc24eb1b989b2e421aec3f47fd0be676a1e415c9 100644
--- a/typo3/sysext/beuser/Classes/Controller/BackendUserActionController.php
+++ b/typo3/sysext/beuser/Classes/Controller/BackendUserActionController.php
@@ -48,7 +48,6 @@ class BackendUserActionController extends ActionController
      * Set up the doc header properly here
      *
      * @param ViewInterface $view
-     * @return void
      */
     protected function initializeView(ViewInterface $view)
     {
@@ -68,8 +67,6 @@ class BackendUserActionController extends ActionController
 
     /**
      * Generates the action menu
-     *
-     * @return void
      */
     protected function generateMenu()
     {
@@ -115,7 +112,6 @@ class BackendUserActionController extends ActionController
     /**
      * Registers the Icons into the docheader
      *
-     * @return void
      * @throws \InvalidArgumentException
      */
     protected function registerDocheaderButtons()
diff --git a/typo3/sysext/beuser/Classes/Controller/BackendUserController.php b/typo3/sysext/beuser/Classes/Controller/BackendUserController.php
index e5b60dbe309b8cb43495a7734dc09f2c14be6498..56c1793d8e5c110324ef52c60f1c48bfba17bb3a 100644
--- a/typo3/sysext/beuser/Classes/Controller/BackendUserController.php
+++ b/typo3/sysext/beuser/Classes/Controller/BackendUserController.php
@@ -89,7 +89,6 @@ class BackendUserController extends BackendUserActionController
      *
      * @param \TYPO3\CMS\Extbase\Mvc\RequestInterface $request
      * @param \TYPO3\CMS\Extbase\Mvc\ResponseInterface $response
-     * @return void
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException
      */
     public function processRequest(\TYPO3\CMS\Extbase\Mvc\RequestInterface $request, \TYPO3\CMS\Extbase\Mvc\ResponseInterface $response)
@@ -108,7 +107,6 @@ class BackendUserController extends BackendUserActionController
     /**
      * Initialize actions
      *
-     * @return void
      * @throws \RuntimeException
      */
     public function initializeAction()
@@ -128,7 +126,6 @@ class BackendUserController extends BackendUserActionController
      * - Switch session to different user
      *
      * @param \TYPO3\CMS\Beuser\Domain\Model\Demand $demand
-     * @return void
      */
     public function indexAction(\TYPO3\CMS\Beuser\Domain\Model\Demand $demand = null)
     {
@@ -165,8 +162,6 @@ class BackendUserController extends BackendUserActionController
 
     /**
      * Views all currently logged in BackendUsers and their sessions
-     *
-     * @return void
      */
     public function onlineAction()
     {
@@ -186,8 +181,6 @@ class BackendUserController extends BackendUserActionController
 
     /**
      * Compare backend users from demand
-     *
-     * @return void
      */
     public function compareAction()
     {
@@ -201,7 +194,6 @@ class BackendUserController extends BackendUserActionController
      * Attaches one backend user to the compare list
      *
      * @param int $uid
-     * @return void
      */
     public function addToCompareListAction($uid)
     {
@@ -214,7 +206,6 @@ class BackendUserController extends BackendUserActionController
      * Removes given backend user to the compare list
      *
      * @param int $uid
-     * @return void
      */
     public function removeFromCompareListAction($uid)
     {
@@ -229,7 +220,6 @@ class BackendUserController extends BackendUserActionController
      *
      * @param \TYPO3\CMS\Beuser\Domain\Model\BackendUser $backendUser
      * @param string $sessionId
-     * @return void
      */
     protected function terminateBackendUserSessionAction(\TYPO3\CMS\Beuser\Domain\Model\BackendUser $backendUser, $sessionId)
     {
@@ -246,7 +236,6 @@ class BackendUserController extends BackendUserActionController
      * Switches to a given user (SU-mode) and then redirects to the start page of the backend to refresh the navigation etc.
      *
      * @param string $switchUser BE-user record that will be switched to
-     * @return void
      */
     protected function switchUser($switchUser)
     {
diff --git a/typo3/sysext/beuser/Classes/Controller/BackendUserGroupController.php b/typo3/sysext/beuser/Classes/Controller/BackendUserGroupController.php
index 53107eaee1e9a8f65be316b7a7043c5036f51786..41533932c49463c259311f500f90f1083d10477a 100644
--- a/typo3/sysext/beuser/Classes/Controller/BackendUserGroupController.php
+++ b/typo3/sysext/beuser/Classes/Controller/BackendUserGroupController.php
@@ -37,7 +37,6 @@ class BackendUserGroupController extends BackendUserActionController
     /**
      * Initialize actions
      *
-     * @return void
      * @throws \RuntimeException
      */
     public function initializeAction()
@@ -54,8 +53,6 @@ class BackendUserGroupController extends BackendUserActionController
 
     /**
      * Displays all BackendUserGroups
-     *
-     * @return void
      */
     public function indexAction()
     {
diff --git a/typo3/sysext/beuser/Classes/Controller/PermissionController.php b/typo3/sysext/beuser/Classes/Controller/PermissionController.php
index e731d9c4279889b40028e5a094363d61fb6cd3cd..fae4de3ca3c8130b64f958ccdd2209ed194882df 100644
--- a/typo3/sysext/beuser/Classes/Controller/PermissionController.php
+++ b/typo3/sysext/beuser/Classes/Controller/PermissionController.php
@@ -84,8 +84,6 @@ class PermissionController extends ActionController
 
     /**
      * Initialize action
-     *
-     * @return void
      */
     protected function initializeAction()
     {
@@ -112,7 +110,6 @@ class PermissionController extends ActionController
      * Initializes view
      *
      * @param ViewInterface $view The view to be initialized
-     * @return void
      */
     protected function initializeView(ViewInterface $view)
     {
@@ -147,7 +144,6 @@ class PermissionController extends ActionController
     /**
      * Registers the Icons into the docheader
      *
-     * @return void
      * @throws \InvalidArgumentException
      */
     protected function registerDocHeaderButtons()
@@ -204,8 +200,6 @@ class PermissionController extends ActionController
 
     /**
      * Index action
-     *
-     * @return void
      */
     public function indexAction()
     {
@@ -271,8 +265,6 @@ class PermissionController extends ActionController
 
     /**
      * Edit action
-     *
-     * @return void
      */
     public function editAction()
     {
@@ -321,7 +313,6 @@ class PermissionController extends ActionController
      *
      * @param array $data
      * @param array $mirror
-     * @return void
      */
     protected function updateAction(array $data, array $mirror)
     {
diff --git a/typo3/sysext/beuser/Classes/Domain/Model/BackendUser.php b/typo3/sysext/beuser/Classes/Domain/Model/BackendUser.php
index 758c5227f3c23abb4878538cf4f3f631489f00d3..0ba5e6df56b261275a39113f2c448a2645529eec 100644
--- a/typo3/sysext/beuser/Classes/Domain/Model/BackendUser.php
+++ b/typo3/sysext/beuser/Classes/Domain/Model/BackendUser.php
@@ -49,7 +49,6 @@ class BackendUser extends \TYPO3\CMS\Extbase\Domain\Model\BackendUser
 
     /**
      * @param string $allowedLanguages
-     * @return void
      */
     public function setAllowedLanguages($allowedLanguages)
     {
@@ -66,7 +65,6 @@ class BackendUser extends \TYPO3\CMS\Extbase\Domain\Model\BackendUser
 
     /**
      * @param string $dbMountPoints
-     * @return void
      */
     public function setDbMountPoints($dbMountPoints)
     {
@@ -99,7 +97,6 @@ class BackendUser extends \TYPO3\CMS\Extbase\Domain\Model\BackendUser
 
     /**
      * @param string $fileMountPoints
-     * @return void
      */
     public function setFileMountPoints($fileMountPoints)
     {
diff --git a/typo3/sysext/beuser/Classes/Domain/Model/Demand.php b/typo3/sysext/beuser/Classes/Domain/Model/Demand.php
index e0353993b8610c1bbb02907c1de5a20679e66924..24467ed9ecdd854319a5972b16560c67baf2c565 100644
--- a/typo3/sysext/beuser/Classes/Domain/Model/Demand.php
+++ b/typo3/sysext/beuser/Classes/Domain/Model/Demand.php
@@ -74,7 +74,6 @@ class Demand extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * @param string $userName
-     * @return void
      */
     public function setUserName($userName)
     {
@@ -91,7 +90,6 @@ class Demand extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * @param int $userType
-     * @return void
      */
     public function setUserType($userType)
     {
@@ -108,7 +106,6 @@ class Demand extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * @param int $status
-     * @return void
      */
     public function setStatus($status)
     {
@@ -125,7 +122,6 @@ class Demand extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * @param int $logins
-     * @return void
      */
     public function setLogins($logins)
     {
diff --git a/typo3/sysext/beuser/Classes/Domain/Model/ModuleData.php b/typo3/sysext/beuser/Classes/Domain/Model/ModuleData.php
index 4bc06230ad021497b4f0fdd3bb9966a794b3933f..553880bdf9f0dce20843f1018617b27ef4607a5c 100644
--- a/typo3/sysext/beuser/Classes/Domain/Model/ModuleData.php
+++ b/typo3/sysext/beuser/Classes/Domain/Model/ModuleData.php
@@ -47,7 +47,6 @@ class ModuleData
 
     /**
      * @param \TYPO3\CMS\Beuser\Domain\Model\Demand $demand
-     * @return void
      */
     public function setDemand(\TYPO3\CMS\Beuser\Domain\Model\Demand $demand)
     {
@@ -69,7 +68,6 @@ class ModuleData
      * Cannot be ObjectStorage, must be array
      *
      * @param int $uid
-     * @return void
      */
     public function attachUidCompareUser($uid)
     {
@@ -80,7 +78,6 @@ class ModuleData
      * Strip one backend user from the compare user list
      *
      * @param int $uid
-     * @return void
      */
     public function detachUidCompareUser($uid)
     {
diff --git a/typo3/sysext/beuser/Classes/Domain/Repository/BackendUserSessionRepository.php b/typo3/sysext/beuser/Classes/Domain/Repository/BackendUserSessionRepository.php
index 9529c8060531564a14cccea2bdd1266c8b52abe5..faae0ea8d5254176efc452613ffc3821d979b305 100644
--- a/typo3/sysext/beuser/Classes/Domain/Repository/BackendUserSessionRepository.php
+++ b/typo3/sysext/beuser/Classes/Domain/Repository/BackendUserSessionRepository.php
@@ -79,7 +79,6 @@ class BackendUserSessionRepository extends Repository
      * Update current session to move back to the original user.
      *
      * @param AbstractUserAuthentication $authentication
-     * @return void
      */
     public function switchBackToOriginalUser(AbstractUserAuthentication $authentication)
     {
diff --git a/typo3/sysext/beuser/Classes/Hook/BackendControllerHook.php b/typo3/sysext/beuser/Classes/Hook/BackendControllerHook.php
index fe1a63ed7ebcf67944ae349716b6053cb3c4641d..1bad4ef7c04d039392d0c31f1469b54ea4ffd361 100644
--- a/typo3/sysext/beuser/Classes/Hook/BackendControllerHook.php
+++ b/typo3/sysext/beuser/Classes/Hook/BackendControllerHook.php
@@ -29,7 +29,6 @@ class BackendControllerHook
      *
      * @param array $configuration
      * @param BackendController $backendController
-     * @return void
      */
     public function addJavaScript(array $configuration, BackendController $backendController)
     {
diff --git a/typo3/sysext/beuser/Classes/Hook/SwitchBackUserHook.php b/typo3/sysext/beuser/Classes/Hook/SwitchBackUserHook.php
index 55e267140c7724348b4f07c57c1308bb49d9cbe1..65678332c368f40c8929194561d4f63197c3a5a1 100644
--- a/typo3/sysext/beuser/Classes/Hook/SwitchBackUserHook.php
+++ b/typo3/sysext/beuser/Classes/Hook/SwitchBackUserHook.php
@@ -31,7 +31,6 @@ class SwitchBackUserHook
      * @param array $params
      * @param AbstractUserAuthentication $authentication
      * @see AbstractUserAuthentication
-     * @return void
      */
     public function switchBack($params, AbstractUserAuthentication $authentication)
     {
diff --git a/typo3/sysext/beuser/Classes/Service/ModuleDataStorageService.php b/typo3/sysext/beuser/Classes/Service/ModuleDataStorageService.php
index f006f023f7e9c1bbdb6ae8acebe0ee0140cc54bc..1e1caf634a221778157c19b7dd9e7f2098848b30 100644
--- a/typo3/sysext/beuser/Classes/Service/ModuleDataStorageService.php
+++ b/typo3/sysext/beuser/Classes/Service/ModuleDataStorageService.php
@@ -58,7 +58,6 @@ class ModuleDataStorageService implements \TYPO3\CMS\Core\SingletonInterface
      * Persists serialized module data to user settings
      *
      * @param \TYPO3\CMS\Beuser\Domain\Model\ModuleData $moduleData
-     * @return void
      */
     public function persistModuleData(\TYPO3\CMS\Beuser\Domain\Model\ModuleData $moduleData)
     {
diff --git a/typo3/sysext/core/Classes/Authentication/AbstractUserAuthentication.php b/typo3/sysext/core/Classes/Authentication/AbstractUserAuthentication.php
index d4376b7d7a741c33aaa7bceec7d1f2edd74919b1..dcbed6fbd112c4b443c7c43aecf50bb6be4c6ec1 100644
--- a/typo3/sysext/core/Classes/Authentication/AbstractUserAuthentication.php
+++ b/typo3/sysext/core/Classes/Authentication/AbstractUserAuthentication.php
@@ -368,7 +368,6 @@ abstract class AbstractUserAuthentication
      * If a user is authenticated the database record of the user (array) will be set in the ->user internal variable.
      *
      * @throws Exception
-     * @return void
      */
     public function start()
     {
@@ -469,7 +468,6 @@ abstract class AbstractUserAuthentication
     /**
      * Sets the session cookie for the current disposal.
      *
-     * @return void
      * @throws Exception
      */
     protected function setSessionCookie()
@@ -568,7 +566,6 @@ abstract class AbstractUserAuthentication
      * Checks if a submission of username and password is present or use other authentication by auth services
      *
      * @throws \RuntimeException
-     * @return void
      * @internal
      */
     public function checkAuthentication()
@@ -1016,8 +1013,6 @@ abstract class AbstractUserAuthentication
      * Log out current user!
      * Removes the current session record, sets the internal ->user array to a blank string;
      * Thereby the current user (if any) is effectively logged out!
-     *
-     * @return void
      */
     public function logoff()
     {
@@ -1049,8 +1044,6 @@ abstract class AbstractUserAuthentication
      * Perform the logoff action. Called from logoff() as a way to allow subclasses to override
      * what happens when a user logs off, without needing to reproduce the hook calls and logging
      * that happens in the public logoff() API method.
-     *
-     * @return void
      */
     protected function performLogoff()
     {
@@ -1064,7 +1057,6 @@ abstract class AbstractUserAuthentication
      * Empty / unset the cookie
      *
      * @param string $cookieName usually, this is $this->name
-     * @return void
      */
     public function removeCookie($cookieName)
     {
@@ -1220,7 +1212,6 @@ abstract class AbstractUserAuthentication
      * If $variable is not an array, $this->uc is saved!
      *
      * @param array|string $variable An array you want to store for the user as session data. If $variable is not supplied (is null), the internal variable, ->uc, is stored by default
-     * @return void
      */
     public function writeUC($variable = '')
     {
@@ -1248,7 +1239,6 @@ abstract class AbstractUserAuthentication
      * If $theUC is FALSE, the 'uc' content from the ->user array will be unserialized and restored in ->uc
      *
      * @param mixed $theUC If an array, then set as ->uc, otherwise load from user record
-     * @return void
      */
     public function unpack_uc($theUC = '')
     {
@@ -1268,7 +1258,6 @@ abstract class AbstractUserAuthentication
      * @param string $module Is the name of the module ($MCONF['name'])
      * @param mixed $data Is the data you want to store for that module (array, string, ...)
      * @param bool|int $noSave If $noSave is set, then the ->uc array (which carries all kinds of user data) is NOT written immediately, but must be written by some subsequent call.
-     * @return void
      */
     public function pushModuleData($module, $data, $noSave = 0)
     {
@@ -1312,7 +1301,6 @@ abstract class AbstractUserAuthentication
      *
      * @param string $key A non empty string to store the data under
      * @param mixed $data Data store store in session
-     * @return void
      */
     public function setSessionData($key, $data)
     {
@@ -1328,7 +1316,6 @@ abstract class AbstractUserAuthentication
      *
      * @param string $key Pointer to an associative key in the session data array which is stored serialized in the field "ses_data" of the session table.
      * @param mixed $data The data to store in index $key
-     * @return void
      */
     public function setAndSaveSessionData($key, $data)
     {
@@ -1475,7 +1462,6 @@ abstract class AbstractUserAuthentication
     /**
      * Garbage collector, removing old expired sessions.
      *
-     * @return void
      * @internal
      */
     public function gc()
@@ -1495,7 +1481,6 @@ abstract class AbstractUserAuthentication
      * @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.)
-     * @return void
      */
     public function writelog($type, $action, $error, $details_nr, $details, $data, $tablename, $recuid, $recpid)
     {
@@ -1507,7 +1492,6 @@ abstract class AbstractUserAuthentication
      * @param string $email Email address
      * @param int $secondsBack Number of sections back in time to check. This is a kind of limit for how many failures an hour for instance
      * @param int $maxFailures Max allowed failures before a warning mail is sent
-     * @return void
      * @ignore
      */
     public function checkLogFailures($email, $secondsBack, $maxFailures)
@@ -1523,7 +1507,6 @@ abstract class AbstractUserAuthentication
      * Will check the users for disabled, start/endtime, etc. ($this->user_where_clause())
      *
      * @param int $uid The UID of the backend user to set in ->user
-     * @return void
      * @internal
      * @see SC_mod_tools_be_user_index::compareUsers(), \TYPO3\CMS\Setup\Controller\SetupModuleController::simulateUser(), freesite_admin::startCreate()
      */
@@ -1536,7 +1519,6 @@ abstract class AbstractUserAuthentication
      * Raw initialization of the be_user with username=$name
      *
      * @param string $name The username to look up.
-     * @return void
      * @see \TYPO3\CMS\Core\Authentication\AbstractUserAuthentication::setBeUserByUid()
      * @internal
      */
diff --git a/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php b/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php
index 7125d4d1336dff3f05f898eab6130c453d974e0b..d0e5ee6d36dffcd2546da948fe7b1e737574a567 100644
--- a/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php
+++ b/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php
@@ -1239,7 +1239,6 @@ class BackendUserAuthentication extends AbstractUserAuthentication
      *
      * @param array $mountPointUids Page UIDs that should be used as web mountpoints
      * @param bool $append If TRUE the given mount point will be appended. Otherwise the current mount points will be replaced.
-     * @return void
      */
     public function setWebmounts(array $mountPointUids, $append = false)
     {
@@ -1279,7 +1278,6 @@ class BackendUserAuthentication extends AbstractUserAuthentication
      * if the backend user login has verified OK.
      * Generally this is required initialization of a backend user.
      *
-     * @return void
      * @access private
      * @see \TYPO3\CMS\Core\TypoScript\Parser\TypoScriptParser
      */
@@ -1424,7 +1422,6 @@ class BackendUserAuthentication extends AbstractUserAuthentication
      *
      * @param string $grList Commalist of be_groups uid numbers
      * @param string $idList List of already processed be_groups-uids so the function will not fall into an eternal recursion.
-     * @return void
      * @access private
      */
     public function fetchGroups($grList, $idList = '')
@@ -1530,7 +1527,6 @@ class BackendUserAuthentication extends AbstractUserAuthentication
      * a representation of the exact groups/subgroups which the BE_USER has membership with.
      *
      * @param string $cList The newly compiled group-list which must be compared with the current list in the user record and possibly stored if a difference is detected.
-     * @return void
      * @access private
      */
     public function setCachedList($cList)
@@ -1547,8 +1543,6 @@ class BackendUserAuthentication extends AbstractUserAuthentication
     /**
      * Sets up all file storages for a user.
      * Needs to be called AFTER the groups have been loaded.
-     *
-     * @return void
      */
     protected function initializeFileStorages()
     {
@@ -1777,8 +1771,6 @@ class BackendUserAuthentication extends AbstractUserAuthentication
      * Adds filters based on what the user has set
      * this should be done in this place, and called whenever needed,
      * but only when needed
-     *
-     * @return void
      */
     public function evaluateUserSpecificFileFilterSettings()
     {
@@ -2026,7 +2018,6 @@ class BackendUserAuthentication extends AbstractUserAuthentication
      * Initializing workspace.
      * Called from within this function, see fetchGroupData()
      *
-     * @return void
      * @see fetchGroupData()
      */
     public function workspaceInit()
@@ -2043,8 +2034,6 @@ class BackendUserAuthentication extends AbstractUserAuthentication
 
     /**
      * Limiting the DB mountpoints if there any selected in the workspace record
-     *
-     * @return void
      */
     protected function initializeDbMountpointsInWorkspace()
     {
@@ -2171,7 +2160,6 @@ class BackendUserAuthentication extends AbstractUserAuthentication
      * Setting workspace ID
      *
      * @param int $workspaceId ID of workspace to set for backend user. If not valid the default workspace for BE user is found and set.
-     * @return void
      */
     public function setWorkspace($workspaceId)
     {
@@ -2215,8 +2203,6 @@ class BackendUserAuthentication extends AbstractUserAuthentication
 
     /**
      * Sets the default workspace in the context of the current backend user.
-     *
-     * @return void
      */
     public function setDefaultWorkspace()
     {
@@ -2228,7 +2214,6 @@ class BackendUserAuthentication extends AbstractUserAuthentication
      * Setting workspace preview state for user:
      *
      * @param bool $previewState State of user preview.
-     * @return void
      */
     public function setWorkspacePreview($previewState)
     {
@@ -2373,7 +2358,6 @@ class BackendUserAuthentication extends AbstractUserAuthentication
      * @param string $email Email address
      * @param int $secondsBack Number of sections back in time to check. This is a kind of limit for how many failures an hour for instance.
      * @param int $max Max allowed failures before a warning mail is sent
-     * @return void
      * @access private
      */
     public function checkLogFailures($email, $secondsBack = 3600, $max = 3)
@@ -2500,7 +2484,6 @@ This is a dump of the failures:
      *
      * @param bool $proceedIfNoUserIsLoggedIn if this option is set, then there won't be a redirect to the login screen of the Backend - used for areas in the backend which do not need user rights like the login page.
      * @throws \RuntimeException
-     * @return void
      */
     public function backendCheckLogin($proceedIfNoUserIsLoggedIn = false)
     {
@@ -2533,7 +2516,6 @@ This is a dump of the failures:
      * Initialize the internal ->uc array for the backend user
      * Will make the overrides if necessary, and write the UC back to the be_users record if changes has happened
      *
-     * @return void
      * @internal
      */
     public function backendSetUC()
@@ -2583,7 +2565,6 @@ This is a dump of the failures:
      * Override: Call this function every time the uc is updated.
      * That is 1) by reverting to default values, 2) in the setup-module, 3) userTS changes (userauthgroup)
      *
-     * @return void
      * @internal
      */
     public function overrideUC()
@@ -2594,7 +2575,6 @@ This is a dump of the failures:
     /**
      * Clears the user[uc] and ->uc to blank strings. Then calls ->backendSetUC() to fill it again with reset contents
      *
-     * @return void
      * @internal
      */
     public function resetUC()
@@ -2608,7 +2588,6 @@ This is a dump of the failures:
      * Will send an email notification to warning_email_address/the login users email address when a login session is just started.
      * Depends on various parameters whether mails are send and to whom.
      *
-     * @return void
      * @access private
      */
     private function emailAtLogin()
diff --git a/typo3/sysext/core/Classes/Authentication/CommandLineUserAuthentication.php b/typo3/sysext/core/Classes/Authentication/CommandLineUserAuthentication.php
index e81690590a542812fb561726964d04600ac1db6e..8b5600120ed506d3692d6176490bc145177a74f0 100644
--- a/typo3/sysext/core/Classes/Authentication/CommandLineUserAuthentication.php
+++ b/typo3/sysext/core/Classes/Authentication/CommandLineUserAuthentication.php
@@ -82,7 +82,6 @@ class CommandLineUserAuthentication extends BackendUserAuthentication
      * Logs in the TYPO3 Backend user "_cli_"
      *
      * @param bool $proceedIfNoUserIsLoggedIn if this option is set, then there won't be a redirect to the login screen of the Backend - used for areas in the backend which do not need user rights like the login page.
-     * @return void
      */
     public function backendCheckLogin($proceedIfNoUserIsLoggedIn = false)
     {
@@ -123,8 +122,6 @@ class CommandLineUserAuthentication extends BackendUserAuthentication
 
     /**
      * Create a record in the DB table be_users called "_cli_" with no other information
-     *
-     * @return void
      */
     protected function createCliUser()
     {
diff --git a/typo3/sysext/core/Classes/Cache/Backend/AbstractBackend.php b/typo3/sysext/core/Classes/Cache/Backend/AbstractBackend.php
index ee3f64181c4c9eb370da2fe3c223ea7dca5e073d..0540cf3338f2c9ef37ce1df7c291246e42f86c92 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/AbstractBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/AbstractBackend.php
@@ -81,7 +81,6 @@ abstract class AbstractBackend implements \TYPO3\CMS\Core\Cache\Backend\BackendI
      * Sets a reference to the cache frontend which uses this backend
      *
      * @param \TYPO3\CMS\Core\Cache\Frontend\FrontendInterface $cache The frontend for this backend
-     * @return void
      * @api
      */
     public function setCache(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface $cache)
@@ -94,7 +93,6 @@ abstract class AbstractBackend implements \TYPO3\CMS\Core\Cache\Backend\BackendI
      * Sets the default lifetime for this cache backend
      *
      * @param int $defaultLifetime Default lifetime of this cache backend in seconds. If NULL is specified, the default lifetime is used. "0" means unlimited lifetime.
-     * @return void
      * @throws \InvalidArgumentException
      * @api
      */
diff --git a/typo3/sysext/core/Classes/Cache/Backend/ApcBackend.php b/typo3/sysext/core/Classes/Cache/Backend/ApcBackend.php
index 46a5ab9846edbfdf4c797a37926f07aa774f6f14..dd51ab2f2d664a4613493cc62f52903349cf4edc 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/ApcBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/ApcBackend.php
@@ -88,7 +88,6 @@ class ApcBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend implement
      * Initializes the identifier prefix when setting the cache.
      *
      * @param \TYPO3\CMS\Core\Cache\Frontend\FrontendInterface $cache
-     * @return void
      */
     public function setCache(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface $cache)
     {
@@ -126,7 +125,6 @@ class ApcBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend implement
      * @param string $data The data to be stored
      * @param array $tags Tags to associate with this cache entry
      * @param int $lifetime Lifetime of this cache entry in seconds. If NULL is specified, the default lifetime is used. "0" means unlimited lifetime.
-     * @return void
      * @throws \TYPO3\CMS\Core\Cache\Exception if no cache frontend has been set.
      * @throws \TYPO3\CMS\Core\Cache\Exception\InvalidDataException if $data is not a string
      * @api
@@ -229,7 +227,6 @@ class ApcBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend implement
     /**
      * Removes all cache entries of this cache.
      *
-     * @return void
      * @throws \TYPO3\CMS\Core\Cache\Exception
      * @api
      */
@@ -245,7 +242,6 @@ class ApcBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend implement
      * Removes all cache entries of this cache which are tagged by the specified tag.
      *
      * @param string $tag The tag the entries must have
-     * @return void
      * @api
      */
     public function flushByTag($tag)
@@ -261,7 +257,6 @@ class ApcBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend implement
      *
      * @param string $entryIdentifier
      * @param array $tags
-     * @return void
      */
     protected function addIdentifierToTags($entryIdentifier, array $tags)
     {
@@ -293,7 +288,6 @@ class ApcBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend implement
      * Removes association of the identifier with the given tags
      *
      * @param string $entryIdentifier
-     * @return void
      */
     protected function removeIdentifierFromAllTags($entryIdentifier)
     {
@@ -322,8 +316,6 @@ class ApcBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend implement
 
     /**
      * Does nothing, as APC does GC itself
-     *
-     * @return void
      */
     public function collectGarbage()
     {
diff --git a/typo3/sysext/core/Classes/Cache/Backend/ApcuBackend.php b/typo3/sysext/core/Classes/Cache/Backend/ApcuBackend.php
index d52a751aac952e03174f1d92b534048baf9ce481..445d5cbabba77ca79ba6a00f1a8c3705895ac9d5 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/ApcuBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/ApcuBackend.php
@@ -89,7 +89,6 @@ class ApcuBackend extends AbstractBackend implements TaggableBackendInterface
      * Initializes the identifier prefix when setting the cache.
      *
      * @param \TYPO3\CMS\Core\Cache\Frontend\FrontendInterface $cache
-     * @return void
      */
     public function setCache(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface $cache)
     {
@@ -127,7 +126,6 @@ class ApcuBackend extends AbstractBackend implements TaggableBackendInterface
      * @param string $data The data to be stored
      * @param array $tags Tags to associate with this cache entry
      * @param int $lifetime Lifetime of this cache entry in seconds. If NULL is specified, the default lifetime is used. "0" means unlimited lifetime.
-     * @return void
      * @throws Cache\Exception if no cache frontend has been set.
      * @throws Cache\Exception\InvalidDataException if $data is not a string
      * @api
@@ -230,7 +228,6 @@ class ApcuBackend extends AbstractBackend implements TaggableBackendInterface
     /**
      * Removes all cache entries of this cache.
      *
-     * @return void
      * @throws Cache\Exception
      * @api
      */
@@ -246,7 +243,6 @@ class ApcuBackend extends AbstractBackend implements TaggableBackendInterface
      * Removes all cache entries of this cache which are tagged by the specified tag.
      *
      * @param string $tag The tag the entries must have
-     * @return void
      * @api
      */
     public function flushByTag($tag)
@@ -262,7 +258,6 @@ class ApcuBackend extends AbstractBackend implements TaggableBackendInterface
      *
      * @param string $entryIdentifier
      * @param array $tags
-     * @return void
      */
     protected function addIdentifierToTags($entryIdentifier, array $tags)
     {
@@ -294,7 +289,6 @@ class ApcuBackend extends AbstractBackend implements TaggableBackendInterface
      * Removes association of the identifier with the given tags
      *
      * @param string $entryIdentifier
-     * @return void
      */
     protected function removeIdentifierFromAllTags($entryIdentifier)
     {
@@ -323,8 +317,6 @@ class ApcuBackend extends AbstractBackend implements TaggableBackendInterface
 
     /**
      * Does nothing, as APCu does GC itself
-     *
-     * @return void
      */
     public function collectGarbage()
     {
diff --git a/typo3/sysext/core/Classes/Cache/Backend/BackendInterface.php b/typo3/sysext/core/Classes/Cache/Backend/BackendInterface.php
index 432fada0ce7e285e9d52dd3420de8692c0863468..815d9cfd2039bab5fbb95ee6a54fcc2aeac1f84f 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/BackendInterface.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/BackendInterface.php
@@ -24,7 +24,6 @@ interface BackendInterface
      * Sets a reference to the cache frontend which uses this backend
      *
      * @param \TYPO3\CMS\Core\Cache\Frontend\FrontendInterface $cache The frontend for this backend
-     * @return void
      * @api
      */
     public function setCache(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface $cache);
@@ -36,7 +35,6 @@ interface BackendInterface
      * @param string $data The data to be stored
      * @param array $tags Tags to associate with this cache entry. If the backend does not support tags, this option can be ignored.
      * @param int $lifetime Lifetime of this cache entry in seconds. If NULL is specified, the default lifetime is used. "0" means unlimited lifetime.
-     * @return void
      * @throws \TYPO3\CMS\Core\Cache\Exception if no cache frontend has been set.
      * @throws \TYPO3\CMS\Core\Cache\Exception\InvalidDataException if the data is not a string
      * @api
@@ -75,7 +73,6 @@ interface BackendInterface
     /**
      * Removes all cache entries of this cache.
      *
-     * @return void
      * @api
      */
     public function flush();
@@ -83,7 +80,6 @@ interface BackendInterface
     /**
      * Does garbage collection
      *
-     * @return void
      * @api
      */
     public function collectGarbage();
diff --git a/typo3/sysext/core/Classes/Cache/Backend/FileBackend.php b/typo3/sysext/core/Classes/Cache/Backend/FileBackend.php
index 65276775d68540ecb3653c2c996d585284d94a53..534386c3b368919a095e53c4bf7fe9731347f651 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/FileBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/FileBackend.php
@@ -57,7 +57,6 @@ class FileBackend extends \TYPO3\CMS\Core\Cache\Backend\SimpleFileBackend implem
      * On the positive side, a frozen cache backend is much faster on read access.
      * A frozen backend can only be thawed by calling the flush() method.
      *
-     * @return void
      * @throws \RuntimeException
      */
     public function freeze()
@@ -104,7 +103,6 @@ class FileBackend extends \TYPO3\CMS\Core\Cache\Backend\SimpleFileBackend implem
      * does not exist in v4.
      *
      * @param \TYPO3\CMS\Core\Cache\Frontend\FrontendInterface $cache The cache frontend
-     * @return void
      */
     public function setCache(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface $cache)
     {
@@ -122,7 +120,6 @@ class FileBackend extends \TYPO3\CMS\Core\Cache\Backend\SimpleFileBackend implem
      * @param string $data The data to be stored
      * @param array $tags Tags to associate with this cache entry
      * @param int $lifetime Lifetime of this cache entry in seconds. If NULL is specified, the default lifetime is used. "0" means unlimited lifetime.
-     * @return void
      * @throws \RuntimeException
      * @throws \TYPO3\CMS\Core\Cache\Exception\InvalidDataException if the directory does not exist or is not writable or exceeds the maximum allowed path length, or if no cache frontend has been set.
      * @throws \TYPO3\CMS\Core\Cache\Exception if the directory does not exist or is not writable or exceeds the maximum allowed path length, or if no cache frontend has been set.
@@ -278,7 +275,6 @@ class FileBackend extends \TYPO3\CMS\Core\Cache\Backend\SimpleFileBackend implem
     /**
      * Removes all cache entries of this cache and sets the frozen flag to FALSE.
      *
-     * @return void
      * @api
      */
     public function flush()
@@ -293,7 +289,6 @@ class FileBackend extends \TYPO3\CMS\Core\Cache\Backend\SimpleFileBackend implem
      * Removes all cache entries of this cache which are tagged by the specified tag.
      *
      * @param string $tag The tag the entries must have
-     * @return void
      * @api
      */
     public function flushByTag($tag)
@@ -328,7 +323,6 @@ class FileBackend extends \TYPO3\CMS\Core\Cache\Backend\SimpleFileBackend implem
     /**
      * Does garbage collection
      *
-     * @return void
      * @api
      */
     public function collectGarbage()
diff --git a/typo3/sysext/core/Classes/Cache/Backend/FreezableBackendInterface.php b/typo3/sysext/core/Classes/Cache/Backend/FreezableBackendInterface.php
index ba9d4bc69397114591735c5884083f11511d4bdb..f0125840ee8308f92e615ae14f7eb53fb6bb340d 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/FreezableBackendInterface.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/FreezableBackendInterface.php
@@ -26,8 +26,6 @@ interface FreezableBackendInterface extends \TYPO3\CMS\Core\Cache\Backend\Backen
      *
      * On the positive side, a frozen cache backend is much faster on read access.
      * A frozen backend can only be thawn by calling the flush() method.
-     *
-     * @return void
      */
     public function freeze();
 
diff --git a/typo3/sysext/core/Classes/Cache/Backend/MemcachedBackend.php b/typo3/sysext/core/Classes/Cache/Backend/MemcachedBackend.php
index c35b1d7014f396a1bf57f5c119609e57c64f0b14..1041fd04ce8ff62f654ee6062189842ea54dbc70 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/MemcachedBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/MemcachedBackend.php
@@ -118,7 +118,6 @@ class MemcachedBackend extends AbstractBackend implements TaggableBackendInterfa
      * to be formatted like "<host>[:<port>]" or "unix://<path>"
      *
      * @param array $servers An array of servers to add.
-     * @return void
      * @api
      */
     protected function setServers(array $servers)
@@ -130,7 +129,6 @@ class MemcachedBackend extends AbstractBackend implements TaggableBackendInterfa
      * Setter for compression flags bit
      *
      * @param bool $useCompression
-     * @return void
      * @api
      */
     protected function setCompression($useCompression)
@@ -157,7 +155,6 @@ class MemcachedBackend extends AbstractBackend implements TaggableBackendInterfa
     /**
      * Initializes the identifier prefix
      *
-     * @return void
      * @throws Exception
      */
     public function initializeObject()
@@ -209,7 +206,6 @@ class MemcachedBackend extends AbstractBackend implements TaggableBackendInterfa
      * Initializes the identifier prefix when setting the cache.
      *
      * @param FrontendInterface $cache The frontend for this backend
-     * @return void
      */
     public function setCache(FrontendInterface $cache)
     {
@@ -225,7 +221,6 @@ class MemcachedBackend extends AbstractBackend implements TaggableBackendInterfa
      * @param string $data The data to be stored
      * @param array $tags Tags to associate with this cache entry
      * @param int $lifetime Lifetime of this cache entry in seconds. If NULL is specified, the default lifetime is used. "0" means unlimited lifetime.
-     * @return void
      * @throws Exception if no cache frontend has been set.
      * @throws \InvalidArgumentException if the identifier is not valid or the final memcached key is longer than 250 characters
      * @throws Exception\InvalidDataException if $data is not a string
@@ -361,7 +356,6 @@ class MemcachedBackend extends AbstractBackend implements TaggableBackendInterfa
     /**
      * Removes all cache entries of this cache.
      *
-     * @return void
      * @throws Exception
      * @api
      */
@@ -377,7 +371,6 @@ class MemcachedBackend extends AbstractBackend implements TaggableBackendInterfa
      * Removes all cache entries of this cache which are tagged by the specified tag.
      *
      * @param string $tag The tag the entries must have
-     * @return void
      * @api
      */
     public function flushByTag($tag)
@@ -393,7 +386,6 @@ class MemcachedBackend extends AbstractBackend implements TaggableBackendInterfa
      *
      * @param string $entryIdentifier
      * @param array $tags
-     * @return void
      */
     protected function addIdentifierToTags($entryIdentifier, array $tags)
     {
@@ -425,7 +417,6 @@ class MemcachedBackend extends AbstractBackend implements TaggableBackendInterfa
      * Removes association of the identifier with the given tags
      *
      * @param string $entryIdentifier
-     * @return void
      */
     protected function removeIdentifierFromAllTags($entryIdentifier)
     {
@@ -469,7 +460,6 @@ class MemcachedBackend extends AbstractBackend implements TaggableBackendInterfa
     /**
      * Does nothing, as memcached does GC itself
      *
-     * @return void
      * @api
      */
     public function collectGarbage()
diff --git a/typo3/sysext/core/Classes/Cache/Backend/NullBackend.php b/typo3/sysext/core/Classes/Cache/Backend/NullBackend.php
index ad9e3c7b01877e91b77bcf9fc734f7e2c37636ef..485131262b605e071b50005d6d009d0a4da5338e 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/NullBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/NullBackend.php
@@ -29,7 +29,6 @@ class NullBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend implemen
      * @param string $data ignored
      * @param array $tags ignored
      * @param int $lifetime ignored
-     * @return void
      * @api
      */
     public function set($entryIdentifier, $data, array $tags = [], $lifetime = null)
@@ -40,7 +39,6 @@ class NullBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend implemen
      * Acts as if it would enable data compression
      *
      * @param bool $compression ignored
-     * @return void
      */
     public function setCompression($compression)
     {
@@ -97,7 +95,6 @@ class NullBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend implemen
     /**
      * Does nothing
      *
-     * @return void
      * @api
      */
     public function flush()
@@ -108,7 +105,6 @@ class NullBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend implemen
      * Does nothing
      *
      * @param string $tag ignored
-     * @return void
      * @api
      */
     public function flushByTag($tag)
@@ -118,7 +114,6 @@ class NullBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend implemen
     /**
      * Does nothing
      *
-     * @return void
      * @api
      */
     public function collectGarbage()
@@ -129,7 +124,6 @@ class NullBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend implemen
      * Does nothing
      *
      * @param string $identifier An identifier which describes the cache entry to load
-     * @return void
      * @api
      */
     public function requireOnce($identifier)
diff --git a/typo3/sysext/core/Classes/Cache/Backend/PdoBackend.php b/typo3/sysext/core/Classes/Cache/Backend/PdoBackend.php
index 430b5839d52d5575160ecfb80cf79b9fc4a91765..2f316d48a10cf988f8124f65e5d5d47b06d4de6b 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/PdoBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/PdoBackend.php
@@ -49,7 +49,6 @@ class PdoBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend implement
      * Sets the DSN to use
      *
      * @param string $DSN The DSN to use for connecting to the DB
-     * @return void
      * @api
      */
     public function setDataSourceName($DSN)
@@ -61,7 +60,6 @@ class PdoBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend implement
      * Sets the username to use
      *
      * @param string $username The username to use for connecting to the DB
-     * @return void
      * @api
      */
     public function setUsername($username)
@@ -73,7 +71,6 @@ class PdoBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend implement
      * Sets the password to use
      *
      * @param string $password The password to use for connecting to the DB
-     * @return void
      * @api
      */
     public function setPassword($password)
@@ -83,8 +80,6 @@ class PdoBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend implement
 
     /**
      * Initialize the cache backend.
-     *
-     * @return void
      */
     public function initializeObject()
     {
@@ -98,7 +93,6 @@ class PdoBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend implement
      * @param string $data The data to be stored
      * @param array $tags Tags to associate with this cache entry
      * @param int $lifetime Lifetime of this cache entry in seconds. If NULL is specified, the default lifetime is used. "0" means unlimited lifetime.
-     * @return void
      * @throws \TYPO3\CMS\Core\Cache\Exception if no cache frontend has been set.
      * @throws \InvalidArgumentException if the identifier is not valid
      * @throws \TYPO3\CMS\Core\Cache\Exception\InvalidDataException if $data is not a string
@@ -177,7 +171,6 @@ class PdoBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend implement
     /**
      * Removes all cache entries of this cache.
      *
-     * @return void
      * @api
      */
     public function flush()
@@ -192,7 +185,6 @@ class PdoBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend implement
      * Removes all cache entries of this cache which are tagged by the specified tag.
      *
      * @param string $tag The tag the entries must have
-     * @return void
      * @api
      */
     public function flushByTag($tag)
@@ -221,7 +213,6 @@ class PdoBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend implement
     /**
      * Does garbage collection
      *
-     * @return void
      * @api
      */
     public function collectGarbage()
@@ -245,7 +236,6 @@ class PdoBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend implement
     /**
      * Connect to the database
      *
-     * @return void
      * @throws \RuntimeException if something goes wrong
      */
     protected function connect()
@@ -271,7 +261,6 @@ class PdoBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend implement
     /**
      * Creates the tables needed for the cache backend.
      *
-     * @return void
      * @throws \RuntimeException if something goes wrong
      */
     protected function createCacheTables()
diff --git a/typo3/sysext/core/Classes/Cache/Backend/RedisBackend.php b/typo3/sysext/core/Classes/Cache/Backend/RedisBackend.php
index c431d50be92812cdf2827b3eebdf1a3a7d27c6c3..4330bcc3acdec9afd23d941ae472f33e266a1439 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/RedisBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/RedisBackend.php
@@ -147,7 +147,6 @@ class RedisBackend extends AbstractBackend implements TaggableBackendInterface
     /**
      * Initializes the redis backend
      *
-     * @return void
      * @throws \TYPO3\CMS\Core\Cache\Exception if access to redis with password is denied or if database selection fails
      */
     public function initializeObject()
@@ -182,7 +181,6 @@ class RedisBackend extends AbstractBackend implements TaggableBackendInterface
      * Setter for persistent connection
      *
      * @param bool $persistentConnection
-     * @return void
      * @api
      */
     public function setPersistentConnection($persistentConnection)
@@ -194,7 +192,6 @@ class RedisBackend extends AbstractBackend implements TaggableBackendInterface
      * Setter for server hostname
      *
      * @param string $hostname Hostname
-     * @return void
      * @api
      */
     public function setHostname($hostname)
@@ -206,7 +203,6 @@ class RedisBackend extends AbstractBackend implements TaggableBackendInterface
      * Setter for server port
      *
      * @param int $port Port
-     * @return void
      * @api
      */
     public function setPort($port)
@@ -218,7 +214,6 @@ class RedisBackend extends AbstractBackend implements TaggableBackendInterface
      * Setter for database number
      *
      * @param int $database Database
-     * @return void
      * @throws \InvalidArgumentException if database number is not valid
      * @api
      */
@@ -237,7 +232,6 @@ class RedisBackend extends AbstractBackend implements TaggableBackendInterface
      * Setter for authentication password
      *
      * @param string $password Password
-     * @return void
      * @api
      */
     public function setPassword($password)
@@ -249,7 +243,6 @@ class RedisBackend extends AbstractBackend implements TaggableBackendInterface
      * Enable data compression
      *
      * @param bool $compression TRUE to enable compression
-     * @return void
      * @throws \InvalidArgumentException if compression parameter is not of type boolean
      * @api
      */
@@ -267,7 +260,6 @@ class RedisBackend extends AbstractBackend implements TaggableBackendInterface
      * gzcompress default level will be used.
      *
      * @param int $compressionLevel -1 to 9: Compression level
-     * @return void
      * @throws \InvalidArgumentException if compressionLevel parameter is not within allowed bounds
      * @api
      */
@@ -289,7 +281,6 @@ class RedisBackend extends AbstractBackend implements TaggableBackendInterface
      * of seconds to wait if a connection can be established.
      *
      * @param int $connectionTimeout limit in seconds, a value greater or equal than 0
-     * @return void
      * @throws \InvalidArgumentException if compressionLevel parameter is not within allowed bounds
      * @api
      */
@@ -316,7 +307,6 @@ class RedisBackend extends AbstractBackend implements TaggableBackendInterface
      * @param string $data Data to be stored
      * @param array $tags Tags to associate with this cache entry
      * @param int $lifetime Lifetime of this cache entry in seconds. If NULL is specified, default lifetime is used. "0" means unlimited lifetime.
-     * @return void
      * @throws \InvalidArgumentException if identifier is not valid
      * @throws \TYPO3\CMS\Core\Cache\Exception\InvalidDataException if data is not a string
      * @api
@@ -468,7 +458,6 @@ class RedisBackend extends AbstractBackend implements TaggableBackendInterface
      *
      * Scales O(1) with number of cache entries
      *
-     * @return void
      * @api
      */
     public function flush()
@@ -485,7 +474,6 @@ class RedisBackend extends AbstractBackend implements TaggableBackendInterface
      * Scales O(n^2) with number of tag entries
      *
      * @param string $tag Tag the entries must have
-     * @return void
      * @throws \InvalidArgumentException if identifier is not a string
      * @api
      */
@@ -510,7 +498,6 @@ class RedisBackend extends AbstractBackend implements TaggableBackendInterface
      *
      * Scales O(n*m) with number of cache entries (n) and number of tags (m)
      *
-     * @return void
      * @api
      */
     public function collectGarbage()
@@ -540,7 +527,6 @@ class RedisBackend extends AbstractBackend implements TaggableBackendInterface
      *
      * @param array $identifiers List of identifiers to remove
      * @param array $tags List of tags to be handled
-     * @return void
      */
     protected function removeIdentifierEntriesAndRelations(array $identifiers, array $tags)
     {
diff --git a/typo3/sysext/core/Classes/Cache/Backend/SimpleFileBackend.php b/typo3/sysext/core/Classes/Cache/Backend/SimpleFileBackend.php
index 508a4520b74f2f6e2f2b48ccbbef0df777c1e196..4cb6b3d135edc05360b611e169556d6cb82920f2 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/SimpleFileBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/SimpleFileBackend.php
@@ -72,7 +72,6 @@ class SimpleFileBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend im
      *
      * @param \TYPO3\CMS\Core\Cache\Frontend\FrontendInterface $cache The cache frontend
      * @throws \TYPO3\CMS\Core\Cache\Exception
-     * @return void
      */
     public function setCache(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface $cache)
     {
@@ -109,7 +108,6 @@ class SimpleFileBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend im
      * option was handled.
      *
      * @param string $cacheDirectory The cache base directory. If a relative path
-     * @return void
      * @throws \TYPO3\CMS\Core\Cache\Exception if the directory is not within allowed
      */
     public function setCacheDirectory($cacheDirectory)
@@ -180,7 +178,6 @@ class SimpleFileBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend im
      * exists in TYPO3 v4 only.
      *
      * @param string $finalCacheDirectory Absolute path to final cache directory
-     * @return void
      * @throws \TYPO3\CMS\Core\Cache\Exception If directory is not writable after creation
      */
     protected function createFinalCacheDirectory($finalCacheDirectory)
@@ -213,7 +210,6 @@ class SimpleFileBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend im
      * @param string $data The data to be stored
      * @param array $tags Tags to associate with this cache entry
      * @param int $lifetime This cache backend does not support life times
-     * @return void
      * @throws \TYPO3\CMS\Core\Cache\Exception if the directory does not exist or is not writable or exceeds the maximum allowed path length, or if no cache frontend has been set.
      * @throws \TYPO3\CMS\Core\Cache\Exception\InvalidDataException if the data to bes stored is not a string.
      * @throws \InvalidArgumentException
@@ -307,7 +303,6 @@ class SimpleFileBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend im
     /**
      * Removes all cache entries of this cache.
      *
-     * @return void
      * @api
      */
     public function flush()
@@ -331,7 +326,6 @@ class SimpleFileBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend im
     /**
      * Not necessary
      *
-     * @return void
      * @api
      */
     public function collectGarbage()
diff --git a/typo3/sysext/core/Classes/Cache/Backend/TaggableBackendInterface.php b/typo3/sysext/core/Classes/Cache/Backend/TaggableBackendInterface.php
index f58cc67cced934e41426eb2534f95cf813af0535..bca3cfc9b9d2035aba416852eaf60ee7f9b26549 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/TaggableBackendInterface.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/TaggableBackendInterface.php
@@ -21,7 +21,6 @@ interface TaggableBackendInterface extends \TYPO3\CMS\Core\Cache\Backend\Backend
      * Removes all cache entries of this cache which are tagged by the specified tag.
      *
      * @param string $tag The tag the entries must have
-     * @return void
      * @api
      */
     public function flushByTag($tag);
@@ -30,7 +29,6 @@ interface TaggableBackendInterface extends \TYPO3\CMS\Core\Cache\Backend\Backend
      * Removes all cache entries of this cache which are tagged by any of the specified tags.
      *
      * @param string[] $tags List of tags
-     * @return void
      * @api
      */
     public function flushByTags(array $tags);
diff --git a/typo3/sysext/core/Classes/Cache/Backend/TransientMemoryBackend.php b/typo3/sysext/core/Classes/Cache/Backend/TransientMemoryBackend.php
index f80a3233323e85c858c33251985496c38a13c148..6fc76bc39401804e19ee601657cad49ef8435910 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/TransientMemoryBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/TransientMemoryBackend.php
@@ -39,7 +39,6 @@ class TransientMemoryBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBacke
      * @param string $data The data to be stored
      * @param array $tags Tags to associate with this cache entry
      * @param int $lifetime Lifetime of this cache entry in seconds. If NULL is specified, the default lifetime is used. "0" means unlimited lifetime.
-     * @return void
      * @throws \TYPO3\CMS\Core\Cache\Exception if no cache frontend has been set.
      * @throws \TYPO3\CMS\Core\Cache\Exception\InvalidDataException
      * @api
@@ -121,7 +120,6 @@ class TransientMemoryBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBacke
     /**
      * Removes all cache entries of this cache.
      *
-     * @return void
      * @api
      */
     public function flush()
@@ -134,7 +132,6 @@ class TransientMemoryBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBacke
      * Removes all cache entries of this cache which are tagged by the specified tag.
      *
      * @param string $tag The tag the entries must have
-     * @return void
      * @api
      */
     public function flushByTag($tag)
@@ -148,7 +145,6 @@ class TransientMemoryBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBacke
     /**
      * Does nothing
      *
-     * @return void
      * @api
      */
     public function collectGarbage()
diff --git a/typo3/sysext/core/Classes/Cache/Backend/Typo3DatabaseBackend.php b/typo3/sysext/core/Classes/Cache/Backend/Typo3DatabaseBackend.php
index e079ba6de7c97c9de19d39d77b02996760d1639b..af58aec999ef02448b4b06ff135c9b1ae2ae8afc 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/Typo3DatabaseBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/Typo3DatabaseBackend.php
@@ -61,7 +61,6 @@ class Typo3DatabaseBackend extends AbstractBackend implements TaggableBackendInt
      * Set cache frontend instance and calculate data and tags table name
      *
      * @param FrontendInterface $cache The frontend for this backend
-     * @return void
      * @api
      */
     public function setCache(FrontendInterface $cache)
@@ -79,7 +78,6 @@ class Typo3DatabaseBackend extends AbstractBackend implements TaggableBackendInt
      * @param string $data The data to be stored
      * @param array $tags Tags to associate with this cache entry
      * @param int $lifetime Lifetime of this cache entry in seconds. If NULL is specified, the default lifetime is used. "0" means unlimited lifetime.
-     * @return void
      * @throws Exception if no cache frontend has been set.
      * @throws InvalidDataException if the data to be stored is not a string.
      */
@@ -250,8 +248,6 @@ class Typo3DatabaseBackend extends AbstractBackend implements TaggableBackendInt
 
     /**
      * Removes all cache entries of this cache.
-     *
-     * @return void
      */
     public function flush()
     {
@@ -331,7 +327,6 @@ class Typo3DatabaseBackend extends AbstractBackend implements TaggableBackendInt
      * Removes all cache entries of this cache which are tagged by the specified tag.
      *
      * @param string $tag The tag the entries must have
-     * @return void
      */
     public function flushByTag($tag)
     {
@@ -381,8 +376,6 @@ class Typo3DatabaseBackend extends AbstractBackend implements TaggableBackendInt
 
     /**
      * Does garbage collection
-     *
-     * @return void
      */
     public function collectGarbage()
     {
@@ -528,7 +521,6 @@ class Typo3DatabaseBackend extends AbstractBackend implements TaggableBackendInt
      * Check if required frontend instance exists
      *
      * @throws Exception If there is no frontend instance in $this->cache
-     * @return void
      */
     protected function throwExceptionIfFrontendDoesNotExist()
     {
diff --git a/typo3/sysext/core/Classes/Cache/Backend/WincacheBackend.php b/typo3/sysext/core/Classes/Cache/Backend/WincacheBackend.php
index 2d8b221a6d685eaacac23624c251405494521296..b04eb2d8785b669650d90f0d330bfbacfc8a449c 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/WincacheBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/WincacheBackend.php
@@ -65,7 +65,6 @@ class WincacheBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend impl
      * @param string $data The data to be stored
      * @param array $tags Tags to associate with this cache entry
      * @param int $lifetime Lifetime of this cache entry in seconds. If NULL is specified, the default lifetime is used. "0" means unlimited lifetime.
-     * @return void
      * @throws \TYPO3\CMS\Core\Cache\Exception if no cache frontend has been set
      * @throws \InvalidArgumentException if the identifier is not valid
      * @throws \TYPO3\CMS\Core\Cache\Exception\InvalidDataException if $data is not a string
@@ -163,7 +162,6 @@ class WincacheBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend impl
      * Removes all cache entries of this cache
      *
      * @throws \TYPO3\CMS\Core\Cache\Exception
-     * @return void
      */
     public function flush()
     {
@@ -178,7 +176,6 @@ class WincacheBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend impl
      * tag.
      *
      * @param string $tag The tag the entries must have
-     * @return void
      */
     public function flushByTag($tag)
     {
@@ -193,7 +190,6 @@ class WincacheBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend impl
      *
      * @param string $entryIdentifier
      * @param array $tags
-     * @return void
      */
     protected function addIdentifierToTags($entryIdentifier, array $tags)
     {
@@ -225,7 +221,6 @@ class WincacheBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend impl
      * Removes association of the identifier with the given tags
      *
      * @param string $entryIdentifier
-     * @return void
      */
     protected function removeIdentifierFromAllTags($entryIdentifier)
     {
@@ -254,8 +249,6 @@ class WincacheBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend impl
 
     /**
      * Does nothing, as wincache does GC itself
-     *
-     * @return void
      */
     public function collectGarbage()
     {
diff --git a/typo3/sysext/core/Classes/Cache/CacheManager.php b/typo3/sysext/core/Classes/Cache/CacheManager.php
index a975ffd3fe300cee24ba0317127b44ba7fd5edd7..59bace3b4d84d218c02b0522a22f3b69e401e773 100644
--- a/typo3/sysext/core/Classes/Cache/CacheManager.php
+++ b/typo3/sysext/core/Classes/Cache/CacheManager.php
@@ -77,7 +77,6 @@ class CacheManager implements SingletonInterface
      * Existing cache configurations are preserved.
      *
      * @param array $cacheConfigurations The cache configurations to set
-     * @return void
      * @throws \InvalidArgumentException If $cacheConfigurations is not an array
      */
     public function setCacheConfigurations(array $cacheConfigurations)
@@ -94,7 +93,6 @@ class CacheManager implements SingletonInterface
      * Registers a cache so it can be retrieved at a later point.
      *
      * @param FrontendInterface $cache The cache frontend to be registered
-     * @return void
      * @throws DuplicateIdentifierException if a cache with the given identifier has already been registered.
      * @api
      */
@@ -141,7 +139,6 @@ class CacheManager implements SingletonInterface
     /**
      * Flushes all registered caches
      *
-     * @return void
      * @api
      */
     public function flushCaches()
@@ -156,7 +153,6 @@ class CacheManager implements SingletonInterface
      * Flushes all registered caches of a specific group
      *
      * @param string $groupIdentifier
-     * @return void
      * @throws NoSuchCacheGroupException
      * @api
      */
@@ -179,7 +175,6 @@ class CacheManager implements SingletonInterface
      *
      * @param string $groupIdentifier
      * @param string|array $tag Tag to search for
-     * @return void
      * @throws NoSuchCacheGroupException
      * @api
      */
@@ -205,7 +200,6 @@ class CacheManager implements SingletonInterface
      *
      * @param string $groupIdentifier
      * @param string[] $tags Tags to search for
-     * @return void
      * @throws NoSuchCacheGroupException
      * @api
      */
@@ -230,7 +224,6 @@ class CacheManager implements SingletonInterface
      * caches.
      *
      * @param string $tag Tag to search for
-     * @return void
      * @api
      */
     public function flushCachesByTag($tag)
@@ -245,7 +238,6 @@ class CacheManager implements SingletonInterface
      * Flushes entries tagged by any of the specified tags in all registered caches.
      *
      * @param string[] $tags Tags to search for
-     * @return void
      * @api
      */
     public function flushCachesByTags(array $tags)
@@ -258,8 +250,6 @@ class CacheManager implements SingletonInterface
 
     /**
      * Instantiates all registered caches.
-     *
-     * @return void
      */
     protected function createAllCaches()
     {
diff --git a/typo3/sysext/core/Classes/Cache/Frontend/AbstractFrontend.php b/typo3/sysext/core/Classes/Cache/Frontend/AbstractFrontend.php
index b32fc92d1233bad53b136d31f6da67135c0000b9..6a72b59eb9d8a0aac212eb9db08cb2c463531990 100644
--- a/typo3/sysext/core/Classes/Cache/Frontend/AbstractFrontend.php
+++ b/typo3/sysext/core/Classes/Cache/Frontend/AbstractFrontend.php
@@ -113,7 +113,6 @@ abstract class AbstractFrontend implements FrontendInterface
     /**
      * Removes all cache entries of this cache.
      *
-     * @return void
      * @api
      */
     public function flush()
@@ -125,7 +124,6 @@ abstract class AbstractFrontend implements FrontendInterface
      * Removes all cache entries of this cache which are tagged by any of the specified tags.
      *
      * @param string[] $tags
-     * @return void
      * @throws \InvalidArgumentException
      */
     public function flushByTags(array $tags)
@@ -144,7 +142,6 @@ abstract class AbstractFrontend implements FrontendInterface
      * Removes all cache entries of this cache which are tagged by the specified tag.
      *
      * @param string $tag The tag the entries must have
-     * @return void
      * @throws \InvalidArgumentException
      * @api
      */
@@ -167,7 +164,6 @@ abstract class AbstractFrontend implements FrontendInterface
     /**
      * Does garbage collection
      *
-     * @return void
      * @api
      */
     public function collectGarbage()
diff --git a/typo3/sysext/core/Classes/Cache/Frontend/FrontendInterface.php b/typo3/sysext/core/Classes/Cache/Frontend/FrontendInterface.php
index 07db08454dc761e3c8acd0f396b93bc3a96a8632..d4904b197785c5e8e8a4a1a63b94e7e9d2c23665 100644
--- a/typo3/sysext/core/Classes/Cache/Frontend/FrontendInterface.php
+++ b/typo3/sysext/core/Classes/Cache/Frontend/FrontendInterface.php
@@ -58,7 +58,6 @@ interface FrontendInterface
      * @param mixed $data The data to cache - also depends on the concrete cache implementation
      * @param array $tags Tags to associate with this cache entry
      * @param int $lifetime Lifetime of this cache entry in seconds. If NULL is specified, the default lifetime is used. "0" means unlimited lifetime.
-     * @return void
      * @api
      */
     public function set($entryIdentifier, $data, array $tags = [], $lifetime = null);
@@ -100,8 +99,6 @@ interface FrontendInterface
 
     /**
      * Removes all cache entries of this cache.
-     *
-     * @return void
      */
     public function flush();
 
@@ -109,7 +106,6 @@ interface FrontendInterface
      * Removes all cache entries of this cache which are tagged by the specified tag.
      *
      * @param string $tag The tag the entries must have
-     * @return void
      * @api
      */
     public function flushByTag($tag);
@@ -118,7 +114,6 @@ interface FrontendInterface
      * Removes all cache entries of this cache which are tagged by any of the specified tags.
      *
      * @param string[] $tags List of tags
-     * @return void
      * @api
      */
     public function flushByTags(array $tags);
@@ -126,7 +121,6 @@ interface FrontendInterface
     /**
      * Does garbage collection
      *
-     * @return void
      * @api
      */
     public function collectGarbage();
diff --git a/typo3/sysext/core/Classes/Cache/Frontend/PhpFrontend.php b/typo3/sysext/core/Classes/Cache/Frontend/PhpFrontend.php
index 2eb9322d4e431d3a130a2bb462fcd4d2e86ec1fc..84d1a1cf9a0eea50481369ef5f382eb4c57b50c4 100644
--- a/typo3/sysext/core/Classes/Cache/Frontend/PhpFrontend.php
+++ b/typo3/sysext/core/Classes/Cache/Frontend/PhpFrontend.php
@@ -43,7 +43,6 @@ class PhpFrontend extends StringFrontend
      * @param string $sourceCode PHP source code
      * @param array $tags Tags to associate with this cache entry
      * @param int $lifetime Lifetime of this cache entry in seconds. If NULL is specified, the default lifetime is used. "0" means unlimited lifetime.
-     * @return void
      * @throws \InvalidArgumentException If $entryIdentifier or $tags is invalid
      * @throws InvalidDataException If $sourceCode is not a string
      * @api
diff --git a/typo3/sysext/core/Classes/Cache/Frontend/StringFrontend.php b/typo3/sysext/core/Classes/Cache/Frontend/StringFrontend.php
index f3bcb33a97692750fd871574ddb66ad9904d08f2..aee6fa83725d00d751fa3802c81a3e1f83fd377e 100644
--- a/typo3/sysext/core/Classes/Cache/Frontend/StringFrontend.php
+++ b/typo3/sysext/core/Classes/Cache/Frontend/StringFrontend.php
@@ -31,7 +31,6 @@ class StringFrontend extends AbstractFrontend
      * @param string $string The variable to cache
      * @param array $tags Tags to associate with this cache entry
      * @param int $lifetime Lifetime of this cache entry in seconds. If NULL is specified, the default lifetime is used. "0" means unlimited lifetime.
-     * @return void
      * @throws \InvalidArgumentException if the identifier or tag is not valid
      * @throws InvalidDataException if the variable to cache is not of type string
      * @api
diff --git a/typo3/sysext/core/Classes/Cache/Frontend/VariableFrontend.php b/typo3/sysext/core/Classes/Cache/Frontend/VariableFrontend.php
index b79463d12afb5a12ac174635c4a7beff63053c18..92c8ee76d52fd2de2a67c798ba3476e4caff051e 100644
--- a/typo3/sysext/core/Classes/Cache/Frontend/VariableFrontend.php
+++ b/typo3/sysext/core/Classes/Cache/Frontend/VariableFrontend.php
@@ -30,7 +30,6 @@ class VariableFrontend extends AbstractFrontend
      * @param mixed $variable The variable to cache
      * @param array $tags Tags to associate with this cache entry
      * @param int $lifetime Lifetime of this cache entry in seconds. If NULL is specified, the default lifetime is used. "0" means unlimited lifetime.
-     * @return void
      * @throws \InvalidArgumentException if the identifier or tag is not valid
      * @api
      */
diff --git a/typo3/sysext/core/Classes/Category/CategoryRegistry.php b/typo3/sysext/core/Classes/Category/CategoryRegistry.php
index 22cdd600134bed2491dcca517412bdb7a7c1f28d..7014abbea0f26ae1135663b450bc9130a69091c4 100644
--- a/typo3/sysext/core/Classes/Category/CategoryRegistry.php
+++ b/typo3/sysext/core/Classes/Category/CategoryRegistry.php
@@ -135,7 +135,6 @@ class CategoryRegistry implements SingletonInterface
      *
      * @param array $configuration Current field configuration
      * @throws \UnexpectedValueException
-     * @return void
      */
     public function getCategoryFieldsForTable(array &$configuration)
     {
@@ -215,7 +214,6 @@ class CategoryRegistry implements SingletonInterface
     /**
      * Apply TCA to all registered tables
      *
-     * @return void
      * @internal
      */
     public function applyTcaForPreRegisteredTables()
@@ -242,8 +240,6 @@ class CategoryRegistry implements SingletonInterface
 
     /**
      * Add default categorized tables to the registry
-     *
-     * @return void
      */
     protected function registerDefaultCategorizedTables()
     {
@@ -268,7 +264,6 @@ class CategoryRegistry implements SingletonInterface
      *              + fieldList: field configuration to be added to showitems
      *              + typesList: list of types that shall visualize the categories field
      *              + position: insert position of the categories field
-     * @return void
      */
     protected function addToAllTCAtypes($tableName, $fieldName, array $options)
     {
@@ -326,7 +321,6 @@ class CategoryRegistry implements SingletonInterface
      *              + interface: boolean if the category should be included in the "interface" section of the TCA table
      *              + l10n_mode
      *              + l10n_display
-     * @return void
      */
     protected function addTcaColumn($tableName, $fieldName, array $options)
     {
diff --git a/typo3/sysext/core/Classes/Category/Collection/CategoryCollection.php b/typo3/sysext/core/Classes/Category/Collection/CategoryCollection.php
index 52f7ec0995facc6d343d112e20f5f2023742032c..d80fb514c6590fdb3988597a5b2cd8be2b53b64b 100644
--- a/typo3/sysext/core/Classes/Category/Collection/CategoryCollection.php
+++ b/typo3/sysext/core/Classes/Category/Collection/CategoryCollection.php
@@ -198,8 +198,6 @@ class CategoryCollection extends AbstractRecordCollection implements EditableCol
      * If the content entries of the storage had not been loaded on creation
      * ($fillItems = false) this function is to be used for loading the contents
      * afterwards.
-     *
-     * @return void
      */
     public function loadContents()
     {
@@ -230,7 +228,6 @@ class CategoryCollection extends AbstractRecordCollection implements EditableCol
      * Adds on entry to the collection
      *
      * @param mixed $data
-     * @return void
      */
     public function add($data)
     {
@@ -241,7 +238,6 @@ class CategoryCollection extends AbstractRecordCollection implements EditableCol
      * Adds a set of entries to the collection
      *
      * @param CollectionInterface $other
-     * @return void
      */
     public function addAll(CollectionInterface $other)
     {
@@ -255,7 +251,6 @@ class CategoryCollection extends AbstractRecordCollection implements EditableCol
      * Note: not the given "index"
      *
      * @param mixed $data
-     * @return void
      */
     public function remove($data)
     {
@@ -272,8 +267,6 @@ class CategoryCollection extends AbstractRecordCollection implements EditableCol
     /**
      * Removes all entries from the collection
      * collection will be empty afterwards
-     *
-     * @return void
      */
     public function removeAll()
     {
diff --git a/typo3/sysext/core/Classes/Charset/CharsetConverter.php b/typo3/sysext/core/Classes/Charset/CharsetConverter.php
index 772bd2b1119a13b4296bb304f4be9699d84d52d1..7c633d078346bde84da5c4d08cda7830c9303261 100644
--- a/typo3/sysext/core/Classes/Charset/CharsetConverter.php
+++ b/typo3/sysext/core/Classes/Charset/CharsetConverter.php
@@ -340,7 +340,6 @@ class CharsetConverter implements SingletonInterface
      * @param string $fromCharset From charset (the current charset of the string)
      * @param string $toCharset To charset (the output charset wanted)
      * @param bool $useEntityForNoChar If set, then characters that are not available in the destination character set will be encoded as numeric entities
-     * @return void
      * @see conv()
      */
     public function convArray(&$array, $fromCharset, $toCharset, $useEntityForNoChar = false)
diff --git a/typo3/sysext/core/Classes/Collection/AbstractRecordCollection.php b/typo3/sysext/core/Classes/Collection/AbstractRecordCollection.php
index 966e47e5cd82680ba85e2d30a6e0ea56c7fad2cb..bae0b82688b997be1fd755478df7c412a91e52bc 100644
--- a/typo3/sysext/core/Classes/Collection/AbstractRecordCollection.php
+++ b/typo3/sysext/core/Classes/Collection/AbstractRecordCollection.php
@@ -105,7 +105,6 @@ abstract class AbstractRecordCollection implements RecordCollectionInterface, Pe
      * Move forward to next element
      *
      * @link http://php.net/manual/en/iterator.next.php
-     * @return void Any returned value is ignored.
      */
     public function next()
     {
@@ -142,7 +141,6 @@ abstract class AbstractRecordCollection implements RecordCollectionInterface, Pe
      * Rewind the Iterator to the first element
      *
      * @link http://php.net/manual/en/iterator.rewind.php
-     * @return void Any returned value is ignored.
      */
     public function rewind()
     {
@@ -224,7 +222,6 @@ abstract class AbstractRecordCollection implements RecordCollectionInterface, Pe
      * Setter for the title
      *
      * @param string $title
-     * @return void
      */
     public function setTitle($title)
     {
@@ -235,7 +232,6 @@ abstract class AbstractRecordCollection implements RecordCollectionInterface, Pe
      * Setter for the description
      *
      * @param string $desc
-     * @return void
      */
     public function setDescription($desc)
     {
@@ -256,7 +252,6 @@ abstract class AbstractRecordCollection implements RecordCollectionInterface, Pe
      * Setter for the name of the data-source table
      *
      * @param string $tableName
-     * @return void
      */
     public function setItemTableName($tableName)
     {
@@ -271,7 +266,6 @@ abstract class AbstractRecordCollection implements RecordCollectionInterface, Pe
      *
      * @param $callbackFunction
      * @see http://www.php.net/manual/en/function.usort.php
-     * @return void
      */
     public function usort($callbackFunction)
     {
@@ -287,7 +281,6 @@ abstract class AbstractRecordCollection implements RecordCollectionInterface, Pe
      *
      * @param int $currentPosition
      * @param int $newPosition
-     * @return void
      */
     public function moveItemAt($currentPosition, $newPosition = 0)
     {
@@ -309,7 +302,6 @@ abstract class AbstractRecordCollection implements RecordCollectionInterface, Pe
      * Sets the identifier of the collection
      *
      * @param int $id
-     * @return void
      */
     public function setIdentifier($id)
     {
@@ -359,8 +351,6 @@ abstract class AbstractRecordCollection implements RecordCollectionInterface, Pe
 
     /**
      * Persists current collection state to underlying storage
-     *
-     * @return void
      */
     public function persist()
     {
@@ -432,7 +422,6 @@ abstract class AbstractRecordCollection implements RecordCollectionInterface, Pe
      * Loads the properties of this collection from an array
      *
      * @param array $array
-     * @return void
      */
     public function fromArray(array $array)
     {
diff --git a/typo3/sysext/core/Classes/Collection/EditableCollectionInterface.php b/typo3/sysext/core/Classes/Collection/EditableCollectionInterface.php
index e17260fc247b5c127b3843eb865ef4f06d8455ad..d94ad8f109ca4140773a0e49b8870b4b577f268a 100644
--- a/typo3/sysext/core/Classes/Collection/EditableCollectionInterface.php
+++ b/typo3/sysext/core/Classes/Collection/EditableCollectionInterface.php
@@ -23,7 +23,6 @@ interface EditableCollectionInterface
      * Adds on entry to the collection
      *
      * @param mixed $data
-     * @return void
      */
     public function add($data);
 
@@ -31,7 +30,6 @@ interface EditableCollectionInterface
      * Adds a set of entries to the collection
      *
      * @param CollectionInterface $other
-     * @return void
      */
     public function addAll(CollectionInterface $other);
 
@@ -41,7 +39,6 @@ interface EditableCollectionInterface
      * Note: not the given "index"
      *
      * @param mixed $data
-     * @return void
      */
     public function remove($data);
 
@@ -49,8 +46,6 @@ interface EditableCollectionInterface
      * Removes all entries from the collection
      *
      * collection will be empty afterwards
-     *
-     * @return void
      */
     public function removeAll();
 }
diff --git a/typo3/sysext/core/Classes/Collection/NameableCollectionInterface.php b/typo3/sysext/core/Classes/Collection/NameableCollectionInterface.php
index 171e49a6348ca38ff646aaf32c3920005f770cdd..b643595250dc65fffab7618a978a223090dd3baf 100644
--- a/typo3/sysext/core/Classes/Collection/NameableCollectionInterface.php
+++ b/typo3/sysext/core/Classes/Collection/NameableCollectionInterface.php
@@ -28,7 +28,6 @@ interface NameableCollectionInterface
      * Setter for the title
      *
      * @param string $title
-     * @return void
      */
     public function setTitle($title);
 
@@ -36,7 +35,6 @@ interface NameableCollectionInterface
      * Setter for the description
      *
      * @param string $description
-     * @return void
      */
     public function setDescription($description);
 
@@ -49,8 +47,6 @@ interface NameableCollectionInterface
 
     /**
      * Getter for the description
-     *
-     * @return void
      */
     public function getDescription();
 }
diff --git a/typo3/sysext/core/Classes/Collection/PersistableCollectionInterface.php b/typo3/sysext/core/Classes/Collection/PersistableCollectionInterface.php
index 664e6256d724bc734b8384f9e5eb0bfc367ab43e..1fd75bdc89b2bb89126c056e3906a25d54e8b6a8 100644
--- a/typo3/sysext/core/Classes/Collection/PersistableCollectionInterface.php
+++ b/typo3/sysext/core/Classes/Collection/PersistableCollectionInterface.php
@@ -39,7 +39,6 @@ interface PersistableCollectionInterface
      * Sets the identifier of the collection
      *
      * @param int|string $id
-     * @return void
      */
     public function setIdentifier($id);
 
@@ -58,8 +57,6 @@ interface PersistableCollectionInterface
 
     /**
      * Persists current collection state to underlying storage
-     *
-     * @return void
      */
     public function persist();
 
@@ -72,8 +69,6 @@ interface PersistableCollectionInterface
      * If the content entries of the storage had not been loaded on creation
      * ($fillItems = false) this function is to be used for loading the contents
      * afterwards.
-     *
-     * @return void
      */
     public function loadContents();
 }
diff --git a/typo3/sysext/core/Classes/Collection/RecordCollectionInterface.php b/typo3/sysext/core/Classes/Collection/RecordCollectionInterface.php
index 91b577e19ceec5bd128e3474342239fd482bf5ac..1e4637496da96e6c00ad0f8cb2d9aa61abd639e9 100644
--- a/typo3/sysext/core/Classes/Collection/RecordCollectionInterface.php
+++ b/typo3/sysext/core/Classes/Collection/RecordCollectionInterface.php
@@ -23,7 +23,6 @@ interface RecordCollectionInterface extends \TYPO3\CMS\Core\Collection\Collectio
      * Setter for the name of the data-source table
      *
      * @param string $tableName
-     * @return void
      */
     public function setItemTableName($tableName);
 
diff --git a/typo3/sysext/core/Classes/Collection/RecordCollectionRepository.php b/typo3/sysext/core/Classes/Collection/RecordCollectionRepository.php
index 42ef912c7b0fafe571ff157d40df6c90ea9d8f41..d3ff29844ba543c5a7cfae9269a6324f37ada0d7 100644
--- a/typo3/sysext/core/Classes/Collection/RecordCollectionRepository.php
+++ b/typo3/sysext/core/Classes/Collection/RecordCollectionRepository.php
@@ -147,7 +147,6 @@ class RecordCollectionRepository
      * Deletes a record collection by uid.
      *
      * @param int $uid uid to be deleted
-     * @return void
      */
     public function deleteByUid($uid)
     {
diff --git a/typo3/sysext/core/Classes/Collection/SortableCollectionInterface.php b/typo3/sysext/core/Classes/Collection/SortableCollectionInterface.php
index 24b953b6efe11f301ebae5b46782070a1a312b43..f81be9b2f3d5a6c938b51085b426fd897e50f76b 100644
--- a/typo3/sysext/core/Classes/Collection/SortableCollectionInterface.php
+++ b/typo3/sysext/core/Classes/Collection/SortableCollectionInterface.php
@@ -33,7 +33,6 @@ interface SortableCollectionInterface
      *
      * @param $callbackFunction
      * @see http://www.php.net/manual/en/function.usort.php
-     * @return void
      */
     public function usort($callbackFunction);
 
@@ -45,7 +44,6 @@ interface SortableCollectionInterface
      *
      * @param int $currentPosition
      * @param int $newPosition
-     * @return void
      */
     public function moveItemAt($currentPosition, $newPosition = 0);
 }
diff --git a/typo3/sysext/core/Classes/Collection/StaticRecordCollection.php b/typo3/sysext/core/Classes/Collection/StaticRecordCollection.php
index 8e51d9d8bb5a874bcca4e41c302f33937f6ce7be..cf82613093b7de6863dfc4c6def4c5ffcefee040 100644
--- a/typo3/sysext/core/Classes/Collection/StaticRecordCollection.php
+++ b/typo3/sysext/core/Classes/Collection/StaticRecordCollection.php
@@ -69,8 +69,6 @@ class StaticRecordCollection extends AbstractRecordCollection implements Editabl
      * If the content entries of the storage had not been loaded on creation
      * ($fillItems = false) this function is to be used for loading the contents
      * afterwards.
-     *
-     * @return void
      */
     public function loadContents()
     {
@@ -104,7 +102,6 @@ class StaticRecordCollection extends AbstractRecordCollection implements Editabl
      * Adds on entry to the collection
      *
      * @param mixed $data
-     * @return void
      */
     public function add($data)
     {
@@ -115,7 +112,6 @@ class StaticRecordCollection extends AbstractRecordCollection implements Editabl
      * Adds a set of entries to the collection
      *
      * @param CollectionInterface $other
-     * @return void
      */
     public function addAll(CollectionInterface $other)
     {
@@ -130,7 +126,6 @@ class StaticRecordCollection extends AbstractRecordCollection implements Editabl
      * Note: not the given "index"
      *
      * @param mixed $data
-     * @return void
      */
     public function remove($data)
     {
@@ -148,8 +143,6 @@ class StaticRecordCollection extends AbstractRecordCollection implements Editabl
      * Removes all entries from the collection
      *
      * collection will be empty afterwards
-     *
-     * @return void
      */
     public function removeAll()
     {
diff --git a/typo3/sysext/core/Classes/Compatibility/LoadedExtensionArrayElement.php b/typo3/sysext/core/Classes/Compatibility/LoadedExtensionArrayElement.php
index 23e9ec677f1c0c0fe2f164a5968075f7ceb2aa3c..df6ac6cd64705f0d7becee01ae6696f306ad01bd 100644
--- a/typo3/sysext/core/Classes/Compatibility/LoadedExtensionArrayElement.php
+++ b/typo3/sysext/core/Classes/Compatibility/LoadedExtensionArrayElement.php
@@ -60,8 +60,6 @@ class LoadedExtensionArrayElement implements \IteratorAggregate, \ArrayAccess, \
 
     /**
      * Create main information
-     *
-     * @return void
      */
     protected function initializeBasicExtensionInformation()
     {
@@ -95,8 +93,6 @@ class LoadedExtensionArrayElement implements \IteratorAggregate, \ArrayAccess, \
 
     /**
      * Initialize extension icon
-     *
-     * @return void
      */
     protected function initializeExtensionIcon()
     {
@@ -157,7 +153,6 @@ class LoadedExtensionArrayElement implements \IteratorAggregate, \ArrayAccess, \
      * @link http://php.net/manual/en/arrayaccess.offsetset.php
      * @param mixed $offset The offset to assign the value to.
      * @param mixed $value The value to set.
-     * @return void
      * @throws \InvalidArgumentException
      */
     public function offsetSet($offset, $value)
@@ -170,7 +165,6 @@ class LoadedExtensionArrayElement implements \IteratorAggregate, \ArrayAccess, \
      *
      * @link http://php.net/manual/en/arrayaccess.offsetunset.php
      * @param mixed $offset The offset to unset.
-     * @return void
      * @throws \InvalidArgumentException
      */
     public function offsetUnset($offset)
diff --git a/typo3/sysext/core/Classes/Compatibility/LoadedExtensionsArray.php b/typo3/sysext/core/Classes/Compatibility/LoadedExtensionsArray.php
index 2ab8ac7eb533f66f4182f1bacde9c899e130b9d5..5f496754727b0f7d434a75980ed51e192454a86d 100644
--- a/typo3/sysext/core/Classes/Compatibility/LoadedExtensionsArray.php
+++ b/typo3/sysext/core/Classes/Compatibility/LoadedExtensionsArray.php
@@ -81,7 +81,6 @@ class LoadedExtensionsArray implements \Iterator, \ArrayAccess, \Serializable, \
      * @param mixed $offset The offset to assign the value to.
      * @param mixed $value The value to set.
      * @throws \InvalidArgumentException
-     * @return void
      */
     public function offsetSet($offset, $value)
     {
@@ -94,7 +93,6 @@ class LoadedExtensionsArray implements \Iterator, \ArrayAccess, \Serializable, \
      * @link http://php.net/manual/en/arrayaccess.offsetunset.php
      * @param mixed $offset The offset to unset.
      * @throws \InvalidArgumentException
-     * @return void
      */
     public function offsetUnset($offset)
     {
@@ -150,7 +148,6 @@ class LoadedExtensionsArray implements \Iterator, \ArrayAccess, \Serializable, \
      * Move forward to next element
      *
      * @link http://php.net/manual/en/iterator.next.php
-     * @return void Any returned value is ignored.
      */
     public function next()
     {
@@ -189,7 +186,6 @@ class LoadedExtensionsArray implements \Iterator, \ArrayAccess, \Serializable, \
      * Rewind the Iterator to the first element
      *
      * @link http://php.net/manual/en/iterator.rewind.php
-     * @return void Any returned value is ignored.
      */
     public function rewind()
     {
@@ -199,8 +195,6 @@ class LoadedExtensionsArray implements \Iterator, \ArrayAccess, \Serializable, \
 
     /**
      * Reset
-     *
-     * @return void
      */
     public function reset()
     {
diff --git a/typo3/sysext/core/Classes/Configuration/ConfigurationManager.php b/typo3/sysext/core/Classes/Configuration/ConfigurationManager.php
index 64b4d01cc52ba1e9d7f646e39011bedfa92b2441..2993be9af4bc1368f05dda14c1a2343b4cc29372 100644
--- a/typo3/sysext/core/Classes/Configuration/ConfigurationManager.php
+++ b/typo3/sysext/core/Classes/Configuration/ConfigurationManager.php
@@ -175,7 +175,6 @@ class ConfigurationManager
      * Override local configuration with new values.
      *
      * @param array $configurationToMerge Override configuration array
-     * @return void
      */
     public function updateLocalConfiguration(array $configurationToMerge)
     {
@@ -295,7 +294,6 @@ class ConfigurationManager
      *
      * @access private
      * @throws \UnexpectedValueException
-     * @return void
      */
     public function exportConfiguration()
     {
@@ -373,7 +371,6 @@ class ConfigurationManager
      * by the install tool in an early step.
      *
      * @throws \RuntimeException
-     * @return void
      * @access private
      */
     public function createLocalConfigurationFromFactoryConfiguration()
diff --git a/typo3/sysext/core/Classes/Configuration/FlexForm/FlexFormTools.php b/typo3/sysext/core/Classes/Configuration/FlexForm/FlexFormTools.php
index ff28f69b211e60ff300a6938ac0b3e0a9835b61e..277f4971abcc5671a9968e004d38bdc6b438a52e 100644
--- a/typo3/sysext/core/Classes/Configuration/FlexForm/FlexFormTools.php
+++ b/typo3/sysext/core/Classes/Configuration/FlexForm/FlexFormTools.php
@@ -908,7 +908,6 @@ class FlexFormTools
      * @param array $PA Additional configuration used in calling function
      * @param string $path Path of value in DS structure
      * @param FlexFormTools $pObj caller
-     * @return void
      */
     public function cleanFlexFormXML_callBackFunction($dsArr, $data, $PA, $path, $pObj)
     {
diff --git a/typo3/sysext/core/Classes/Configuration/TypoScript/ConditionMatching/AbstractConditionMatcher.php b/typo3/sysext/core/Classes/Configuration/TypoScript/ConditionMatching/AbstractConditionMatcher.php
index cca7d8866d311d3db848ecb9260f8f632792bb67..3c5f21480a5b5486a690ce782e7c50ee45b2c2ac 100644
--- a/typo3/sysext/core/Classes/Configuration/TypoScript/ConditionMatching/AbstractConditionMatcher.php
+++ b/typo3/sysext/core/Classes/Configuration/TypoScript/ConditionMatching/AbstractConditionMatcher.php
@@ -59,7 +59,6 @@ abstract class AbstractConditionMatcher
      * Sets the id of the page to evaluate conditions for.
      *
      * @param int $pageId Id of the page (must be positive)
-     * @return void
      */
     public function setPageId($pageId)
     {
@@ -82,7 +81,6 @@ abstract class AbstractConditionMatcher
      * Sets the rootline.
      *
      * @param array $rootline The rootline to be used for matching (must have elements)
-     * @return void
      */
     public function setRootline(array $rootline)
     {
@@ -105,7 +103,6 @@ abstract class AbstractConditionMatcher
      * Sets whether to simulate the behaviour and match all conditions.
      *
      * @param bool $simulateMatchResult Whether to simulate positive matches
-     * @return void
      */
     public function setSimulateMatchResult($simulateMatchResult)
     {
@@ -118,7 +115,6 @@ abstract class AbstractConditionMatcher
      * Sets whether to simulate the behaviour and match specific conditions.
      *
      * @param array $simulateMatchConditions Conditions to simulate a match for
-     * @return void
      */
     public function setSimulateMatchConditions(array $simulateMatchConditions)
     {
@@ -662,7 +658,6 @@ abstract class AbstractConditionMatcher
      * Sets a log message.
      *
      * @param string $message The log message to set/write
-     * @return void
      */
     abstract protected function log($message);
 }
diff --git a/typo3/sysext/core/Classes/Console/CommandApplication.php b/typo3/sysext/core/Classes/Console/CommandApplication.php
index 41489352049e8f6db6794a18cac56464e91f602d..1dd9c9e459d1584c3476e598e24c114493bbea2f 100644
--- a/typo3/sysext/core/Classes/Console/CommandApplication.php
+++ b/typo3/sysext/core/Classes/Console/CommandApplication.php
@@ -69,7 +69,6 @@ class CommandApplication implements ApplicationInterface
      * Run the Symfony Console application in this TYPO3 application
      *
      * @param callable $execute
-     * @return void
      */
     public function run(callable $execute = null)
     {
@@ -92,8 +91,6 @@ class CommandApplication implements ApplicationInterface
 
     /**
      * Check the script is called from a cli environment.
-     *
-     * @return void
      */
     protected function checkEnvironmentOrDie()
     {
diff --git a/typo3/sysext/core/Classes/Console/CommandRequestHandler.php b/typo3/sysext/core/Classes/Console/CommandRequestHandler.php
index 27070f90a23fe16d2fee5edf30ed6a12be41b518..f841fee1dc7147d8f8dfc9455a252d4923b217c7 100644
--- a/typo3/sysext/core/Classes/Console/CommandRequestHandler.php
+++ b/typo3/sysext/core/Classes/Console/CommandRequestHandler.php
@@ -55,7 +55,6 @@ class CommandRequestHandler implements RequestHandlerInterface
      * Handles any commandline request
      *
      * @param InputInterface $input
-     * @return void
      */
     public function handleRequest(InputInterface $input)
     {
@@ -114,7 +113,6 @@ class CommandRequestHandler implements RequestHandlerInterface
     }
 
     /**
-     *
      * @param InputInterface $input
      * @return bool|Command
      */
diff --git a/typo3/sysext/core/Classes/Controller/CommandLineController.php b/typo3/sysext/core/Classes/Controller/CommandLineController.php
index e5686b014eb3ef15e196a97989be11e09551078a..a272720f382a1b2d605f7e3d70e4fc7a9ecfc31c 100644
--- a/typo3/sysext/core/Classes/Controller/CommandLineController.php
+++ b/typo3/sysext/core/Classes/Controller/CommandLineController.php
@@ -60,7 +60,6 @@ class CommandLineController
      * Constructor
      * Make sure child classes also call this!
      *
-     * @return void
      * @deprecated the CommandLineController is deprecated since TYPO3 v8 and will be removed in TYPO3 v9, use a separate CLI Command instead
      */
     public function __construct()
@@ -146,7 +145,6 @@ class CommandLineController
     /**
      * Validates if the input arguments in this->cli_args are all listed in this->cli_options and if not,
      * will exit with an error.
-     *
      */
     public function cli_validateArgs()
     {
@@ -186,7 +184,6 @@ class CommandLineController
      * Set environment array to $cli_args
      *
      * @param array $argv Configuration options
-     * @return void
      */
     public function cli_setArguments(array $argv = [])
     {
@@ -247,8 +244,6 @@ class CommandLineController
 
     /**
      * Prints help-output from ->cli_help array
-     *
-     * @return void
      */
     public function cli_help()
     {
diff --git a/typo3/sysext/core/Classes/Core/ApplicationInterface.php b/typo3/sysext/core/Classes/Core/ApplicationInterface.php
index 4bc7f3fca830cc4a35382094e3db1b5b97b538d6..3c9ac5d2cc8194fded1c2442305f8a83201aeeee 100644
--- a/typo3/sysext/core/Classes/Core/ApplicationInterface.php
+++ b/typo3/sysext/core/Classes/Core/ApplicationInterface.php
@@ -25,7 +25,6 @@ interface ApplicationInterface
      * Starting point
      *
      * @param callable $execute
-     * @return void
      */
     public function run(callable $execute = null);
 }
diff --git a/typo3/sysext/core/Classes/Core/Bootstrap.php b/typo3/sysext/core/Classes/Core/Bootstrap.php
index 92e5b25263651e31fdbd15ce7022ec496db46fd5..e9bd2864591e201a37fe085da11a3402b408054e 100644
--- a/typo3/sysext/core/Classes/Core/Bootstrap.php
+++ b/typo3/sysext/core/Classes/Core/Bootstrap.php
@@ -344,7 +344,6 @@ class Bootstrap
      *
      * @param string $objectName Object name, as later used by the Object Manager
      * @param object $instance The instance to register
-     * @return void
      * @internal This is not a public API method, do not use in own extensions
      */
     public function setEarlyInstance($objectName, $instance)
@@ -956,7 +955,6 @@ class Bootstrap
      * Check for registered ext tables hooks and run them
      *
      * @throws \UnexpectedValueException
-     * @return void
      */
     protected function runExtTablesPostProcessingHooks()
     {
diff --git a/typo3/sysext/core/Classes/Core/SystemEnvironmentBuilder.php b/typo3/sysext/core/Classes/Core/SystemEnvironmentBuilder.php
index f89301cb37e8af7ed289c79ed21942f3f60a5b3d..33ee08ca6c3e366ae6ad9fbb28b3819feb2a0a9a 100644
--- a/typo3/sysext/core/Classes/Core/SystemEnvironmentBuilder.php
+++ b/typo3/sysext/core/Classes/Core/SystemEnvironmentBuilder.php
@@ -65,7 +65,6 @@ class SystemEnvironmentBuilder
      *
      * @internal This method should not be used by 3rd party code. It will change without further notice.
      * @param int $entryPointLevel Number of subdirectories where the entry script is located under the document root
-     * @return void
      */
     public static function run($entryPointLevel = 0)
     {
@@ -79,8 +78,6 @@ class SystemEnvironmentBuilder
 
     /**
      * Define all simple constants that have no dependency to local configuration
-     *
-     * @return void
      */
     protected static function defineBaseConstants()
     {
@@ -147,7 +144,6 @@ class SystemEnvironmentBuilder
      * Calculate all required base paths and set as constants.
      *
      * @param int $entryPointLevel Number of subdirectories where the entry script is located under the document root
-     * @return void
      */
     protected static function definePaths($entryPointLevel = 0)
     {
@@ -176,8 +172,6 @@ class SystemEnvironmentBuilder
 
     /**
      * Check if path and script file name calculation was successful, exit if not.
-     *
-     * @return void
      */
     protected static function checkMainPathsExist()
     {
@@ -195,8 +189,6 @@ class SystemEnvironmentBuilder
 
     /**
      * Set up / initialize several globals variables
-     *
-     * @return void
      */
     protected static function initializeGlobalVariables()
     {
@@ -210,8 +202,6 @@ class SystemEnvironmentBuilder
     /**
      * Initialize global time tracking variables.
      * These are helpers to for example output script parsetime at the end of a script.
-     *
-     * @return void
      */
     protected static function initializeGlobalTimeTrackingVariables()
     {
@@ -237,8 +227,6 @@ class SystemEnvironmentBuilder
      * ext_localconf or ext_tables. Since the final error reporting must be set up
      * after those extension files are read, a default configuration is needed to
      * suppress error reporting meanwhile during further bootstrap.
-     *
-     * @return void
      */
     protected static function initializeBasicErrorReporting()
     {
diff --git a/typo3/sysext/core/Classes/DataHandling/DataHandler.php b/typo3/sysext/core/Classes/DataHandling/DataHandler.php
index 0d611578a927affee30dc15a919b337fa63cf3cc..9be45edfe09468bdf02a122eada4135dd43d244a 100644
--- a/typo3/sysext/core/Classes/DataHandling/DataHandler.php
+++ b/typo3/sysext/core/Classes/DataHandling/DataHandler.php
@@ -730,7 +730,6 @@ class DataHandler
      * @param array $data Data to be modified or inserted in the database
      * @param array $cmd Commands to copy, move, delete, localize, versionize records.
      * @param BackendUserAuthentication|NULL $altUserObject An alternative userobject you can set instead of the default, which is $GLOBALS['BE_USER']
-     * @return void
      */
     public function start($data, $cmd, $altUserObject = null)
     {
@@ -776,7 +775,6 @@ class DataHandler
      * Example: $mirror[table][11] = '22,33' will look for content in $this->datamap[table][11] and copy it to $this->datamap[table][22] and $this->datamap[table][33]
      *
      * @param array $mirror This array has the syntax $mirror[table_name][uid] = [list of uids to copy data-value TO!]
-     * @return void
      */
     public function setMirror($mirror)
     {
@@ -806,7 +804,6 @@ class DataHandler
      * Initializes default values coming from User TSconfig
      *
      * @param array $userTS User TSconfig array
-     * @return void
      */
     public function setDefaultsFromUserTS($userTS)
     {
@@ -833,7 +830,6 @@ class DataHandler
      * It turns out that some versions of PHP arranges submitted data for files different if sent in an array. This function will unify this so the internal array $this->uploadedFileArray will always contain files arranged in the same structure.
      *
      * @param array $postFiles $_FILES array
-     * @return void
      */
     public function process_uploads($postFiles)
     {
@@ -869,7 +865,6 @@ class DataHandler
      * @param array $outputArr $this->uploadedFileArray passed by reference
      * @param array $inputArr Input array  ($_FILES parts)
      * @param string $keyToSet The current $_FILES array key to set on the outermost level.
-     * @return void
      * @access private
      * @see process_uploads()
      */
@@ -901,7 +896,6 @@ class DataHandler
      * @param string $table (reference) The table currently processing data for
      * @param string $id (reference) The record uid currently processing data for, [integer] or [string] (like 'NEW...')
      * @param array $fieldArray (reference) The field array of a record
-     * @return void
      */
     public function hook_processDatamap_afterDatabaseOperations(&$hookObjectsArr, &$status, &$table, &$id, &$fieldArray)
     {
@@ -1356,7 +1350,6 @@ class DataHandler
      *
      * @param string $table Table name
      * @param int $id Record uid
-     * @return void
      */
     public function placeholderShadowing($table, $id)
     {
@@ -2848,7 +2841,6 @@ class DataHandler
      * @param bool $set TRUE if an update should be done
      * @throws \InvalidArgumentException
      * @throws \TYPO3\CMS\Core\Exception
-     * @return void
      */
     protected function checkValue_input_ValidateEmail($value, &$set)
     {
@@ -2992,7 +2984,6 @@ class DataHandler
      * @param string $callBackFunc Call back function, default is checkValue_SW(). If $this->callBackObj is set to an object, the callback function in that object is called instead.
      * @param string $structurePath
      * @param array $workspaceOptions
-     * @return void
      * @see checkValue_flex_procInData()
      */
     public function checkValue_flex_procInData_travDS(&$dataValues, $dataValues_current, $uploadedFiles, $DSelements, $pParams, $callBackFunc, $structurePath, array $workspaceOptions = [])
@@ -3459,7 +3450,6 @@ class DataHandler
      *
      * @param int $uid Page UID to copy
      * @param int $destPid Destination PID: >=0 then it points to a page-id on which to insert the record (as the first element). <0 then it points to a uid from its own table after which to insert it (works if
-     * @return void
      */
     public function copyPages($uid, $destPid)
     {
@@ -4032,7 +4022,6 @@ class DataHandler
      *
      * @param string $table Table name
      * @param int $theNewSQLID Record UID
-     * @return void
      */
     public function copyRecord_fixRTEmagicImages($table, $theNewSQLID)
     {
@@ -4138,7 +4127,6 @@ class DataHandler
      * @param bool $first
      * @param array $overrideValues
      * @param string $excludeFields
-     * @return void
      */
     public function copyL10nOverlayRecords($table, $uid, $destPid, $first = false, $overrideValues = [], $excludeFields = '')
     {
@@ -4257,7 +4245,6 @@ class DataHandler
      * @param string $table Table name to move
      * @param int $uid Record uid to move
      * @param int $destPid Position to move to: $destPid: >=0 then it points to a page-id on which to insert the record (as the first element). <0 then it points to a uid from its own table after which to insert it (works if
-     * @return void
      */
     public function moveRecord($table, $uid, $destPid)
     {
@@ -4343,7 +4330,6 @@ class DataHandler
      * @param string $table Table name to move
      * @param int $uid Record uid to move
      * @param int $destPid Position to move to: $destPid: >=0 then it points to a page-id on which to insert the record (as the first element). <0 then it points to a uid from its own table after which to insert it (works if
-     * @return void
      * @see moveRecord()
      */
     public function moveRecord_raw($table, $uid, $destPid)
@@ -4497,7 +4483,6 @@ class DataHandler
      * @param string $table Record Table
      * @param string $uid Record UID
      * @param string $destPid Position to move to
-     * @return void
      */
     public function moveRecord_procFields($table, $uid, $destPid)
     {
@@ -4519,7 +4504,6 @@ class DataHandler
      * @param string $field Record field
      * @param string $value Record field value
      * @param array $conf TCA configuration of current field
-     * @return void
      */
     public function moveRecord_procBasedOnFieldType($table, $uid, $destPid, $field, $value, $conf)
     {
@@ -4556,7 +4540,6 @@ class DataHandler
      * @param string $uid Record UID
      * @param string $destPid Position to move to
      * @param string $originalRecordDestinationPid Position to move the original record to
-     * @return void
      */
     public function moveL10nOverlayRecords($table, $uid, $destPid, $originalRecordDestinationPid)
     {
@@ -4828,7 +4811,6 @@ class DataHandler
      * @param string $table The table of the localized parent record
      * @param int $id The uid of the localized parent record
      * @param array|string $command Defines the command to be performed (see example above)
-     * @return void
      */
     protected function inlineLocalizeSynchronize($table, $id, $command)
     {
@@ -4981,7 +4963,6 @@ class DataHandler
      *
      * @param string $table Table name
      * @param int $id Record UID
-     * @return void
      */
     public function deleteAction($table, $id)
     {
@@ -5011,7 +4992,6 @@ class DataHandler
      * @param int $uid Record UID
      * @param bool $noRecordCheck Flag: If $noRecordCheck is set, then the function does not check permission to delete record
      * @param bool $forceHardDelete If TRUE, the "deleted" flag is ignored if applicable for record and the record is deleted COMPLETELY!
-     * @return void
      */
     public function deleteEl($table, $uid, $noRecordCheck = false, $forceHardDelete = false)
     {
@@ -5029,7 +5009,6 @@ class DataHandler
      * @param string $table Table name
      * @param int $uid Record UID
      * @param bool $forceHardDelete If TRUE, the "deleted" flag is ignored if applicable for record and the record is deleted COMPLETELY!
-     * @return void
      */
     public function deleteVersionsForRecord($table, $uid, $forceHardDelete)
     {
@@ -5061,7 +5040,6 @@ class DataHandler
      *
      * @param string $table Table name
      * @param int $uid Record UID
-     * @return void
      */
     public function undeleteRecord($table, $uid)
     {
@@ -5081,7 +5059,6 @@ class DataHandler
      * @param bool $noRecordCheck Flag: If $noRecordCheck is set, then the function does not check permission to delete record
      * @param bool $forceHardDelete If TRUE, the "deleted" flag is ignored if applicable for record and the record is deleted COMPLETELY!
      * @param bool $undeleteRecord If TRUE, the "deleted" flag is set to 0 again and thus, the item is undeleted.
-     * @return void
      */
     public function deleteRecord($table, $uid, $noRecordCheck = false, $forceHardDelete = false, $undeleteRecord = false)
     {
@@ -5249,7 +5226,6 @@ class DataHandler
      * @param array $PA
      * @param string $structurePath not used
      * @param object $pObj not used
-     * @return void
      */
     public function deleteRecord_flexFormCallBack($dsArr, $dataValue, $PA, $structurePath, $pObj)
     {
@@ -5276,7 +5252,6 @@ class DataHandler
      * @param int $uid Page id
      * @param bool $force If TRUE, pages are not checked for permission.
      * @param bool $forceHardDelete If TRUE, the "deleted" flag is ignored if applicable for record and the record is deleted COMPLETELY!
-     * @return void
      */
     public function deletePages($uid, $force = false, $forceHardDelete = false)
     {
@@ -5316,7 +5291,6 @@ class DataHandler
      *
      * @param int $uid Page id
      * @param bool $forceHardDelete If TRUE, the "deleted" flag is ignored if applicable for record and the record is deleted COMPLETELY!
-     * @return void
      * @access private
      * @see deletePages()
      */
@@ -5364,7 +5338,6 @@ class DataHandler
      *
      * @param string $table Record table
      * @param int $uid Record uid
-     * @return void
      */
     protected function copyMovedRecordToNewLocation($table, $uid)
     {
@@ -5493,7 +5466,6 @@ class DataHandler
      * @param string $table Record Table
      * @param string $uid Record UID
      * @param bool $undeleteRecord If a record should be undeleted (e.g. from history/undo)
-     * @return void
      * @see deleteRecord()
      */
     public function deleteRecord_procFields($table, $uid, $undeleteRecord = false)
@@ -5518,7 +5490,6 @@ class DataHandler
      * @param string $value Record field value
      * @param array $conf TCA configuration of current field
      * @param bool $undeleteRecord If a record should be undeleted (e.g. from history/undo)
-     * @return void
      * @see deleteRecord()
      */
     public function deleteRecord_procBasedOnFieldType($table, $uid, $field, $value, $conf, $undeleteRecord = false)
@@ -5566,7 +5537,6 @@ class DataHandler
      *
      * @param string $table Record Table
      * @param string $uid Record UID
-     * @return void
      */
     public function deleteL10nOverlayRecords($table, $uid)
     {
@@ -5743,7 +5713,6 @@ class DataHandler
      * @param string $table Table for the two input records
      * @param int $id Current record (about to go offline)
      * @param int $swapWith Swap record (about to go online)
-     * @return void
      * @see version_swap()
      */
     public function version_remapMMForVersionSwap($table, $id, $swapWith)
@@ -5838,7 +5807,6 @@ class DataHandler
      * @param string $table Table for the two input records
      * @param int $id Current record (about to go offline)
      * @param int $swapWith Swap record (about to go online)
-     * @return void
      * @see version_remapMMForVersionSwap()
      */
     public function version_remapMMForVersionSwap_execSwap($table, $id, $swapWith)
@@ -5888,8 +5856,6 @@ class DataHandler
 
     /**
      * Processes the fields with references as registered during the copy process. This includes all FlexForm fields which had references.
-     *
-     * @return void
      */
     public function remapListedDBRecords()
     {
@@ -6052,7 +6018,6 @@ class DataHandler
      * @param string $value Field value
      * @param int $uid The uid of the ORIGINAL record
      * @param string $table Table name
-     * @return void
      */
     public function remapListedDBRecords_procInline($conf, $value, $uid, $table)
     {
@@ -6105,8 +6070,6 @@ class DataHandler
     /**
      * Processes the $this->remapStack at the end of copying, inserting, etc. actions.
      * The remapStack takes care about the correct mapping of new and old uids in case of relational data.
-     *
-     * @return void
      */
     public function processRemapStack()
     {
@@ -6236,7 +6199,6 @@ class DataHandler
      *
      * @param string $flexFormId, e.g. <table>:<uid>:<field>
      * @param array $modifications Modifications with paths and values (e.g. 'sDEF/lDEV/field/vDEF' => 'TYPO3')
-     * @return void
      */
     protected function updateFlexFormData($flexFormId, array $modifications)
     {
@@ -6286,7 +6248,6 @@ class DataHandler
      * @param array $callback The method to be called
      * @param array $arguments The arguments to be submitted to the callback method
      * @param bool $forceRemapStackActions Whether to force to use the stack
-     * @return void
      * @see processRemapStack
      */
     protected function triggerRemapAction($table, $id, array $callback, array $arguments, $forceRemapStackActions = false)
@@ -6306,7 +6267,6 @@ class DataHandler
      * @param int $id The affected ID
      * @param array $callback The callback information (object and method)
      * @param array $arguments The arguments to be used with the callback
-     * @return void
      */
     public function addRemapAction($table, $id, array $callback, array $arguments)
     {
@@ -6325,7 +6285,6 @@ class DataHandler
      *
      * @param string $table
      * @param int $id
-     * @return void
      */
     public function addRemapStackRefIndex($table, $id)
     {
@@ -6342,7 +6301,6 @@ class DataHandler
      * @param int $id Uid of the parent record
      * @param array $incomingFieldArray Reference to the incomingFieldArray of process_datamap
      * @param array $registerDBList Reference to the $registerDBList array that was created/updated by versionizing calls to DataHandler in process_datamap.
-     * @return void
      */
     public function getVersionizedIncomingFieldArray($table, $id, &$incomingFieldArray, &$registerDBList)
     {
@@ -6958,7 +6916,6 @@ class DataHandler
      * @param string $table Record table name
      * @param int $id Record uid
      * @param array $fieldArray Array of field=>value pairs to insert. FIELDS MUST MATCH the database FIELDS. No check is done.
-     * @return void
      */
     public function updateDB($table, $id, $fieldArray)
     {
@@ -7176,7 +7133,6 @@ class DataHandler
      * @param string $table Table name
      * @param int $id Record ID
      * @param int $logId Log entry ID, important for linking between log and history views
-     * @return void
      */
     public function setHistory($table, $id, $logId)
     {
@@ -7200,7 +7156,6 @@ class DataHandler
      *
      * @param string $table Table name
      * @param int $id Record UID
-     * @return void
      */
     public function updateRefIndex($table, $id)
     {
@@ -7521,7 +7476,6 @@ class DataHandler
      *
      * @param string $table Table name
      * @param array $incomingFieldArray Incoming array (passed by reference)
-     * @return void
      */
     public function addDefaultPermittedLanguageIfNotSet($table, &$incomingFieldArray)
     {
@@ -7726,8 +7680,6 @@ class DataHandler
      * Disables the delete clause for fetching records.
      * In general only undeleted records will be used. If the delete
      * clause is disabled, also deleted records are taken into account.
-     *
-     * @return void
      */
     public function disableDeleteClause()
     {
@@ -7754,7 +7706,6 @@ class DataHandler
      * Add delete restriction if not disabled
      *
      * @param QueryRestrictionContainerInterface $restrictions
-     * @return void
      */
     protected function addDeleteRestriction(QueryRestrictionContainerInterface $restrictions)
     {
@@ -7834,8 +7785,6 @@ class DataHandler
     /**
      * Executing dbAnalysisStore
      * This will save MM relations for new records but is executed after records are created because we need to know the ID of them
-     *
-     * @return void
      */
     public function dbAnalysisStoreExec()
     {
@@ -7849,8 +7798,6 @@ class DataHandler
 
     /**
      * Removing files registered for removal before exit
-     *
-     * @return void
      */
     public function removeRegisteredFiles()
     {
@@ -7944,7 +7891,6 @@ class DataHandler
      *
      * @param string $table Table name
      * @param int $uid Record UID
-     * @return void
      */
     public function fixUniqueInPid($table, $uid)
     {
@@ -8191,7 +8137,6 @@ class DataHandler
      * @param string $field Field name
      * @param string $filelist List of files to work on from field
      * @param string $func Function, eg. "deleteAll" which will delete all files listed.
-     * @return void
      */
     public function extFileFunctions($table, $field, $filelist, $func)
     {
@@ -8298,7 +8243,6 @@ class DataHandler
      * @param string $table Table name of record that was just updated.
      * @param int $uid UID of updated / inserted record
      * @param int $pid REAL PID of page of a deleted/moved record to get TSconfig in ClearCache.
-     * @return void
      * @internal This method is not meant to be called directly but only from the core itself or from hooks
      */
     public function registerRecordIdForPageCacheClearing($table, $uid, $pid = null)
@@ -8317,7 +8261,6 @@ class DataHandler
 
     /**
      * Do the actual clear cache
-     * @return void
      */
     protected function processClearCacheQueue()
     {
@@ -8525,7 +8468,6 @@ class DataHandler
      *
      *
      * @param string $cacheCmd The cache command, see above description
-     * @return void
      */
     public function clear_cacheCmd($cacheCmd)
     {
@@ -8679,7 +8621,6 @@ class DataHandler
      * Print log error messages from the operations of this script instance
      *
      * @param string $redirect Redirect URL (for creating link in message)
-     * @return void (Will exit on error)
      */
     public function printLogErrorMessages($redirect)
     {
@@ -8799,7 +8740,6 @@ class DataHandler
      * Adds new values to the remapStackChildIds array.
      *
      * @param array $idValues uid values
-     * @return void
      */
     protected function addNewValuesToRemapStackChildIds(array $idValues)
     {
@@ -8910,7 +8850,6 @@ class DataHandler
      * @param string $table Name of the table
      * @param int $id Uid of the record
      * @param string $identifier Name of the action to be tracked
-     * @return void
      */
     protected function registerNestedElementCall($table, $id, $identifier)
     {
@@ -8921,8 +8860,6 @@ class DataHandler
 
     /**
      * Resets the nested element calls.
-     *
-     * @return void
      */
     protected function resetNestedElementCalls()
     {
@@ -8949,7 +8886,6 @@ class DataHandler
     /**
      * Registers elements to be deleted in the registry.
      *
-     * @return void
      * @see process_datamap
      */
     protected function registerElementsToBeDeleted()
@@ -8961,7 +8897,6 @@ class DataHandler
     /**
      * Resets the elements to be deleted in the registry.
      *
-     * @return void
      * @see process_datamap
      */
     protected function resetElementsToBeDeleted()
@@ -9011,8 +8946,6 @@ class DataHandler
     /**
      * Controls active elements and sets NULL values if not active.
      * Datamap is modified accordant to submitted control values.
-     *
-     * @return void
      */
     protected function controlActiveElements()
     {
@@ -9031,7 +8964,6 @@ class DataHandler
      *
      * @param array $active hierarchical array with active elements
      * @param array $haystack hierarchical array with haystack to be modified
-     * @return void
      */
     protected function setNullValues(array $active, array &$haystack)
     {
diff --git a/typo3/sysext/core/Classes/DataHandling/DataHandlerCheckModifyAccessListHookInterface.php b/typo3/sysext/core/Classes/DataHandling/DataHandlerCheckModifyAccessListHookInterface.php
index 22979ccfe6728bc193d9b6da4843d96a69abc3bc..24a3494947fb40633a0280adf46ae6babf334a29 100644
--- a/typo3/sysext/core/Classes/DataHandling/DataHandlerCheckModifyAccessListHookInterface.php
+++ b/typo3/sysext/core/Classes/DataHandling/DataHandlerCheckModifyAccessListHookInterface.php
@@ -25,7 +25,6 @@ interface DataHandlerCheckModifyAccessListHookInterface
      * @param bool &$accessAllowed Whether the user has access to modify a table
      * @param string $table The name of the table to be modified
      * @param \TYPO3\CMS\Core\DataHandling\DataHandler $parent The calling parent object
-     * @return void
      */
     public function checkModifyAccessList(&$accessAllowed, $table, \TYPO3\CMS\Core\DataHandling\DataHandler $parent);
 }
diff --git a/typo3/sysext/core/Classes/DataHandling/DataHandlerProcessUploadHookInterface.php b/typo3/sysext/core/Classes/DataHandling/DataHandlerProcessUploadHookInterface.php
index c55d40186574d6f3d0806a44e392061dd120273d..f01fe76b5dffb87ae13da80c5c19cd86de33043f 100644
--- a/typo3/sysext/core/Classes/DataHandling/DataHandlerProcessUploadHookInterface.php
+++ b/typo3/sysext/core/Classes/DataHandling/DataHandlerProcessUploadHookInterface.php
@@ -25,7 +25,6 @@ interface DataHandlerProcessUploadHookInterface
      *
      * @param string $filename The uploaded file
      * @param \TYPO3\CMS\Core\DataHandling\DataHandler $parentObject
-     * @return void
      */
     public function processUpload_postProcessAction(&$filename, \TYPO3\CMS\Core\DataHandling\DataHandler $parentObject);
 }
diff --git a/typo3/sysext/core/Classes/DataHandling/TableColumnSubType.php b/typo3/sysext/core/Classes/DataHandling/TableColumnSubType.php
index 36781285e5901f88164fbeefedf408b6c2a14fc3..4703f79088aa95099fe978814e966012c27045e1 100644
--- a/typo3/sysext/core/Classes/DataHandling/TableColumnSubType.php
+++ b/typo3/sysext/core/Classes/DataHandling/TableColumnSubType.php
@@ -16,7 +16,6 @@ namespace TYPO3\CMS\Core\DataHandling;
 
 /**
  * Enumeration object for tca internal type
- *
  */
 class TableColumnSubType extends \TYPO3\CMS\Core\Type\Enumeration
 {
diff --git a/typo3/sysext/core/Classes/DataHandling/TableColumnType.php b/typo3/sysext/core/Classes/DataHandling/TableColumnType.php
index 8a600b85fad17e878604983d60e7ba59e47d0e1d..92f5a27fea801d45790be1d0ba4285c13e9575a3 100644
--- a/typo3/sysext/core/Classes/DataHandling/TableColumnType.php
+++ b/typo3/sysext/core/Classes/DataHandling/TableColumnType.php
@@ -16,7 +16,6 @@ namespace TYPO3\CMS\Core\DataHandling;
 
 /**
  * Enumeration object for tca type
- *
  */
 class TableColumnType extends \TYPO3\CMS\Core\Type\Enumeration
 {
diff --git a/typo3/sysext/core/Classes/Database/DatabaseConnection.php b/typo3/sysext/core/Classes/Database/DatabaseConnection.php
index 43c7f681771e8fdff421d27c28d2c914830de101..9cc9016d2470957dd65a989145cb56382c56848c 100644
--- a/typo3/sysext/core/Classes/Database/DatabaseConnection.php
+++ b/typo3/sysext/core/Classes/Database/DatabaseConnection.php
@@ -182,8 +182,6 @@ class DatabaseConnection
 
     /**
      * Initialize the database connection
-     *
-     * @return void
      */
     public function initialize()
     {
@@ -1623,7 +1621,6 @@ class DatabaseConnection
      * The default value of this setting is utf8.
      *
      * @param string $connectionCharset The connection charset that will be passed on to mysqli_set_charset() when connecting the database. Default is utf8.
-     * @return void
      */
     public function setConnectionCharset($connectionCharset = 'utf8')
     {
@@ -1636,7 +1633,6 @@ class DatabaseConnection
      *
      * @throws \RuntimeException
      * @throws \UnexpectedValueException
-     * @return void
      */
     public function connectDB()
     {
@@ -1719,7 +1715,6 @@ class DatabaseConnection
      * If the character set does not match or if the session variables
      * can not be read a RuntimeException is thrown.
      *
-     * @return void
      * @throws \RuntimeException
      */
     protected function checkConnectionCharset()
@@ -1787,8 +1782,6 @@ class DatabaseConnection
 
     /**
      * Disconnect from database if connected
-     *
-     * @return void
      */
     protected function disconnectIfConnected()
     {
@@ -1840,7 +1833,6 @@ class DatabaseConnection
      *
      * @param string $func Function calling debug()
      * @param string $query Last query if not last built query
-     * @return void
      */
     public function debug($func, $query = '')
     {
diff --git a/typo3/sysext/core/Classes/Database/PdoHelper.php b/typo3/sysext/core/Classes/Database/PdoHelper.php
index e9e6543adb08a64756da02f581724f545622f9f8..5d9dc27516fc89f4a8b804c7a7dc4ca627359c13 100644
--- a/typo3/sysext/core/Classes/Database/PdoHelper.php
+++ b/typo3/sysext/core/Classes/Database/PdoHelper.php
@@ -30,7 +30,6 @@ class PdoHelper
      * @param \PDO $databaseHandle
      * @param string $pdoDriver
      * @param string $pathAndFilename
-     * @return void
      */
     public static function importSql(\PDO $databaseHandle, $pdoDriver, $pathAndFilename)
     {
diff --git a/typo3/sysext/core/Classes/Database/PostProcessQueryHookInterface.php b/typo3/sysext/core/Classes/Database/PostProcessQueryHookInterface.php
index 41712e20e700f4945cbb8341c5e8b1bce54affc4..d7602130bb874fc4364f3eceda352d318cc22969 100644
--- a/typo3/sysext/core/Classes/Database/PostProcessQueryHookInterface.php
+++ b/typo3/sysext/core/Classes/Database/PostProcessQueryHookInterface.php
@@ -30,7 +30,6 @@ interface PostProcessQueryHookInterface
      * @param string $orderBy Order by statement
      * @param int $limit Database return limit
      * @param \TYPO3\CMS\Core\Database\DatabaseConnection $parentObject
-     * @return void
      */
     public function exec_SELECTquery_postProcessAction(&$select_fields, &$from_table, &$where_clause, &$groupBy, &$orderBy, &$limit, \TYPO3\CMS\Core\Database\DatabaseConnection $parentObject);
 
@@ -41,7 +40,6 @@ interface PostProcessQueryHookInterface
      * @param array $fieldsValues Field values as key => value pairs
      * @param string|array $noQuoteFields List/array of keys NOT to quote
      * @param \TYPO3\CMS\Core\Database\DatabaseConnection $parentObject
-     * @return void
      */
     public function exec_INSERTquery_postProcessAction(&$table, array &$fieldsValues, &$noQuoteFields, \TYPO3\CMS\Core\Database\DatabaseConnection $parentObject);
 
@@ -53,7 +51,6 @@ interface PostProcessQueryHookInterface
      * @param array $rows Table rows
      * @param string|array $noQuoteFields List/array of keys NOT to quote
      * @param \TYPO3\CMS\Core\Database\DatabaseConnection $parentObject
-     * @return void
      */
     public function exec_INSERTmultipleRows_postProcessAction(&$table, array &$fields, array &$rows, &$noQuoteFields, \TYPO3\CMS\Core\Database\DatabaseConnection $parentObject);
 
@@ -65,7 +62,6 @@ interface PostProcessQueryHookInterface
      * @param array $fieldsValues Field values as key => value pairs
      * @param string|array $noQuoteFields List/array of keys NOT to quote
      * @param \TYPO3\CMS\Core\Database\DatabaseConnection $parentObject
-     * @return void
      */
     public function exec_UPDATEquery_postProcessAction(&$table, &$where, array &$fieldsValues, &$noQuoteFields, \TYPO3\CMS\Core\Database\DatabaseConnection $parentObject);
 
@@ -75,7 +71,6 @@ interface PostProcessQueryHookInterface
      * @param string $table Database table name
      * @param string $where WHERE clause
      * @param \TYPO3\CMS\Core\Database\DatabaseConnection $parentObject
-     * @return void
      */
     public function exec_DELETEquery_postProcessAction(&$table, &$where, \TYPO3\CMS\Core\Database\DatabaseConnection $parentObject);
 
@@ -84,7 +79,6 @@ interface PostProcessQueryHookInterface
      *
      * @param string $table Database table name
      * @param \TYPO3\CMS\Core\Database\DatabaseConnection $parentObject
-     * @return void
      */
     public function exec_TRUNCATEquery_postProcessAction(&$table, \TYPO3\CMS\Core\Database\DatabaseConnection $parentObject);
 }
diff --git a/typo3/sysext/core/Classes/Database/PreProcessQueryHookInterface.php b/typo3/sysext/core/Classes/Database/PreProcessQueryHookInterface.php
index aac83e57872575b7e953276ed75251d041f4dad0..56ebe6ca8f7d8788bec37e12b282c64853915176 100644
--- a/typo3/sysext/core/Classes/Database/PreProcessQueryHookInterface.php
+++ b/typo3/sysext/core/Classes/Database/PreProcessQueryHookInterface.php
@@ -30,7 +30,6 @@ interface PreProcessQueryHookInterface
      * @param string $orderBy Order by statement
      * @param int $limit Database return limit
      * @param \TYPO3\CMS\Core\Database\DatabaseConnection $parentObject
-     * @return void
      */
     public function SELECTquery_preProcessAction(&$select_fields, &$from_table, &$where_clause, &$groupBy, &$orderBy, &$limit, \TYPO3\CMS\Core\Database\DatabaseConnection $parentObject);
 
@@ -41,7 +40,6 @@ interface PreProcessQueryHookInterface
      * @param array $fieldsValues Field values as key => value pairs
      * @param string|array $noQuoteFields List/array of keys NOT to quote
      * @param \TYPO3\CMS\Core\Database\DatabaseConnection $parentObject
-     * @return void
      */
     public function INSERTquery_preProcessAction(&$table, array &$fieldsValues, &$noQuoteFields, \TYPO3\CMS\Core\Database\DatabaseConnection $parentObject);
 
@@ -55,7 +53,6 @@ interface PreProcessQueryHookInterface
      * @param array $rows Table rows
      * @param string|array $noQuoteFields List/array of keys NOT to quote
      * @param \TYPO3\CMS\Core\Database\DatabaseConnection $parentObject
-     * @return void
      */
     public function INSERTmultipleRows_preProcessAction(&$table, array &$fields, array &$rows, &$noQuoteFields, \TYPO3\CMS\Core\Database\DatabaseConnection $parentObject);
 
@@ -67,7 +64,6 @@ interface PreProcessQueryHookInterface
      * @param array $fieldsValues Field values as key => value pairs
      * @param string|array $noQuoteFields List/array of keys NOT to quote
      * @param \TYPO3\CMS\Core\Database\DatabaseConnection $parentObject
-     * @return void
      */
     public function UPDATEquery_preProcessAction(&$table, &$where, array &$fieldsValues, &$noQuoteFields, \TYPO3\CMS\Core\Database\DatabaseConnection $parentObject);
 
@@ -77,7 +73,6 @@ interface PreProcessQueryHookInterface
      * @param string $table Database table name
      * @param string $where WHERE clause
      * @param \TYPO3\CMS\Core\Database\DatabaseConnection $parentObject
-     * @return void
      */
     public function DELETEquery_preProcessAction(&$table, &$where, \TYPO3\CMS\Core\Database\DatabaseConnection $parentObject);
 
@@ -86,7 +81,6 @@ interface PreProcessQueryHookInterface
      *
      * @param string $table Database table name
      * @param \TYPO3\CMS\Core\Database\DatabaseConnection $parentObject
-     * @return void
      */
     public function TRUNCATEquery_preProcessAction(&$table, \TYPO3\CMS\Core\Database\DatabaseConnection $parentObject);
 }
diff --git a/typo3/sysext/core/Classes/Database/PreparedStatement.php b/typo3/sysext/core/Classes/Database/PreparedStatement.php
index 27f750af79cad080ebe86cb5cf15320d4ad371b3..01460afab00d1111c9a4c3579be828745e13b72a 100644
--- a/typo3/sysext/core/Classes/Database/PreparedStatement.php
+++ b/typo3/sysext/core/Classes/Database/PreparedStatement.php
@@ -497,7 +497,6 @@ class PreparedStatement
      * Releases the cursor. Should always be call after having fetched rows from
      * a query execution.
      *
-     * @return void
      * @api
      */
     public function free()
@@ -549,7 +548,6 @@ class PreparedStatement
      * Sets the default fetch mode for this prepared query.
      *
      * @param int $mode One of the \TYPO3\CMS\Core\Database\PreparedStatement::FETCH_* constants
-     * @return void
      * @api
      */
     public function setFetchMode($mode)
@@ -602,7 +600,6 @@ class PreparedStatement
      * @param string $query
      * @param array $parameterValues
      * @param array $precompiledQueryParts
-     * @return void
      */
     protected function convertNamedPlaceholdersToQuestionMarks(&$query, array &$parameterValues, array &$precompiledQueryParts)
     {
diff --git a/typo3/sysext/core/Classes/Database/Query/BulkInsertQuery.php b/typo3/sysext/core/Classes/Database/Query/BulkInsertQuery.php
index 00e3ff01cfa3b8aa7baefc676a9022a87f651322..e02ba58691a69fab48a9328d51b2ccc0ac83f24d 100644
--- a/typo3/sysext/core/Classes/Database/Query/BulkInsertQuery.php
+++ b/typo3/sysext/core/Classes/Database/Query/BulkInsertQuery.php
@@ -108,8 +108,6 @@ class BulkInsertQuery
      *                                   for a single column (named and indexed) or
      *                                   multiple types are given for a single column
      *                                   (named and indexed).
-     *
-     * @return void
      */
     public function addValues(array $values, array $types = [])
     {
diff --git a/typo3/sysext/core/Classes/Database/QueryGenerator.php b/typo3/sysext/core/Classes/Database/QueryGenerator.php
index bf95cb00cf52b3618cd18fa7fe8d5b8ad9284d30..d4ad1ba9898b70ac829f9f9dbcc4923b4dbd2059 100644
--- a/typo3/sysext/core/Classes/Database/QueryGenerator.php
+++ b/typo3/sysext/core/Classes/Database/QueryGenerator.php
@@ -278,7 +278,6 @@ class QueryGenerator
      * @param string $name The name
      * @param string $table The table name
      * @param string $fieldList The field list
-     * @return void
      */
     public function init($name, $table, $fieldList = '')
     {
@@ -407,7 +406,6 @@ class QueryGenerator
      * @param string $name The name
      * @param string $list The list
      * @param string $force
-     * @return void
      */
     public function setAndCleanUpExternalLists($name, $list, $force = '')
     {
@@ -425,7 +423,6 @@ class QueryGenerator
      * Process data
      *
      * @param string $qC Query config
-     * @return void
      */
     public function procesData($qC = '')
     {
@@ -1221,8 +1218,6 @@ class QueryGenerator
 
     /**
      * Init user definition
-     *
-     * @return void
      */
     public function initUserDef()
     {
@@ -1364,7 +1359,6 @@ class QueryGenerator
      *
      * @param array $qcArr
      * @param bool $first
-     * @return void
      */
     public function getUserDefQuery($qcArr, $first)
     {
@@ -1689,7 +1683,6 @@ class QueryGenerator
      * Sets the current name of the input form.
      *
      * @param string $formName The name of the form.
-     * @return void
      */
     public function setFormName($formName)
     {
diff --git a/typo3/sysext/core/Classes/Database/QueryView.php b/typo3/sysext/core/Classes/Database/QueryView.php
index 746ac85abba05781d44966c66a61e5b89e2dd2b6..cb40a329dea405bfcd9627bc41a936991564c8da 100644
--- a/typo3/sysext/core/Classes/Database/QueryView.php
+++ b/typo3/sysext/core/Classes/Database/QueryView.php
@@ -1253,7 +1253,6 @@ class QueryView
      * Sets the current name of the input form.
      *
      * @param string $formName The name of the form.
-     * @return void
      */
     public function setFormName($formName)
     {
diff --git a/typo3/sysext/core/Classes/Database/ReferenceIndex.php b/typo3/sysext/core/Classes/Database/ReferenceIndex.php
index 92edeb3126d9f11b16174af0e4feacce08e26d05..f56a3ba54cfb7466f4182950326c1f5e6dffd314 100644
--- a/typo3/sysext/core/Classes/Database/ReferenceIndex.php
+++ b/typo3/sysext/core/Classes/Database/ReferenceIndex.php
@@ -464,7 +464,6 @@ class ReferenceIndex
      * @param string $flexPointer Pointer to location inside FlexForm structure where reference is located in [field]
      * @param int $deleted Whether record is deleted-flagged or not
      * @param array $items Data array with database relations (table/id)
-     * @return void
      */
     public function createEntryData_dbRels($table, $uid, $fieldName, $flexPointer, $deleted, $items)
     {
@@ -482,7 +481,6 @@ class ReferenceIndex
      * @param string $flexPointer Pointer to location inside FlexForm structure where reference is located in [field]
      * @param int $deleted Whether record is deleted-flagged or not
      * @param array $items Data array with file relations
-     * @return void
      */
     public function createEntryData_fileRels($table, $uid, $fieldName, $flexPointer, $deleted, $items)
     {
@@ -504,7 +502,6 @@ class ReferenceIndex
      * @param string $flexPointer Pointer to location inside FlexForm structure
      * @param int $deleted
      * @param array $keys Data array with soft reference keys
-     * @return void
      */
     public function createEntryData_softreferences($table, $uid, $fieldName, $flexPointer, $deleted, $keys)
     {
@@ -660,7 +657,6 @@ class ReferenceIndex
      * @param array $PA Additional configuration used in calling function
      * @param string $structurePath Path of value in DS structure
      * @param object $parentObject Object reference to caller (unused)
-     * @return void
      * @see DataHandler::checkValue_flex_procInData_travDS(),FlexFormTools::traverseFlexFormXMLData()
      */
     public function getRelations_flexFormCallBack($dsArr, $dataValue, $PA, $structurePath, $parentObject)
diff --git a/typo3/sysext/core/Classes/Database/RelationHandler.php b/typo3/sysext/core/Classes/Database/RelationHandler.php
index 3323d7045de01ed3063ee02d7240c96cd40afac2..616e006c975b59117ec5a5b172c4b146961e9cb8 100644
--- a/typo3/sysext/core/Classes/Database/RelationHandler.php
+++ b/typo3/sysext/core/Classes/Database/RelationHandler.php
@@ -257,7 +257,6 @@ class RelationHandler
      * @param int $MMuid Local UID for MM lookup
      * @param string $currentTable Current table name
      * @param array $conf TCA configuration for current field
-     * @return void
      */
     public function start($itemlist, $tablelist, $MMtable = '', $MMuid = 0, $currentTable = '', $conf = [])
     {
@@ -357,7 +356,6 @@ class RelationHandler
      * Sets whether the reference index shall be updated.
      *
      * @param bool $updateReferenceIndex Whether the reference index shall be updated
-     * @return void
      */
     public function setUpdateReferenceIndex($updateReferenceIndex)
     {
@@ -385,7 +383,6 @@ class RelationHandler
      *
      * @param string $itemlist Item list
      * @param array $configuration Parent field configuration
-     * @return void
      */
     public function readList($itemlist, array $configuration)
     {
@@ -467,7 +464,6 @@ class RelationHandler
      * This function is only relevant for data that is stored in comma separated lists!
      *
      * @param string $sortby The default_sortby field/command (e.g. 'price DESC')
-     * @return void
      */
     public function sortList($sortby)
     {
@@ -519,7 +515,6 @@ class RelationHandler
      *
      * @param string $tableName MM Tablename
      * @param int $uid Local UID
-     * @return void
      */
     public function readMM($tableName, $uid)
     {
@@ -606,7 +601,6 @@ class RelationHandler
      * @param string $MM_tableName MM table name
      * @param int $uid Local UID
      * @param bool $prependTableName If set, then table names will always be written.
-     * @return void
      */
     public function writeMM($MM_tableName, $uid, $prependTableName = false)
     {
@@ -850,7 +844,6 @@ class RelationHandler
      * @param int $uid Local, current UID
      * @param int $newUid Local, new UID
      * @param bool $prependTableName If set, then table names will always be written.
-     * @return void
      */
     public function remapMM($MM_tableName, $uid, $newUid, $prependTableName = false)
     {
@@ -904,7 +897,6 @@ class RelationHandler
      *
      * @param int $uid The uid of the parent record (this value is also on the foreign_table in the foreign_field)
      * @param array $conf TCA configuration for current field
-     * @return void
      */
     public function readForeignField($uid, $conf)
     {
@@ -1043,7 +1035,6 @@ class RelationHandler
      * @param int $parentUid The uid of the parent record
      * @param int $updateToUid If this is larger than zero it will be used as foreign UID instead of the given $parentUid (on Copy)
      * @param bool $skipSorting Do not update the sorting columns, this could happen for imported values
-     * @return void
      */
     public function writeForeignField($conf, $parentUid, $updateToUid = 0, $skipSorting = false)
     {
diff --git a/typo3/sysext/core/Classes/Database/Schema/Parser/Parser.php b/typo3/sysext/core/Classes/Database/Schema/Parser/Parser.php
index 975c0fe4d8dd63285d2e8340b06c6166baea7366..a46095508dfa927d5e4671957e02c342f3d04f1d 100644
--- a/typo3/sysext/core/Classes/Database/Schema/Parser/Parser.php
+++ b/typo3/sysext/core/Classes/Database/Schema/Parser/Parser.php
@@ -81,7 +81,6 @@ class Parser
      *
      * @param int $token The token type.
      *
-     * @return void
      *
      * @throws StatementException If the tokens don't match.
      */
@@ -123,8 +122,6 @@ class Parser
      *
      * @param bool $deep Whether to clean peek and reset errors.
      * @param int $position Position to reset.
-     *
-     * @return void
      */
     public function free($deep = false, $position = 0)
     {
@@ -169,7 +166,6 @@ class Parser
      * @param string $expected Expected string.
      * @param array|null $token Got token.
      *
-     * @return void
      *
      * @throws \TYPO3\CMS\Core\Database\Schema\Exception\StatementException
      */
@@ -194,7 +190,6 @@ class Parser
      * @param string $message Optional message.
      * @param array|null $token Optional token.
      *
-     * @return void
      *
      * @throws \TYPO3\CMS\Core\Database\Schema\Exception\StatementException
      */
diff --git a/typo3/sysext/core/Classes/Database/TableConfigurationPostProcessingHookInterface.php b/typo3/sysext/core/Classes/Database/TableConfigurationPostProcessingHookInterface.php
index 4eeb947051e8df76812d39d1deb4adf6c804e9cd..777175c8f7ca31bed7f653effd6af7862661ff8a 100644
--- a/typo3/sysext/core/Classes/Database/TableConfigurationPostProcessingHookInterface.php
+++ b/typo3/sysext/core/Classes/Database/TableConfigurationPostProcessingHookInterface.php
@@ -22,8 +22,6 @@ interface TableConfigurationPostProcessingHookInterface
     /**
      * Function which may process data created / registered by extTables
      * scripts (f.e. modifying TCA data of all extensions)
-     *
-     * @return void
      */
     public function processData();
 }
diff --git a/typo3/sysext/core/Classes/Error/AbstractExceptionHandler.php b/typo3/sysext/core/Classes/Error/AbstractExceptionHandler.php
index 3e788da96d71baaa9ad30a0cf65e4242e01843f2..84cda3930aeed3c018ad82f0424fd13f62f9ab40 100644
--- a/typo3/sysext/core/Classes/Error/AbstractExceptionHandler.php
+++ b/typo3/sysext/core/Classes/Error/AbstractExceptionHandler.php
@@ -50,7 +50,6 @@ abstract class AbstractExceptionHandler implements ExceptionHandlerInterface, \T
      *
      * @param \Throwable $exception The throwable object.
      * @param string $context The context where the exception was thrown, WEB or CLI
-     * @return void
      * @see \TYPO3\CMS\Core\Utility\GeneralUtility::sysLog(), \TYPO3\CMS\Core\Utility\GeneralUtility::devLog()
      */
     protected function writeLogEntries(\Throwable $exception, $context)
@@ -92,7 +91,6 @@ abstract class AbstractExceptionHandler implements ExceptionHandlerInterface, \T
      * Writes an exception in the sys_log table
      *
      * @param string $logMessage Default text that follows the message.
-     * @return void
      */
     protected function writeLog($logMessage)
     {
@@ -140,7 +138,6 @@ abstract class AbstractExceptionHandler implements ExceptionHandlerInterface, \T
      * TYPO3\CMS\Core\Error\Http\StatusException and headers are not sent, yet.
      *
      * @param \Throwable $exception The throwable object.
-     * @return void
      */
     protected function sendStatusHeaders(\Throwable $exception)
     {
diff --git a/typo3/sysext/core/Classes/Error/DebugExceptionHandler.php b/typo3/sysext/core/Classes/Error/DebugExceptionHandler.php
index 150b81e7a73beb4276508470ddeeae23fe7ef40e..90a5f0870c604c9ec335801cfbd00cf3a751aaf7 100644
--- a/typo3/sysext/core/Classes/Error/DebugExceptionHandler.php
+++ b/typo3/sysext/core/Classes/Error/DebugExceptionHandler.php
@@ -35,7 +35,6 @@ class DebugExceptionHandler extends AbstractExceptionHandler
      * Formats and echoes the exception as XHTML.
      *
      * @param \Throwable $exception The throwable object.
-     * @return void
      */
     public function echoExceptionWeb(\Throwable $exception)
     {
@@ -113,7 +112,6 @@ class DebugExceptionHandler extends AbstractExceptionHandler
      * Formats and echoes the exception for the command line
      *
      * @param \Throwable $exception The throwable object.
-     * @return void
      */
     public function echoExceptionCLI(\Throwable $exception)
     {
diff --git a/typo3/sysext/core/Classes/Error/ErrorHandler.php b/typo3/sysext/core/Classes/Error/ErrorHandler.php
index 7b70bc8727ab4c6ccb59218a16f17cf410bc9116..e701a392bbcec7963e2d47d33226dffabbaf28b8 100644
--- a/typo3/sysext/core/Classes/Error/ErrorHandler.php
+++ b/typo3/sysext/core/Classes/Error/ErrorHandler.php
@@ -56,7 +56,6 @@ class ErrorHandler implements ErrorHandlerInterface
      * Defines which error levels should result in an exception thrown.
      *
      * @param int $exceptionalErrors The integer representing the E_* error level to handle as exceptions
-     * @return void
      */
     public function setExceptionalErrors($exceptionalErrors)
     {
@@ -179,7 +178,6 @@ class ErrorHandler implements ErrorHandlerInterface
      *
      * @param string $logMessage Default text that follows the message (in english!).
      * @param int $severity The error level of the message (0 = OK, 1 = warning, 2 = error)
-     * @return void
      */
     protected function writeLog($logMessage, $severity)
     {
diff --git a/typo3/sysext/core/Classes/Error/ErrorHandlerInterface.php b/typo3/sysext/core/Classes/Error/ErrorHandlerInterface.php
index 2afb8418be8aaf4f8c4582fbee6006bc5f6f9ebb..ac15eb163b4d522f6aeab3a4360ed7beb4546652 100644
--- a/typo3/sysext/core/Classes/Error/ErrorHandlerInterface.php
+++ b/typo3/sysext/core/Classes/Error/ErrorHandlerInterface.php
@@ -32,7 +32,6 @@ interface ErrorHandlerInterface
      * Defines which error levels should result in an exception thrown.
      *
      * @param int $exceptionalErrors The integer representing the E_* error level to handle as exceptions
-     * @return void
      */
     public function setExceptionalErrors($exceptionalErrors);
 
diff --git a/typo3/sysext/core/Classes/Error/ExceptionHandlerInterface.php b/typo3/sysext/core/Classes/Error/ExceptionHandlerInterface.php
index 5d671be3fcd6ec63e6b2456b5b547f42a823d7fb..18cd981eb26ee564bcb82c83b2d651e7d25cd158 100644
--- a/typo3/sysext/core/Classes/Error/ExceptionHandlerInterface.php
+++ b/typo3/sysext/core/Classes/Error/ExceptionHandlerInterface.php
@@ -30,7 +30,6 @@ interface ExceptionHandlerInterface
      * Handles the given exception
      *
      * @param \Throwable $exception The throwable object.
-     * @return void
      */
     public function handleException(\Throwable $exception);
 
@@ -38,7 +37,6 @@ interface ExceptionHandlerInterface
      * Formats and echoes the exception as XHTML.
      *
      * @param \Throwable $exception The throwable object.
-     * @return void
      */
     public function echoExceptionWeb(\Throwable $exception);
 
@@ -46,7 +44,6 @@ interface ExceptionHandlerInterface
      * Formats and echoes the exception for the command line
      *
      * @param \Throwable $exception The throwable object.
-     * @return void
      */
     public function echoExceptionCLI(\Throwable $exception);
 }
diff --git a/typo3/sysext/core/Classes/Error/Http/StatusException.php b/typo3/sysext/core/Classes/Error/Http/StatusException.php
index dd3f76342053d3c01ddc487597df7eb4dd6adf30..4ddde79b5b72329d0bf9fdc2f7d29df1663b3959 100644
--- a/typo3/sysext/core/Classes/Error/Http/StatusException.php
+++ b/typo3/sysext/core/Classes/Error/Http/StatusException.php
@@ -52,7 +52,6 @@ class StatusException extends \TYPO3\CMS\Core\Error\Exception
      * Setter for the title.
      *
      * @param string $title
-     * @return void
      */
     public function setTitle($title)
     {
diff --git a/typo3/sysext/core/Classes/Error/ProductionExceptionHandler.php b/typo3/sysext/core/Classes/Error/ProductionExceptionHandler.php
index a6853fdfa036db6e13c65d6b98b35220b3c7b110..023ca889430f69c71938b9ace1739e7fe26f430c 100644
--- a/typo3/sysext/core/Classes/Error/ProductionExceptionHandler.php
+++ b/typo3/sysext/core/Classes/Error/ProductionExceptionHandler.php
@@ -50,7 +50,6 @@ class ProductionExceptionHandler extends AbstractExceptionHandler
      * Echoes an exception for the web.
      *
      * @param \Throwable $exception The throwable object.
-     * @return void
      */
     public function echoExceptionWeb(\Throwable $exception)
     {
@@ -68,7 +67,6 @@ class ProductionExceptionHandler extends AbstractExceptionHandler
      * Echoes an exception for the command line.
      *
      * @param \Throwable $exception The throwable object.
-     * @return void
      */
     public function echoExceptionCLI(\Throwable $exception)
     {
diff --git a/typo3/sysext/core/Classes/Exception.php b/typo3/sysext/core/Classes/Exception.php
index 3460b856623f8b348a78d3d4c4a6aabff99cc73c..c94523e1e445c09ff4bde8729174a7c908f20410 100644
--- a/typo3/sysext/core/Classes/Exception.php
+++ b/typo3/sysext/core/Classes/Exception.php
@@ -16,7 +16,6 @@ namespace TYPO3\CMS\Core;
 
 /**
  * An exception
- *
  */
 class Exception extends \Exception
 {
diff --git a/typo3/sysext/core/Classes/ExtDirect/ExtDirectDebug.php b/typo3/sysext/core/Classes/ExtDirect/ExtDirectDebug.php
index 865499b36244ddeab4e779b8cec6aa49fae3e866..5d96f22fb55267ca333233ccdff2513e5830c69e 100644
--- a/typo3/sysext/core/Classes/ExtDirect/ExtDirectDebug.php
+++ b/typo3/sysext/core/Classes/ExtDirect/ExtDirectDebug.php
@@ -42,7 +42,6 @@ class ExtDirectDebug
      * Adds a new message of any data type to the internal debug message array.
      *
      * @param mixed $message
-     * @return void
      */
     public function debug($message)
     {
diff --git a/typo3/sysext/core/Classes/FormProtection/AbstractFormProtection.php b/typo3/sysext/core/Classes/FormProtection/AbstractFormProtection.php
index 240f76a013e533fd7d0339f71d30b8d42690f82a..dc634da3e583341f2c7b2a55187184d13dbd4604 100644
--- a/typo3/sysext/core/Classes/FormProtection/AbstractFormProtection.php
+++ b/typo3/sysext/core/Classes/FormProtection/AbstractFormProtection.php
@@ -61,8 +61,6 @@ abstract class AbstractFormProtection
      * Deletes the session token and persists the (empty) token.
      *
      * This function is intended to be called when a user logs on or off.
-     *
-     * @return void
      */
     public function clean()
     {
@@ -129,8 +127,6 @@ abstract class AbstractFormProtection
     /**
      * Creates or displays an error message telling the user that the submitted
      * form token is invalid.
-     *
-     * @return void
      */
     protected function createValidationErrorMessage()
     {
@@ -151,7 +147,6 @@ abstract class AbstractFormProtection
      * of this class.
      *
      * @access private
-     * @return void
      */
     abstract public function persistSessionToken();
 }
diff --git a/typo3/sysext/core/Classes/FormProtection/BackendFormProtection.php b/typo3/sysext/core/Classes/FormProtection/BackendFormProtection.php
index 75b219b503eb161868abef6dea5a57533906a691..c7b52b6d2a5f47ae30b44a126a32bab122405037 100644
--- a/typo3/sysext/core/Classes/FormProtection/BackendFormProtection.php
+++ b/typo3/sysext/core/Classes/FormProtection/BackendFormProtection.php
@@ -125,7 +125,6 @@ class BackendFormProtection extends AbstractFormProtection
      * class.
      *
      * @access private
-     * @return void
      */
     public function persistSessionToken()
     {
@@ -154,7 +153,6 @@ class BackendFormProtection extends AbstractFormProtection
      * available during re-login of the user.
      *
      * @access private
-     * @return void
      */
     public function storeSessionTokenInRegistry()
     {
diff --git a/typo3/sysext/core/Classes/FormProtection/FormProtectionFactory.php b/typo3/sysext/core/Classes/FormProtection/FormProtectionFactory.php
index 2030e15e0905cbe6ec0e16212e2fcfbc44fb77fd..6b28d6560fe88ea386ee8043440be03e6f447255 100644
--- a/typo3/sysext/core/Classes/FormProtection/FormProtectionFactory.php
+++ b/typo3/sysext/core/Classes/FormProtection/FormProtectionFactory.php
@@ -204,7 +204,6 @@ class FormProtectionFactory
      * @access private
      * @param string $classNameOrType
      * @param AbstractFormProtection $instance
-     * @return void
      */
     public static function set($classNameOrType, AbstractFormProtection $instance)
     {
@@ -215,8 +214,6 @@ class FormProtectionFactory
      * Purges all existing instances.
      *
      * This function is particularly useful when cleaning up in unit testing.
-     *
-     * @return void
      */
     public static function purgeInstances()
     {
diff --git a/typo3/sysext/core/Classes/FormProtection/FrontendFormProtection.php b/typo3/sysext/core/Classes/FormProtection/FrontendFormProtection.php
index e9513369fea6fe6f4d997e9afb06f31b039b3e6f..a502e0ee9f98a5aae9c11c12023964dfa9a5e381 100644
--- a/typo3/sysext/core/Classes/FormProtection/FrontendFormProtection.php
+++ b/typo3/sysext/core/Classes/FormProtection/FrontendFormProtection.php
@@ -113,7 +113,6 @@ class FrontendFormProtection extends AbstractFormProtection
      * class.
      *
      * @access private
-     * @return void
      */
     public function persistSessionToken()
     {
diff --git a/typo3/sysext/core/Classes/FormProtection/InstallToolFormProtection.php b/typo3/sysext/core/Classes/FormProtection/InstallToolFormProtection.php
index d7cc3f3922262e25e5d3a21f38ee3b07a603489c..4f6485217039f42b400a56e1b27de788379e0f06 100644
--- a/typo3/sysext/core/Classes/FormProtection/InstallToolFormProtection.php
+++ b/typo3/sysext/core/Classes/FormProtection/InstallToolFormProtection.php
@@ -60,8 +60,6 @@ class InstallToolFormProtection extends AbstractFormProtection
 {
     /**
      * Retrieves or generates the session token.
-     *
-     * @return void
      */
     protected function retrieveSessionToken()
     {
@@ -76,8 +74,6 @@ class InstallToolFormProtection extends AbstractFormProtection
     /**
      * Saves the tokens so that they can be used by a later incarnation of this
      * class.
-     *
-     * @return void
      */
     public function persistSessionToken()
     {
diff --git a/typo3/sysext/core/Classes/FrontendEditing/FrontendEditingController.php b/typo3/sysext/core/Classes/FrontendEditing/FrontendEditingController.php
index d03429378fc7f3e378ba6b2b5bcef970c07a6532..c0993983814d956bf8405c668793607e5676e36e 100644
--- a/typo3/sysext/core/Classes/FrontendEditing/FrontendEditingController.php
+++ b/typo3/sysext/core/Classes/FrontendEditing/FrontendEditingController.php
@@ -43,8 +43,6 @@ class FrontendEditingController
 
     /**
      * Initializes configuration options.
-     *
-     * @return void
      */
     public function initConfigOptions()
     {
@@ -197,7 +195,6 @@ class FrontendEditingController
      * Management of the on-page frontend editing forms and edit panels.
      * Basically taking in the data and commands and passes them on to the proper classes as they should be.
      *
-     * @return void
      * @throws \UnexpectedValueException if TSFE_EDIT[cmd] is not a valid command
      * @see \TYPO3\CMS\Frontend\Http\RequestHandler
      */
@@ -234,7 +231,6 @@ class FrontendEditingController
      *
      * @param string $table The table name for the record to hide.
      * @param int $uid The UID for the record to hide.
-     * @return void
      */
     public function doHide($table, $uid)
     {
@@ -253,7 +249,6 @@ class FrontendEditingController
      *
      * @param string $table The table name for the record to unhide.
      * @param int $uid The UID for the record to unhide.
-     * @return void
      */
     public function doUnhide($table, $uid)
     {
@@ -272,7 +267,6 @@ class FrontendEditingController
      *
      * @param string $table The table name for the record to move.
      * @param int $uid The UID for the record to hide.
-     * @return void
      */
     public function doUp($table, $uid)
     {
@@ -284,7 +278,6 @@ class FrontendEditingController
      *
      * @param string $table The table name for the record to move.
      * @param int $uid The UID for the record to move.
-     * @return void
      */
     public function doDown($table, $uid)
     {
@@ -296,7 +289,6 @@ class FrontendEditingController
      *
      * @param string $table The table name for the record to move.
      * @param int $uid The UID for the record to move.
-     * @return void
      */
     public function doMoveAfter($table, $uid)
     {
@@ -311,7 +303,6 @@ class FrontendEditingController
      * @param int $uid The UID for the record to move.
      * @param string $direction The direction to move, either 'up' or 'down'.
      * @param int $afterUID The UID of record to move after. This is specified for dragging only.
-     * @return void
      */
     protected function move($table, $uid, $direction = '', $afterUID = 0)
     {
@@ -430,7 +421,6 @@ class FrontendEditingController
      *
      * @param string $table The table name for the record to delete.
      * @param int $uid The UID for the record to delete.
-     * @return void
      */
     public function doDelete($table, $uid)
     {
@@ -447,7 +437,6 @@ class FrontendEditingController
      *
      * @param string $table The table name for the record to save.
      * @param int $uid The UID for the record to save.
-     * @return void
      */
     public function doSave($table, $uid)
     {
@@ -470,7 +459,6 @@ class FrontendEditingController
      *
      * @param string $table The table name for the record to save.
      * @param int $uid The UID for the record to save.
-     * @return void
      * @note 	This method is only a wrapper for doSave() but is needed so
      */
     public function doSaveAndClose($table, $uid)
@@ -484,7 +472,6 @@ class FrontendEditingController
      *
      * @param string $table The table name for the record to close.
      * @param int $uid The UID for the record to close.
-     * @return void
      */
     public function doClose($table, $uid)
     {
@@ -636,8 +623,6 @@ class FrontendEditingController
 
     /**
      * Initializes \TYPO3\CMS\Core\DataHandling\DataHandler since it is used on modification actions.
-     *
-     * @return void
      */
     protected function initializeTceMain()
     {
diff --git a/typo3/sysext/core/Classes/Html/RteHtmlParser.php b/typo3/sysext/core/Classes/Html/RteHtmlParser.php
index ef9519ced5652233b5a263290d50a90ee3d2e5a2..90e3bff9439b9822eb42fc039ccfef5611ab48f2 100644
--- a/typo3/sysext/core/Classes/Html/RteHtmlParser.php
+++ b/typo3/sysext/core/Classes/Html/RteHtmlParser.php
@@ -136,7 +136,6 @@ class RteHtmlParser extends HtmlParser
      *
      * @param string $elRef Element reference, eg "tt_content:bodytext
      * @param int $recPid PID of the record (page id)
-     * @return void
      */
     public function init($elRef = '', $recPid = 0)
     {
diff --git a/typo3/sysext/core/Classes/Http/AjaxRequestHandler.php b/typo3/sysext/core/Classes/Http/AjaxRequestHandler.php
index ff14fcf5bfa6814994bcd6fc31545c2058f690d3..5f65b71701da075923334c1b027e3df3f49f4af3 100644
--- a/typo3/sysext/core/Classes/Http/AjaxRequestHandler.php
+++ b/typo3/sysext/core/Classes/Http/AjaxRequestHandler.php
@@ -133,7 +133,6 @@ class AjaxRequestHandler
      * Sets the content format for the ajax call
      *
      * @param string $format Can be one of 'plain' (default), 'xml', 'json', 'javascript', 'jsonbody' or 'jsonhead'
-     * @return void
      */
     public function setContentFormat($format)
     {
@@ -148,7 +147,6 @@ class AjaxRequestHandler
      * adds <script>-Tags around it.
      *
      * @param string $javascriptCallbackWrap The javascript callback wrap to be used
-     * @return void
      */
     public function setJavascriptCallbackWrap($javascriptCallbackWrap)
     {
@@ -159,7 +157,6 @@ class AjaxRequestHandler
      * Sets an error message and the error flag
      *
      * @param string $errorMsg The error message
-     * @return void
      */
     public function setError($errorMsg = '')
     {
diff --git a/typo3/sysext/core/Classes/Http/Stream.php b/typo3/sysext/core/Classes/Http/Stream.php
index a7e478eeb3a8ce4a45070a17ddf292a5f66928d1..7ffc159c9d830d1603fffb7371787adfd7fdc963 100644
--- a/typo3/sysext/core/Classes/Http/Stream.php
+++ b/typo3/sysext/core/Classes/Http/Stream.php
@@ -85,8 +85,6 @@ class Stream implements StreamInterface
 
     /**
      * Closes the stream and any underlying resources.
-     *
-     * @return void
      */
     public function close()
     {
diff --git a/typo3/sysext/core/Classes/Imaging/GraphicalFunctions.php b/typo3/sysext/core/Classes/Imaging/GraphicalFunctions.php
index e8dc51e674966df011e537a32c1914e93f7ffd24..cafb884645655baa3e763cd27048be0f7c92d5ad 100644
--- a/typo3/sysext/core/Classes/Imaging/GraphicalFunctions.php
+++ b/typo3/sysext/core/Classes/Imaging/GraphicalFunctions.php
@@ -323,8 +323,6 @@ class GraphicalFunctions
     /**
      * Init function. Must always call this when using the class.
      * This function will read the configuration information from $GLOBALS['TYPO3_CONF_VARS']['GFX'] can set some values in internal variables.
-     *
-     * @return void
      */
     public function init()
     {
@@ -394,7 +392,6 @@ class GraphicalFunctions
      * @param resource $im GDlib image pointer
      * @param array $conf TypoScript array with configuration for the GIFBUILDER object.
      * @param array $workArea The current working area coordinates.
-     * @return void
      * @see \TYPO3\CMS\Frontend\Imaging\GifBuilder::make()
      */
     public function maskImageOntoImage(&$im, $conf, $workArea)
@@ -481,7 +478,6 @@ class GraphicalFunctions
      * @param resource $im GDlib image pointer
      * @param array $conf TypoScript array with configuration for the GIFBUILDER object.
      * @param array $workArea The current working area coordinates.
-     * @return void
      * @see \TYPO3\CMS\Frontend\Imaging\GifBuilder::make(), maskImageOntoImage()
      */
     public function copyImageOntoImage(&$im, $conf, $workArea)
@@ -504,7 +500,6 @@ class GraphicalFunctions
      * @param resource $cpImg GDlib image pointer, source (top image)
      * @param array $conf TypoScript array with the properties for the IMAGE GIFBUILDER object. Only used for the "tile" property value.
      * @param array $workArea Work area
-     * @return void Works on the $im image pointer
      * @access private
      */
     public function copyGifOntoGif(&$im, $cpImg, $conf, $workArea)
@@ -584,7 +579,6 @@ class GraphicalFunctions
      * @param int $dstHeight Destination height
      * @param int $srcWidth Source width
      * @param int $srcHeight Source height
-     * @return void
      * @access private
      */
     public function imagecopyresized(&$dstImg, $srcImg, $dstX, $dstY, $srcX, $srcY, $dstWidth, $dstHeight, $srcWidth, $srcHeight)
@@ -614,7 +608,6 @@ class GraphicalFunctions
      * @param resource $im GDlib image pointer
      * @param array $conf TypoScript array with configuration for the GIFBUILDER object.
      * @param array $workArea The current working area coordinates.
-     * @return void
      * @see \TYPO3\CMS\Frontend\Imaging\GifBuilder::make()
      */
     public function makeText(&$im, $conf, $workArea)
@@ -845,7 +838,6 @@ class GraphicalFunctions
      *
      * @param array $cords Coordinates for a polygon image map as created by ->calcTextCordsForMap()
      * @param array $conf Configuration for "imgMap." property of a TEXT GIFBUILDER object.
-     * @return void
      * @access private
      * @see makeText(), calcTextCordsForMap()
      */
@@ -899,7 +891,6 @@ class GraphicalFunctions
      * @param int $wordSpacing The spacing of words in pixels
      * @param array $splitRenderingConf Array
      * @param int $sF Scale factor
-     * @return void
      * @access private
      */
     public function SpacedImageTTFText(&$im, $fontSize, $angle, $x, $y, $Fcolor, $fontFile, $text, $spacing, $wordSpacing, $splitRenderingConf, $sF = 1)
@@ -1028,7 +1019,6 @@ class GraphicalFunctions
      * @param string $string (See argument for PHP function imageTTFtext()). UTF-8 string, possibly with entities in.
      * @param array $splitRendering Split-rendering configuration
      * @param int $sF Scale factor
-     * @return void
      */
     public function ImageTTFTextWrapper($im, $fontSize, $angle, $x, $y, $color, $fontFile, $string, $splitRendering, $sF = 1)
     {
@@ -1254,7 +1244,6 @@ class GraphicalFunctions
      * @param array $splitRendering Split-rendering configuration
      * @param array $conf The configuration
      * @param int $sF Scale factor
-     * @return void
      */
     protected function renderTTFText(&$im, $fontSize, $angle, $x, $y, $color, $fontFile, $string, $splitRendering, $conf, $sF = 1)
     {
@@ -1359,7 +1348,6 @@ class GraphicalFunctions
      * @param array $conf TypoScript array with configuration for the GIFBUILDER object.
      * @param array $workArea The current working area coordinates.
      * @param array $txtConf TypoScript array with configuration for the associated TEXT GIFBUILDER object.
-     * @return void
      * @see \TYPO3\CMS\Frontend\Imaging\GifBuilder::make(), makeText()
      */
     public function makeOutline(&$im, $conf, $workArea, $txtConf)
@@ -1418,7 +1406,6 @@ class GraphicalFunctions
      * @param array $conf TypoScript array with configuration for the GIFBUILDER object.
      * @param array $workArea The current working area coordinates.
      * @param array $txtConf TypoScript array with configuration for the associated TEXT GIFBUILDER object.
-     * @return void
      * @see \TYPO3\CMS\Frontend\Imaging\GifBuilder::make(), makeShadow()
      */
     public function makeEmboss(&$im, $conf, $workArea, $txtConf)
@@ -1441,7 +1428,6 @@ class GraphicalFunctions
      * @param array $conf TypoScript array with configuration for the GIFBUILDER object.
      * @param array $workArea The current working area coordinates.
      * @param array $txtConf TypoScript array with configuration for the associated TEXT GIFBUILDER object.
-     * @return void
      * @see \TYPO3\CMS\Frontend\Imaging\GifBuilder::make(), makeText(), makeEmboss()
      */
     public function makeShadow(&$im, $conf, $workArea, $txtConf)
@@ -1542,7 +1528,6 @@ class GraphicalFunctions
      * @param resource $im GDlib image pointer
      * @param array $conf TypoScript array with configuration for the GIFBUILDER object.
      * @param array $workArea The current working area coordinates.
-     * @return void
      * @see \TYPO3\CMS\Frontend\Imaging\GifBuilder::make()
      */
     public function makeBox(&$im, $conf, $workArea)
@@ -1582,7 +1567,6 @@ class GraphicalFunctions
      * @param resource $im GDlib image pointer
      * @param array $conf TypoScript array with configuration for the GIFBUILDER object.
      * @param array $workArea The current working area coordinates.
-     * @return void
      * @see \TYPO3\CMS\Frontend\Imaging\GifBuilder::make()
      */
     public function makeEllipse(&$im, array $conf, array $workArea)
@@ -1603,7 +1587,6 @@ class GraphicalFunctions
      *
      * @param resource $im GDlib image pointer
      * @param array $conf TypoScript array with configuration for the GIFBUILDER object.
-     * @return void
      * @see \TYPO3\CMS\Frontend\Imaging\GifBuilder::make(), applyImageMagickToPHPGif()
      */
     public function makeEffect(&$im, $conf)
@@ -1697,7 +1680,6 @@ class GraphicalFunctions
      *
      * @param resource $im GDlib image pointer
      * @param array $conf TypoScript array with configuration for the GIFBUILDER object.
-     * @return void
      * @see \TYPO3\CMS\Frontend\Imaging\GifBuilder::make(), autoLevels(), outputLevels(), inputLevels()
      */
     public function adjust(&$im, $conf)
@@ -1733,7 +1715,6 @@ class GraphicalFunctions
      *
      * @param resource $im GDlib image pointer
      * @param array $conf TypoScript array with configuration for the GIFBUILDER object.
-     * @return void
      * @see \TYPO3\CMS\Frontend\Imaging\GifBuilder::make()
      */
     public function crop(&$im, $conf)
@@ -1772,7 +1753,6 @@ class GraphicalFunctions
      *
      * @param resource $im GDlib image pointer
      * @param array $conf TypoScript array with configuration for the GIFBUILDER object.
-     * @return void
      * @see \TYPO3\CMS\Frontend\Imaging\GifBuilder::make()
      */
     public function scale(&$im, $conf)
@@ -1805,7 +1785,6 @@ class GraphicalFunctions
      * Setting internal working area boundaries (->workArea)
      *
      * @param string $workArea Working area dimensions, comma separated
-     * @return void
      * @access private
      * @see \TYPO3\CMS\Frontend\Imaging\GifBuilder::make()
      */
@@ -1830,7 +1809,6 @@ class GraphicalFunctions
      * Apply auto-levels to input image pointer
      *
      * @param resource $im GDlib Image Pointer
-     * @return void
      */
     public function autolevels(&$im)
     {
@@ -1861,7 +1839,6 @@ class GraphicalFunctions
      * @param int $low The "low" value (close to 0)
      * @param int $high The "high" value (close to 255)
      * @param bool $swap If swap, then low and high are swapped. (Useful for negated masks...)
-     * @return void
      */
     public function outputLevels(&$im, $low, $high, $swap = false)
     {
@@ -1891,7 +1868,6 @@ class GraphicalFunctions
      * @param resource $im GDlib Image Pointer
      * @param int $low The "low" value (close to 0)
      * @param int $high The "high" value (close to 255)
-     * @return void
      */
     public function inputLevels(&$im, $low, $high)
     {
@@ -2701,7 +2677,6 @@ class GraphicalFunctions
      *
      * @param resource $im The image pointer (reference)
      * @param string $command The ImageMagick parameters. Like effects, scaling etc.
-     * @return void
      */
     public function applyImageMagickToPHPGif(&$im, $command)
     {
@@ -2791,7 +2766,6 @@ class GraphicalFunctions
     /**
      * Destroy internal image pointer, $this->im
      *
-     * @return void
      * @see \TYPO3\CMS\Frontend\Imaging\GifBuilder::gifBuild()
      */
     public function destroy()
@@ -2982,7 +2956,6 @@ class GraphicalFunctions
      * @param string $textline1 Text line 1
      * @param string $textline2 Text line 2
      * @param string $textline3 Text line 3
-     * @return void
      * @throws \RuntimeException
      */
     public function getTemporaryImageWithText($filename, $textline1, $textline2, $textline3)
diff --git a/typo3/sysext/core/Classes/Imaging/IconRegistry.php b/typo3/sysext/core/Classes/Imaging/IconRegistry.php
index 39f751088e58e171d35edde1af3070aecb21bf35..42ba7e450e8646d4ca2188523ec2992406f55058 100644
--- a/typo3/sysext/core/Classes/Imaging/IconRegistry.php
+++ b/typo3/sysext/core/Classes/Imaging/IconRegistry.php
@@ -3115,8 +3115,6 @@ class IconRegistry implements SingletonInterface
 
     /**
      * Load icons from TCA for each table and add them as "tcarecords-XX" to $this->icons
-     *
-     * @return void
      */
     protected function registerTCAIcons()
     {
@@ -3152,8 +3150,6 @@ class IconRegistry implements SingletonInterface
 
     /**
      * Register module icons
-     *
-     * @return void
      */
     protected function registerModuleIcons()
     {
diff --git a/typo3/sysext/core/Classes/Integrity/DatabaseIntegrityCheck.php b/typo3/sysext/core/Classes/Integrity/DatabaseIntegrityCheck.php
index 34eb270763e80a9ff4f33edc1974da0dbeca5e84..890fd7c641a77b4554af40d3940328813b09f532 100644
--- a/typo3/sysext/core/Classes/Integrity/DatabaseIntegrityCheck.php
+++ b/typo3/sysext/core/Classes/Integrity/DatabaseIntegrityCheck.php
@@ -99,7 +99,6 @@ class DatabaseIntegrityCheck
      * @param int $theID a pid (page-record id) from which to start making the tree
      * @param string $depthData HTML-code (image-tags) used when this function calls itself recursively.
      * @param bool $versions Internal variable, don't set from outside!
-     * @return void
      */
     public function genTree($theID, $depthData = '', $versions = false)
     {
@@ -164,7 +163,6 @@ class DatabaseIntegrityCheck
      * @param string $_ Unused parameter
      * @param string $table Table to get the records from
      * @param bool $versions Internal variable, don't set from outside!
-     * @return void
      */
     public function genTree_records($theID, $_ = '', $table = '', $versions = false)
     {
@@ -212,7 +210,6 @@ class DatabaseIntegrityCheck
      * Fills $this->lRecords with the records from all tc-tables that are not attached to a PID in the pid-list.
      *
      * @param string $pid_list list of pid's (page-record uid's). This list is probably made by genTree()
-     * @return void
      */
     public function lostRecords($pid_list)
     {
@@ -418,7 +415,6 @@ class DatabaseIntegrityCheck
      * This selects non-empty-records from the tables/fields in the fkey_array generated by getGroupFields()
      *
      * @param array $fkey_arrays Array with tables/fields generated by getGroupFields()
-     * @return void
      * @see getGroupFields()
      */
     public function selectNonEmptyRecordsWithFkeys($fkey_arrays)
diff --git a/typo3/sysext/core/Classes/Localization/LanguageStore.php b/typo3/sysext/core/Classes/Localization/LanguageStore.php
index 478dfc27c4029ea0782eb530c86d60aa81f63cb0..97abc472d481af066eec4a74c9284761629ef5e5 100644
--- a/typo3/sysext/core/Classes/Localization/LanguageStore.php
+++ b/typo3/sysext/core/Classes/Localization/LanguageStore.php
@@ -57,8 +57,6 @@ class LanguageStore implements \TYPO3\CMS\Core\SingletonInterface
 
     /**
      * Initializes the current class.
-     *
-     * @return void
      */
     public function initialize()
     {
diff --git a/typo3/sysext/core/Classes/Localization/Locales.php b/typo3/sysext/core/Classes/Localization/Locales.php
index 0ce7187cbb042bc456c166cde04465d3f9f893e5..04e58225f617770fec19ddf6175267cf3eeea36f 100644
--- a/typo3/sysext/core/Classes/Localization/Locales.php
+++ b/typo3/sysext/core/Classes/Localization/Locales.php
@@ -130,8 +130,6 @@ class Locales implements \TYPO3\CMS\Core\SingletonInterface
 
     /**
      * Initializes the languages.
-     *
-     * @return void
      */
     public static function initialize()
     {
diff --git a/typo3/sysext/core/Classes/Localization/LocalizationFactory.php b/typo3/sysext/core/Classes/Localization/LocalizationFactory.php
index 07ca8afc34c766865b75e0cf21d6bdc15dca5bc5..46c365a1e8b3e39397828bf7ebd8a03596e30c27 100644
--- a/typo3/sysext/core/Classes/Localization/LocalizationFactory.php
+++ b/typo3/sysext/core/Classes/Localization/LocalizationFactory.php
@@ -49,8 +49,6 @@ class LocalizationFactory implements \TYPO3\CMS\Core\SingletonInterface
 
     /**
      * Initialize cache instance to be ready to use
-     *
-     * @return void
      */
     protected function initializeCache()
     {
@@ -163,7 +161,6 @@ class LocalizationFactory implements \TYPO3\CMS\Core\SingletonInterface
      * @param string $charset
      * @param int $errorMode
      * @param array $LOCAL_LANG
-     * @return void
      */
     protected function localizationOverride($fileReference, $languageKey, $charset, $errorMode, array &$LOCAL_LANG)
     {
diff --git a/typo3/sysext/core/Classes/Locking/FileLockStrategy.php b/typo3/sysext/core/Classes/Locking/FileLockStrategy.php
index 2f6c4f5ca96374ba6f407f28668bdf62e0585cfa..0f2360f2df75570d2a86b4ed2f08ca823992119c 100644
--- a/typo3/sysext/core/Classes/Locking/FileLockStrategy.php
+++ b/typo3/sysext/core/Classes/Locking/FileLockStrategy.php
@@ -167,8 +167,6 @@ class FileLockStrategy implements LockingStrategyInterface
 
     /**
      * Destroys the resource associated with the lock
-     *
-     * @return void
      */
     public function destroy()
     {
diff --git a/typo3/sysext/core/Classes/Locking/LockingStrategyInterface.php b/typo3/sysext/core/Classes/Locking/LockingStrategyInterface.php
index a8bebd47c76a3abc6f890587627e6f6b34d25ad8..464e96b2ab4cdc4c15bd334d70dd1d53939eb5db 100644
--- a/typo3/sysext/core/Classes/Locking/LockingStrategyInterface.php
+++ b/typo3/sysext/core/Classes/Locking/LockingStrategyInterface.php
@@ -73,8 +73,6 @@ interface LockingStrategyInterface
 
     /**
      * Destroys the resource associated with the lock
-     *
-     * @return void
      */
     public function destroy();
 
diff --git a/typo3/sysext/core/Classes/Locking/SemaphoreLockStrategy.php b/typo3/sysext/core/Classes/Locking/SemaphoreLockStrategy.php
index ef39d71d5cbbc6099c2294c89d048169a5592886..db1c3344db872d9621a37dceb694abfad77b66e3 100644
--- a/typo3/sysext/core/Classes/Locking/SemaphoreLockStrategy.php
+++ b/typo3/sysext/core/Classes/Locking/SemaphoreLockStrategy.php
@@ -151,8 +151,6 @@ class SemaphoreLockStrategy implements LockingStrategyInterface
 
     /**
      * Destroys the resource associated with the lock
-     *
-     * @return void
      */
     public function destroy()
     {
diff --git a/typo3/sysext/core/Classes/Locking/SimpleLockStrategy.php b/typo3/sysext/core/Classes/Locking/SimpleLockStrategy.php
index 851705306196e24a1de0ca2d3520fb9d0332c816..2ebc43a12c7ab8acda60653e28bb630f5185e5fb 100644
--- a/typo3/sysext/core/Classes/Locking/SimpleLockStrategy.php
+++ b/typo3/sysext/core/Classes/Locking/SimpleLockStrategy.php
@@ -72,7 +72,6 @@ class SimpleLockStrategy implements LockingStrategyInterface
     /**
      * @param int $loops Number of times a locked resource is tried to be acquired.
      * @param int $step Milliseconds after lock acquire is retried. $loops * $step results in the maximum delay of a lock.
-     * @return void
      */
     public function init($loops = 0, $step = 0)
     {
@@ -188,8 +187,6 @@ class SimpleLockStrategy implements LockingStrategyInterface
 
     /**
      * Destroys the resource associated with the lock
-     *
-     * @return void
      */
     public function destroy()
     {
diff --git a/typo3/sysext/core/Classes/Log/LogLevel.php b/typo3/sysext/core/Classes/Log/LogLevel.php
index e14bf5b179423e5d14465583e0193ed4e1b17f73..8f8a8ee33f9c1ba0167ddde35d8a3783ef545288 100644
--- a/typo3/sysext/core/Classes/Log/LogLevel.php
+++ b/typo3/sysext/core/Classes/Log/LogLevel.php
@@ -137,7 +137,6 @@ class LogLevel
      * Validates a log level.
      *
      * @param int $level log level to validate
-     * @return void
      * @throws \Psr\Log\InvalidArgumentException if the given log level is invalid
      */
     public static function validateLevel($level)
diff --git a/typo3/sysext/core/Classes/Log/LogManager.php b/typo3/sysext/core/Classes/Log/LogManager.php
index 630383805125262be9a6382712c0da110b241702..7248661547fd23d60256dfb03430e25052fc1dd0 100644
--- a/typo3/sysext/core/Classes/Log/LogManager.php
+++ b/typo3/sysext/core/Classes/Log/LogManager.php
@@ -56,8 +56,6 @@ class LogManager implements \TYPO3\CMS\Core\SingletonInterface, LogManagerInterf
 
     /**
      * For use in unit test context only. Resets the internal logger registry.
-     *
-     * @return void
      */
     public function reset()
     {
@@ -100,7 +98,6 @@ class LogManager implements \TYPO3\CMS\Core\SingletonInterface, LogManagerInterf
      * For use in unit test context only.
      *
      * @param string $name
-     * @return void
      */
     public function registerLogger($name)
     {
@@ -121,7 +118,6 @@ class LogManager implements \TYPO3\CMS\Core\SingletonInterface, LogManagerInterf
      * Appends the writers to the given logger as configured.
      *
      * @param \TYPO3\CMS\Core\Log\Logger $logger Logger to configure
-     * @return void
      */
     protected function setWritersForLogger(Logger $logger)
     {
@@ -146,7 +142,6 @@ class LogManager implements \TYPO3\CMS\Core\SingletonInterface, LogManagerInterf
      * Appends the processors to the given logger as configured.
      *
      * @param \TYPO3\CMS\Core\Log\Logger $logger Logger to configure
-     * @return void
      */
     protected function setProcessorsForLogger(Logger $logger)
     {
diff --git a/typo3/sysext/core/Classes/Log/LogRecord.php b/typo3/sysext/core/Classes/Log/LogRecord.php
index 66424392f7115c3cd2c404b8592362f911bd83dc..2fded57563405880ef379a39129542408e86d37c 100644
--- a/typo3/sysext/core/Classes/Log/LogRecord.php
+++ b/typo3/sysext/core/Classes/Log/LogRecord.php
@@ -336,7 +336,6 @@ class LogRecord implements \ArrayAccess
      *
      * @param mixed $offset
      * @param mixed $value
-     * @return void
      */
     public function offsetSet($offset, $value)
     {
@@ -349,7 +348,6 @@ class LogRecord implements \ArrayAccess
      * Offset to unset, required by ArrayAccess interface
      *
      * @param mixed $offset
-     * @return void
      */
     public function offsetUnset($offset)
     {
diff --git a/typo3/sysext/core/Classes/Log/Logger.php b/typo3/sysext/core/Classes/Log/Logger.php
index cadd81c878fe1c20efe7917ac6a1c482b1b03121..9cee006e8aba9917eb448622a32bf688aec14bc5 100644
--- a/typo3/sysext/core/Classes/Log/Logger.php
+++ b/typo3/sysext/core/Classes/Log/Logger.php
@@ -133,7 +133,6 @@ class Logger implements \Psr\Log\LoggerInterface
      *
      * @param int $minimumLevel
      * @param \TYPO3\CMS\Core\Log\Processor\ProcessorInterface $processor The processor to add.
-     * @return void
      */
     public function addProcessor($minimumLevel, Processor\ProcessorInterface $processor)
     {
@@ -208,7 +207,6 @@ class Logger implements \Psr\Log\LoggerInterface
      * Passes the \TYPO3\CMS\Core\Log\LogRecord to all registered writers.
      *
      * @param \TYPO3\CMS\Core\Log\LogRecord $record
-     * @return void
      */
     protected function writeLog(LogRecord $record)
     {
diff --git a/typo3/sysext/core/Classes/Log/Processor/AbstractMemoryProcessor.php b/typo3/sysext/core/Classes/Log/Processor/AbstractMemoryProcessor.php
index 8bc6ae5233d62e6466e6c7328df857845a64350b..00b05e2a645611685e42ed72eaa05b31f575eb86 100644
--- a/typo3/sysext/core/Classes/Log/Processor/AbstractMemoryProcessor.php
+++ b/typo3/sysext/core/Classes/Log/Processor/AbstractMemoryProcessor.php
@@ -42,7 +42,6 @@ abstract class AbstractMemoryProcessor extends AbstractProcessor
      * Sets the allocated memory usage type
      *
      * @param bool $realMemoryUsage Which allocated memory type to use
-     * @return void
      */
     public function setRealMemoryUsage($realMemoryUsage)
     {
@@ -63,7 +62,6 @@ abstract class AbstractMemoryProcessor extends AbstractProcessor
      * Sets whether size should be formatted
      *
      * @param bool $formatSize
-     * @return void
      */
     public function setFormatSize($formatSize)
     {
diff --git a/typo3/sysext/core/Classes/Log/Writer/FileWriter.php b/typo3/sysext/core/Classes/Log/Writer/FileWriter.php
index a84bc00b4f8a640ccecddc50f708fb9249b71631..271129cc593f5f90bf158b2344913fa8ad28a5b4 100644
--- a/typo3/sysext/core/Classes/Log/Writer/FileWriter.php
+++ b/typo3/sysext/core/Classes/Log/Writer/FileWriter.php
@@ -148,7 +148,6 @@ class FileWriter extends AbstractWriter
     /**
      * Opens the log file handle
      *
-     * @return void
      * @throws \RuntimeException if the log file can't be opened.
      */
     protected function openLogFile()
@@ -166,8 +165,6 @@ class FileWriter extends AbstractWriter
 
     /**
      * Closes the log file handle.
-     *
-     * @return void
      */
     protected function closeLogFile()
     {
@@ -180,8 +177,6 @@ class FileWriter extends AbstractWriter
     /**
      * Creates the log file with correct permissions
      * and parent directories, if needed
-     *
-     * @return void
      */
     protected function createLogFile()
     {
@@ -205,7 +200,6 @@ class FileWriter extends AbstractWriter
      * Creates .htaccess file inside a new directory to access protect it
      *
      * @param string $htaccessFile Path of .htaccess file
-     * @return void
      */
     protected function createHtaccessFile($htaccessFile)
     {
diff --git a/typo3/sysext/core/Classes/Log/Writer/SyslogWriter.php b/typo3/sysext/core/Classes/Log/Writer/SyslogWriter.php
index 694675f1b2e36771e51547a0e9c1000f8c696833..f98e8e419ed8392aecbde3961adeabfeccd9d740 100644
--- a/typo3/sysext/core/Classes/Log/Writer/SyslogWriter.php
+++ b/typo3/sysext/core/Classes/Log/Writer/SyslogWriter.php
@@ -86,7 +86,6 @@ class SyslogWriter extends AbstractWriter
      * Sets the facility to use when logging to syslog.
      *
      * @param int $facility Facility to use when logging.
-     * @return void
      */
     public function setFacility($facility)
     {
diff --git a/typo3/sysext/core/Classes/Mail/MailMessage.php b/typo3/sysext/core/Classes/Mail/MailMessage.php
index b621f7c0e57477a30579aa396cb7c5c99cd11720..f4e85d8967a36bd082f605fa1a8a23718b71e183 100644
--- a/typo3/sysext/core/Classes/Mail/MailMessage.php
+++ b/typo3/sysext/core/Classes/Mail/MailMessage.php
@@ -46,7 +46,6 @@ class MailMessage extends \Swift_Message
     protected $failedRecipients = [];
 
     /**
-     * @return void
      */
     private function initializeMailer()
     {
diff --git a/typo3/sysext/core/Classes/Mail/Mailer.php b/typo3/sysext/core/Classes/Mail/Mailer.php
index 22bd02f0b1513436fc35865a746b7558d218969c..5f743d0197c8dc5986fd30661016629ca1e2ad61 100644
--- a/typo3/sysext/core/Classes/Mail/Mailer.php
+++ b/typo3/sysext/core/Classes/Mail/Mailer.php
@@ -172,8 +172,6 @@ class Mailer extends \Swift_Mailer
 
     /**
      * Emits a signal after mailer initialization
-     *
-     * @return void
      */
     protected function emitPostInitializeMailerSignal()
     {
diff --git a/typo3/sysext/core/Classes/Messaging/AbstractMessage.php b/typo3/sysext/core/Classes/Messaging/AbstractMessage.php
index 6beaeaf1e6498343b4e907d3d8f92d3732d34646..403fd1e62600c18e3b725fb3c68343f504cdaae2 100644
--- a/typo3/sysext/core/Classes/Messaging/AbstractMessage.php
+++ b/typo3/sysext/core/Classes/Messaging/AbstractMessage.php
@@ -63,7 +63,6 @@ abstract class AbstractMessage
      * Sets the message's title
      *
      * @param string $title The message's title
-     * @return void
      */
     public function setTitle(string $title)
     {
@@ -84,7 +83,6 @@ abstract class AbstractMessage
      * Sets the message
      *
      * @param string $message The message
-     * @return void
      */
     public function setMessage(string $message)
     {
@@ -105,7 +103,6 @@ abstract class AbstractMessage
      * Sets the message' severity
      *
      * @param int $severity The severity, must be one of AbstractMessage::INFO or similar constants
-     * @return void
      */
     public function setSeverity(int $severity = self::OK)
     {
diff --git a/typo3/sysext/core/Classes/Messaging/AbstractStandaloneMessage.php b/typo3/sysext/core/Classes/Messaging/AbstractStandaloneMessage.php
index 176d0b8c886c00e79c645f9cfc1c1e5f363ded72..b9cb153a47a858f185a7f734d10e3500fd8a5c4b 100644
--- a/typo3/sysext/core/Classes/Messaging/AbstractStandaloneMessage.php
+++ b/typo3/sysext/core/Classes/Messaging/AbstractStandaloneMessage.php
@@ -67,7 +67,6 @@ abstract class AbstractStandaloneMessage extends AbstractMessage
      * The marker array passed, will be merged with already present markers.
      *
      * @param array $markers Array containing the markers and values (e.g. ###MARKERNAME### => value)
-     * @return void
      */
     public function setMarkers(array $markers)
     {
@@ -119,7 +118,6 @@ abstract class AbstractStandaloneMessage extends AbstractMessage
      * Sets the filename to the HTML template
      *
      * @param string $htmlTemplate The filename of the HTML template, relative to PATH_site
-     * @return void
      */
     public function setHtmlTemplate($htmlTemplate)
     {
@@ -145,8 +143,6 @@ abstract class AbstractStandaloneMessage extends AbstractMessage
 
     /**
      * Renders the message and echoes it.
-     *
-     * @return void
      */
     public function output()
     {
diff --git a/typo3/sysext/core/Classes/Messaging/FlashMessage.php b/typo3/sysext/core/Classes/Messaging/FlashMessage.php
index 5b758885fcd50bcf7f14f43600b80268704eab79..1fd815251570589c3bc9408adff94eec46a1e2c8 100644
--- a/typo3/sysext/core/Classes/Messaging/FlashMessage.php
+++ b/typo3/sysext/core/Classes/Messaging/FlashMessage.php
@@ -83,7 +83,6 @@ class FlashMessage extends AbstractMessage
      * Sets the message's storeInSession flag
      *
      * @param bool $storeInSession The persistence flag
-     * @return void
      */
     public function setStoreInSession($storeInSession)
     {
diff --git a/typo3/sysext/core/Classes/Messaging/FlashMessageQueue.php b/typo3/sysext/core/Classes/Messaging/FlashMessageQueue.php
index 7500df42c5edea4a922fddbad9afcbf6cac0c2e4..6f9cbcf7faff6988ab4540bc521d3363b5ee8ad2 100644
--- a/typo3/sysext/core/Classes/Messaging/FlashMessageQueue.php
+++ b/typo3/sysext/core/Classes/Messaging/FlashMessageQueue.php
@@ -52,7 +52,6 @@ class FlashMessageQueue extends \SplQueue
      *
      * @param FlashMessage $message Instance of \TYPO3\CMS\Core\Messaging\FlashMessage, representing a message
      * @throws \TYPO3\CMS\Core\Exception
-     * @return void
      */
     public function enqueue($message)
     {
@@ -71,7 +70,6 @@ class FlashMessageQueue extends \SplQueue
 
     /**
      * @param FlashMessage $message
-     * @return void
      */
     public function addMessage(FlashMessage $message)
     {
@@ -80,7 +78,6 @@ class FlashMessageQueue extends \SplQueue
 
     /**
      * This method is empty, as it will not move any flash message (e.g. from the session)
-     * @return void
      */
     public function dequeue()
     {
@@ -92,7 +89,6 @@ class FlashMessageQueue extends \SplQueue
      * flash messages that will be stored in the session.
      *
      * @param FlashMessage $message
-     * @return void
      */
     protected function addFlashMessageToSession(FlashMessage $message)
     {
@@ -147,7 +143,6 @@ class FlashMessageQueue extends \SplQueue
      * Stores given flash messages in the session
      *
      * @param FlashMessage[] $flashMessages
-     * @return void
      */
     protected function storeFlashMessagesInSession(array $flashMessages = null)
     {
@@ -158,7 +153,6 @@ class FlashMessageQueue extends \SplQueue
      * Removes all flash messages from the session
      *
      * @param int $severity Optional severity, must be one of \TYPO3\CMS\Core\Messaging\AbstractMessage constants
-     * @return void
      */
     protected function removeAllFlashMessagesFromSession($severity = null)
     {
@@ -238,7 +232,6 @@ class FlashMessageQueue extends \SplQueue
      * Removes all items from the queue
      *
      * @param int $severity Optional severity, must be one of \TYPO3\CMS\Core\Messaging\AbstractMessage constants
-     * @return void
      */
     public function clear($severity = null)
     {
diff --git a/typo3/sysext/core/Classes/Package/FailsafePackageManager.php b/typo3/sysext/core/Classes/Package/FailsafePackageManager.php
index 1c62336f3d73d5a66ee98a06ecff978c81c12e59..b66bf08e6f3f81b2113953dd8c3ac93c9e1ebadd 100644
--- a/typo3/sysext/core/Classes/Package/FailsafePackageManager.php
+++ b/typo3/sysext/core/Classes/Package/FailsafePackageManager.php
@@ -29,8 +29,6 @@ class FailsafePackageManager extends PackageManager
     /**
      * Loads the states of available packages from the PackageStates.php file.
      * The result is stored in $this->packageStatesConfiguration.
-     *
-     * @return void
      */
     protected function loadPackageStates()
     {
@@ -45,8 +43,6 @@ class FailsafePackageManager extends PackageManager
 
     /**
      * Sort and save states
-     *
-     * @return void
      */
     protected function sortAndSavePackageStates()
     {
diff --git a/typo3/sysext/core/Classes/Package/MetaData.php b/typo3/sysext/core/Classes/Package/MetaData.php
index 005b4590c412dbaa5480e450a38a36861930c606..034333a019433ad38d52b0c28020260e5d575bf1 100644
--- a/typo3/sysext/core/Classes/Package/MetaData.php
+++ b/typo3/sysext/core/Classes/Package/MetaData.php
@@ -123,7 +123,6 @@ class MetaData
 
     /**
      * @param string $version The package version to set
-     * @return void
      */
     public function setVersion($version)
     {
@@ -140,7 +139,6 @@ class MetaData
 
     /**
      * @param string $description The package description to set
-     * @return void
      */
     public function setDescription($description)
     {
@@ -175,7 +173,6 @@ class MetaData
      * Add a constraint
      *
      * @param MetaData\PackageConstraint $constraint The constraint to add
-     * @return void
      */
     public function addConstraint(MetaData\PackageConstraint $constraint)
     {
diff --git a/typo3/sysext/core/Classes/Package/Package.php b/typo3/sysext/core/Classes/Package/Package.php
index 03510abf76bec98a0bad03fd4c07ea87112ca033..3450a57030e44498c793302b4ed6302cd95a1ad5 100644
--- a/typo3/sysext/core/Classes/Package/Package.php
+++ b/typo3/sysext/core/Classes/Package/Package.php
@@ -108,8 +108,6 @@ class Package implements PackageInterface
     /**
      * Loads package management related flags from the "extra:typo3/cms:Package" section
      * of extensions composer.json files into local properties
-     *
-     * @return void
      */
     protected function loadFlagsFromComposerManifest()
     {
@@ -165,7 +163,6 @@ class Package implements PackageInterface
      * Sets the protection flag of the package
      *
      * @param bool $protected TRUE if the package should be protected, otherwise FALSE
-     * @return void
      * @api
      */
     public function setProtected($protected)
diff --git a/typo3/sysext/core/Classes/Package/PackageInterface.php b/typo3/sysext/core/Classes/Package/PackageInterface.php
index 256eedd1f41b1b8fb18e46bd1594e40815680f62..647d4094d0a230d046b3ef1037572c99217b514c 100644
--- a/typo3/sysext/core/Classes/Package/PackageInterface.php
+++ b/typo3/sysext/core/Classes/Package/PackageInterface.php
@@ -82,7 +82,6 @@ interface PackageInterface
      * Sets the protection flag of the package
      *
      * @param bool $protected TRUE if the package should be protected, otherwise FALSE
-     * @return void
      * @api
      */
     public function setProtected($protected);
diff --git a/typo3/sysext/core/Classes/Package/PackageManager.php b/typo3/sysext/core/Classes/Package/PackageManager.php
index 067d574d8a189585c4d16ffb7826a5f7890e80dd..ef22e667a6dff6f4713d2a6af17e1c1b38c6c644 100644
--- a/typo3/sysext/core/Classes/Package/PackageManager.php
+++ b/typo3/sysext/core/Classes/Package/PackageManager.php
@@ -127,8 +127,6 @@ class PackageManager implements \TYPO3\CMS\Core\SingletonInterface
 
     /**
      * Initializes the package manager
-     *
-     * @return void
      */
     public function initialize()
     {
@@ -222,7 +220,6 @@ class PackageManager implements \TYPO3\CMS\Core\SingletonInterface
      * The result is stored in $this->packageStatesConfiguration.
      *
      * @throws Exception\PackageStatesUnavailableException
-     * @return void
      */
     protected function loadPackageStates()
     {
@@ -255,8 +252,6 @@ class PackageManager implements \TYPO3\CMS\Core\SingletonInterface
      * Initializes activePackages property
      *
      * Saves PackageStates.php if list of required extensions has changed.
-     *
-     * @return void
      */
     protected function initializePackageObjects()
     {
@@ -293,8 +288,6 @@ class PackageManager implements \TYPO3\CMS\Core\SingletonInterface
 
     /**
      * Initializes a backwards compatibility $GLOBALS['TYPO3_LOADED_EXT'] array
-     *
-     * @return void
      */
     protected function initializeCompatibilityLoadedExtArray()
     {
@@ -305,8 +298,6 @@ class PackageManager implements \TYPO3\CMS\Core\SingletonInterface
     /**
      * Scans all directories in the packages directories for available packages.
      * For each package a Package object is created and stored in $this->packages.
-     *
-     * @return void
      */
     public function scanAvailablePackages()
     {
@@ -461,7 +452,6 @@ class PackageManager implements \TYPO3\CMS\Core\SingletonInterface
      * Unregisters a package from the list of available packages
      *
      * @param string $packageKey Package Key of the package to be unregistered
-     * @return void
      */
     protected function unregisterPackageByPackageKey($packageKey)
     {
@@ -813,7 +803,6 @@ class PackageManager implements \TYPO3\CMS\Core\SingletonInterface
      * Unregisters a package from the list of available packages
      *
      * @param PackageInterface $package The package to be unregistered
-     * @return void
      * @throws Exception\InvalidPackageStateException
      */
     public function unregisterPackage(PackageInterface $package)
diff --git a/typo3/sysext/core/Classes/Package/UnitTestPackageManager.php b/typo3/sysext/core/Classes/Package/UnitTestPackageManager.php
index ac93de417030a7f7cd998669853d2519aa147d4e..43a97994cd2f27eef6982e472283648a1426b7df 100644
--- a/typo3/sysext/core/Classes/Package/UnitTestPackageManager.php
+++ b/typo3/sysext/core/Classes/Package/UnitTestPackageManager.php
@@ -24,8 +24,6 @@ class UnitTestPackageManager extends PackageManager
 {
     /**
      * Initializes the package manager
-     *
-     * @return void
      */
     public function initialize()
     {
@@ -38,8 +36,6 @@ class UnitTestPackageManager extends PackageManager
     /**
      * Overwrite the original method to avoid resolving dependencies (which we do not need)
      * and saving the PackageStates.php file (which we do not want), when calling scanAvailablePackages()
-     *
-     * @return void
      */
     protected function sortAndSavePackageStates()
     {
diff --git a/typo3/sysext/core/Classes/Page/PageRenderer.php b/typo3/sysext/core/Classes/Page/PageRenderer.php
index 0c31b8d2220a19d758a0387b14049e424da16567..54b86a072cd877a7fceb948f31274c00c4783702 100644
--- a/typo3/sysext/core/Classes/Page/PageRenderer.php
+++ b/typo3/sysext/core/Classes/Page/PageRenderer.php
@@ -431,8 +431,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
 
     /**
      * Reset all vars to initial values
-     *
-     * @return void
      */
     protected function reset()
     {
@@ -462,7 +460,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
      * Sets the title
      *
      * @param string $title	title of webpage
-     * @return void
      */
     public function setTitle($title)
     {
@@ -473,7 +470,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
      * Enables/disables rendering of XHTML code
      *
      * @param bool $enable Enable XHTML
-     * @return void
      */
     public function setRenderXhtml($enable)
     {
@@ -484,7 +480,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
      * Sets xml prolog and docType
      *
      * @param string $xmlPrologAndDocType Complete tags for xml prolog and docType
-     * @return void
      */
     public function setXmlPrologAndDocType($xmlPrologAndDocType)
     {
@@ -495,7 +490,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
      * Sets meta charset
      *
      * @param string $charSet Used charset
-     * @return void
      */
     public function setCharSet($charSet)
     {
@@ -506,7 +500,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
      * Sets language
      *
      * @param string $lang Used language
-     * @return void
      */
     public function setLanguage($lang)
     {
@@ -526,7 +519,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
      * Set the meta charset tag
      *
      * @param string $metaCharsetTag
-     * @return void
      */
     public function setMetaCharsetTag($metaCharsetTag)
     {
@@ -537,7 +529,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
      * Sets html tag
      *
      * @param string $htmlTag Html tag
-     * @return void
      */
     public function setHtmlTag($htmlTag)
     {
@@ -548,7 +539,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
      * Sets HTML head tag
      *
      * @param string $headTag HTML head tag
-     * @return void
      */
     public function setHeadTag($headTag)
     {
@@ -559,7 +549,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
      * Sets favicon
      *
      * @param string $favIcon
-     * @return void
      */
     public function setFavIcon($favIcon)
     {
@@ -570,7 +559,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
      * Sets icon mime type
      *
      * @param string $iconMimeType
-     * @return void
      */
     public function setIconMimeType($iconMimeType)
     {
@@ -581,7 +569,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
      * Sets HTML base URL
      *
      * @param string $baseUrl HTML base URL
-     * @return void
      */
     public function setBaseUrl($baseUrl)
     {
@@ -592,7 +579,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
      * Sets template file
      *
      * @param string $file
-     * @return void
      */
     public function setTemplateFile($file)
     {
@@ -603,7 +589,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
      * Sets Content for Body
      *
      * @param string $content
-     * @return void
      */
     public function setBodyContent($content)
     {
@@ -614,7 +599,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
      * Sets path to requireJS library (relative to typo3 directory)
      *
      * @param string $path Path to requireJS library
-     * @return void
      */
     public function setRequireJsPath($path)
     {
@@ -625,7 +609,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
      * Sets Path for ExtJs library (relative to typo3 directory)
      *
      * @param string $path
-     * @return void
      */
     public function setExtJsPath($path)
     {
@@ -640,8 +623,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
     /*****************************************************/
     /**
      * Enables MoveJsFromHeaderToFooter
-     *
-     * @return void
      */
     public function enableMoveJsFromHeaderToFooter()
     {
@@ -650,8 +631,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
 
     /**
      * Disables MoveJsFromHeaderToFooter
-     *
-     * @return void
      */
     public function disableMoveJsFromHeaderToFooter()
     {
@@ -660,8 +639,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
 
     /**
      * Enables compression of javascript
-     *
-     * @return void
      */
     public function enableCompressJavascript()
     {
@@ -670,8 +647,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
 
     /**
      * Disables compression of javascript
-     *
-     * @return void
      */
     public function disableCompressJavascript()
     {
@@ -680,8 +655,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
 
     /**
      * Enables compression of css
-     *
-     * @return void
      */
     public function enableCompressCss()
     {
@@ -690,8 +663,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
 
     /**
      * Disables compression of css
-     *
-     * @return void
      */
     public function disableCompressCss()
     {
@@ -700,8 +671,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
 
     /**
      * Enables concatenation of js and css files
-     *
-     * @return void
      */
     public function enableConcatenateFiles()
     {
@@ -710,8 +679,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
 
     /**
      * Disables concatenation of js and css files
-     *
-     * @return void
      */
     public function disableConcatenateFiles()
     {
@@ -720,8 +687,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
 
     /**
      * Enables concatenation of js files
-     *
-     * @return void
      */
     public function enableConcatenateJavascript()
     {
@@ -730,8 +695,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
 
     /**
      * Disables concatenation of js files
-     *
-     * @return void
      */
     public function disableConcatenateJavascript()
     {
@@ -740,8 +703,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
 
     /**
      * Enables concatenation of css files
-     *
-     * @return void
      */
     public function enableConcatenateCss()
     {
@@ -750,8 +711,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
 
     /**
      * Disables concatenation of css files
-     *
-     * @return void
      */
     public function disableConcatenateCss()
     {
@@ -760,8 +719,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
 
     /**
      * Sets removal of all line breaks in template
-     *
-     * @return void
      */
     public function enableRemoveLineBreaksFromTemplate()
     {
@@ -770,8 +727,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
 
     /**
      * Unsets removal of all line breaks in template
-     *
-     * @return void
      */
     public function disableRemoveLineBreaksFromTemplate()
     {
@@ -781,8 +736,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
     /**
      * Enables Debug Mode
      * This is a shortcut to switch off all compress/concatenate features to enable easier debug
-     *
-     * @return void
      */
     public function enableDebugMode()
     {
@@ -1030,7 +983,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
      * Adds meta data
      *
      * @param string $meta Meta data (complete metatag)
-     * @return void
      */
     public function addMetaTag($meta)
     {
@@ -1043,7 +995,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
      * Adds inline HTML comment
      *
      * @param string $comment
-     * @return void
      */
     public function addInlineComment($comment)
     {
@@ -1056,7 +1007,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
      * Adds header data
      *
      * @param string $data Free header data for HTML header
-     * @return void
      */
     public function addHeaderData($data)
     {
@@ -1069,7 +1019,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
      * Adds footer data
      *
      * @param string $data Free header data for HTML header
-     * @return void
      */
     public function addFooterData($data)
     {
@@ -1091,7 +1040,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
      * @param string $splitChar The char used to split the allWrap value, default is "|"
      * @param bool $async Flag if property 'async="async"' should be added to JavaScript tags
      * @param string $integrity Subresource Integrity (SRI)
-     * @return void
      */
     public function addJsLibrary($name, $file, $type = 'text/javascript', $compress = false, $forceOnTop = false, $allWrap = '', $excludeFromConcatenation = false, $splitChar = '|', $async = false, $integrity = '')
     {
@@ -1127,7 +1075,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
      * @param string $splitChar The char used to split the allWrap value, default is "|"
      * @param bool $async Flag if property 'async="async"' should be added to JavaScript tags
      * @param string $integrity Subresource Integrity (SRI)
-     * @return void
      */
     public function addJsFooterLibrary($name, $file, $type = 'text/javascript', $compress = false, $forceOnTop = false, $allWrap = '', $excludeFromConcatenation = false, $splitChar = '|', $async = false, $integrity = '')
     {
@@ -1162,7 +1109,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
      * @param string $splitChar The char used to split the allWrap value, default is "|"
      * @param bool $async Flag if property 'async="async"' should be added to JavaScript tags
      * @param string $integrity Subresource Integrity (SRI)
-     * @return void
      */
     public function addJsFile($file, $type = 'text/javascript', $compress = true, $forceOnTop = false, $allWrap = '', $excludeFromConcatenation = false, $splitChar = '|', $async = false, $integrity = '')
     {
@@ -1197,7 +1143,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
      * @param string $splitChar The char used to split the allWrap value, default is "|"
      * @param bool $async Flag if property 'async="async"' should be added to JavaScript tags
      * @param string $integrity Subresource Integrity (SRI)
-     * @return void
      */
     public function addJsFooterFile($file, $type = 'text/javascript', $compress = true, $forceOnTop = false, $allWrap = '', $excludeFromConcatenation = false, $splitChar = '|', $async = false, $integrity = '')
     {
@@ -1227,7 +1172,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
      * @param string $block
      * @param bool $compress
      * @param bool $forceOnTop
-     * @return void
      */
     public function addJsInlineCode($name, $block, $compress = true, $forceOnTop = false)
     {
@@ -1248,7 +1192,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
      * @param string $block
      * @param bool $compress
      * @param bool $forceOnTop
-     * @return void
      */
     public function addJsFooterInlineCode($name, $block, $compress = true, $forceOnTop = false)
     {
@@ -1267,7 +1210,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
      *
      * @param string $block Javascript code
      * @param bool $forceOnTop Position of the javascript code (TRUE for putting it on top, default is FALSE = bottom)
-     * @return void
      */
     public function addExtOnReadyCode($block, $forceOnTop = false)
     {
@@ -1284,7 +1226,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
      * Adds the ExtDirect code
      *
      * @param array $filterNamespaces Limit the output to defined namespaces. If empty, all namespaces are generated
-     * @return void
      */
     public function addExtDirectCode(array $filterNamespaces = [])
     {
@@ -1414,7 +1355,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
      * @param string $allWrap
      * @param bool $excludeFromConcatenation
      * @param string $splitChar The char used to split the allWrap value, default is "|"
-     * @return void
      */
     public function addCssFile($file, $rel = 'stylesheet', $media = 'all', $title = '', $compress = true, $forceOnTop = false, $allWrap = '', $excludeFromConcatenation = false, $splitChar = '|')
     {
@@ -1445,7 +1385,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
      * @param string $allWrap
      * @param bool $excludeFromConcatenation
      * @param string $splitChar The char used to split the allWrap value, default is "|"
-     * @return void
      */
     public function addCssLibrary($file, $rel = 'stylesheet', $media = 'all', $title = '', $compress = true, $forceOnTop = false, $allWrap = '', $excludeFromConcatenation = false, $splitChar = '|')
     {
@@ -1471,7 +1410,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
      * @param string $block
      * @param bool $compress
      * @param bool $forceOnTop
-     * @return void
      */
     public function addCssInlineBlock($name, $block, $compress = false, $forceOnTop = false)
     {
@@ -1490,7 +1428,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
      * @param null|string $version The jQuery version that should be included, either "latest" or any available version
      * @param null|string $source The location of the jQuery source, can be "local", "google", "msn", "jquery" or just an URL to your jQuery lib
      * @param string $namespace The namespace in which the jQuery object of the specific version should be stored.
-     * @return void
      * @throws \UnexpectedValueException
      */
     public function loadJquery($version = null, $source = null, $namespace = self::JQUERY_NAMESPACE_DEFAULT)
@@ -1520,8 +1457,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
      * this automatically adds the JavaScript path of all loaded extensions in the requireJS path option
      * so it resolves names like TYPO3/CMS/MyExtension/MyJsFile to EXT:MyExtension/Resources/Public/JavaScript/MyJsFile.js
      * when using requireJS
-     *
-     * @return void
      */
     public function loadRequireJs()
     {
@@ -1615,7 +1550,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
      *      ),
      *
      * @param array $configuration The configuration that will be merged with existing one.
-     * @return void
      */
     public function addRequireJsConfiguration(array $configuration)
     {
@@ -1641,7 +1575,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
      *
      * @param string $mainModuleName Must be in the form of "TYPO3/CMS/PackageName/ModuleName" e.g. "TYPO3/CMS/Backend/FormEngine"
      * @param string $callBackFunction loaded right after the requireJS loading, must be wrapped in function() {}
-     * @return void
      */
     public function loadRequireJsModule($mainModuleName, $callBackFunction = null)
     {
@@ -1664,7 +1597,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
      *
      * @param bool $css Flag, if set the ext-css will be loaded
      * @param bool $theme Flag, if set the ext-theme "grey" will be loaded
-     * @return void
      */
     public function loadExtJS($css = true, $theme = true)
     {
@@ -1675,8 +1607,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
 
     /**
      * Call this function to load debug version of ExtJS. Use this for development only
-     *
-     * @return void
      */
     public function enableExtJsDebug()
     {
@@ -1690,7 +1620,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
      *
      * @param string $key
      * @param string $value
-     * @return void
      */
     public function addInlineLanguageLabel($key, $value)
     {
@@ -1705,7 +1634,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
      *
      * @param array $array
      * @param bool $parseWithLanguageService
-     * @return void
      */
     public function addInlineLanguageLabelArray(array $array, $parseWithLanguageService = false)
     {
@@ -1729,7 +1657,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
      * @param string $selectionPrefix Prefix to select the correct labels (default: '')
      * @param string $stripFromSelectionName String to be removed from the label names in the output. (default: '')
      * @param int $errorMode Error mode (when file could not be found): 0 - syslog entry, 1 - do nothing, 2 - throw an exception
-     * @return void
      */
     public function addInlineLanguageLabelFile($fileRef, $selectionPrefix = '', $stripFromSelectionName = '', $errorMode = 0)
     {
@@ -1752,7 +1679,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
      * @param string $namespace
      * @param string $key
      * @param string $value
-     * @return void
      */
     public function addInlineSetting($namespace, $key, $value)
     {
@@ -1780,7 +1706,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
      *
      * @param string $namespace
      * @param array $array
-     * @return void
      */
     public function addInlineSettingArray($namespace, array $array)
     {
@@ -1804,7 +1729,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
      * Adds content to body content
      *
      * @param string $content
-     * @return void
      */
     public function addBodyContent($content)
     {
@@ -1894,8 +1818,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
      * Remove ending slashes from static header block
      * if the page is being rendered as html (not xhtml)
      * and define property $this->endingSlash for further use
-     *
-     * @return void
      */
     protected function prepareRendering()
     {
@@ -2468,7 +2390,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
      * @param string $selectionPrefix
      * @param string $stripFromSelectionName
      * @param int $errorMode
-     * @return void
      * @throws \RuntimeException
      */
     protected function includeLanguageFileForInline($fileRef, $selectionPrefix = '', $stripFromSelectionName = '', $errorMode = 0)
@@ -2546,8 +2467,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
     /**
      * Concatenate files into one file
      * registered handler
-     *
-     * @return void
      */
     protected function doConcatenate()
     {
@@ -2557,8 +2476,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
 
     /**
      * Concatenate JavaScript files according to the configuration.
-     *
-     * @return void
      */
     protected function doConcatenateJavaScript()
     {
@@ -2583,8 +2500,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
 
     /**
      * Concatenate CSS files according to configuration.
-     *
-     * @return void
      */
     protected function doConcatenateCss()
     {
@@ -2611,8 +2526,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
 
     /**
      * Compresses inline code
-     *
-     * @return void
      */
     protected function doCompress()
     {
@@ -2622,8 +2535,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
 
     /**
      * Compresses CSS according to configuration.
-     *
-     * @return void
      */
     protected function doCompressCss()
     {
@@ -2647,8 +2558,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
 
     /**
      * Compresses JavaScript according to configuration.
-     *
-     * @return void
      */
     protected function doCompressJavaScript()
     {
@@ -2773,8 +2682,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
     /*****************************************************/
     /**
      * Execute PreRenderHook for possible manipulation
-     *
-     * @return void
      */
     protected function executePreRenderHook()
     {
@@ -2800,8 +2707,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
 
     /**
      * PostTransform for possible manipulation of concatenated and compressed files
-     *
-     * @return void
      */
     protected function executeRenderPostTransformHook()
     {
@@ -2837,7 +2742,6 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
      * @param $cssInline string
      * @param $jsFooterInline string
      * @param $jsFooterLibs string
-     * @return void
      */
     protected function executePostRenderHook(&$jsLibs, &$jsFiles, &$jsFooterFiles, &$cssLibs, &$cssFiles, &$jsInline, &$cssInline, &$jsFooterInline, &$jsFooterLibs)
     {
diff --git a/typo3/sysext/core/Classes/Registry.php b/typo3/sysext/core/Classes/Registry.php
index 903205893a8a2ddfe70bee0e91af39551556e9d1..8add9de3da4fb318f88c8d193adfabfd55cd79a1 100644
--- a/typo3/sysext/core/Classes/Registry.php
+++ b/typo3/sysext/core/Classes/Registry.php
@@ -69,7 +69,6 @@ class Registry implements SingletonInterface
      * @param string $namespace Extension key of extension
      * @param string $key The key of the entry to set.
      * @param mixed $value The value to set. This can be any PHP data type; This class takes care of serialization
-     * @return void
      * @throws \InvalidArgumentException Throws an exception if the given namespace is not valid
      */
     public function set($namespace, $key, $value)
@@ -108,7 +107,6 @@ class Registry implements SingletonInterface
      *
      * @param string $namespace Extension key of extension
      * @param string $key The key of the entry to unset.
-     * @return void
      * @throws \InvalidArgumentException Throws an exception if the given namespace is not valid
      */
     public function remove($namespace, $key)
@@ -127,7 +125,6 @@ class Registry implements SingletonInterface
      * Unset all persistent entries of given namespace.
      *
      * @param string $namespace Extension key of extension
-     * @return void
      * @throws \InvalidArgumentException Throws an exception if given namespace is invalid
      */
     public function removeAllByNamespace($namespace)
@@ -157,7 +154,6 @@ class Registry implements SingletonInterface
      * Loads all entries of given namespace into the internal $entries cache.
      *
      * @param string $namespace Extension key of extension
-     * @return void
      * @throws \InvalidArgumentException Thrown if given namespace is invalid
      */
     protected function loadEntriesByNamespace($namespace)
@@ -182,7 +178,6 @@ class Registry implements SingletonInterface
      * It must be at least two characters long. The word 'core' is reserved for TYPO3 core usage.
      *
      * @param string $namespace Namespace
-     * @return void
      * @throws \InvalidArgumentException Thrown if given namespace is invalid
      */
     protected function validateNamespace($namespace)
diff --git a/typo3/sysext/core/Classes/Resource/AbstractFile.php b/typo3/sysext/core/Classes/Resource/AbstractFile.php
index d90feec97e5d80336ac127f4ecf9a832ffe430fa..f90321cf862a5331397ff98d3fc32b2b894636fd 100644
--- a/typo3/sysext/core/Classes/Resource/AbstractFile.php
+++ b/typo3/sysext/core/Classes/Resource/AbstractFile.php
@@ -445,8 +445,6 @@ abstract class AbstractFile implements FileInterface
     /**
      * Marks this file as deleted. This should only be used inside the
      * File Abstraction Layer, as it is a low-level API method.
-     *
-     * @return void
      */
     public function setDeleted()
     {
diff --git a/typo3/sysext/core/Classes/Resource/AbstractRepository.php b/typo3/sysext/core/Classes/Resource/AbstractRepository.php
index 63c4d9542acab610b858306b56fc674592b513ce..ce2b2f882cc5e07806616e7eba222944399b001a 100644
--- a/typo3/sysext/core/Classes/Resource/AbstractRepository.php
+++ b/typo3/sysext/core/Classes/Resource/AbstractRepository.php
@@ -64,7 +64,6 @@ abstract class AbstractRepository implements RepositoryInterface, SingletonInter
      * Adds an object to this repository.
      *
      * @param object $object The object to add
-     * @return void
      * @api
      */
     public function add($object)
@@ -75,7 +74,6 @@ abstract class AbstractRepository implements RepositoryInterface, SingletonInter
      * Removes an object from this repository.
      *
      * @param object $object The object to remove
-     * @return void
      * @api
      */
     public function remove($object)
@@ -87,7 +85,6 @@ abstract class AbstractRepository implements RepositoryInterface, SingletonInter
      *
      * @param object $existingObject The existing object
      * @param object $newObject The new object
-     * @return void
      * @api
      */
     public function replace($existingObject, $newObject)
@@ -181,7 +178,6 @@ abstract class AbstractRepository implements RepositoryInterface, SingletonInter
      * Removes all objects of this repository as if remove() was called for
      * all of them.
      *
-     * @return void
      * @api
      */
     public function removeAll()
@@ -232,7 +228,6 @@ abstract class AbstractRepository implements RepositoryInterface, SingletonInter
      * @param array $defaultOrderings The property names to order by
      *
      * @throws \BadMethodCallException
-     * @return void
      * @api
      */
     public function setDefaultOrderings(array $defaultOrderings)
@@ -246,7 +241,6 @@ abstract class AbstractRepository implements RepositoryInterface, SingletonInter
      * @param \TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface $defaultQuerySettings The query settings to be used by default
      *
      * @throws \BadMethodCallException
-     * @return void
      * @api
      */
     public function setDefaultQuerySettings(\TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface $defaultQuerySettings)
@@ -285,7 +279,6 @@ abstract class AbstractRepository implements RepositoryInterface, SingletonInter
      * @param array $arguments The arguments
      *
      * @throws \BadMethodCallException
-     * @return void
      */
     public function __call($method, $arguments)
     {
diff --git a/typo3/sysext/core/Classes/Resource/Collection/CategoryBasedFileCollection.php b/typo3/sysext/core/Classes/Resource/Collection/CategoryBasedFileCollection.php
index 0a9fa5ff2c3ebbb3b441db04dea218643459ab6a..84df0b48fd8299976cfa7f4f10283bc4c57c7a62 100644
--- a/typo3/sysext/core/Classes/Resource/Collection/CategoryBasedFileCollection.php
+++ b/typo3/sysext/core/Classes/Resource/Collection/CategoryBasedFileCollection.php
@@ -46,8 +46,6 @@ class CategoryBasedFileCollection extends AbstractFileCollection
 
     /**
      * Populates the content-entries of the collection
-     *
-     * @return void
      */
     public function loadContents()
     {
diff --git a/typo3/sysext/core/Classes/Resource/Collection/FolderBasedFileCollection.php b/typo3/sysext/core/Classes/Resource/Collection/FolderBasedFileCollection.php
index 66ec49a364e9383c7e59c6f33bd897b981b234f9..607ba2c8b78d3a6e301bf64b7dc49ec47132038f 100644
--- a/typo3/sysext/core/Classes/Resource/Collection/FolderBasedFileCollection.php
+++ b/typo3/sysext/core/Classes/Resource/Collection/FolderBasedFileCollection.php
@@ -60,8 +60,6 @@ class FolderBasedFileCollection extends AbstractFileCollection
      * If the content entries of the storage had not been loaded on creation
      * ($fillItems = false) this function is to be used for loading the contents
      * afterwards.
-     *
-     * @return void
      */
     public function loadContents()
     {
diff --git a/typo3/sysext/core/Classes/Resource/Collection/StaticFileCollection.php b/typo3/sysext/core/Classes/Resource/Collection/StaticFileCollection.php
index 1bd418676a6f96ebb54ac9e5d15b5797c3790427..e2507c7298b9d7c390d4af2fa469d980af16016f 100644
--- a/typo3/sysext/core/Classes/Resource/Collection/StaticFileCollection.php
+++ b/typo3/sysext/core/Classes/Resource/Collection/StaticFileCollection.php
@@ -46,8 +46,6 @@ class StaticFileCollection extends AbstractFileCollection
      * If the content entries of the storage had not been loaded on creation
      * ($fillItems = false) this function is to be used for loading the contents
      * afterwards.
-     *
-     * @return void
      */
     public function loadContents()
     {
diff --git a/typo3/sysext/core/Classes/Resource/Driver/AbstractDriver.php b/typo3/sysext/core/Classes/Resource/Driver/AbstractDriver.php
index 42de84349a0f6b3cad2a4edee81e637f54b02e98..ac8e466045adff02bf7e3564f4a639660e582ca8 100644
--- a/typo3/sysext/core/Classes/Resource/Driver/AbstractDriver.php
+++ b/typo3/sysext/core/Classes/Resource/Driver/AbstractDriver.php
@@ -18,7 +18,6 @@ use TYPO3\CMS\Core\Utility\PathUtility;
 
 /**
  * An abstract implementation of a storage driver.
- *
  */
 abstract class AbstractDriver implements DriverInterface
 {
@@ -88,7 +87,6 @@ abstract class AbstractDriver implements DriverInterface
      * Sets the storage uid the driver belongs to
      *
      * @param int $storageUid
-     * @return void
      */
     public function setStorageUid($storageUid)
     {
diff --git a/typo3/sysext/core/Classes/Resource/Driver/DriverInterface.php b/typo3/sysext/core/Classes/Resource/Driver/DriverInterface.php
index 10797fdc6406dc781f1ed39681a36a3edd1bb596..ca9f49b745308dde61677db2fc65b8caea850353 100644
--- a/typo3/sysext/core/Classes/Resource/Driver/DriverInterface.php
+++ b/typo3/sysext/core/Classes/Resource/Driver/DriverInterface.php
@@ -22,7 +22,6 @@ interface DriverInterface
 {
     /**
      * Processes the configuration for this driver.
-     * @return void
      */
     public function processConfiguration();
 
@@ -30,15 +29,12 @@ interface DriverInterface
      * Sets the storage uid the driver belongs to
      *
      * @param int $storageUid
-     * @return void
      */
     public function setStorageUid($storageUid);
 
     /**
      * Initializes this object. This is called by the storage after the driver
      * has been attached.
-     *
-     * @return void
      */
     public function initialize();
 
@@ -354,7 +350,6 @@ interface DriverInterface
      * buffer before. Will be taken care of by the Storage.
      *
      * @param string $identifier
-     * @return void
      */
     public function dumpFileContents($identifier);
 
diff --git a/typo3/sysext/core/Classes/Resource/Driver/DriverRegistry.php b/typo3/sysext/core/Classes/Resource/Driver/DriverRegistry.php
index 5143b780314ff0fba742c14e0ab633135a5275a2..79f090096a83135e21aa08a62e924a28d63f834d 100644
--- a/typo3/sysext/core/Classes/Resource/Driver/DriverRegistry.php
+++ b/typo3/sysext/core/Classes/Resource/Driver/DriverRegistry.php
@@ -85,8 +85,6 @@ class DriverRegistry implements \TYPO3\CMS\Core\SingletonInterface
     /**
      * Adds the TCA information so the registered drivers can be selected when creating a sys_file_storage
      * in the TYPO3 Backend.
-     *
-     * @return void
      */
     public function addDriversToTCA()
     {
diff --git a/typo3/sysext/core/Classes/Resource/Driver/LocalDriver.php b/typo3/sysext/core/Classes/Resource/Driver/LocalDriver.php
index c969b91f1ad28a35c84409d4bf39426b2da9f80b..edf21de1f8f89108927c4b1cd5126ccc6867e1cc 100644
--- a/typo3/sysext/core/Classes/Resource/Driver/LocalDriver.php
+++ b/typo3/sysext/core/Classes/Resource/Driver/LocalDriver.php
@@ -23,7 +23,6 @@ use TYPO3\CMS\Core\Utility\PathUtility;
 
 /**
  * Driver for the local file system
- *
  */
 class LocalDriver extends AbstractHierarchicalFilesystemDriver
 {
@@ -90,8 +89,6 @@ class LocalDriver extends AbstractHierarchicalFilesystemDriver
 
     /**
      * Processes the configuration for this driver.
-     *
-     * @return void
      */
     public function processConfiguration()
     {
@@ -106,8 +103,6 @@ class LocalDriver extends AbstractHierarchicalFilesystemDriver
     /**
      * Initializes this object. This is called by the storage after the driver
      * has been attached.
-     *
-     * @return void
      */
     public function initialize()
     {
@@ -116,8 +111,6 @@ class LocalDriver extends AbstractHierarchicalFilesystemDriver
     /**
      * Determines the base URL for this driver, from the configuration or
      * the TypoScript frontend object
-     *
-     * @return void
      */
     protected function determineBaseUrl()
     {
@@ -1381,7 +1374,6 @@ class LocalDriver extends AbstractHierarchicalFilesystemDriver
      * buffer before. Will be taken care of by the Storage.
      *
      * @param string $identifier
-     * @return void
      */
     public function dumpFileContents($identifier)
     {
diff --git a/typo3/sysext/core/Classes/Resource/Exception.php b/typo3/sysext/core/Classes/Resource/Exception.php
index 2745955d0845e6779a77a7c0d49aa189d7328a19..79db6c81607c5a5b3e5ef41411ff7d9a5ce31ca2 100644
--- a/typo3/sysext/core/Classes/Resource/Exception.php
+++ b/typo3/sysext/core/Classes/Resource/Exception.php
@@ -16,7 +16,6 @@ namespace TYPO3\CMS\Core\Resource;
 
 /**
  * An exception when something is wrong with the file handling
- *
  */
 class Exception extends \TYPO3\CMS\Core\Exception
 {
diff --git a/typo3/sysext/core/Classes/Resource/Exception/AbstractFileOperationException.php b/typo3/sysext/core/Classes/Resource/Exception/AbstractFileOperationException.php
index bf7c4fb510bd16cbe1eefb97966b6b4b4d124d22..a3cda144f76c221e6159eb5c442b235614f94b45 100644
--- a/typo3/sysext/core/Classes/Resource/Exception/AbstractFileOperationException.php
+++ b/typo3/sysext/core/Classes/Resource/Exception/AbstractFileOperationException.php
@@ -16,7 +16,6 @@ namespace TYPO3\CMS\Core\Resource\Exception;
 
 /**
  * An exception when something is wrong with the file handling
- *
  */
 abstract class AbstractFileOperationException extends \TYPO3\CMS\Core\Resource\Exception
 {
diff --git a/typo3/sysext/core/Classes/Resource/Exception/ExistingTargetFileNameException.php b/typo3/sysext/core/Classes/Resource/Exception/ExistingTargetFileNameException.php
index 52644bad31e0a476c66dcbde4562e2fc5dc1ee0f..ada7f5fa9bee4e5f58452725b4123c292ee1eeaf 100644
--- a/typo3/sysext/core/Classes/Resource/Exception/ExistingTargetFileNameException.php
+++ b/typo3/sysext/core/Classes/Resource/Exception/ExistingTargetFileNameException.php
@@ -16,7 +16,6 @@ namespace TYPO3\CMS\Core\Resource\Exception;
 
 /**
  * An exception when something is wrong with the file handling
- *
  */
 class ExistingTargetFileNameException extends \TYPO3\CMS\Core\Resource\Exception
 {
diff --git a/typo3/sysext/core/Classes/Resource/Exception/ExistingTargetFolderException.php b/typo3/sysext/core/Classes/Resource/Exception/ExistingTargetFolderException.php
index a57296b5e3c4017b8021e60e8a16183d05483f11..eaa06bb43f076a0b904181b2e76c7dfb013a97f7 100644
--- a/typo3/sysext/core/Classes/Resource/Exception/ExistingTargetFolderException.php
+++ b/typo3/sysext/core/Classes/Resource/Exception/ExistingTargetFolderException.php
@@ -16,7 +16,6 @@ namespace TYPO3\CMS\Core\Resource\Exception;
 
 /**
  * An exception when something is wrong with the file handling
- *
  */
 class ExistingTargetFolderException extends \TYPO3\CMS\Core\Resource\Exception
 {
diff --git a/typo3/sysext/core/Classes/Resource/Exception/FileDoesNotExistException.php b/typo3/sysext/core/Classes/Resource/Exception/FileDoesNotExistException.php
index d0f20dfb55810bf911c9c9a684bc654751c72bca..7faae132248816838269979f71429d5b1baff04d 100644
--- a/typo3/sysext/core/Classes/Resource/Exception/FileDoesNotExistException.php
+++ b/typo3/sysext/core/Classes/Resource/Exception/FileDoesNotExistException.php
@@ -16,7 +16,6 @@ namespace TYPO3\CMS\Core\Resource\Exception;
 
 /**
  * An exception to throw if a file does not exist
- *
  */
 class FileDoesNotExistException extends ResourceDoesNotExistException
 {
diff --git a/typo3/sysext/core/Classes/Resource/Exception/FileOperationErrorException.php b/typo3/sysext/core/Classes/Resource/Exception/FileOperationErrorException.php
index 4885e4b6eb75c3e1eab8c04c8ac2723849aae517..f84d9141cd0c4b23167ba60530074eadac155087 100644
--- a/typo3/sysext/core/Classes/Resource/Exception/FileOperationErrorException.php
+++ b/typo3/sysext/core/Classes/Resource/Exception/FileOperationErrorException.php
@@ -16,7 +16,6 @@ namespace TYPO3\CMS\Core\Resource\Exception;
 
 /**
  * An exception when something is wrong with the file handling
- *
  */
 class FileOperationErrorException extends \TYPO3\CMS\Core\Resource\Exception\AbstractFileOperationException
 {
diff --git a/typo3/sysext/core/Classes/Resource/Exception/FolderDoesNotExistException.php b/typo3/sysext/core/Classes/Resource/Exception/FolderDoesNotExistException.php
index 94982b027b6c9725ac0a835b2c47efb6448590ce..60217cce93b0861e97b87dc0e7f51fd7cb15da09 100644
--- a/typo3/sysext/core/Classes/Resource/Exception/FolderDoesNotExistException.php
+++ b/typo3/sysext/core/Classes/Resource/Exception/FolderDoesNotExistException.php
@@ -16,7 +16,6 @@ namespace TYPO3\CMS\Core\Resource\Exception;
 
 /**
  * An exception to throw if a folder does not exist
- *
  */
 class FolderDoesNotExistException extends ResourceDoesNotExistException
 {
diff --git a/typo3/sysext/core/Classes/Resource/Exception/IllegalFileExtensionException.php b/typo3/sysext/core/Classes/Resource/Exception/IllegalFileExtensionException.php
index f23d466ce89f9488d5d9abf2557596606faad61c..faaf45c1525a9492afde4d44fc1f3f44cb5e6cd7 100644
--- a/typo3/sysext/core/Classes/Resource/Exception/IllegalFileExtensionException.php
+++ b/typo3/sysext/core/Classes/Resource/Exception/IllegalFileExtensionException.php
@@ -16,7 +16,6 @@ namespace TYPO3\CMS\Core\Resource\Exception;
 
 /**
  * An exception when something is wrong with the file handling
- *
  */
 class IllegalFileExtensionException extends \TYPO3\CMS\Core\Resource\Exception
 {
diff --git a/typo3/sysext/core/Classes/Resource/Exception/InsufficientFileAccessPermissionsException.php b/typo3/sysext/core/Classes/Resource/Exception/InsufficientFileAccessPermissionsException.php
index db4770c8aa52e15ed1bd69ceee17094817c567e0..34a88ca3a55ebac0f9ae9c33be6344d4c874b600 100644
--- a/typo3/sysext/core/Classes/Resource/Exception/InsufficientFileAccessPermissionsException.php
+++ b/typo3/sysext/core/Classes/Resource/Exception/InsufficientFileAccessPermissionsException.php
@@ -16,7 +16,6 @@ namespace TYPO3\CMS\Core\Resource\Exception;
 
 /**
  * An exception when something is wrong with the file handling
- *
  */
 class InsufficientFileAccessPermissionsException extends \TYPO3\CMS\Core\Resource\Exception
 {
diff --git a/typo3/sysext/core/Classes/Resource/Exception/InsufficientFileReadPermissionsException.php b/typo3/sysext/core/Classes/Resource/Exception/InsufficientFileReadPermissionsException.php
index 4c9238a19821952f09092b025b440dc5f2823786..3d375a6f1faa2090ab62fd9de994d4fe293ceffb 100644
--- a/typo3/sysext/core/Classes/Resource/Exception/InsufficientFileReadPermissionsException.php
+++ b/typo3/sysext/core/Classes/Resource/Exception/InsufficientFileReadPermissionsException.php
@@ -16,7 +16,6 @@ namespace TYPO3\CMS\Core\Resource\Exception;
 
 /**
  * An exception when something is wrong with the file handling
- *
  */
 class InsufficientFileReadPermissionsException extends \TYPO3\CMS\Core\Resource\Exception\InsufficientFileAccessPermissionsException
 {
diff --git a/typo3/sysext/core/Classes/Resource/Exception/InsufficientFileWritePermissionsException.php b/typo3/sysext/core/Classes/Resource/Exception/InsufficientFileWritePermissionsException.php
index 8d1a95c252907ec5ccd72b3896b49380801d1648..e8eb2b89f2d6abee19784bac56891c85881f3100 100644
--- a/typo3/sysext/core/Classes/Resource/Exception/InsufficientFileWritePermissionsException.php
+++ b/typo3/sysext/core/Classes/Resource/Exception/InsufficientFileWritePermissionsException.php
@@ -16,7 +16,6 @@ namespace TYPO3\CMS\Core\Resource\Exception;
 
 /**
  * An exception when something is wrong with the file handling
- *
  */
 class InsufficientFileWritePermissionsException extends \TYPO3\CMS\Core\Resource\Exception\InsufficientFileAccessPermissionsException
 {
diff --git a/typo3/sysext/core/Classes/Resource/Exception/InsufficientFolderAccessPermissionsException.php b/typo3/sysext/core/Classes/Resource/Exception/InsufficientFolderAccessPermissionsException.php
index 4842356ff31e4c9a380d6cbdbd2eef2741dbf08a..008cdedcf7e1f2f8e497486fdc8772f947e6c28f 100644
--- a/typo3/sysext/core/Classes/Resource/Exception/InsufficientFolderAccessPermissionsException.php
+++ b/typo3/sysext/core/Classes/Resource/Exception/InsufficientFolderAccessPermissionsException.php
@@ -16,7 +16,6 @@ namespace TYPO3\CMS\Core\Resource\Exception;
 
 /**
  * An exception when something is wrong with the file handling
- *
  */
 class InsufficientFolderAccessPermissionsException extends \TYPO3\CMS\Core\Resource\Exception
 {
diff --git a/typo3/sysext/core/Classes/Resource/Exception/InsufficientFolderReadPermissionsException.php b/typo3/sysext/core/Classes/Resource/Exception/InsufficientFolderReadPermissionsException.php
index 4fae13df906b05dd435669a8297f1d6dbfc9c628..7f109ba0c28f07411822d326f3082f917ca3b68f 100644
--- a/typo3/sysext/core/Classes/Resource/Exception/InsufficientFolderReadPermissionsException.php
+++ b/typo3/sysext/core/Classes/Resource/Exception/InsufficientFolderReadPermissionsException.php
@@ -16,7 +16,6 @@ namespace TYPO3\CMS\Core\Resource\Exception;
 
 /**
  * An exception when something is wrong with the file handling
- *
  */
 class InsufficientFolderReadPermissionsException extends \TYPO3\CMS\Core\Resource\Exception\InsufficientFolderAccessPermissionsException
 {
diff --git a/typo3/sysext/core/Classes/Resource/Exception/InsufficientFolderWritePermissionsException.php b/typo3/sysext/core/Classes/Resource/Exception/InsufficientFolderWritePermissionsException.php
index 5397d00afafa4b5d5f0c97c25a7ee680a409f725..3d7d8cdb2ffe660cd5b8d09863df388c3e11ad16 100644
--- a/typo3/sysext/core/Classes/Resource/Exception/InsufficientFolderWritePermissionsException.php
+++ b/typo3/sysext/core/Classes/Resource/Exception/InsufficientFolderWritePermissionsException.php
@@ -16,7 +16,6 @@ namespace TYPO3\CMS\Core\Resource\Exception;
 
 /**
  * An exception when something is wrong with the file handling
- *
  */
 class InsufficientFolderWritePermissionsException extends \TYPO3\CMS\Core\Resource\Exception\InsufficientFolderAccessPermissionsException
 {
diff --git a/typo3/sysext/core/Classes/Resource/Exception/InsufficientUserPermissionsException.php b/typo3/sysext/core/Classes/Resource/Exception/InsufficientUserPermissionsException.php
index 9b9100411154a906bd99ce184cbd471e3e47f98f..103a88b903d12beea9ebd30a70795861ebd9d6a7 100644
--- a/typo3/sysext/core/Classes/Resource/Exception/InsufficientUserPermissionsException.php
+++ b/typo3/sysext/core/Classes/Resource/Exception/InsufficientUserPermissionsException.php
@@ -16,7 +16,6 @@ namespace TYPO3\CMS\Core\Resource\Exception;
 
 /**
  * An exception when something is wrong with the file handling
- *
  */
 class InsufficientUserPermissionsException extends \TYPO3\CMS\Core\Resource\Exception
 {
diff --git a/typo3/sysext/core/Classes/Resource/Exception/InvalidConfigurationException.php b/typo3/sysext/core/Classes/Resource/Exception/InvalidConfigurationException.php
index a87c903dc8d5e8d707542692054b1b245a67f23b..3dceab8c8b20a406caffec1a6b4deab238326f8f 100644
--- a/typo3/sysext/core/Classes/Resource/Exception/InvalidConfigurationException.php
+++ b/typo3/sysext/core/Classes/Resource/Exception/InvalidConfigurationException.php
@@ -16,7 +16,6 @@ namespace TYPO3\CMS\Core\Resource\Exception;
 
 /**
  * An exception when something is wrong with the configuration
- *
  */
 class InvalidConfigurationException extends \TYPO3\CMS\Core\Resource\Exception
 {
diff --git a/typo3/sysext/core/Classes/Resource/Exception/InvalidFileException.php b/typo3/sysext/core/Classes/Resource/Exception/InvalidFileException.php
index 4e60755c30b450562d9fa912a0d4c4b3f1523866..7e24e0c4d36c3e63421acfee9b71aafcffa9877d 100644
--- a/typo3/sysext/core/Classes/Resource/Exception/InvalidFileException.php
+++ b/typo3/sysext/core/Classes/Resource/Exception/InvalidFileException.php
@@ -16,7 +16,6 @@ namespace TYPO3\CMS\Core\Resource\Exception;
 
 /**
  * An exception when something is wrong with the File
- *
  */
 class InvalidFileException extends \TYPO3\CMS\Core\Resource\Exception
 {
diff --git a/typo3/sysext/core/Classes/Resource/Exception/InvalidFileNameException.php b/typo3/sysext/core/Classes/Resource/Exception/InvalidFileNameException.php
index 408b609fa9af262dcfb390bfa43c09ab58834de0..84924058e85595b4a1b1df5a233b4fc8bd416a78 100644
--- a/typo3/sysext/core/Classes/Resource/Exception/InvalidFileNameException.php
+++ b/typo3/sysext/core/Classes/Resource/Exception/InvalidFileNameException.php
@@ -16,7 +16,6 @@ namespace TYPO3\CMS\Core\Resource\Exception;
 
 /**
  * An exception when something is wrong with the File name
- *
  */
 class InvalidFileNameException extends \TYPO3\CMS\Core\Resource\Exception
 {
diff --git a/typo3/sysext/core/Classes/Resource/Exception/InvalidFolderException.php b/typo3/sysext/core/Classes/Resource/Exception/InvalidFolderException.php
index 1160b4f272fdda8696902af8f220a983295ba24c..afe0d8fe46f10e3102bfc437598ae2052df40e32 100644
--- a/typo3/sysext/core/Classes/Resource/Exception/InvalidFolderException.php
+++ b/typo3/sysext/core/Classes/Resource/Exception/InvalidFolderException.php
@@ -16,7 +16,6 @@ namespace TYPO3\CMS\Core\Resource\Exception;
 
 /**
  * An exception when something is wrong with the Folder
- *
  */
 class InvalidFolderException extends \TYPO3\CMS\Core\Resource\Exception
 {
diff --git a/typo3/sysext/core/Classes/Resource/Exception/InvalidPathException.php b/typo3/sysext/core/Classes/Resource/Exception/InvalidPathException.php
index 6c4146bcaeeff681a6180741a7bdd7c2c89e2789..e1d11abc7dcfc824b8034e09dc666290c4dd6ded 100644
--- a/typo3/sysext/core/Classes/Resource/Exception/InvalidPathException.php
+++ b/typo3/sysext/core/Classes/Resource/Exception/InvalidPathException.php
@@ -16,7 +16,6 @@ namespace TYPO3\CMS\Core\Resource\Exception;
 
 /**
  * An exception when something is wrong with the path
- *
  */
 class InvalidPathException extends \TYPO3\CMS\Core\Resource\Exception
 {
diff --git a/typo3/sysext/core/Classes/Resource/Exception/InvalidTargetFolderException.php b/typo3/sysext/core/Classes/Resource/Exception/InvalidTargetFolderException.php
index 5d7f4652bfaf7747f7659f8916c9b7703d9ad790..f7a31b6f2e0a96a5da63d1056d90a662d770580e 100644
--- a/typo3/sysext/core/Classes/Resource/Exception/InvalidTargetFolderException.php
+++ b/typo3/sysext/core/Classes/Resource/Exception/InvalidTargetFolderException.php
@@ -16,7 +16,6 @@ namespace TYPO3\CMS\Core\Resource\Exception;
 
 /**
  * An exception when something is wrong with the file handling
- *
  */
 class InvalidTargetFolderException extends \TYPO3\CMS\Core\Resource\Exception
 {
diff --git a/typo3/sysext/core/Classes/Resource/Exception/NotInMountPointException.php b/typo3/sysext/core/Classes/Resource/Exception/NotInMountPointException.php
index 7c55b4cb627927ca441fd6f5d3ae3055e1231fe1..72febd1b3743986e98f42fa8bed4a368dd76441b 100644
--- a/typo3/sysext/core/Classes/Resource/Exception/NotInMountPointException.php
+++ b/typo3/sysext/core/Classes/Resource/Exception/NotInMountPointException.php
@@ -16,7 +16,6 @@ namespace TYPO3\CMS\Core\Resource\Exception;
 
 /**
  * An exception when something is wrong with the Mount Point
- *
  */
 class NotInMountPointException extends \TYPO3\CMS\Core\Resource\Exception
 {
diff --git a/typo3/sysext/core/Classes/Resource/Exception/UploadException.php b/typo3/sysext/core/Classes/Resource/Exception/UploadException.php
index 741783101fefcef172daa0059a56a9e156ffad88..d7f3777cfff93db917d38aba30fe10bbaa304355 100644
--- a/typo3/sysext/core/Classes/Resource/Exception/UploadException.php
+++ b/typo3/sysext/core/Classes/Resource/Exception/UploadException.php
@@ -16,7 +16,6 @@ namespace TYPO3\CMS\Core\Resource\Exception;
 
 /**
  * An exception when the upload goes wrong
- *
  */
 class UploadException extends \TYPO3\CMS\Core\Resource\Exception\AbstractFileOperationException
 {
diff --git a/typo3/sysext/core/Classes/Resource/Exception/UploadSizeException.php b/typo3/sysext/core/Classes/Resource/Exception/UploadSizeException.php
index 968f9ea7800f733714577275ddce6888ab71d592..b6bae4ff5de31a214cc6398c0b9eded48217a926 100644
--- a/typo3/sysext/core/Classes/Resource/Exception/UploadSizeException.php
+++ b/typo3/sysext/core/Classes/Resource/Exception/UploadSizeException.php
@@ -16,7 +16,6 @@ namespace TYPO3\CMS\Core\Resource\Exception;
 
 /**
  * An exception when the size of the uploaded file has exceeded
- *
  */
 class UploadSizeException extends \TYPO3\CMS\Core\Resource\Exception\AbstractFileOperationException
 {
diff --git a/typo3/sysext/core/Classes/Resource/File.php b/typo3/sysext/core/Classes/Resource/File.php
index 1021c610067c6a8bc171545f147dd253442dd03f..c6339bef79dfc85e8a367fc40d6fff93f3be0100 100644
--- a/typo3/sysext/core/Classes/Resource/File.php
+++ b/typo3/sysext/core/Classes/Resource/File.php
@@ -18,7 +18,6 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 /**
  * File representation in the file abstraction layer.
- *
  */
 class File extends AbstractFile
 {
@@ -178,7 +177,6 @@ class File extends AbstractFile
 
     /**
      * Loads MetaData from Repository
-     * @return void
      */
     protected function loadMetaData()
     {
@@ -199,7 +197,6 @@ class File extends AbstractFile
      * NOTE: This method should not be called from outside the File Abstraction Layer (FAL)!
      *
      * @param array $properties
-     * @return void
      * @internal
      */
     public function updateProperties(array $properties)
@@ -242,7 +239,6 @@ class File extends AbstractFile
      * @internal Do not use outside the FileAbstraction Layer classes
      *
      * @param array $properties
-     * @return void
      */
     public function _updateMetaDataProperties(array $properties)
     {
diff --git a/typo3/sysext/core/Classes/Resource/Folder.php b/typo3/sysext/core/Classes/Resource/Folder.php
index c36088f4799ec7ae2edfa7bdcfeaf775a3795d9a..9ac85a5ccad45be78a9e4be54b06dbdf9f495367 100644
--- a/typo3/sysext/core/Classes/Resource/Folder.php
+++ b/typo3/sysext/core/Classes/Resource/Folder.php
@@ -134,7 +134,6 @@ class Folder implements FolderInterface
      * as the name is more seen as a label
      *
      * @param string $name The new name
-     * @return void
      */
     public function setName($name)
     {
@@ -418,7 +417,6 @@ class Folder implements FolderInterface
      * NOTE: This method should not be called from outside the File Abstraction Layer (FAL)!
      *
      * @param array $properties
-     * @return void
      * @internal
      */
     public function updateProperties(array $properties)
diff --git a/typo3/sysext/core/Classes/Resource/Hook/FileDumpEIDHookInterface.php b/typo3/sysext/core/Classes/Resource/Hook/FileDumpEIDHookInterface.php
index 0d22b52184ce2583786d4880b412622119b3de9f..7bd301e86bda5914652c9cb70ee861d079b6f91c 100644
--- a/typo3/sysext/core/Classes/Resource/Hook/FileDumpEIDHookInterface.php
+++ b/typo3/sysext/core/Classes/Resource/Hook/FileDumpEIDHookInterface.php
@@ -26,7 +26,6 @@ interface FileDumpEIDHookInterface
      * or 401 if authentication is required
      *
      * @param \TYPO3\CMS\Core\Resource\ResourceInterface $file
-     * @return void
      */
     public function checkFileAccess(\TYPO3\CMS\Core\Resource\ResourceInterface $file);
 }
diff --git a/typo3/sysext/core/Classes/Resource/InaccessibleFolder.php b/typo3/sysext/core/Classes/Resource/InaccessibleFolder.php
index 55b670ab3e4aead17feac75914778bde71519810..895ccdd08febf6d47b838fca573a99b545183096 100644
--- a/typo3/sysext/core/Classes/Resource/InaccessibleFolder.php
+++ b/typo3/sysext/core/Classes/Resource/InaccessibleFolder.php
@@ -29,7 +29,6 @@ class InaccessibleFolder extends Folder
      * used to prevent duplicate code in all the methods
      *
      * @throws Exception\InsufficientFolderReadPermissionsException
-     * @return void
      */
     protected function throwInaccessibleException()
     {
@@ -45,7 +44,6 @@ class InaccessibleFolder extends Folder
      * as the name is more seen as a label
      *
      * @param string $name The new name
-     * @return void
      */
     public function setName($name)
     {
@@ -250,7 +248,6 @@ class InaccessibleFolder extends Folder
      * NOTE: This method should not be called from outside the File Abstraction Layer (FAL)!
      *
      * @param array $properties
-     * @return void
      * @internal
      */
     public function updateProperties(array $properties)
diff --git a/typo3/sysext/core/Classes/Resource/Index/ExtractorRegistry.php b/typo3/sysext/core/Classes/Resource/Index/ExtractorRegistry.php
index f92b1d949d42ce290c53915ba4a4bdbbf4be0c2a..4bff3515d269bc1e05466f16ea46c49be6bf31a7 100644
--- a/typo3/sysext/core/Classes/Resource/Index/ExtractorRegistry.php
+++ b/typo3/sysext/core/Classes/Resource/Index/ExtractorRegistry.php
@@ -19,7 +19,6 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 /**
  * Registry for MetaData extraction Services
- *
  */
 class ExtractorRegistry implements SingletonInterface
 {
diff --git a/typo3/sysext/core/Classes/Resource/Index/FileIndexRepository.php b/typo3/sysext/core/Classes/Resource/Index/FileIndexRepository.php
index b2490b99dfac7140784de6e389ef6ee7ef5b48df..eca664dd14d10dcb814800de673a0f818d0c2860 100644
--- a/typo3/sysext/core/Classes/Resource/Index/FileIndexRepository.php
+++ b/typo3/sysext/core/Classes/Resource/Index/FileIndexRepository.php
@@ -301,7 +301,6 @@ class FileIndexRepository implements SingletonInterface
      * Adds a file to the index
      *
      * @param File $file
-     * @return void
      */
     public function add(File $file)
     {
@@ -390,7 +389,6 @@ class FileIndexRepository implements SingletonInterface
      * Updates the index record in the database
      *
      * @param File $file
-     * @return void
      */
     public function update(File $file)
     {
@@ -491,7 +489,6 @@ class FileIndexRepository implements SingletonInterface
      * Updates the timestamp when the file indexer extracted metadata
      *
      * @param int $fileUid
-     * @return void
      */
     public function updateIndexingTime($fileUid)
     {
@@ -511,7 +508,6 @@ class FileIndexRepository implements SingletonInterface
      * Marks given file as missing in sys_file
      *
      * @param int $fileUid
-     * @return void
      */
     public function markFileAsMissing($fileUid)
     {
@@ -532,7 +528,6 @@ class FileIndexRepository implements SingletonInterface
      * Remove a sys_file record from the database
      *
      * @param int $fileUid
-     * @return void
      */
     public function remove($fileUid)
     {
@@ -551,7 +546,6 @@ class FileIndexRepository implements SingletonInterface
      * Update Reference Index (sys_refindex) for a file
      *
      * @param int $id Record UID
-     * @return void
      */
     public function updateRefIndex($id)
     {
diff --git a/typo3/sysext/core/Classes/Resource/Index/Indexer.php b/typo3/sysext/core/Classes/Resource/Index/Indexer.php
index 17f25549b600d034dab39f8ba0dd788bb4d91012..7b631f5cbae31e87d0b9dbce6139043d6c924899 100644
--- a/typo3/sysext/core/Classes/Resource/Index/Indexer.php
+++ b/typo3/sysext/core/Classes/Resource/Index/Indexer.php
@@ -77,7 +77,6 @@ class Indexer
      * Update index entry
      *
      * @param File $fileObject
-     * @return void
      */
     public function updateIndexEntry(File $fileObject)
     {
@@ -88,7 +87,6 @@ class Indexer
     }
 
     /**
-     * @return void
      */
     public function processChangesInStorages()
     {
@@ -102,7 +100,6 @@ class Indexer
 
     /**
      * @param int $maximumFileCount
-     * @return void
      */
     public function runMetaDataExtraction($maximumFileCount = -1)
     {
@@ -196,7 +193,6 @@ class Indexer
      * Adds updated files to the processing queue
      *
      * @param array $fileIdentifierArray
-     * @return void
      */
     protected function detectChangedFilesInStorage(array $fileIdentifierArray)
     {
@@ -225,8 +221,6 @@ class Indexer
     /**
      * Processes the Files which have been detected as "changed or new"
      * in the storage
-     *
-     * @return void
      */
     protected function processChangedAndNewFiles()
     {
diff --git a/typo3/sysext/core/Classes/Resource/Index/MetaDataRepository.php b/typo3/sysext/core/Classes/Resource/Index/MetaDataRepository.php
index db58940061af6d007f53782b9d7cd3527085cc43..f085b24838f2e9fe66bee9a270870dcdb67dcffa 100644
--- a/typo3/sysext/core/Classes/Resource/Index/MetaDataRepository.php
+++ b/typo3/sysext/core/Classes/Resource/Index/MetaDataRepository.php
@@ -157,7 +157,6 @@ class MetaDataRepository implements SingletonInterface
      *
      * @param int $fileUid the file uid to update
      * @param array $data Data to update
-     * @return void
      * @internal
      */
     public function update($fileUid, array $data)
@@ -193,7 +192,6 @@ class MetaDataRepository implements SingletonInterface
      * Remove all metadata records for a certain file from the database
      *
      * @param int $fileUid
-     * @return void
      */
     public function removeByFileUid($fileUid)
     {
diff --git a/typo3/sysext/core/Classes/Resource/ProcessedFile.php b/typo3/sysext/core/Classes/Resource/ProcessedFile.php
index 1ba8b0f9c266addfd7f68ec9d4e5143b64963cd4..74d4260136d3f2bd8858cbfd1602d2d9654aa2a3 100644
--- a/typo3/sysext/core/Classes/Resource/ProcessedFile.php
+++ b/typo3/sysext/core/Classes/Resource/ProcessedFile.php
@@ -176,7 +176,6 @@ class ProcessedFile extends AbstractFile
      * Injects a local file, which is a processing result into the object.
      *
      * @param string $filePath
-     * @return void
      * @throws \RuntimeException
      */
     public function updateWithLocalFile($filePath)
@@ -389,8 +388,6 @@ class ProcessedFile extends AbstractFile
 
     /**
      * Defines that the original file should be used.
-     *
-     * @return void
      */
     public function setUsesOriginalFile()
     {
diff --git a/typo3/sysext/core/Classes/Resource/ProcessedFileRepository.php b/typo3/sysext/core/Classes/Resource/ProcessedFileRepository.php
index ee9a6980086faa9e1acf9853d5aceec350642d93..dd63afc66b06d8b41797185d3545055d32d2d0fa 100644
--- a/typo3/sysext/core/Classes/Resource/ProcessedFileRepository.php
+++ b/typo3/sysext/core/Classes/Resource/ProcessedFileRepository.php
@@ -124,7 +124,6 @@ class ProcessedFileRepository extends AbstractRepository
      * Adds a processedfile object in the database
      *
      * @param ProcessedFile $processedFile
-     * @return void
      */
     public function add($processedFile)
     {
@@ -151,7 +150,6 @@ class ProcessedFileRepository extends AbstractRepository
      * Updates an existing file object in the database
      *
      * @param ProcessedFile $processedFile
-     * @return void
      */
     public function update($processedFile)
     {
diff --git a/typo3/sysext/core/Classes/Resource/Processing/AbstractTask.php b/typo3/sysext/core/Classes/Resource/Processing/AbstractTask.php
index e41a81e89c5e7262c2b8861c6c3dc2d8dbc52cee..f168ad52fce6431715f3a7132bcc0fd76030c1c4 100644
--- a/typo3/sysext/core/Classes/Resource/Processing/AbstractTask.php
+++ b/typo3/sysext/core/Classes/Resource/Processing/AbstractTask.php
@@ -210,7 +210,6 @@ abstract class AbstractTask implements TaskInterface
      * the file processing service.
      *
      * @param bool $successful Set this to FALSE if executing the task failed
-     * @return void
      */
     public function setExecuted($successful)
     {
diff --git a/typo3/sysext/core/Classes/Resource/Processing/FileDeletionAspect.php b/typo3/sysext/core/Classes/Resource/Processing/FileDeletionAspect.php
index 9b55fca1dec648b88e1f2fe91734012ad05ec7dc..596189fe4d14643c4cb291f772a8d89279e7649a 100644
--- a/typo3/sysext/core/Classes/Resource/Processing/FileDeletionAspect.php
+++ b/typo3/sysext/core/Classes/Resource/Processing/FileDeletionAspect.php
@@ -65,7 +65,6 @@ class FileDeletionAspect
      * Cleanup database record for a deleted file
      *
      * @param FileInterface $fileObject
-     * @return void
      */
     public function removeFromRepository(FileInterface $fileObject)
     {
@@ -122,7 +121,6 @@ class FileDeletionAspect
      * Remove all category references of the deleted file.
      *
      * @param File $fileObject
-     * @return void
      */
     protected function cleanupCategoryReferences(File $fileObject)
     {
@@ -144,7 +142,6 @@ class FileDeletionAspect
      * Remove all processed files that belong to the given File object
      *
      * @param FileInterface $fileObject
-     * @return void
      */
     protected function cleanupProcessedFiles(FileInterface $fileObject)
     {
diff --git a/typo3/sysext/core/Classes/Resource/Processing/ProcessorInterface.php b/typo3/sysext/core/Classes/Resource/Processing/ProcessorInterface.php
index 27687e1805c348429837d950692aa74098d0ad21..545e53501246a1b2b1b476efb2223169e1717da7 100644
--- a/typo3/sysext/core/Classes/Resource/Processing/ProcessorInterface.php
+++ b/typo3/sysext/core/Classes/Resource/Processing/ProcessorInterface.php
@@ -31,7 +31,6 @@ interface ProcessorInterface
      * Processes the given task and sets the processing result in the task object.
      *
      * @param TaskInterface $task
-     * @return void
      */
     public function processTask(TaskInterface $task);
 }
diff --git a/typo3/sysext/core/Classes/Resource/Processing/TaskInterface.php b/typo3/sysext/core/Classes/Resource/Processing/TaskInterface.php
index dd2a9845b4e14f899299997b94ee7a8fab1a9887..05b9b18b29f4f5c2f9094aa1c692d16fccee7c58 100644
--- a/typo3/sysext/core/Classes/Resource/Processing/TaskInterface.php
+++ b/typo3/sysext/core/Classes/Resource/Processing/TaskInterface.php
@@ -113,7 +113,6 @@ interface TaskInterface
      * the file processing service.
      *
      * @param bool $successful Set this to FALSE if executing the task failed
-     * @return void
      */
     public function setExecuted($successful);
 
diff --git a/typo3/sysext/core/Classes/Resource/ResourceCompressor.php b/typo3/sysext/core/Classes/Resource/ResourceCompressor.php
index bd6c795a6040e1d6c7d30d9a41c554a46b23d30b..0bd2dfe5531dfc91edd49c067e2efeedea11c7f5 100644
--- a/typo3/sysext/core/Classes/Resource/ResourceCompressor.php
+++ b/typo3/sysext/core/Classes/Resource/ResourceCompressor.php
@@ -91,7 +91,6 @@ class ResourceCompressor
      * Sets absolute path to working directory
      *
      * @param string $rootPath Absolute path
-     * @return void
      */
     public function setRootPath($rootPath)
     {
@@ -603,7 +602,6 @@ class ResourceCompressor
      *
      * @param string $filename Target filename
      * @param string $contents File contents
-     * @return void
      */
     protected function writeFileAndCompressed($filename, $contents)
     {
diff --git a/typo3/sysext/core/Classes/Resource/ResourceFactory.php b/typo3/sysext/core/Classes/Resource/ResourceFactory.php
index c4d3b69cbe1fe0415031b45d59746a0850f52a1f..e4162dbc1f551d709fdc7baf01a66d24ca9ba38c 100644
--- a/typo3/sysext/core/Classes/Resource/ResourceFactory.php
+++ b/typo3/sysext/core/Classes/Resource/ResourceFactory.php
@@ -240,8 +240,6 @@ class ResourceFactory implements ResourceFactoryInterface, \TYPO3\CMS\Core\Singl
 
     /**
      * Creates an array mapping all uids to the basePath of storages using the "local" driver.
-     *
-     * @return void
      */
     protected function initializeLocalStorageCache()
     {
diff --git a/typo3/sysext/core/Classes/Resource/ResourceInterface.php b/typo3/sysext/core/Classes/Resource/ResourceInterface.php
index e32357abf7a66e096911691436252a10e7774f3e..d509bab9809c0bc2d923b2bdc0032cd3bc2bbe8a 100644
--- a/typo3/sysext/core/Classes/Resource/ResourceInterface.php
+++ b/typo3/sysext/core/Classes/Resource/ResourceInterface.php
@@ -16,7 +16,6 @@ namespace TYPO3\CMS\Core\Resource;
 
 /**
  * ResourceInterface
- *
  */
 interface ResourceInterface
 {
diff --git a/typo3/sysext/core/Classes/Resource/ResourceStorage.php b/typo3/sysext/core/Classes/Resource/ResourceStorage.php
index cb776432bc6a2ca8d8ce45eddcfd30cf6fc533a4..296e9bc2133c882ab71e5d22ae105d7916964f3c 100644
--- a/typo3/sysext/core/Classes/Resource/ResourceStorage.php
+++ b/typo3/sysext/core/Classes/Resource/ResourceStorage.php
@@ -401,8 +401,6 @@ class ResourceStorage implements ResourceStorageInterface
      * Can only be modified by an admin.
      *
      * Typically, this is only done if the configuration is wrong.
-     *
-     * @return void
      */
     public function markAsPermanentlyOffline()
     {
@@ -425,8 +423,6 @@ class ResourceStorage implements ResourceStorageInterface
      *
      * Non-permanent: This typically happens for remote storages
      * that are "flaky" and not available all the time.
-     *
-     * @return void
      */
     public function markAsTemporaryOffline()
     {
@@ -447,7 +443,6 @@ class ResourceStorage implements ResourceStorageInterface
      * @param array $additionalData
      *
      * @throws Exception\FolderDoesNotExistException
-     * @return void
      */
     public function addFileMount($folderIdentifier, $additionalData = [])
     {
@@ -564,7 +559,6 @@ class ResourceStorage implements ResourceStorageInterface
      * Sets the user permissions of the storage.
      *
      * @param array $userPermissions
-     * @return void
      */
     public function setUserPermissions(array $userPermissions)
     {
@@ -758,7 +752,6 @@ class ResourceStorage implements ResourceStorageInterface
      * Assures read permission for given folder.
      *
      * @param Folder $folder If a folder is given, mountpoints are checked. If not only user folder read permissions are checked.
-     * @return void
      * @throws Exception\InsufficientFolderAccessPermissionsException
      */
     protected function assureFolderReadPermission(Folder $folder = null)
@@ -783,7 +776,6 @@ class ResourceStorage implements ResourceStorageInterface
      *
      * @param Folder $folder If a folder is given, mountpoints are checked. If not only user folder delete permissions are checked.
      * @param bool $checkDeleteRecursively
-     * @return void
      * @throws Exception\InsufficientFolderAccessPermissionsException
      * @throws Exception\InsufficientFolderWritePermissionsException
      * @throws Exception\InsufficientUserPermissionsException
@@ -813,7 +805,6 @@ class ResourceStorage implements ResourceStorageInterface
      * Assures read permission for given file.
      *
      * @param FileInterface $file
-     * @return void
      * @throws Exception\InsufficientFileAccessPermissionsException
      * @throws Exception\IllegalFileExtensionException
      */
@@ -837,7 +828,6 @@ class ResourceStorage implements ResourceStorageInterface
      * Assures write permission for given file.
      *
      * @param FileInterface $file
-     * @return void
      * @throws Exception\IllegalFileExtensionException
      * @throws Exception\InsufficientFileWritePermissionsException
      * @throws Exception\InsufficientUserPermissionsException
@@ -857,7 +847,6 @@ class ResourceStorage implements ResourceStorageInterface
      * Assure replace permission for given file.
      *
      * @param FileInterface $file
-     * @return void
      * @throws Exception\InsufficientFileWritePermissionsException
      * @throws Exception\InsufficientFolderWritePermissionsException
      */
@@ -877,7 +866,6 @@ class ResourceStorage implements ResourceStorageInterface
      * Assures delete permission for given file.
      *
      * @param FileInterface $file
-     * @return void
      * @throws Exception\IllegalFileExtensionException
      * @throws Exception\InsufficientFileWritePermissionsException
      * @throws Exception\InsufficientFolderWritePermissionsException
@@ -909,7 +897,6 @@ class ResourceStorage implements ResourceStorageInterface
      *
      * @param Folder $targetFolder The target folder where the file should be written
      * @param string $targetFileName The file name which should be written into the storage
-     * @return void
      *
      * @throws Exception\InsufficientFolderWritePermissionsException
      * @throws Exception\IllegalFileExtensionException
@@ -939,7 +926,6 @@ class ResourceStorage implements ResourceStorageInterface
      * @param Folder $targetFolder The target folder where the file should be uploaded
      * @param string $targetFileName the destination file name $_FILES['file1']['name']
      * @param int $uploadedFileSize
-     * @return void
      *
      * @throws Exception\InsufficientFolderWritePermissionsException
      * @throws Exception\UploadException
@@ -972,7 +958,6 @@ class ResourceStorage implements ResourceStorageInterface
      * @param FileInterface $file
      * @param Folder $targetFolder
      * @param string $targetFileName
-     * @return void
      */
     protected function assureFileMovePermissions(FileInterface $file, Folder $targetFolder, $targetFileName)
     {
@@ -1003,7 +988,6 @@ class ResourceStorage implements ResourceStorageInterface
      * @throws Exception\IllegalFileExtensionException
      * @throws Exception\InsufficientFileReadPermissionsException
      * @throws Exception\InsufficientUserPermissionsException
-     * @return void
      */
     protected function assureFileRenamePermissions(FileInterface $file, $targetFileName)
     {
@@ -1037,7 +1021,6 @@ class ResourceStorage implements ResourceStorageInterface
      * @throws Exception\IllegalFileExtensionException
      * @throws Exception\InsufficientFileReadPermissionsException
      * @throws Exception\InsufficientUserPermissionsException
-     * @return void
      */
     protected function assureFileCopyPermissions(FileInterface $file, Folder $targetFolder, $targetFileName)
     {
@@ -1065,7 +1048,6 @@ class ResourceStorage implements ResourceStorageInterface
      *
      * @param FolderInterface $folderToCopy
      * @param FolderInterface $targetParentFolder
-     * @return void
      *
      * @throws Exception
      * @throws Exception\InsufficientFolderWritePermissionsException
@@ -1109,7 +1091,6 @@ class ResourceStorage implements ResourceStorageInterface
      * @throws Exception\InsufficientFileReadPermissionsException
      * @throws Exception\InsufficientUserPermissionsException
      * @throws \RuntimeException
-     * @return void
      */
     protected function assureFolderMovePermissions(FolderInterface $folderToMove, FolderInterface $targetParentFolder)
     {
@@ -1404,8 +1385,6 @@ class ResourceStorage implements ResourceStorageInterface
 
     /**
      * Unsets the file and folder name filters, thus making this storage return unfiltered filelists.
-     *
-     * @return void
      */
     public function unsetFileAndFolderNameFilters()
     {
@@ -1414,8 +1393,6 @@ class ResourceStorage implements ResourceStorageInterface
 
     /**
      * Resets the file and folder name filters to the default values defined in the TYPO3 configuration.
-     *
-     * @return void
      */
     public function resetFileAndFolderNameFiltersToDefault()
     {
@@ -1653,7 +1630,6 @@ class ResourceStorage implements ResourceStorageInterface
      * @param bool $asDownload If set Content-Disposition attachment is sent, inline otherwise
      * @param string $alternativeFilename the filename for the download (if $asDownload is set)
      * @param string $overrideMimeType If set this will be used as Content-Type header instead of the automatically detected mime type.
-     * @return void
      */
     public function dumpFileContents(FileInterface $file, $asDownload = false, $alternativeFilename = null, $overrideMimeType = null)
     {
@@ -2461,7 +2437,6 @@ class ResourceStorage implements ResourceStorageInterface
      *
      * @param FileInterface $file
      * @param Folder $targetFolder
-     * @return void
      */
     protected function emitPostFileAddSignal(FileInterface $file, Folder $targetFolder)
     {
@@ -2473,7 +2448,6 @@ class ResourceStorage implements ResourceStorageInterface
      *
      * @param FileInterface $file
      * @param Folder $targetFolder
-     * @return void
      */
     protected function emitPreFileCopySignal(FileInterface $file, Folder $targetFolder)
     {
@@ -2485,7 +2459,6 @@ class ResourceStorage implements ResourceStorageInterface
      *
      * @param FileInterface $file
      * @param Folder $targetFolder
-     * @return void
      */
     protected function emitPostFileCopySignal(FileInterface $file, Folder $targetFolder)
     {
@@ -2497,7 +2470,6 @@ class ResourceStorage implements ResourceStorageInterface
      *
      * @param FileInterface $file
      * @param Folder $targetFolder
-     * @return void
      */
     protected function emitPreFileMoveSignal(FileInterface $file, Folder $targetFolder)
     {
@@ -2510,7 +2482,6 @@ class ResourceStorage implements ResourceStorageInterface
      * @param FileInterface $file
      * @param Folder $targetFolder
      * @param FolderInterface $originalFolder
-     * @return void
      */
     protected function emitPostFileMoveSignal(FileInterface $file, Folder $targetFolder, FolderInterface $originalFolder)
     {
@@ -2522,7 +2493,6 @@ class ResourceStorage implements ResourceStorageInterface
      *
      * @param FileInterface $file
      * @param $targetFolder
-     * @return void
      */
     protected function emitPreFileRenameSignal(FileInterface $file, $targetFolder)
     {
@@ -2534,7 +2504,6 @@ class ResourceStorage implements ResourceStorageInterface
      *
      * @param FileInterface $file
      * @param string $sanitizedTargetFileName
-     * @return void
      */
     protected function emitPostFileRenameSignal(FileInterface $file, $sanitizedTargetFileName)
     {
@@ -2546,7 +2515,6 @@ class ResourceStorage implements ResourceStorageInterface
      *
      * @param FileInterface $file
      * @param $localFilePath
-     * @return void
      */
     protected function emitPreFileReplaceSignal(FileInterface $file, $localFilePath)
     {
@@ -2558,7 +2526,6 @@ class ResourceStorage implements ResourceStorageInterface
      *
      * @param FileInterface $file
      * @param string $localFilePath
-     * @return void
      */
     protected function emitPostFileReplaceSignal(FileInterface $file, $localFilePath)
     {
@@ -2580,7 +2547,6 @@ class ResourceStorage implements ResourceStorageInterface
      * Emits the file pre-deletion signal.
      *
      * @param FileInterface $file
-     * @return void
      */
     protected function emitPreFileDeleteSignal(FileInterface $file)
     {
@@ -2591,7 +2557,6 @@ class ResourceStorage implements ResourceStorageInterface
      * Emits the file post-deletion signal
      *
      * @param FileInterface $file
-     * @return void
      */
     protected function emitPostFileDeleteSignal(FileInterface $file)
     {
@@ -2603,7 +2568,6 @@ class ResourceStorage implements ResourceStorageInterface
      *
      * @param FileInterface $file
      * @param mixed $content
-     * @return void
      */
     protected function emitPostFileSetContentsSignal(FileInterface $file, $content)
     {
@@ -2615,7 +2579,6 @@ class ResourceStorage implements ResourceStorageInterface
      *
      * @param Folder $targetFolder
      * @param string $name
-     * @return void
      */
     protected function emitPreFolderAddSignal(Folder $targetFolder, $name)
     {
@@ -2626,7 +2589,6 @@ class ResourceStorage implements ResourceStorageInterface
      * Emits the folder post-add signal.
      *
      * @param Folder $folder
-     * @return void
      */
     protected function emitPostFolderAddSignal(Folder $folder)
     {
@@ -2639,7 +2601,6 @@ class ResourceStorage implements ResourceStorageInterface
      * @param Folder $folder
      * @param Folder $targetFolder
      * @param $newName
-     * @return void
      */
     protected function emitPreFolderCopySignal(Folder $folder, Folder $targetFolder, $newName)
     {
@@ -2652,7 +2613,6 @@ class ResourceStorage implements ResourceStorageInterface
      * @param Folder $folder
      * @param Folder $targetFolder
      * @param $newName
-     * @return void
      */
     protected function emitPostFolderCopySignal(Folder $folder, Folder $targetFolder, $newName)
     {
@@ -2665,7 +2625,6 @@ class ResourceStorage implements ResourceStorageInterface
      * @param Folder $folder
      * @param Folder $targetFolder
      * @param $newName
-     * @return void
      */
     protected function emitPreFolderMoveSignal(Folder $folder, Folder $targetFolder, $newName)
     {
@@ -2679,7 +2638,6 @@ class ResourceStorage implements ResourceStorageInterface
      * @param Folder $targetFolder
      * @param string $newName
      * @param Folder $originalFolder
-     * @return void
      */
     protected function emitPostFolderMoveSignal(Folder $folder, Folder $targetFolder, $newName, Folder $originalFolder)
     {
@@ -2691,7 +2649,6 @@ class ResourceStorage implements ResourceStorageInterface
      *
      * @param Folder $folder
      * @param string $newName
-     * @return void
      */
     protected function emitPreFolderRenameSignal(Folder $folder, $newName)
     {
@@ -2703,7 +2660,6 @@ class ResourceStorage implements ResourceStorageInterface
      *
      * @param Folder $folder
      * @param string $newName
-     * @return void
      */
     protected function emitPostFolderRenameSignal(Folder $folder, $newName)
     {
@@ -2714,7 +2670,6 @@ class ResourceStorage implements ResourceStorageInterface
      * Emits the folder pre-deletion signal.
      *
      * @param Folder $folder
-     * @return void
      */
     protected function emitPreFolderDeleteSignal(Folder $folder)
     {
@@ -2725,7 +2680,6 @@ class ResourceStorage implements ResourceStorageInterface
      * Emits folder post-deletion signal..
      *
      * @param Folder $folder
-     * @return void
      */
     protected function emitPostFolderDeleteSignal(Folder $folder)
     {
@@ -3016,7 +2970,6 @@ class ResourceStorage implements ResourceStorageInterface
 
     /**
      * @param bool $isDefault
-     * @return void
      */
     public function setDefault($isDefault)
     {
diff --git a/typo3/sysext/core/Classes/Resource/ResourceStorageInterface.php b/typo3/sysext/core/Classes/Resource/ResourceStorageInterface.php
index 2a4fe02dd9f9d0459a0660d4b05cf7fc0e48fc80..83b60715d8fb76a660374a420e270a3617dccd54 100644
--- a/typo3/sysext/core/Classes/Resource/ResourceStorageInterface.php
+++ b/typo3/sysext/core/Classes/Resource/ResourceStorageInterface.php
@@ -16,7 +16,6 @@ namespace TYPO3\CMS\Core\Resource;
 
 /**
  * The interface for a resource storage containing all constants
- *
  */
 interface ResourceStorageInterface
 {
diff --git a/typo3/sysext/core/Classes/Resource/Security/FileMetadataPermissionsAspect.php b/typo3/sysext/core/Classes/Resource/Security/FileMetadataPermissionsAspect.php
index 99d463fb58e0defb7d5be321536a89a3f95be8e0..fec029d05b15dee9c305ae871a0b7e6b6a923619 100644
--- a/typo3/sysext/core/Classes/Resource/Security/FileMetadataPermissionsAspect.php
+++ b/typo3/sysext/core/Classes/Resource/Security/FileMetadataPermissionsAspect.php
@@ -61,7 +61,6 @@ class FileMetadataPermissionsAspect implements DataHandlerCheckModifyAccessListH
      * @param string $table The name of the table to be modified
      * @param DataHandler $parent The calling parent object
      * @throws \UnexpectedValueException
-     * @return void
      */
     public function checkModifyAccessList(&$accessAllowed, $table, DataHandler $parent)
     {
diff --git a/typo3/sysext/core/Classes/Resource/Security/StoragePermissionsAspect.php b/typo3/sysext/core/Classes/Resource/Security/StoragePermissionsAspect.php
index 5f4d50a85ebb972ca14b6a4e995fcbb20e86935f..d67db114a393ec35e488338d916c7d61557fc558 100644
--- a/typo3/sysext/core/Classes/Resource/Security/StoragePermissionsAspect.php
+++ b/typo3/sysext/core/Classes/Resource/Security/StoragePermissionsAspect.php
@@ -57,7 +57,6 @@ class StoragePermissionsAspect
      *
      * @param ResourceFactory $resourceFactory
      * @param ResourceStorage $storage
-     * @return void
      */
     public function addUserPermissionsToStorage(ResourceFactory $resourceFactory, ResourceStorage $storage)
     {
@@ -76,7 +75,6 @@ class StoragePermissionsAspect
      * Adds file mounts from the user's file mount records
      *
      * @param ResourceStorage $storage
-     * @return void
      */
     protected function addFileMountsToStorage(ResourceStorage $storage)
     {
diff --git a/typo3/sysext/core/Classes/Resource/Service/MagicImageService.php b/typo3/sysext/core/Classes/Resource/Service/MagicImageService.php
index 2d1e1b5ff089390a338055367bca9d8095c34fb6..5b6695035d3832a243edada1483ffad767ed2e46 100644
--- a/typo3/sysext/core/Classes/Resource/Service/MagicImageService.php
+++ b/typo3/sysext/core/Classes/Resource/Service/MagicImageService.php
@@ -69,7 +69,6 @@ class MagicImageService
      * Set maximum dimensions of magic images based on RTE configuration
      *
      * @param array $rteConfiguration: RTE configuration probably coming from PageTSConfig
-     * @return void
      */
     public function setMagicImageMaximumDimensions(array $rteConfiguration)
     {
diff --git a/typo3/sysext/core/Classes/Resource/Service/UserFileInlineLabelService.php b/typo3/sysext/core/Classes/Resource/Service/UserFileInlineLabelService.php
index 695a227c2250371586b2124123730c3352cc464d..e3d89f748c9097689a706b124a607d53cf081f0f 100644
--- a/typo3/sysext/core/Classes/Resource/Service/UserFileInlineLabelService.php
+++ b/typo3/sysext/core/Classes/Resource/Service/UserFileInlineLabelService.php
@@ -29,7 +29,6 @@ class UserFileInlineLabelService
      * Get the user function label for the file_reference table
      *
      * @param array $params
-     * @return void
      */
     public function getInlineLabel(array &$params)
     {
diff --git a/typo3/sysext/core/Classes/Resource/StorageRepository.php b/typo3/sysext/core/Classes/Resource/StorageRepository.php
index 62fe8ef3628ef5c90bedadaaee6c9e789a021950..44d5f952ef120ba41cacdd0ebadd2bde16f22d3d 100644
--- a/typo3/sysext/core/Classes/Resource/StorageRepository.php
+++ b/typo3/sysext/core/Classes/Resource/StorageRepository.php
@@ -80,8 +80,6 @@ class StorageRepository extends AbstractRepository
 
     /**
      * Initializes the Storage
-     *
-     * @return void
      */
     protected function initializeLocalCache()
     {
diff --git a/typo3/sysext/core/Classes/Resource/TextExtraction/PlainTextExtractor.php b/typo3/sysext/core/Classes/Resource/TextExtraction/PlainTextExtractor.php
index 8aa48fbfe828862f870ef6cb0ae11ba1c8306ca3..b0d87e68cfc0e81c7fa523318044807a9e92688f 100644
--- a/typo3/sysext/core/Classes/Resource/TextExtraction/PlainTextExtractor.php
+++ b/typo3/sysext/core/Classes/Resource/TextExtraction/PlainTextExtractor.php
@@ -19,7 +19,6 @@ use TYPO3\CMS\Core\Utility\PathUtility;
 
 /**
  * A simple text extractor to extract text from plain text files.
- *
  */
 class PlainTextExtractor implements TextExtractorInterface
 {
diff --git a/typo3/sysext/core/Classes/Resource/TextExtraction/TextExtractorInterface.php b/typo3/sysext/core/Classes/Resource/TextExtraction/TextExtractorInterface.php
index 97e9c2287b254e51e311bbefc1fa5b6e7980da41..92d7f4dd3237869d4bee6627821be97bee1eff3f 100644
--- a/typo3/sysext/core/Classes/Resource/TextExtraction/TextExtractorInterface.php
+++ b/typo3/sysext/core/Classes/Resource/TextExtraction/TextExtractorInterface.php
@@ -18,7 +18,6 @@ use TYPO3\CMS\Core\Resource\FileInterface;
 
 /**
  * An interface for text extractors
- *
  */
 interface TextExtractorInterface
 {
diff --git a/typo3/sysext/core/Classes/Resource/TextExtraction/TextExtractorRegistry.php b/typo3/sysext/core/Classes/Resource/TextExtraction/TextExtractorRegistry.php
index 950a1010f74be41988d905ef92ea414237be0ebc..8b8ebace3bc6119dec75cdd5719c05dd99c4e3d0 100644
--- a/typo3/sysext/core/Classes/Resource/TextExtraction/TextExtractorRegistry.php
+++ b/typo3/sysext/core/Classes/Resource/TextExtraction/TextExtractorRegistry.php
@@ -20,7 +20,6 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 /**
  * Class TextExtractorRegistry
- *
  */
 class TextExtractorRegistry implements SingletonInterface
 {
diff --git a/typo3/sysext/core/Classes/Service/AbstractService.php b/typo3/sysext/core/Classes/Service/AbstractService.php
index e5da9f3ce3c7e1f8354a89b66920d756511edcc8..a58b4740cba4ec5a8c7e0d09da39273d4ebb988b 100644
--- a/typo3/sysext/core/Classes/Service/AbstractService.php
+++ b/typo3/sysext/core/Classes/Service/AbstractService.php
@@ -148,7 +148,6 @@ abstract class AbstractService
      * @param string $msg Debug message
      * @param int $severity Severity: 0 is info, 1 is notice, 2 is warning, 3 is fatal error, -1 is "OK" message
      * @param array|bool $dataVar dditional data you want to pass to the logger.
-     * @return void
      */
     public function devLog($msg, $severity = 0, $dataVar = false)
     {
@@ -162,7 +161,6 @@ abstract class AbstractService
      *
      * @param int $errNum Error number (see T3_ERR_SV_* constants)
      * @param string $errMsg Error message
-     * @return void
      */
     public function errorPush($errNum = T3_ERR_SV_GENERAL, $errMsg = 'Unspecified error occurred')
     {
@@ -174,8 +172,6 @@ abstract class AbstractService
 
     /**
      * Removes the last error from the error stack.
-     *
-     * @return void
      */
     public function errorPull()
     {
@@ -241,8 +237,6 @@ abstract class AbstractService
 
     /**
      * Reset the error stack.
-     *
-     * @return void
      */
     public function resetErrors()
     {
@@ -276,8 +270,6 @@ abstract class AbstractService
 
     /**
      * Deactivate the service. Use this if the service fails at runtime and will not be available.
-     *
-     * @return void
      */
     public function deactivateService()
     {
@@ -376,7 +368,6 @@ abstract class AbstractService
      * Register file which should be deleted afterwards.
      *
      * @param string File name with absolute path.
-     * @return void
      */
     public function registerTempFile($absFile)
     {
@@ -389,8 +380,6 @@ abstract class AbstractService
 
     /**
      * Delete registered temporary files.
-     *
-     * @return void
      */
     public function unlinkTempFiles()
     {
@@ -410,7 +399,6 @@ abstract class AbstractService
      *
      * @param mixed $content Input content (going into ->inputContent)
      * @param string $type The type of the input content (or file). Might be the same as the service subtypes.
-     * @return void
      */
     public function setInput($content, $type = '')
     {
@@ -424,7 +412,6 @@ abstract class AbstractService
      *
      * @param string $absFile File name
      * @param string $type The type of the input content (or file). Might be the same as the service subtypes.
-     * @return void
      */
     public function setInputFile($absFile, $type = '')
     {
@@ -473,7 +460,6 @@ abstract class AbstractService
      * Set the output file name.
      *
      * @param string $absFile File name
-     * @return void
      */
     public function setOutputFile($absFile)
     {
@@ -535,8 +521,6 @@ abstract class AbstractService
     /**
      * Resets the service.
      * Will be called by init(). Should be used before every use if a service instance is used multiple times.
-     *
-     * @return void
      */
     public function reset()
     {
@@ -552,8 +536,6 @@ abstract class AbstractService
     /**
      * Clean up the service.
      * Child classes should explicitly call parent::__destruct() in their destructors for this to work
-     *
-     * @return void
      */
     public function __destruct()
     {
diff --git a/typo3/sysext/core/Classes/Service/OpcodeCacheService.php b/typo3/sysext/core/Classes/Service/OpcodeCacheService.php
index 71ea16539287a5746745f148d06a38b981e834b0..64612f27511a2b8557db9b3967733b92019b1505 100644
--- a/typo3/sysext/core/Classes/Service/OpcodeCacheService.php
+++ b/typo3/sysext/core/Classes/Service/OpcodeCacheService.php
@@ -65,8 +65,6 @@ class OpcodeCacheService
      * Clears a file from an opcache, if one exists.
      *
      * @param string|NULL $fileAbsPath The file as absolute path to be cleared or NULL to clear completely.
-     *
-     * @return void
      */
     public function clearAllActive($fileAbsPath = null)
     {
diff --git a/typo3/sysext/core/Classes/Session/Backend/RedisSessionBackend.php b/typo3/sysext/core/Classes/Session/Backend/RedisSessionBackend.php
index 0745f44fb009ba2320ea983ae1f07e29f5762599..87ded7b904cdb8716d8b77e27991c605df340f93 100644
--- a/typo3/sysext/core/Classes/Session/Backend/RedisSessionBackend.php
+++ b/typo3/sysext/core/Classes/Session/Backend/RedisSessionBackend.php
@@ -235,7 +235,6 @@ class RedisSessionBackend implements SessionBackendInterface
     /**
      * Initializes the redis backend
      *
-     * @return void
      * @throws \RuntimeException if access to redis with password is denied or if database selection fails
      */
     protected function initializeConnection()
diff --git a/typo3/sysext/core/Classes/TimeTracker/NullTimeTracker.php b/typo3/sysext/core/Classes/TimeTracker/NullTimeTracker.php
index 6579de52d7ddf8508d169412725f23e86165972d..0ba34b91c1f8b5c03749ae4fafa1811e920b8cba 100644
--- a/typo3/sysext/core/Classes/TimeTracker/NullTimeTracker.php
+++ b/typo3/sysext/core/Classes/TimeTracker/NullTimeTracker.php
@@ -28,7 +28,6 @@ class NullTimeTracker
      *
      * does nothing
      *
-     * @return void
      * @deprecated since TYPO3 v8, will be removed in v9, use the regular time tracking
      */
     public function start()
@@ -43,7 +42,6 @@ class NullTimeTracker
      *
      * @param string $tslabel Label string for the entry, eg. TypoScript property name
      * @param string $value Additional value(?)
-     * @return void
      */
     public function push($tslabel, $value = '')
     {
@@ -55,7 +53,6 @@ class NullTimeTracker
      * does nothing
      *
      * @param string $content The content string generated within the push/pull part.
-     * @return void
      */
     public function pull($content = '')
     {
@@ -68,7 +65,6 @@ class NullTimeTracker
      *
      * @param array $data Query array
      * @param string $msg Message/Label to attach
-     * @return void
      */
     public function setTSselectQuery(array $data, $msg = '')
     {
@@ -81,7 +77,6 @@ class NullTimeTracker
      *
      * @param string $content The message string
      * @param int $num Message type: 0: information, 1: message, 2: warning, 3: error
-     * @return void
      */
     public function setTSlogMessage($content, $num = 0)
     {
@@ -102,8 +97,6 @@ class NullTimeTracker
      * Increases the stack pointer
      *
      * does nothing
-     *
-     * @return void
      */
     public function incStackPointer()
     {
@@ -113,8 +106,6 @@ class NullTimeTracker
      * Decreases the stack pointer
      *
      * does nothing
-     *
-     * @return void
      */
     public function decStackPointer()
     {
diff --git a/typo3/sysext/core/Classes/TimeTracker/TimeTracker.php b/typo3/sysext/core/Classes/TimeTracker/TimeTracker.php
index 38a08c6ba438aa77a896db286ddc8877bb4e5c27..4b56019336f4d795b95e69b891a5edc718a59296 100644
--- a/typo3/sysext/core/Classes/TimeTracker/TimeTracker.php
+++ b/typo3/sysext/core/Classes/TimeTracker/TimeTracker.php
@@ -142,8 +142,6 @@ class TimeTracker implements SingletonInterface
 
     /**
      * Sets the starting time
-     *
-     * @return void
      */
     public function start()
     {
@@ -158,7 +156,6 @@ class TimeTracker implements SingletonInterface
      *
      * @param string $tslabel Label string for the entry, eg. TypoScript property name
      * @param string $value Additional value(?)
-     * @return void
      * @see \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::cObjGetSingle(), pull()
      */
     public function push($tslabel, $value = '')
@@ -185,7 +182,6 @@ class TimeTracker implements SingletonInterface
      * Pulls an element from the TypoScript tracking array
      *
      * @param string $content The content string generated within the push/pull part.
-     * @return void
      * @see \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::cObjGetSingle(), push()
      */
     public function pull($content = '')
@@ -206,7 +202,6 @@ class TimeTracker implements SingletonInterface
      *
      * @param string $content The message string
      * @param int $num Message type: 0: information, 1: message, 2: warning, 3: error
-     * @return void
      * @see \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::CONTENT()
      */
     public function setTSlogMessage($content, $num = 0)
@@ -230,7 +225,6 @@ class TimeTracker implements SingletonInterface
      *
      * @param array $data Query array
      * @param string $msg Message/Label to attach
-     * @return void
      */
     public function setTSselectQuery(array $data, $msg = '')
     {
@@ -248,7 +242,6 @@ class TimeTracker implements SingletonInterface
     /**
      * Increases the stack pointer
      *
-     * @return void
      * @see decStackPointer(), \TYPO3\CMS\Frontend\Page\PageGenerator::renderContent(), \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::cObjGetSingle()
      */
     public function incStackPointer()
@@ -263,7 +256,6 @@ class TimeTracker implements SingletonInterface
     /**
      * Decreases the stack pointer
      *
-     * @return void
      * @see incStackPointer(), \TYPO3\CMS\Frontend\Page\PageGenerator::renderContent(), \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::cObjGetSingle()
      */
     public function decStackPointer()
@@ -536,7 +528,6 @@ class TimeTracker implements SingletonInterface
      * @param array $arr Array (passed by reference) and modified
      * @param int $pointer Pointer value
      * @param string $uniqueId Unique ID string
-     * @return void
      * @access private
      * @see printTSlog()
      */
diff --git a/typo3/sysext/core/Classes/Tree/TableConfiguration/AbstractTableConfigurationTreeDataProvider.php b/typo3/sysext/core/Classes/Tree/TableConfiguration/AbstractTableConfigurationTreeDataProvider.php
index 76961a25d27d62b7abb2f8606e2531d7440aefbb..8a7e57db16199decf732f0103e369bca18daf9b2 100644
--- a/typo3/sysext/core/Classes/Tree/TableConfiguration/AbstractTableConfigurationTreeDataProvider.php
+++ b/typo3/sysext/core/Classes/Tree/TableConfiguration/AbstractTableConfigurationTreeDataProvider.php
@@ -71,7 +71,6 @@ abstract class AbstractTableConfigurationTreeDataProvider extends \TYPO3\CMS\Bac
      * Sets the id of the tree
      *
      * @param string $treeId
-     * @return void
      */
     public function setTreeId($treeId)
     {
@@ -92,7 +91,6 @@ abstract class AbstractTableConfigurationTreeDataProvider extends \TYPO3\CMS\Bac
      * Sets the expandAll
      *
      * @param bool $expandAll
-     * @return void
      */
     public function setExpandAll($expandAll)
     {
@@ -113,7 +111,6 @@ abstract class AbstractTableConfigurationTreeDataProvider extends \TYPO3\CMS\Bac
      * Sets the levelMaximum
      *
      * @param int $levelMaximum
-     * @return void
      */
     public function setLevelMaximum($levelMaximum)
     {
@@ -145,7 +142,6 @@ abstract class AbstractTableConfigurationTreeDataProvider extends \TYPO3\CMS\Bac
      * Sets the list for expanded nodes
      *
      * @param string $expandedList
-     * @return void
      */
     public function setExpandedList($expandedList)
     {
@@ -164,8 +160,6 @@ abstract class AbstractTableConfigurationTreeDataProvider extends \TYPO3\CMS\Bac
 
     /**
      * Read the list for expanded nodes from user settings
-     *
-     * @return void
      */
     public function initializeTreeData()
     {
@@ -176,7 +170,6 @@ abstract class AbstractTableConfigurationTreeDataProvider extends \TYPO3\CMS\Bac
      * Sets the list for selected nodes
      *
      * @param string $selectedList
-     * @return void
      */
     public function setSelectedList($selectedList)
     {
@@ -197,7 +190,6 @@ abstract class AbstractTableConfigurationTreeDataProvider extends \TYPO3\CMS\Bac
      * Sets the list for non selectable tree levels
      *
      * @param string $nonSelectableLevelList
-     * @return void
      */
     public function setNonSelectableLevelList($nonSelectableLevelList)
     {
@@ -218,7 +210,6 @@ abstract class AbstractTableConfigurationTreeDataProvider extends \TYPO3\CMS\Bac
      * Setter for the itemWhiteList
      *
      * @param array $itemWhiteList
-     * @return void
      */
     public function setItemWhiteList(array $itemWhiteList)
     {
@@ -239,7 +230,6 @@ abstract class AbstractTableConfigurationTreeDataProvider extends \TYPO3\CMS\Bac
      * Setter for $itemUnselectableList
      *
      * @param array $itemUnselectableList
-     * @return void
      */
     public function setItemUnselectableList(array $itemUnselectableList)
     {
diff --git a/typo3/sysext/core/Classes/Tree/TableConfiguration/DatabaseTreeDataProvider.php b/typo3/sysext/core/Classes/Tree/TableConfiguration/DatabaseTreeDataProvider.php
index 5d5029b0d07d3d3b6f6b2b8b81b441ed170b0107..b5615225c4983f81c05d6a5e8b7385c2b7101298 100644
--- a/typo3/sysext/core/Classes/Tree/TableConfiguration/DatabaseTreeDataProvider.php
+++ b/typo3/sysext/core/Classes/Tree/TableConfiguration/DatabaseTreeDataProvider.php
@@ -100,7 +100,6 @@ class DatabaseTreeDataProvider extends AbstractTableConfigurationTreeDataProvide
      * Sets the label field
      *
      * @param string $labelField
-     * @return void
      */
     public function setLabelField($labelField)
     {
@@ -121,7 +120,6 @@ class DatabaseTreeDataProvider extends AbstractTableConfigurationTreeDataProvide
      * Sets the table name
      *
      * @param string $tableName
-     * @return void
      */
     public function setTableName($tableName)
     {
@@ -142,7 +140,6 @@ class DatabaseTreeDataProvider extends AbstractTableConfigurationTreeDataProvide
      * Sets the lookup field
      *
      * @param string $lookupField
-     * @return void
      */
     public function setLookupField($lookupField)
     {
@@ -163,7 +160,6 @@ class DatabaseTreeDataProvider extends AbstractTableConfigurationTreeDataProvide
      * Sets the lookup mode
      *
      * @param int $lookupMode
-     * @return void
      */
     public function setLookupMode($lookupMode)
     {
@@ -204,7 +200,6 @@ class DatabaseTreeDataProvider extends AbstractTableConfigurationTreeDataProvide
      * Sets the root uid
      *
      * @param int $rootUid
-     * @return void
      */
     public function setRootUid($rootUid)
     {
@@ -225,7 +220,6 @@ class DatabaseTreeDataProvider extends AbstractTableConfigurationTreeDataProvide
      * Sets the tableWhere clause
      *
      * @param string $tableWhere
-     * @return void
      */
     public function setTableWhere($tableWhere)
     {
@@ -285,8 +279,6 @@ class DatabaseTreeDataProvider extends AbstractTableConfigurationTreeDataProvide
 
     /**
      * Init the tree data
-     *
-     * @return void
      */
     public function initializeTreeData()
     {
@@ -303,8 +295,6 @@ class DatabaseTreeDataProvider extends AbstractTableConfigurationTreeDataProvide
 
     /**
      * Loads the tree data (all possible children)
-     *
-     * @return void
      */
     protected function loadTreeData()
     {
@@ -515,8 +505,6 @@ class DatabaseTreeDataProvider extends AbstractTableConfigurationTreeDataProvide
 
     /**
      * Emits the post processing tree data signal.
-     *
-     * @return void
      */
     protected function emitPostProcessTreeDataSignal()
     {
diff --git a/typo3/sysext/core/Classes/Tree/TableConfiguration/DatabaseTreeNode.php b/typo3/sysext/core/Classes/Tree/TableConfiguration/DatabaseTreeNode.php
index 6f227123b807ac3b2153f02eb0b0fe4e94d6e07b..c356a0e2597fd1fde456d4522c9813f1f59dba1e 100644
--- a/typo3/sysext/core/Classes/Tree/TableConfiguration/DatabaseTreeNode.php
+++ b/typo3/sysext/core/Classes/Tree/TableConfiguration/DatabaseTreeNode.php
@@ -48,7 +48,6 @@ class DatabaseTreeNode extends \TYPO3\CMS\Backend\Tree\TreeRepresentationNode
      * Sets the expand state
      *
      * @param $expanded
-     * @return void
      */
     public function setExpanded($expanded)
     {
@@ -69,7 +68,6 @@ class DatabaseTreeNode extends \TYPO3\CMS\Backend\Tree\TreeRepresentationNode
      * Sets the selectable property
      *
      * @param bool $selectable
-     * @return void
      */
     public function setSelectable($selectable)
     {
@@ -90,7 +88,6 @@ class DatabaseTreeNode extends \TYPO3\CMS\Backend\Tree\TreeRepresentationNode
      * Sets the select state
      *
      * @param bool $selected
-     * @return void
      */
     public function setSelected($selected)
     {
@@ -121,7 +118,6 @@ class DatabaseTreeNode extends \TYPO3\CMS\Backend\Tree\TreeRepresentationNode
      * Sets the hasChildren property
      *
      * @param bool $value
-     * @return void
      */
     public function setHasChildren($value)
     {
@@ -161,7 +157,6 @@ class DatabaseTreeNode extends \TYPO3\CMS\Backend\Tree\TreeRepresentationNode
      * Sets the sort value
      *
      * @param mixed $sortValue
-     * @return void
      */
     public function setSortValue($sortValue)
     {
diff --git a/typo3/sysext/core/Classes/TypoScript/ConfigurationForm.php b/typo3/sysext/core/Classes/TypoScript/ConfigurationForm.php
index 40244d69e022e09428e66bd9723c67fa0ce1434c..4ef239fef9bda63c09f724d468e03db0e291cf00 100644
--- a/typo3/sysext/core/Classes/TypoScript/ConfigurationForm.php
+++ b/typo3/sysext/core/Classes/TypoScript/ConfigurationForm.php
@@ -102,7 +102,6 @@ class ConfigurationForm extends ExtendedTemplateService
 
     /**
      * @param string $cat
-     * @return void
      */
     public function ext_makeHelpInformationForCategory($cat)
     {
@@ -192,7 +191,6 @@ class ConfigurationForm extends ExtendedTemplateService
     /**
      * @param string $key
      * @param string $var
-     * @return void
      */
     public function ext_putValueInConf($key, $var)
     {
@@ -201,7 +199,6 @@ class ConfigurationForm extends ExtendedTemplateService
 
     /**
      * @param string $key
-     * @return void
      */
     public function ext_removeValueInConf($key)
     {
diff --git a/typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php b/typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php
index af334bc6c209e826a6f6d4316445be51e376e3d0..5bbb9779e7d011b12ec240ddb7af1e8630567253 100644
--- a/typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php
+++ b/typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php
@@ -1004,7 +1004,6 @@ class ExtendedTemplateService extends TemplateService
 
     /**
      * @param array $editConstArray
-     * @return void
      */
     public function ext_categorizeEditableConstants($editConstArray)
     {
@@ -1084,7 +1083,6 @@ class ExtendedTemplateService extends TemplateService
 
     /**
      * @param string $category
-     * @return void
      */
     public function ext_getTSCE_config($category)
     {
@@ -1371,7 +1369,6 @@ class ExtendedTemplateService extends TemplateService
      ***************************/
     /**
      * @param string $constants
-     * @return void
      */
     public function ext_regObjectPositions($constants)
     {
@@ -1386,7 +1383,6 @@ class ExtendedTemplateService extends TemplateService
 
     /**
      * @param string $pre
-     * @return void
      */
     public function ext_regObjects($pre)
     {
@@ -1430,7 +1426,6 @@ class ExtendedTemplateService extends TemplateService
     /**
      * @param string $key
      * @param string $var
-     * @return void
      */
     public function ext_putValueInConf($key, $var)
     {
@@ -1452,7 +1447,6 @@ class ExtendedTemplateService extends TemplateService
 
     /**
      * @param string $key
-     * @return void
      */
     public function ext_removeValueInConf($key)
     {
@@ -1501,7 +1495,6 @@ class ExtendedTemplateService extends TemplateService
      * @param array $http_post_files (not used anymore)
      * @param array $theConstants
      * @param array $tplRow Not used
-     * @return void
      */
     public function ext_procesInput($http_post_vars, $http_post_files, $theConstants, $tplRow)
     {
diff --git a/typo3/sysext/core/Classes/TypoScript/Parser/TypoScriptParser.php b/typo3/sysext/core/Classes/TypoScript/Parser/TypoScriptParser.php
index b18360bf118941044b32d65b3fa59a2b73c1b8f3..930811fd50d3a0b9abed3ab5b6003c1cd9aaaac9 100644
--- a/typo3/sysext/core/Classes/TypoScript/Parser/TypoScriptParser.php
+++ b/typo3/sysext/core/Classes/TypoScript/Parser/TypoScriptParser.php
@@ -224,8 +224,6 @@ class TypoScriptParser
      *
      * @param string $string The TypoScript text
      * @param object|string $matchObj If is object, then this is used to match conditions found in the TypoScript code. If matchObj not specified, then no conditions will work! (Except [GLOBAL])
-     *
-     * @return void
      */
     public function parse($string, $matchObj = '')
     {
@@ -662,7 +660,6 @@ class TypoScriptParser
      * @param array $setup The local setup array from the function calling this function.
      * @param array|string $value The value/property pair array to set. If only one of them is set, then the other is not touched (unless $wipeOut is set, which it is when copies are made which must include both value and property)
      * @param bool $wipeOut If set, then both value and property is wiped out when a copy is made of another value.
-     * @return void
      */
     public function setVal($string, array &$setup, $value, $wipeOut = false)
     {
@@ -768,7 +765,6 @@ class TypoScriptParser
      *
      * @param string $err The error message string
      * @param int $num The error severity (in the scale of TimeTracker::setTSlogMessage: Approx: 2=warning, 1=info, 0=nothing, 3=fatal.)
-     * @return void
      */
     public function error($err, $num = 2)
     {
@@ -1230,7 +1226,6 @@ class TypoScriptParser
      * @param string $code Key from the internal array $this->highLightStyles
      * @param int $pointer Pointer to the line in $this->raw which this is about
      * @param int $strlen The number of chars LEFT on this line before the end is reached.
-     * @return void
      * @access private
      * @see parse()
      */
diff --git a/typo3/sysext/core/Classes/TypoScript/TemplateService.php b/typo3/sysext/core/Classes/TypoScript/TemplateService.php
index a5e59cc9dfa24b2972e8db993dd4d5a1539dda86..0c955e1d0fd84fc2a2c9520362e2981ad4da5919 100644
--- a/typo3/sysext/core/Classes/TypoScript/TemplateService.php
+++ b/typo3/sysext/core/Classes/TypoScript/TemplateService.php
@@ -246,7 +246,6 @@ class TemplateService
 
     /**
      * Used by Backend only (Typoscript Template Analyzer)
-     *
      */
     public $clearList_const = [];
 
@@ -360,7 +359,6 @@ class TemplateService
      * Initialize
      * MUST be called directly after creating a new template-object
      *
-     * @return void
      * @see \TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController::initTemplate()
      */
     public function init()
@@ -463,7 +461,6 @@ class TemplateService
      * Sets $this->setup to the parsed TypoScript template array
      *
      * @param array $theRootLine The rootline of the current page (going ALL the way to tree root)
-     * @return void
      * @see \TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController::getConfigArray()
      */
     public function start($theRootLine)
@@ -590,7 +587,6 @@ class TemplateService
      *
      * @param array $theRootLine The rootline of the current page (going ALL the way to tree root)
      * @param int $start_template_uid Set specific template record UID to select; this is only for debugging/development/analysis use in backend modules like "Web > Template". For parsing TypoScript templates in the frontend it should be 0 (zero)
-     * @return void
      * @see start()
      */
     public function runThroughTemplates($theRootLine, $start_template_uid = 0)
@@ -696,7 +692,6 @@ class TemplateService
      * @param string $templateID The id of the current template. Same syntax as $idList ids, eg. "sys_123
      * @param string $templateParent Parent template id (during recursive call); Same syntax as $idList ids, eg. "sys_123
      * @param string $includePath Specifies the path from which the template was included (used with static_includes)
-     * @return void
      * @see runThroughTemplates()
      */
     public function processTemplate($row, $idList, $pid, $templateID = '', $templateParent = '', $includePath = '')
@@ -819,7 +814,6 @@ class TemplateService
      * rootline as before!
      *
      * @param array $fullRootLine Array containing the FULL rootline (up to the TYPO3 root)
-     * @return void
      * @throws \RuntimeException If the given $fullRootLine does not contain all pages that are in the current template rootline
      */
     public function updateRootlineData($fullRootLine)
@@ -851,7 +845,6 @@ class TemplateService
      * @param string $templateID The id of the current template. Same syntax as $idList ids, eg. "sys_123
      * @param int $pid The PID of the input template record
      * @param array $row A full TypoScript template record
-     * @return void
      * @see processTemplate()
      */
     public function includeStaticTypoScriptSources($idList, $templateID, $pid, $row)
@@ -946,7 +939,6 @@ class TemplateService
      * @param string $templateID The id of the current template. Same syntax as $idList ids, eg. "sys_123
      * @param int $pid The PID of the input template record
      * @param array $row A full TypoScript template record
-     * @return void
      * @access private
      * @see includeStaticTypoScriptSources()
      */
@@ -1000,7 +992,6 @@ class TemplateService
      * This will use either frontend or backend overlay functionality depending on environment.
      *
      * @param array $row Row to overlay (passed by reference)
-     * @return void
      */
     public function versionOL(&$row)
     {
@@ -1026,7 +1017,6 @@ class TemplateService
      * Generates the configuration array by replacing constants and parsing the whole thing.
      * Depends on $this->config and $this->constants to be set prior to this! (done by processTemplate/runThroughTemplates)
      *
-     * @return void
      * @see \TYPO3\CMS\Core\TypoScript\Parser\TypoScriptParser, start()
      */
     public function generateConfig()
@@ -1145,7 +1135,6 @@ class TemplateService
      * for include instructions and does the inclusion of external TypoScript files
      * if needed.
      *
-     * @return void
      * @see \TYPO3\CMS\Core\TypoScript\Parser\TypoScriptParser, generateConfig()
      */
     public function processIncludes()
@@ -1251,7 +1240,6 @@ class TemplateService
      *
      * @param array $setupArray TypoScript array
      * @param string $prefix Prefix to the object path. Used for recursive calls to this function.
-     * @return void
      * @see generateConfig()
      */
     public function flattenSetup($setupArray, $prefix)
@@ -1680,7 +1668,6 @@ class TemplateService
      * @param int $id Root id from which to start map creation.
      * @param array $MP_array MP_array passed from root page.
      * @param int $level Recursion brake. Incremented for each recursive call. 20 is the limit.
-     * @return void
      * @see getFromMPvar()
      */
     public function initMPmap_create($id, $MP_array = [], $level = 0)
@@ -1765,7 +1752,6 @@ class TemplateService
      * The class property isDefaultTypoScriptAdded ensures
      * that the adding only happens once.
      *
-     * @return void
      * @see isDefaultTypoScriptAdded
      */
     protected function addDefaultTypoScript()
@@ -1834,7 +1820,6 @@ class TemplateService
      * @param string $identifier 32 bit hash string (eg. a md5 hash of a serialized array identifying the data being stored)
      * @param mixed $data The data to store
      * @param string $tag Is just a textual identification in order to inform about the content
-     * @return void
      */
     protected function setCacheEntry($identifier, $data, $tag)
     {
diff --git a/typo3/sysext/core/Classes/Utility/ArrayUtility.php b/typo3/sysext/core/Classes/Utility/ArrayUtility.php
index ae504a45cf2fc528374aeae92d2c9008518ed40e..b0b07d8e8331d83611ca398c8cdf5e921941800c 100644
--- a/typo3/sysext/core/Classes/Utility/ArrayUtility.php
+++ b/typo3/sysext/core/Classes/Utility/ArrayUtility.php
@@ -24,7 +24,6 @@ class ArrayUtility
      *
      * @param array $arrayToTest
      * @param array $allowedArrayKeys
-     * @return void
      * @throws \InvalidArgumentException if an element in $arrayToTest is not in $allowedArrayKeys
      * @internal
      */
@@ -607,7 +606,6 @@ class ArrayUtility
      * @param bool $addKeys If set to FALSE, keys that are NOT found in $original will not be set. Thus only existing value can/will be overruled from overrule array.
      * @param bool $includeEmptyValues If set, values from $overrule will overrule if they are empty or zero.
      * @param bool $enableUnsetFeature If set, special values "__UNSET" can be used in the overrule array in order to unset array keys in the original array.
-     * @return void
      */
     public static function mergeRecursiveWithOverrule(array &$original, array $overrule, $addKeys = true, $includeEmptyValues = true, $enableUnsetFeature = true)
     {
diff --git a/typo3/sysext/core/Classes/Utility/CommandUtility.php b/typo3/sysext/core/Classes/Utility/CommandUtility.php
index 6a4e23b5f279434f1be1fb4577492c0d3c1e8a77..533e8e8004d757288fc94d2d640d9824f5178faa 100644
--- a/typo3/sysext/core/Classes/Utility/CommandUtility.php
+++ b/typo3/sysext/core/Classes/Utility/CommandUtility.php
@@ -245,7 +245,6 @@ class CommandUtility
      * Extend the preset paths. This way an extension can install an executable and provide the path to \TYPO3\CMS\Core\Utility\CommandUtility
      *
      * @param string $paths Comma separated list of extra paths where a command should be searched. Relative paths (without leading "/") are prepend with site root path (PATH_site).
-     * @return void
      */
     public static function addPaths($paths)
     {
@@ -298,7 +297,6 @@ class CommandUtility
      * Initializes and extends the preset paths with own
      *
      * @param string $paths Comma separated list of extra paths where a command should be searched. Relative paths (without leading "/") are prepend with site root path (PATH_site).
-     * @return void
      */
     protected static function initPaths($paths = '')
     {
diff --git a/typo3/sysext/core/Classes/Utility/DebugUtility.php b/typo3/sysext/core/Classes/Utility/DebugUtility.php
index ae95a3d54d5b901d79cc1aa4eb450842c1d2dae1..42fbd12c9a4e0d09aa773b22cb2f417139f6697c 100644
--- a/typo3/sysext/core/Classes/Utility/DebugUtility.php
+++ b/typo3/sysext/core/Classes/Utility/DebugUtility.php
@@ -201,7 +201,6 @@ class DebugUtility
      * Prints an array
      *
      * @param mixed $array_in Array to print visually (in a table).
-     * @return void
      * @see viewArray()
      */
     public static function printArray($array_in)
diff --git a/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php b/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php
index 547c26f05e6f41ac2c20c3b95495e72ec75f7ae5..a950270e0357774dc2ceaf92d1d7cd737db47fb9 100644
--- a/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php
+++ b/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php
@@ -214,8 +214,6 @@ class ExtensionManagementUtility
 
     /**
      * Clears the extension key map.
-     *
-     * @return void
      */
     public static function clearExtensionKeyMap()
     {
@@ -262,7 +260,6 @@ class ExtensionManagementUtility
      *
      * @param string $table The table name of a table already present in $GLOBALS['TCA'] with a columns section
      * @param array $columnArray The array with the additional columns (typical some fields an extension wants to add)
-     * @return void
      */
     public static function addTCAcolumns($table, $columnArray)
     {
@@ -284,7 +281,6 @@ class ExtensionManagementUtility
      * @param string $newFieldsString Field list to add.
      * @param string $typeList List of specific types to add the field list to. (If empty, all type entries are affected)
      * @param string $position Insert fields before (default) or after one, or replace a field
-     * @return void
      */
     public static function addToAllTCAtypes($table, $newFieldsString, $typeList = '', $position = '')
     {
@@ -404,7 +400,6 @@ class ExtensionManagementUtility
      * @param string $field Name of the field that has the palette to be extended
      * @param string $addFields List of fields to be added to the palette
      * @param string $insertionPosition Insert fields before (default) or after one
-     * @return void
      */
     public static function addFieldsToAllPalettesOfField($table, $field, $addFields, $insertionPosition = '')
     {
@@ -457,7 +452,6 @@ class ExtensionManagementUtility
      * @param string $palette Name of the palette to be extended
      * @param string $addFields List of fields to be added to the palette
      * @param string $insertionPosition Insert fields before (default) or after one
-     * @return void
      */
     public static function addFieldsToPalette($table, $palette, $addFields, $insertionPosition = '')
     {
@@ -498,7 +492,6 @@ class ExtensionManagementUtility
      * @param array $item New item to add
      * @param string $relativeToField Add item relative to existing field
      * @param string $relativePosition Valid keywords: 'before', 'after'
-     * @return void
      */
     public static function addTcaSelectItem($table, $field, array $item, $relativeToField = '', $relativePosition = '')
     {
@@ -630,7 +623,6 @@ class ExtensionManagementUtility
      *
      * @param string $addFields List of fields to be added to the user settings
      * @param string $insertionPosition Insert fields before (default) or after one
-     * @return void
      */
     public static function addFieldsToUserSettings($addFields, $insertionPosition = '')
     {
@@ -818,7 +810,6 @@ class ExtensionManagementUtility
      * FOR USE IN ext_tables.php FILES
      *
      * @param string $table Table name
-     * @return void
      */
     public static function allowTableOnStandardPages($table)
     {
@@ -910,7 +901,6 @@ class ExtensionManagementUtility
      * @param string $position Can be used to set the position of the $sub module within the list of existing submodules for the main module. $position has this syntax: [cmd]:[submodule-key]. cmd can be "after", "before" or "top" (or blank which is default). If "after"/"before" then submodule will be inserted after/before the existing submodule with [submodule-key] if found. If not found, the bottom of list. If "top" the module is inserted in the top of the submodule list.
      * @param string $path The absolute path to the module. Was used prior to TYPO3 v8, use $moduleConfiguration[routeTarget] now
      * @param array $moduleConfiguration additional configuration, previously put in "conf.php" of the module directory
-     * @return void
      */
     public static function addModule($main, $sub = '', $position = '', $path = null, $moduleConfiguration = [])
     {
@@ -980,7 +970,6 @@ class ExtensionManagementUtility
      * @param string $callbackClass
      * @param string $moduleName Optional: must be <mainmodule> or <mainmodule>_<submodule>
      * @param string $accessLevel Optional: can be 'admin' or 'user,group'
-     * @return void
      * @deprecated since TYPO3 v8, will be removed in TYPO3 v9
      */
     public static function registerExtDirectComponent($endpointName, $callbackClass, $moduleName = null, $accessLevel = null)
@@ -1021,7 +1010,6 @@ class ExtensionManagementUtility
      * @param string $title Title of module
      * @param string $MM_key Menu array key - default is "function
      * @param string $WS Workspace conditions. Blank means all workspaces, any other string can be a comma list of "online", "offline" and "custom
-     * @return void
      * @see \TYPO3\CMS\Backend\Module\BaseScriptClass::mergeExternalItems()
      */
     public static function insertModuleFunction($modname, $className, $classPath = null, $title, $MM_key = 'function', $WS = '')
@@ -1042,7 +1030,6 @@ class ExtensionManagementUtility
      * @param string $group The group ('FE', 'BE', 'SYS' ...)
      * @param string $key The key of this setting within the group
      * @param string $content The text to add (include leading "\n" in case of multi-line entries)
-     * @return void
      */
     public static function appendToTypoConfVars($group, $key, $content)
     {
@@ -1056,7 +1043,6 @@ class ExtensionManagementUtility
      * FOR USE IN ext_tables.php/ext_localconf.php FILES
      *
      * @param string $content Page TSconfig content
-     * @return void
      */
     public static function addPageTSConfig($content)
     {
@@ -1071,7 +1057,6 @@ class ExtensionManagementUtility
      * FOR USE IN ext_tables.php/ext_localconf.php FILES
      *
      * @param string $content User TSconfig content
-     * @return void
      */
     public static function addUserTSConfig($content)
     {
@@ -1087,7 +1072,6 @@ class ExtensionManagementUtility
      *
      * @param string $tca_descr_key Description key. Typically a database table (like "pages") but for applications can be other strings, but prefixed with "_MOD_")
      * @param string $file_ref File reference to locallang file, eg. "EXT:lang/Resources/Private/Language/locallang_csh_pages.xlf" (or ".xml")
-     * @return void
      */
     public static function addLLrefForTCAdescr($tca_descr_key, $file_ref)
     {
@@ -1109,7 +1093,6 @@ class ExtensionManagementUtility
      * @param string $componentId
      * @param string $extensionKey
      * @throws \RuntimeException
-     * @return void
      */
     public static function addNavigationComponent($module, $componentId, $extensionKey = null)
     {
@@ -1129,7 +1112,6 @@ class ExtensionManagementUtility
      *
      * @param string $module
      * @param string $componentId
-     * @return void
      */
     public static function addCoreNavigationComponent($module, $componentId)
     {
@@ -1149,7 +1131,6 @@ class ExtensionManagementUtility
      * @param string $serviceType Service type, must not be prefixed "tx_" or "Tx_"
      * @param string $serviceKey Service key, must be prefixed "tx_", "Tx_" or "user_"
      * @param array $info Service description array
-     * @return void
      */
     public static function addService($extKey, $serviceType, $serviceKey, $info)
     {
@@ -1293,7 +1274,6 @@ class ExtensionManagementUtility
      *
      * @param string $serviceType Service type
      * @param string $serviceKey Service key
-     * @return void
      */
     public static function deactivateService($serviceType, $serviceKey)
     {
@@ -1317,7 +1297,6 @@ class ExtensionManagementUtility
      * @param string $type Type (eg. "list_type") - basically a field from "tt_content" table
      * @param string $extensionKey The extension key
      * @throws \RuntimeException
-     * @return void
      */
     public static function addPlugin($itemArray, $type = 'list_type', $extensionKey = null)
     {
@@ -1353,7 +1332,6 @@ class ExtensionManagementUtility
      * @param string $piKeyToMatch Plugin key as used in the list_type field. Use the asterisk * to match all list_type values.
      * @param string $value Either a reference to a flex-form XML file (eg. "FILE:EXT:newloginbox/flexform_ds.xml") or the XML directly.
      * @param string $CTypeToMatch Value of tt_content.CType (Content Type) to match. The default is "list" which corresponds to the "Insert Plugin" content element.  Use the asterisk * to match all CType values.
-     * @return void
      * @see addPlugin()
      */
     public static function addPiFlexFormValue($piKeyToMatch, $value, $CTypeToMatch = 'list')
@@ -1371,7 +1349,6 @@ class ExtensionManagementUtility
      * @param string $table Table name to allow for "insert record
      * @param string $content_table Table name TO WHICH the $table name is applied. See $content_field as well.
      * @param string $content_field Field name in the database $content_table in which $table is allowed to be added as a reference ("Insert Record")
-     * @return void
      */
     public static function addToInsertRecords($table, $content_table = 'tt_content', $content_field = 'records')
     {
@@ -1405,8 +1382,6 @@ class ExtensionManagementUtility
      * @param string $suffix Is used as a suffix of the class name (e.g. "_pi1")
      * @param string $type See description above
      * @param int $cached If $cached is set as USER content object (cObject) is created - otherwise a USER_INT object is created.
-     *
-     * @return void
      */
     public static function addPItoST43($key, $_, $suffix = '', $type = 'list_type', $cached = 0)
     {
@@ -1460,7 +1435,6 @@ tt_content.' . $key . $suffix . ' {
      * @param string $extKey Is of course the extension key
      * @param string $path Is the path where the template files (fixed names) include_static.txt (integer list of uids from the table "static_templates"), constants.txt, setup.txt, and include_static_file.txt is found (relative to extPath, eg. 'static/'). The file include_static_file.txt, allows you to include other static templates defined in files, from your static template, and thus corresponds to the field 'include_static_file' in the sys_template table. The syntax for this is a comma separated list of static templates to include, like:  EXT:css_styled_content/static/,EXT:da_newsletter_subscription/static/,EXT:cc_random_image/pi2/static/
      * @param string $title Is the title in the selector box.
-     * @return void
      * @see addTypoScript()
      */
     public static function addStaticFile($extKey, $path, $title)
@@ -1479,7 +1453,6 @@ tt_content.' . $key . $suffix . ' {
      * @param string $extKey The extension key
      * @param string $filePath The path where the TSconfig file is located
      * @param string $title The title in the selector box
-     * @return void
      */
     public static function registerPageTSConfigFile($extKey, $filePath, $title)
     {
@@ -1504,7 +1477,6 @@ tt_content.' . $key . $suffix . ' {
      * FOR USE IN ext_localconf.php FILES
      *
      * @param string $content TypoScript Setup string
-     * @return void
      */
     public static function addTypoScriptSetup($content)
     {
@@ -1519,7 +1491,6 @@ tt_content.' . $key . $suffix . ' {
      * FOR USE IN ext_localconf.php FILES
      *
      * @param string $content TypoScript Constants string
-     * @return void
      */
     public static function addTypoScriptConstants($content)
     {
@@ -1543,8 +1514,6 @@ tt_content.' . $key . $suffix . ' {
      * @param string $type Is either "setup" or "constants" and obviously determines which kind of TypoScript code we are adding.
      * @param string $content Is the TS content, will be prefixed with a [GLOBAL] line and a comment-header.
      * @param int|string $afterStaticUid Is either an integer pointing to a uid of a static_template or a string pointing to the "key" of a static_file template ([reduced extension_key]/[local path]). The points is that the TypoScript you add is included only IF that static template is included (and in that case, right after). So effectively the TypoScript you set can specifically overrule settings from those static templates.
-     *
-     * @return void
      */
     public static function addTypoScript($key, $type, $content, $afterStaticUid = 0)
     {
@@ -1613,7 +1582,6 @@ tt_content.' . $key . $suffix . ' {
      * extensions should not use it!
      *
      * @param bool $allowCaching Whether or not to load / create concatenated cache file
-     * @return void
      * @access private
      */
     public static function loadExtLocalconf($allowCaching = true)
@@ -1635,8 +1603,6 @@ tt_content.' . $key . $suffix . ' {
 
     /**
      * Execute ext_localconf.php files from extensions
-     *
-     * @return void
      */
     protected static function loadSingleExtLocalconfFiles()
     {
@@ -1657,8 +1623,6 @@ tt_content.' . $key . $suffix . ' {
 
     /**
      * Create cache entry for concatenated ext_localconf.php files
-     *
-     * @return void
      */
     protected static function createExtLocalconfCacheEntry()
     {
@@ -1717,7 +1681,6 @@ tt_content.' . $key . $suffix . ' {
      * extensions should not use it!
      *
      * @param bool $allowCaching Whether or not to load / create concatenated cache file
-     * @return void
      * @access private
      */
     public static function loadBaseTca($allowCaching = true)
@@ -1745,7 +1708,6 @@ tt_content.' . $key . $suffix . ' {
      * The filename must be the table name in $GLOBALS['TCA'], and the content of
      * the file should return an array with content of a specific table.
      *
-     * @return void
      * @see Extension core, extensionmanager and others for examples.
      */
     protected static function buildBaseTcaFromSingleFiles()
@@ -1833,8 +1795,6 @@ tt_content.' . $key . $suffix . ' {
     /**
      * Cache base $GLOBALS['TCA'] to cache file to require the whole thing in one
      * file for next access instead of cycling through all extensions again.
-     *
-     * @return void
      */
     protected static function createBaseTcaCacheFile()
     {
@@ -1862,7 +1822,6 @@ tt_content.' . $key . $suffix . ' {
      * extensions should not use it!
      *
      * @param bool $allowCaching Whether to load / create concatenated cache file
-     * @return void
      * @access private
      */
     public static function loadExtTables($allowCaching = true)
@@ -1885,8 +1844,6 @@ tt_content.' . $key . $suffix . ' {
 
     /**
      * Load ext_tables.php as single files
-     *
-     * @return void
      */
     protected static function loadSingleExtTablesFiles()
     {
@@ -1909,8 +1866,6 @@ tt_content.' . $key . $suffix . ' {
 
     /**
      * Create concatenated ext_tables.php cache file
-     *
-     * @return void
      */
     protected static function createExtTablesCacheEntry()
     {
@@ -1972,8 +1927,6 @@ tt_content.' . $key . $suffix . ' {
      * This method is usually only used by extension that fiddle
      * with the loaded extensions. An example is the extension
      * manager and the install tool.
-     *
-     * @return void
      */
     public static function removeCacheFiles()
     {
@@ -1997,7 +1950,6 @@ tt_content.' . $key . $suffix . ' {
      * localconf.php to LocalConfiguration.php was already run
      *
      * @param string $extensionKey Extension key to load
-     * @return void
      * @throws \RuntimeException
      */
     public static function loadExtension($extensionKey)
@@ -2015,7 +1967,6 @@ tt_content.' . $key . $suffix . ' {
      * localconf.php to LocalConfiguration.php was already run
      *
      * @param string $extensionKey Extension key to remove
-     * @return void
      * @throws \RuntimeException
      */
     public static function unloadExtension($extensionKey)
diff --git a/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtility.php b/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtility.php
index 6691b0ea88bac3617d7ef5e2090412bfb82fd6c5..000969a324c66053b80a899e86b8e61874545f87 100644
--- a/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtility.php
+++ b/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtility.php
@@ -142,7 +142,6 @@ class ExtendedFileUtility extends BasicFileUtility
      * Set existingFilesConflictMode
      *
      * @param \TYPO3\CMS\Core\Resource\DuplicationBehavior|string $existingFilesConflictMode Instance or constant of \TYPO3\CMS\Core\Resource\DuplicationBehavior
-     * @return void
      * @throws Exception
      */
     public function setExistingFilesConflictMode($existingFilesConflictMode)
@@ -165,7 +164,6 @@ class ExtendedFileUtility extends BasicFileUtility
      * Initialization of the class
      *
      * @param array $fileCmds Array with the commands to execute. See "TYPO3 Core API" document
-     * @return void
      */
     public function start($fileCmds)
     {
@@ -180,7 +178,6 @@ class ExtendedFileUtility extends BasicFileUtility
      * If no argument is given, permissions of the currently logged in backend user are taken into account.
      *
      * @param array $permissions File Permissions.
-     * @return void
      */
     public function setActionPermissions(array $permissions = [])
     {
@@ -289,7 +286,6 @@ class ExtendedFileUtility extends BasicFileUtility
     /**
      * Adds all log error messages from the operations of this script instance to the FlashMessageQueue
      *
-     * @return void
      * @deprecated since TYPO3 CMS 8, will be removed in TYPO3 CMS 9
      */
     public function pushErrorMessagesToFlashMessageQueue()
@@ -323,7 +319,6 @@ class ExtendedFileUtility extends BasicFileUtility
      * @param int $details_nr This number is unique for every combination of $type and $action. This is the error-message number, which can later be used to translate error messages.
      * @param string $details This is the default, raw error message in english
      * @param array $data Array with special information that may go into $details by "%s" marks / sprintf() when the log is shown
-     * @return void
      */
     public function writeLog($action, $error, $details_nr, $details, $data)
     {
@@ -343,7 +338,6 @@ class ExtendedFileUtility extends BasicFileUtility
      * @param string $localizationKey
      * @param array $replaceMarkers
      * @param int $severity
-     * @return void
      * @throws \InvalidArgumentException
      */
     protected function addMessageToFlashMessageQueue($localizationKey, array $replaceMarkers = [], $severity = FlashMessage::ERROR)
@@ -1203,7 +1197,6 @@ class ExtendedFileUtility extends BasicFileUtility
      * Add flash message to message queue
      *
      * @param FlashMessage $flashMessage
-     * @return void
      */
     protected function addFlashMessage(FlashMessage $flashMessage)
     {
diff --git a/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtilityProcessDataHookInterface.php b/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtilityProcessDataHookInterface.php
index 54d9216b0e01a547c5f363bf717a753f99a945e5..ff89ef2dde4015c78942998bbba94b739bf7bc2c 100644
--- a/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtilityProcessDataHookInterface.php
+++ b/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtilityProcessDataHookInterface.php
@@ -26,7 +26,6 @@ interface ExtendedFileUtilityProcessDataHookInterface
      * @param array $cmdArr The parameter sent to the action handler
      * @param array $result The results of all calls to the action handler
      * @param \TYPO3\CMS\Core\Utility\File\ExtendedFileUtility $parentObject Parent object
-     * @return void
      */
     public function processData_postProcessAction($action, array $cmdArr, array $result, ExtendedFileUtility $parentObject);
 }
diff --git a/typo3/sysext/core/Classes/Utility/GeneralUtility.php b/typo3/sysext/core/Classes/Utility/GeneralUtility.php
index d3828c1a65b66197596e433840fc141dc8184559..437300e5fbad5bc1c131bb249d32db439d97428e 100644
--- a/typo3/sysext/core/Classes/Utility/GeneralUtility.php
+++ b/typo3/sysext/core/Classes/Utility/GeneralUtility.php
@@ -216,7 +216,6 @@ class GeneralUtility
      *
      * @param mixed $inputGet
      * @param string $key
-     * @return void
      */
     public static function _GETset($inputGet, $key = '')
     {
@@ -2274,7 +2273,6 @@ class GeneralUtility
      *
      * @param string $directory Target directory to create. Must a have trailing slash
      * @param string $deepDirectory Directory to create. This second parameter
-     * @return void
      * @throws \InvalidArgumentException If $directory or $deepDirectory are not strings
      * @throws \RuntimeException If directory could not be created
      */
@@ -3960,7 +3958,6 @@ class GeneralUtility
      * @see makeInstance
      * @param string $className
      * @param \TYPO3\CMS\Core\SingletonInterface $instance
-     * @return void
      * @internal
      */
     public static function setSingletonInstance($className, SingletonInterface $instance)
@@ -3982,7 +3979,6 @@ class GeneralUtility
      * @throws \InvalidArgumentException
      * @param string $className
      * @param \TYPO3\CMS\Core\SingletonInterface $instance
-     * @return void
      * @internal
      */
     public static function removeSingletonInstance($className, SingletonInterface $instance)
@@ -4009,7 +4005,6 @@ class GeneralUtility
      *
      * @internal
      * @param array $newSingletonInstances $className => $object
-     * @return void
      */
     public static function resetSingletonInstances(array $newSingletonInstances)
     {
@@ -4049,7 +4044,6 @@ class GeneralUtility
      * @throws \InvalidArgumentException if class extends \TYPO3\CMS\Core\SingletonInterface
      * @param string $className
      * @param object $instance
-     * @return void
      */
     public static function addInstance($className, $instance)
     {
@@ -4070,7 +4064,6 @@ class GeneralUtility
      * @throws \InvalidArgumentException if $className is empty or if $instance is no instance of $className
      * @param string $className a class name
      * @param object $instance an object
-     * @return void
      */
     protected static function checkInstanceClassName($className, $instance)
     {
@@ -4091,7 +4084,6 @@ class GeneralUtility
      * Warning: This is a helper method for unit tests. Do not call this directly in production code!
      *
      * @see makeInstance
-     * @return void
      */
     public static function purgeInstances()
     {
@@ -4104,7 +4096,6 @@ class GeneralUtility
      *
      * Used in unit tests only.
      *
-     * @return void
      * @internal
      */
     public static function flushInternalRuntimeCaches()
@@ -4172,7 +4163,6 @@ class GeneralUtility
      * Useful to require classes from inside other classes (not global scope). A limited set of global variables are available (see function)
      *
      * @param string $requireFile: Path of the file to be included
-     * @return void
      * @deprecated since TYPO3 CMS 8, this method will be removed in TYPO3 CMS 9
      */
     public static function requireOnce($requireFile)
@@ -4189,7 +4179,6 @@ class GeneralUtility
      * A limited set of global variables are available (see function)
      *
      * @param string $requireFile: Path of the file to be included
-     * @return void
      * @deprecated since TYPO3 CMS 8, this method will be removed in TYPO3 CMS 9
      */
     public static function requireFile($requireFile)
@@ -4253,7 +4242,6 @@ class GeneralUtility
     /**
      * Initialize the system log.
      *
-     * @return void
      * @see sysLog()
      */
     public static function initSysLog()
@@ -4297,7 +4285,6 @@ class GeneralUtility
      * @param string $msg Message (in English).
      * @param string $extKey Extension key (from which extension you are calling the log) or "Core
      * @param int $severity \TYPO3\CMS\Core\Utility\GeneralUtility::SYSLOG_SEVERITY_* constant
-     * @return void
      */
     public static function sysLog($msg, $extKey, $severity = 0)
     {
@@ -4370,7 +4357,6 @@ class GeneralUtility
      * @param string $extKey Extension key (from which extension you are calling the log)
      * @param int $severity Severity: 0 is info, 1 is notice, 2 is warning, 3 is fatal error, -1 is "OK" message
      * @param mixed $dataVar Additional data you want to pass to the logger.
-     * @return void
      */
     public static function devLog($msg, $extKey, $severity = 0, $dataVar = false)
     {
@@ -4387,7 +4373,6 @@ class GeneralUtility
      * Writes a message to the deprecation log.
      *
      * @param string $msg Message (in English).
-     * @return void
      */
     public static function deprecationLog($msg)
     {
@@ -4474,8 +4459,6 @@ class GeneralUtility
     /**
      * Logs a call to a deprecated function.
      * The log message will be taken from the annotation.
-     *
-     * @return void
      */
     public static function logDeprecatedFunction()
     {
@@ -4602,7 +4585,6 @@ class GeneralUtility
     /**
      * Ends and flushes all output buffers
      *
-     * @return void
      * @deprecated since TYPO3 CMS 8, will be removed in TYPO3 CMS 9.
      */
     public static function flushOutputBuffers()
diff --git a/typo3/sysext/core/Classes/Utility/HttpUtility.php b/typo3/sysext/core/Classes/Utility/HttpUtility.php
index 16d4f08d7168d1b3a183cc816b1e28668670f6ec..4adf8553af5531df251bbbc317a8158f52583986 100644
--- a/typo3/sysext/core/Classes/Utility/HttpUtility.php
+++ b/typo3/sysext/core/Classes/Utility/HttpUtility.php
@@ -84,7 +84,6 @@ class HttpUtility
      * Set a specific response code like 404.
      *
      * @param string $httpStatus One of the HTTP_STATUS_* class class constants, default to self::HTTP_STATUS_303
-     * @return void
      */
     public static function setResponseCode($httpStatus = self::HTTP_STATUS_303)
     {
@@ -95,7 +94,6 @@ class HttpUtility
      * Set a specific response code and exit script execution.
      *
      * @param string $httpStatus One of the HTTP_STATUS_* class class constants, default to self::HTTP_STATUS_303
-     * @return void
      */
     public static function setResponseCodeAndExit($httpStatus = self::HTTP_STATUS_303)
     {
diff --git a/typo3/sysext/core/Classes/Utility/PathUtility.php b/typo3/sysext/core/Classes/Utility/PathUtility.php
index ec102dd52ce21057aff9389cbf098579e77164a8..3c0aa4bd753ff3fd2c2e3a11f261a891eb6dedad 100644
--- a/typo3/sysext/core/Classes/Utility/PathUtility.php
+++ b/typo3/sysext/core/Classes/Utility/PathUtility.php
@@ -158,7 +158,6 @@ class PathUtility
      * @param string $path
      *
      * @return string
-     *
      */
     public static function basename($path)
     {
@@ -180,7 +179,6 @@ class PathUtility
      * @param string $path
      *
      * @return string
-     *
      */
     public static function dirname($path)
     {
@@ -203,7 +201,6 @@ class PathUtility
      * @param int $options
      *
      * @return string|array
-     *
      */
     public static function pathinfo($path, $options = null)
     {
diff --git a/typo3/sysext/core/Classes/Utility/RootlineUtility.php b/typo3/sysext/core/Classes/Utility/RootlineUtility.php
index 3ef611c06215b6c40ca7987caf82008c03ad6985..1c27eaabe99561a32dc890ad965532caf3d83dfe 100644
--- a/typo3/sysext/core/Classes/Utility/RootlineUtility.php
+++ b/typo3/sysext/core/Classes/Utility/RootlineUtility.php
@@ -139,7 +139,6 @@ class RootlineUtility
      * Initialize a state to work with
      *
      * @throws \RuntimeException
-     * @return void
      */
     protected function initializeObject()
     {
@@ -166,8 +165,6 @@ class RootlineUtility
      * Purges all rootline caches.
      *
      * Note: This function is intended to be used in unit tests only.
-     *
-     * @return void
      */
     public static function purgeCaches()
     {
@@ -388,7 +385,6 @@ class RootlineUtility
      * Actual function to generate the rootline and cache it
      *
      * @throws \RuntimeException
-     * @return void
      */
     protected function generateRootlineCache()
     {
@@ -471,8 +467,6 @@ class RootlineUtility
      * Parse the MountPoint Parameters
      * Splits the MP-Param via "," for several nested mountpoints
      * and afterwords registers the mountpoint configurations
-     *
-     * @return void
      */
     protected function parseMountPointParameter()
     {
diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/BackendUser/ListUserCest.php b/typo3/sysext/core/Tests/Acceptance/Backend/BackendUser/ListUserCest.php
index e077be703f756e5cec7674380cf6bdab849d968a..3c2b07e8cfa72ab9be77b9c30ac7e1d67a259719 100644
--- a/typo3/sysext/core/Tests/Acceptance/Backend/BackendUser/ListUserCest.php
+++ b/typo3/sysext/core/Tests/Acceptance/Backend/BackendUser/ListUserCest.php
@@ -23,7 +23,6 @@ class ListUserCest
 {
     /**
      * @param Admin $I
-     * @return void
      */
     public function _before(Admin $I)
     {
@@ -42,7 +41,6 @@ class ListUserCest
 
     /**
      * @param Admin $I
-     * @return void
      */
     public function showsHeadingAndListsBackendUsers(Admin $I)
     {
@@ -57,7 +55,6 @@ class ListUserCest
 
     /**
      * @param Admin $I
-     * @return void
      */
     public function filterUsersByUsername(Admin $I)
     {
@@ -85,7 +82,6 @@ class ListUserCest
 
     /**
      * @param Admin $I
-     * @return void
      */
     public function filterUsersByAdmin(Admin $I)
     {
@@ -113,7 +109,6 @@ class ListUserCest
 
     /**
      * @param Admin $I
-     * @return void
      */
     public function filterUsersByStatus(Admin $I)
     {
@@ -141,7 +136,6 @@ class ListUserCest
 
     /**
      * @param Admin $I
-     * @return void
      */
     public function filterUsersByLogin(Admin $I)
     {
@@ -169,7 +163,6 @@ class ListUserCest
 
     /**
      * @param Admin $I
-     * @return void
      */
     public function filterUsersByUserGroup(Admin $I)
     {
@@ -191,7 +184,6 @@ class ListUserCest
     /**
      * @param Admin $I
      * @param int $countOfUsers
-     * @return void
      */
     protected function checkCountOfUsers(Admin $I, $countOfUsers)
     {
diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Install/InstallModuleCest.php b/typo3/sysext/core/Tests/Acceptance/Backend/Install/InstallModuleCest.php
index 91ad379ab798316981b9cfeee7cf2d49bdc50dfe..f100b9b2fa076499ee3c5544b5f14f524e0ed9f6 100644
--- a/typo3/sysext/core/Tests/Acceptance/Backend/Install/InstallModuleCest.php
+++ b/typo3/sysext/core/Tests/Acceptance/Backend/Install/InstallModuleCest.php
@@ -28,7 +28,6 @@ class InstallModuleCest
 
     /**
      * @param Admin $I
-     * @return void
      */
     public function _before(Admin $I)
     {
@@ -49,7 +48,6 @@ class InstallModuleCest
 
     /**
      * @param Admin $I
-     * @return void
      */
     public function unlockAndLockInstallTool(Admin $I)
     {
@@ -77,7 +75,6 @@ class InstallModuleCest
 
     /**
      * @param Admin $I
-     * @return void
      */
     public function loginToInstallTool(Admin $I)
     {
diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Language/LanguageCest.php b/typo3/sysext/core/Tests/Acceptance/Backend/Language/LanguageCest.php
index 7adf1e502b0e373be84f4b353d0fb37d7ae41ea7..bbf4bfc8e0ba27faee8f27d2eadbf33e81c1a656 100644
--- a/typo3/sysext/core/Tests/Acceptance/Backend/Language/LanguageCest.php
+++ b/typo3/sysext/core/Tests/Acceptance/Backend/Language/LanguageCest.php
@@ -23,7 +23,6 @@ class LanguageCest
 {
     /**
      * @param Admin $I
-     * @return void
      */
     public function _before(Admin $I)
     {
@@ -45,7 +44,6 @@ class LanguageCest
 
     /**
      * @param Admin $I
-     * @return void
      */
     public function showsHeadingAndListsInstalledLanguages(Admin $I)
     {
@@ -57,7 +55,6 @@ class LanguageCest
 
     /**
      * @param Admin $I
-     * @return void
      */
     public function filterInstalledLanguages(Admin $I)
     {
@@ -77,7 +74,6 @@ class LanguageCest
 
     /**
      * @param Admin $I
-     * @return void
      */
     public function activateAndDeactivateALanguage(Admin $I)
     {
@@ -98,7 +94,6 @@ class LanguageCest
 
     /**
      * @param Admin $I
-     * @return void
      */
     public function downloadALanguage(Admin $I)
     {
@@ -123,7 +118,6 @@ class LanguageCest
 
     /**
      * @param Admin $I
-     * @return void
      */
     public function showsHeadingAndListsTranslationOverview(Admin $I)
     {
@@ -135,7 +129,6 @@ class LanguageCest
 
     /**
      * @param Admin $I
-     * @return void
      */
     public function filterTranslationOverview(Admin $I)
     {
diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Login/BackendLoginCest.php b/typo3/sysext/core/Tests/Acceptance/Backend/Login/BackendLoginCest.php
index 85ee20f7acdc53cf8e758e223a5adbba492406cc..edec1dfe5ec5fc6e5eab8d66e28b8f6689381bd0 100644
--- a/typo3/sysext/core/Tests/Acceptance/Backend/Login/BackendLoginCest.php
+++ b/typo3/sysext/core/Tests/Acceptance/Backend/Login/BackendLoginCest.php
@@ -126,7 +126,6 @@ class BackendLoginCest
      * @param \AcceptanceTester $I
      * @param string $username
      * @param string $password
-     * @return void
      */
     protected function login(\AcceptanceTester $I, string $username, string $password)
     {
@@ -147,7 +146,6 @@ class BackendLoginCest
      * Logout user by clicking logout button in toolbar
      *
      * @param \AcceptanceTester $I
-     * @return void
      */
     protected function logout(\AcceptanceTester $I)
     {
diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Template/TemplateCest.php b/typo3/sysext/core/Tests/Acceptance/Backend/Template/TemplateCest.php
index b7b5d4a9a763e5b9e664b165966feedbaeb8355f..699df85f7b17b8bafd966e55754816872df1b0ad 100644
--- a/typo3/sysext/core/Tests/Acceptance/Backend/Template/TemplateCest.php
+++ b/typo3/sysext/core/Tests/Acceptance/Backend/Template/TemplateCest.php
@@ -23,7 +23,6 @@ class TemplateCest
 {
     /**
      * @param Admin $I
-     * @return void
      */
     public function _before(Admin $I)
     {
@@ -44,7 +43,6 @@ class TemplateCest
 
     /**
      * @param Admin $I
-     * @return void
      */
     public function pagesWithNoTemplateShouldShowButtonsToCreateTemplates(Admin $I)
     {
@@ -78,7 +76,6 @@ class TemplateCest
 
     /**
      * @param Admin $I
-     * @return void
      */
     public function addANewSiteTemplate(Admin $I)
     {
diff --git a/typo3/sysext/core/Tests/Functional/Category/Collection/CategoryCollectionTest.php b/typo3/sysext/core/Tests/Functional/Category/Collection/CategoryCollectionTest.php
index d6dde24b77bbf3bb89a2bdee8e6ba1f2182f7b33..766e50e5d913fd58c143229cc79fd529c080d1cd 100644
--- a/typo3/sysext/core/Tests/Functional/Category/Collection/CategoryCollectionTest.php
+++ b/typo3/sysext/core/Tests/Functional/Category/Collection/CategoryCollectionTest.php
@@ -56,8 +56,6 @@ class CategoryCollectionTest extends \TYPO3\TestingFramework\Core\Functional\Fun
 
     /**
      * Sets up this test suite.
-     *
-     * @return void
      */
     protected function setUp()
     {
@@ -90,7 +88,6 @@ class CategoryCollectionTest extends \TYPO3\TestingFramework\Core\Functional\Fun
     /**
      * @test
      * @covers \TYPO3\CMS\Core\Category\Collection\CategoryCollection::fromArray
-     * @return void
      */
     public function checkIfFromArrayMethodSetCorrectProperties()
     {
@@ -105,7 +102,6 @@ class CategoryCollectionTest extends \TYPO3\TestingFramework\Core\Functional\Fun
     /**
      * @test
      * @covers \TYPO3\CMS\Core\Category\Collection\CategoryCollection::create
-     * @return void
      */
     public function canCreateDummyCollection()
     {
@@ -116,7 +112,6 @@ class CategoryCollectionTest extends \TYPO3\TestingFramework\Core\Functional\Fun
     /**
      * @test
      * @covers \TYPO3\CMS\Core\Category\Collection\CategoryCollection::create
-     * @return void
      */
     public function canCreateDummyCollectionAndFillItems()
     {
@@ -127,7 +122,6 @@ class CategoryCollectionTest extends \TYPO3\TestingFramework\Core\Functional\Fun
     /**
      * @test
      * @covers \TYPO3\CMS\Core\Category\Collection\CategoryCollection::getCollectedRecords
-     * @return void
      */
     public function getCollectedRecordsReturnsEmptyRecordSet()
     {
@@ -141,7 +135,6 @@ class CategoryCollectionTest extends \TYPO3\TestingFramework\Core\Functional\Fun
     /**
      * @test
      * @covers \TYPO3\CMS\Core\Category\Collection\CategoryCollection::getStorageTableName
-     * @return void
      */
     public function isStorageTableNameEqualsToSysCategory()
     {
@@ -151,7 +144,6 @@ class CategoryCollectionTest extends \TYPO3\TestingFramework\Core\Functional\Fun
     /**
      * @test
      * @covers \TYPO3\CMS\Core\Category\Collection\CategoryCollection::getStorageItemsField
-     * @return void
      */
     public function isStorageItemsFieldEqualsToItems()
     {
@@ -160,7 +152,6 @@ class CategoryCollectionTest extends \TYPO3\TestingFramework\Core\Functional\Fun
 
     /**
      * @test
-     * @return void
      */
     public function canLoadADummyCollectionFromDatabase()
     {
@@ -194,7 +185,6 @@ class CategoryCollectionTest extends \TYPO3\TestingFramework\Core\Functional\Fun
 
     /**
      * @test
-     * @return void
      */
     public function canLoadADummyCollectionFromDatabaseAndAddRecord()
     {
@@ -213,7 +203,6 @@ class CategoryCollectionTest extends \TYPO3\TestingFramework\Core\Functional\Fun
 
     /**
      * @test
-     * @return void
      */
     public function canLoadADummyCollectionWithoutContentFromDatabase()
     {
@@ -225,7 +214,6 @@ class CategoryCollectionTest extends \TYPO3\TestingFramework\Core\Functional\Fun
 
     /**
      * @test
-     * @return void
      */
     public function canLoadADummyCollectionFromDatabaseAfterRemoveOneRelation()
     {
@@ -246,8 +234,6 @@ class CategoryCollectionTest extends \TYPO3\TestingFramework\Core\Functional\Fun
     /********************/
     /**
      * Create dummy table for testing purpose
-     *
-     * @return void
      */
     private function populateDummyTable()
     {
@@ -263,8 +249,6 @@ class CategoryCollectionTest extends \TYPO3\TestingFramework\Core\Functional\Fun
 
     /**
      * Make relation between tables
-     *
-     * @return void
      */
     private function makeRelationBetweenCategoryAndDummyTable()
     {
@@ -283,8 +267,6 @@ class CategoryCollectionTest extends \TYPO3\TestingFramework\Core\Functional\Fun
 
     /**
      * Create dummy table for testing purpose
-     *
-     * @return void
      */
     private function createDummyTable()
     {
@@ -309,8 +291,6 @@ class CategoryCollectionTest extends \TYPO3\TestingFramework\Core\Functional\Fun
 
     /**
      * Drop dummy table
-     *
-     * @return void
      */
     private function dropDummyTable()
     {
@@ -329,8 +309,6 @@ class CategoryCollectionTest extends \TYPO3\TestingFramework\Core\Functional\Fun
 
     /**
      * Add is_dummy_record record and create dummy record
-     *
-     * @return void
      */
     private function prepareTables()
     {
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/AbstractDataHandlerActionTestCase.php b/typo3/sysext/core/Tests/Functional/DataHandling/AbstractDataHandlerActionTestCase.php
index 6a4e9ccdce592b6d59fbfd45950c26afaaa6b3b7..728cc78107ef67caa43338a884da4bcdd0656526 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/AbstractDataHandlerActionTestCase.php
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/AbstractDataHandlerActionTestCase.php
@@ -120,8 +120,6 @@ abstract class AbstractDataHandlerActionTestCase extends \TYPO3\TestingFramework
 
     /**
      * Asserts correct number of warning and error log entries.
-     *
-     * @return void
      */
     protected function assertErrorLogEntries()
     {
diff --git a/typo3/sysext/core/Tests/Functional/Database/DatabaseConnectionTest.php b/typo3/sysext/core/Tests/Functional/Database/DatabaseConnectionTest.php
index fe4f64e77af090457c31d8e8a2a7da1f058a9085..ffa5f212efbcd638e65fc5d04d11515af0730cd3 100644
--- a/typo3/sysext/core/Tests/Functional/Database/DatabaseConnectionTest.php
+++ b/typo3/sysext/core/Tests/Functional/Database/DatabaseConnectionTest.php
@@ -43,8 +43,6 @@ class DatabaseConnectionTest extends \TYPO3\TestingFramework\Core\Functional\Fun
 
     /**
      * Set the test up
-     *
-     * @return void
      */
     protected function setUp()
     {
@@ -62,8 +60,6 @@ class DatabaseConnectionTest extends \TYPO3\TestingFramework\Core\Functional\Fun
 
     /**
      * Tear the test down
-     *
-     * @return void
      */
     protected function tearDown()
     {
@@ -75,7 +71,6 @@ class DatabaseConnectionTest extends \TYPO3\TestingFramework\Core\Functional\Fun
      * @test
      *
      * @group mysql
-     * @return void
      */
     public function selectDbReturnsTrue()
     {
@@ -86,7 +81,6 @@ class DatabaseConnectionTest extends \TYPO3\TestingFramework\Core\Functional\Fun
      * @test
      *
      * @group mysql
-     * @return void
      */
     public function selectDbReturnsFalse()
     {
@@ -102,7 +96,6 @@ class DatabaseConnectionTest extends \TYPO3\TestingFramework\Core\Functional\Fun
      * @test
      *
      * @group mysql
-     * @return void
      */
     public function sqlAffectedRowsReturnsCorrectAmountOfRows()
     {
@@ -114,7 +107,6 @@ class DatabaseConnectionTest extends \TYPO3\TestingFramework\Core\Functional\Fun
      * @test
      *
      * @group mysql
-     * @return void
      */
     public function sqlInsertIdReturnsCorrectId()
     {
@@ -126,7 +118,6 @@ class DatabaseConnectionTest extends \TYPO3\TestingFramework\Core\Functional\Fun
      * @test
      *
      * @group mysql
-     * @return void
      */
     public function noSqlError()
     {
@@ -138,7 +129,6 @@ class DatabaseConnectionTest extends \TYPO3\TestingFramework\Core\Functional\Fun
      * @test
      *
      * @group mysql
-     * @return void
      */
     public function sqlErrorWhenInsertIntoInexistentField()
     {
@@ -150,7 +140,6 @@ class DatabaseConnectionTest extends \TYPO3\TestingFramework\Core\Functional\Fun
      * @test
      *
      * @group mysql
-     * @return void
      */
     public function noSqlErrorCode()
     {
@@ -162,7 +151,6 @@ class DatabaseConnectionTest extends \TYPO3\TestingFramework\Core\Functional\Fun
      * @test
      *
      * @group mysql
-     * @return void
      */
     public function sqlErrorNoWhenInsertIntoInexistentField()
     {
@@ -199,7 +187,6 @@ class DatabaseConnectionTest extends \TYPO3\TestingFramework\Core\Functional\Fun
      * @test
      *
      * @group mysql
-     * @return void
      */
     public function connectDbConnectsToDatabaseWithoutErrors()
     {
@@ -211,7 +198,6 @@ class DatabaseConnectionTest extends \TYPO3\TestingFramework\Core\Functional\Fun
      * @test
      *
      * @group mysql
-     * @return void
      */
     public function disconnectIfConnectedDisconnects()
     {
@@ -273,7 +259,6 @@ class DatabaseConnectionTest extends \TYPO3\TestingFramework\Core\Functional\Fun
      * @param string $expectedResult
      *
      * @group mysql
-     * @return void
      */
     public function fullQuoteStrReturnsQuotedString($values, $expectedResult)
     {
@@ -400,7 +385,6 @@ class DatabaseConnectionTest extends \TYPO3\TestingFramework\Core\Functional\Fun
      * @param string $expectedResult
      *
      * @group mysql
-     * @return void
      */
     public function fullQuoteArrayQuotesArray($values, $expectedResult)
     {
@@ -449,7 +433,6 @@ class DatabaseConnectionTest extends \TYPO3\TestingFramework\Core\Functional\Fun
      * @param string $expectedResult Quoted string we expect
      *
      * @group mysql
-     * @return void
      */
     public function quoteStrQuotesDoubleQuotesCorrectly($string, $expectedResult)
     {
@@ -461,7 +444,6 @@ class DatabaseConnectionTest extends \TYPO3\TestingFramework\Core\Functional\Fun
      * @test
      *
      * @group mysql
-     * @return void
      */
     public function adminQueryReturnsTrueForInsertQuery()
     {
@@ -474,7 +456,6 @@ class DatabaseConnectionTest extends \TYPO3\TestingFramework\Core\Functional\Fun
      * @test
      *
      * @group mysql
-     * @return void
      */
     public function adminQueryReturnsTrueForUpdateQuery()
     {
@@ -491,7 +472,6 @@ class DatabaseConnectionTest extends \TYPO3\TestingFramework\Core\Functional\Fun
      * @test
      *
      * @group mysql
-     * @return void
      */
     public function adminQueryReturnsTrueForDeleteQuery()
     {
@@ -506,7 +486,6 @@ class DatabaseConnectionTest extends \TYPO3\TestingFramework\Core\Functional\Fun
      * @test
      *
      * @group mysql
-     * @return void
      */
     public function adminQueryReturnsResultForSelectQuery()
     {
@@ -523,7 +502,6 @@ class DatabaseConnectionTest extends \TYPO3\TestingFramework\Core\Functional\Fun
      * @test
      *
      * @group mysql
-     * @return void
      */
     public function adminGetCharsetsReturnsArrayWithCharsets()
     {
@@ -541,7 +519,6 @@ class DatabaseConnectionTest extends \TYPO3\TestingFramework\Core\Functional\Fun
      * @test
      *
      * @group mysql
-     * @return void
      */
     public function adminGetKeysReturnIndexKeysOfTable()
     {
@@ -553,7 +530,6 @@ class DatabaseConnectionTest extends \TYPO3\TestingFramework\Core\Functional\Fun
      * @test
      *
      * @group mysql
-     * @return void
      */
     public function adminGetFieldsReturnFieldInformationsForTable()
     {
@@ -566,7 +542,6 @@ class DatabaseConnectionTest extends \TYPO3\TestingFramework\Core\Functional\Fun
      * @test
      *
      * @group mysql
-     * @return void
      */
     public function adminGetTablesReturnAllTablesFromDatabase()
     {
@@ -579,7 +554,6 @@ class DatabaseConnectionTest extends \TYPO3\TestingFramework\Core\Functional\Fun
      * @test
      *
      * @group mysql
-     * @return void
      */
     public function adminGetDbsReturnsAllDatabases()
     {
@@ -623,7 +597,6 @@ class DatabaseConnectionTest extends \TYPO3\TestingFramework\Core\Functional\Fun
      * @param string $expectedResult
      *
      * @group mysql
-     * @return void
      */
     public function sqlNumRowsReturnsCorrectAmountOfRows($sql, $expectedResult)
     {
@@ -642,7 +615,6 @@ class DatabaseConnectionTest extends \TYPO3\TestingFramework\Core\Functional\Fun
      * @test
      *
      * @group mysql
-     * @return void
      */
     public function sqlNumRowsReturnsFalse()
     {
@@ -653,8 +625,6 @@ class DatabaseConnectionTest extends \TYPO3\TestingFramework\Core\Functional\Fun
 
     /**
      * Prepares the test table for the fetch* Tests
-     *
-     * @return void
      */
     protected function prepareTableForFetchTests()
     {
@@ -684,7 +654,6 @@ class DatabaseConnectionTest extends \TYPO3\TestingFramework\Core\Functional\Fun
      * @test
      *
      * @group mysql
-     * @return void
      */
     public function sqlFetchAssocReturnsAssocArray()
     {
@@ -744,7 +713,6 @@ class DatabaseConnectionTest extends \TYPO3\TestingFramework\Core\Functional\Fun
      * @test
      *
      * @group mysql
-     * @return void
      */
     public function sqlFetchRowReturnsNumericArray()
     {
@@ -767,7 +735,6 @@ class DatabaseConnectionTest extends \TYPO3\TestingFramework\Core\Functional\Fun
      * @test
      *
      * @group mysql
-     * @return void
      */
     public function sqlFreeResultReturnsFalseOnFailure()
     {
@@ -782,7 +749,6 @@ class DatabaseConnectionTest extends \TYPO3\TestingFramework\Core\Functional\Fun
      * @test
      *
      * @group mysql
-     * @return void
      */
     public function sqlFreeResultReturnsTrueOnSuccess()
     {
diff --git a/typo3/sysext/core/Tests/Functional/Database/PreparedStatementTest.php b/typo3/sysext/core/Tests/Functional/Database/PreparedStatementTest.php
index cdb5e1610cb72e75cf233ca0e7f2c6fff3518cfa..c47f57c79a00fb751d3e897cd447579dd587cd35 100644
--- a/typo3/sysext/core/Tests/Functional/Database/PreparedStatementTest.php
+++ b/typo3/sysext/core/Tests/Functional/Database/PreparedStatementTest.php
@@ -43,8 +43,6 @@ class PreparedStatementTest extends \TYPO3\TestingFramework\Core\Functional\Func
 
     /**
      * Set the test up
-     *
-     * @return void
      */
     protected function setUp()
     {
@@ -62,8 +60,6 @@ class PreparedStatementTest extends \TYPO3\TestingFramework\Core\Functional\Func
 
     /**
      * Tear the test down
-     *
-     * @return void
      */
     protected function tearDown()
     {
@@ -75,7 +71,6 @@ class PreparedStatementTest extends \TYPO3\TestingFramework\Core\Functional\Func
      * @test
      *
      * @group mysql
-     * @return void
      */
     public function prepareSelectQueryCreateValidQuery()
     {
diff --git a/typo3/sysext/core/Tests/Functional/Database/Schema/SchemaMigratorTest.php b/typo3/sysext/core/Tests/Functional/Database/Schema/SchemaMigratorTest.php
index dad3f54473cdae222e4065464c52243f0fbfd198..3ced4cd5280e7681aeead0df1c4ec5f8d79773e4 100644
--- a/typo3/sysext/core/Tests/Functional/Database/Schema/SchemaMigratorTest.php
+++ b/typo3/sysext/core/Tests/Functional/Database/Schema/SchemaMigratorTest.php
@@ -57,8 +57,6 @@ class SchemaMigratorTest extends \TYPO3\TestingFramework\Core\Functional\Functio
 
     /**
      * Sets up this test suite.
-     *
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Classes/Controller/ContentController.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Classes/Controller/ContentController.php
index c9993258c2ed76c844dab9adf1e495bd0e5cd3ab..3c8aca34e5d55bdd691e6dbc1147d3e3594a6691 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Classes/Controller/ContentController.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Classes/Controller/ContentController.php
@@ -31,7 +31,6 @@ class ContentController extends AbstractController
     protected $defaultViewObjectName = \TYPO3\CMS\Extbase\Mvc\View\JsonView::class;
 
     /**
-     * @return void
      */
     public function listAction()
     {
@@ -42,7 +41,6 @@ class ContentController extends AbstractController
 
     /**
      * @param \OliverHader\IrreTutorial\Domain\Model\Content $content
-     * @return void
      */
     public function showAction(\OliverHader\IrreTutorial\Domain\Model\Content $content)
     {
@@ -53,7 +51,6 @@ class ContentController extends AbstractController
     /**
      * @param \OliverHader\IrreTutorial\Domain\Model\Content $newContent
      * @ignorevalidation $newContent
-     * @return void
      */
     public function newAction(\OliverHader\IrreTutorial\Domain\Model\Content $newContent = null)
     {
@@ -62,7 +59,6 @@ class ContentController extends AbstractController
 
     /**
      * @param \OliverHader\IrreTutorial\Domain\Model\Content $newContent
-     * @return void
      */
     public function createAction(\OliverHader\IrreTutorial\Domain\Model\Content $newContent)
     {
@@ -73,7 +69,6 @@ class ContentController extends AbstractController
     /**
      * @param \OliverHader\IrreTutorial\Domain\Model\Content $content
      * @ignorevalidation $content
-     * @return void
      */
     public function editAction(\OliverHader\IrreTutorial\Domain\Model\Content $content)
     {
@@ -82,7 +77,6 @@ class ContentController extends AbstractController
 
     /**
      * @param \OliverHader\IrreTutorial\Domain\Model\Content $content
-     * @return void
      */
     public function updateAction(\OliverHader\IrreTutorial\Domain\Model\Content $content)
     {
@@ -92,7 +86,6 @@ class ContentController extends AbstractController
 
     /**
      * @param \OliverHader\IrreTutorial\Domain\Model\Content $content
-     * @return void
      */
     public function deleteAction(\OliverHader\IrreTutorial\Domain\Model\Content $content)
     {
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Classes/Controller/QueueController.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Classes/Controller/QueueController.php
index 59223d865d59758a94c5ea2f0c633f2a6a86040b..a28b2ed92073394846a606a8c838a4554dba0a0d 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Classes/Controller/QueueController.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Classes/Controller/QueueController.php
@@ -31,7 +31,6 @@ class QueueController extends AbstractController
     protected $defaultViewObjectName = \TYPO3\CMS\Extbase\Mvc\View\JsonView::class;
 
     /**
-     * @return void
      */
     public function indexAction()
     {
@@ -47,7 +46,6 @@ class QueueController extends AbstractController
     }
 
     /**
-     * @return void
      */
     public function processAction()
     {
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Classes/Domain/Model/Content.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Classes/Domain/Model/Content.php
index 8f6c78dbe7a1bfbf084c0a990a2df7d800d39d56..324fa834cb6888399a7587e56f3558f86fcd483c 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Classes/Domain/Model/Content.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Classes/Domain/Model/Content.php
@@ -47,7 +47,6 @@ class Content extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * @param string $header
-     * @return void
      */
     public function setHeader($header)
     {
@@ -64,7 +63,6 @@ class Content extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * @param \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\OliverHader\IrreTutorial\Domain\Model\Hotel> $hotels
-     * @return void
      */
     public function setHotels(\TYPO3\CMS\Extbase\Persistence\ObjectStorage $hotels)
     {
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Classes/Domain/Model/Hotel.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Classes/Domain/Model/Hotel.php
index e9cb8a04f8ff9afda4ad2381a0bfd87592e068a4..e58227a50b7be2699299c8f86ca4f584cd22e411 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Classes/Domain/Model/Hotel.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Classes/Domain/Model/Hotel.php
@@ -48,7 +48,6 @@ class Hotel extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * @param string $title
-     * @return void
      */
     public function setTitle($title)
     {
@@ -65,7 +64,6 @@ class Hotel extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * @param \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\OliverHader\IrreTutorial\Domain\Model\Offer> $offers
-     * @return void
      */
     public function setOffers(\TYPO3\CMS\Extbase\Persistence\ObjectStorage $offers)
     {
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Classes/Domain/Model/Offer.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Classes/Domain/Model/Offer.php
index fe2586ab64ce3ab62fa8e80f30ad4862e9ddb49a..470d33e787234f770a623f8aac659e792feed874 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Classes/Domain/Model/Offer.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Classes/Domain/Model/Offer.php
@@ -48,7 +48,6 @@ class Offer extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * @param string $title
-     * @return void
      */
     public function setTitle($title)
     {
@@ -65,7 +64,6 @@ class Offer extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * @param \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\OliverHader\IrreTutorial\Domain\Model\Offer> $prices
-     * @return void
      */
     public function setPrices(\TYPO3\CMS\Extbase\Persistence\ObjectStorage $prices)
     {
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Classes/Domain/Model/Price.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Classes/Domain/Model/Price.php
index 23dccd24b9858e66217dadeef836e0bbbdfcfb95..39644f3434f3c2c4d10e3be85252bef06bddcc22 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Classes/Domain/Model/Price.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Classes/Domain/Model/Price.php
@@ -39,7 +39,6 @@ class Price extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * @param string $title
-     * @return void
      */
     public function setTitle($title)
     {
@@ -56,7 +55,6 @@ class Price extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * @param float $price
-     * @return void
      */
     public function setPrice($price)
     {
diff --git a/typo3/sysext/core/Tests/Unit/Authentication/AbstractUserAuthenticationTest.php b/typo3/sysext/core/Tests/Unit/Authentication/AbstractUserAuthenticationTest.php
index 3752e113ffdaaaff3e5f791d86f35e802d2d0ba5..93e8523cb6924fdc6f9afb4346b33ca316516ff6 100644
--- a/typo3/sysext/core/Tests/Unit/Authentication/AbstractUserAuthenticationTest.php
+++ b/typo3/sysext/core/Tests/Unit/Authentication/AbstractUserAuthenticationTest.php
@@ -25,7 +25,6 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 /**
  * Testcase for class \TYPO3\CMS\Core\Authentication\AbstractUserAuthentication
- *
  */
 class AbstractUserAuthenticationTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 {
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Backend/ApcBackendTest.php b/typo3/sysext/core/Tests/Unit/Cache/Backend/ApcBackendTest.php
index f419a12017cf8184513581e49eb52278bc40c75d..6ca51a33de6345919a239ac295fcba5d8096bfc0 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/Backend/ApcBackendTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/Backend/ApcBackendTest.php
@@ -28,8 +28,6 @@ class ApcBackendTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Sets up this testcase
-     *
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Backend/ApcuBackendTest.php b/typo3/sysext/core/Tests/Unit/Cache/Backend/ApcuBackendTest.php
index 396660c4b55e77f38103fe4f6c2c77f7940f890a..bf9b55b2a5bd749d540bbd73fb4125193bf147c9 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/Backend/ApcuBackendTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/Backend/ApcuBackendTest.php
@@ -30,8 +30,6 @@ class ApcuBackendTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Set up
-     *
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Backend/FileBackendTest.php b/typo3/sysext/core/Tests/Unit/Cache/Backend/FileBackendTest.php
index d0226e9a7842988731ba4c3f061167af8f0e44f8..0282b76cc6dbd8eea697006f748e58de91f822bb 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/Backend/FileBackendTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/Backend/FileBackendTest.php
@@ -28,8 +28,6 @@ class FileBackendTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Sets up this testcase
-     *
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Backend/MemcachedBackendTest.php b/typo3/sysext/core/Tests/Unit/Cache/Backend/MemcachedBackendTest.php
index df3ed4e314b15d0ceced3bcc02fbb1b5091a0a61..2fa908a724c8be4509057f9bbb16a925028ab20d 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/Backend/MemcachedBackendTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/Backend/MemcachedBackendTest.php
@@ -25,8 +25,6 @@ class MemcachedBackendTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCas
 {
     /**
      * Sets up this testcase
-     *
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Backend/MockBackend.php b/typo3/sysext/core/Tests/Unit/Cache/Backend/MockBackend.php
index 73dafcdeec25e879b633c52c3e4d8f1180651210..9b19fbb3241ea76f8263f79d9d6a1c6eace69941 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/Backend/MockBackend.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/Backend/MockBackend.php
@@ -31,7 +31,6 @@ class MockBackend extends \TYPO3\CMS\Core\Cache\Backend\NullBackend
      * Sets some option
      *
      * @param mixed $value
-     * @return void
      */
     public function setSomeOption($value)
     {
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Backend/RedisBackendTest.php b/typo3/sysext/core/Tests/Unit/Cache/Backend/RedisBackendTest.php
index 22b5139e06cae9ab52ea7e5e161510503615b7a8..1ec56154b0404f7a7561af9ea852091fccc1b19e 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/Backend/RedisBackendTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/Backend/RedisBackendTest.php
@@ -63,7 +63,6 @@ class RedisBackendTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 
     /**
      * Sets up the redis backend used for testing
-     *
      */
     protected function setUpBackend(array $backendOptions = [])
     {
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Backend/WincacheBackendTest.php b/typo3/sysext/core/Tests/Unit/Cache/Backend/WincacheBackendTest.php
index 9de35a0b2c297a29d4cf63ca2d8aa745b70b611f..fea5fa491a29e394698f8fc3b0712cd5470e44a8 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/Backend/WincacheBackendTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/Backend/WincacheBackendTest.php
@@ -23,8 +23,6 @@ class WincacheBackendTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Sets up this testcase
-     *
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/core/Tests/Unit/Category/Collection/CategoryCollectionTest.php b/typo3/sysext/core/Tests/Unit/Category/Collection/CategoryCollectionTest.php
index 3cd0686703b220a6b81177ee0a3747387a6cdd93..133834ee0f079b8a1b5f0d98f5542a87e3969220 100644
--- a/typo3/sysext/core/Tests/Unit/Category/Collection/CategoryCollectionTest.php
+++ b/typo3/sysext/core/Tests/Unit/Category/Collection/CategoryCollectionTest.php
@@ -23,7 +23,6 @@ class CategoryCollectionTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestC
     /**
      * @test
      * @covers \TYPO3\CMS\Core\Category\Collection\CategoryCollection::__construct
-     * @return void
      */
     public function missingTableNameArgumentForObjectCategoryCollection()
     {
diff --git a/typo3/sysext/core/Tests/Unit/Configuration/TypoScript/ConditionMatching/Fixtures/GeneralUtilityFixture.php b/typo3/sysext/core/Tests/Unit/Configuration/TypoScript/ConditionMatching/Fixtures/GeneralUtilityFixture.php
index 392b94846b5cc45c127c46c8551d2e0510c1e2e4..fec5ccc15713a01e413798ff76b57dc3e3c3aedd 100644
--- a/typo3/sysext/core/Tests/Unit/Configuration/TypoScript/ConditionMatching/Fixtures/GeneralUtilityFixture.php
+++ b/typo3/sysext/core/Tests/Unit/Configuration/TypoScript/ConditionMatching/Fixtures/GeneralUtilityFixture.php
@@ -21,7 +21,6 @@ class GeneralUtilityFixture extends \TYPO3\CMS\Core\Utility\GeneralUtility
 {
     /**
      * @param \TYPO3\CMS\Core\Core\ApplicationContext $applicationContext
-     * @return void
      */
     public static function setApplicationContext($applicationContext)
     {
diff --git a/typo3/sysext/core/Tests/Unit/Core/SystemEnvironmentBuilderTest.php b/typo3/sysext/core/Tests/Unit/Core/SystemEnvironmentBuilderTest.php
index f19759e80df25ec97b682367f0b781faeb6e56a1..8e3277af368944fe33744f3d9c6c1cd6c55bb4e7 100644
--- a/typo3/sysext/core/Tests/Unit/Core/SystemEnvironmentBuilderTest.php
+++ b/typo3/sysext/core/Tests/Unit/Core/SystemEnvironmentBuilderTest.php
@@ -26,8 +26,6 @@ class SystemEnvironmentBuilderTest extends \TYPO3\TestingFramework\Core\Unit\Uni
 
     /**
      * Set up testcase
-     *
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/core/Tests/Unit/Database/ConnectionTest.php b/typo3/sysext/core/Tests/Unit/Database/ConnectionTest.php
index bc7e77350bca83bc4d61414fb9495e336c967933..abe8df26445dccf1a6fb0da4f50de4789dcbf89b 100644
--- a/typo3/sysext/core/Tests/Unit/Database/ConnectionTest.php
+++ b/typo3/sysext/core/Tests/Unit/Database/ConnectionTest.php
@@ -26,7 +26,6 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 /**
  * Test case
- *
  */
 class ConnectionTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 {
@@ -47,8 +46,6 @@ class ConnectionTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 
     /**
      * Create a new database connection mock object for every test.
-     *
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/core/Tests/Unit/Database/DatabaseConnectionTest.php b/typo3/sysext/core/Tests/Unit/Database/DatabaseConnectionTest.php
index 14bb52d5ac7c204e61005b2438c32caddd41790b..69fccbc2840675cd253998ee6cc74adf5961dc8e 100644
--- a/typo3/sysext/core/Tests/Unit/Database/DatabaseConnectionTest.php
+++ b/typo3/sysext/core/Tests/Unit/Database/DatabaseConnectionTest.php
@@ -20,7 +20,6 @@ use TYPO3\TestingFramework\Core\AccessibleObjectInterface;
 
 /**
  * Test case
- *
  */
 class DatabaseConnectionTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 {
@@ -45,8 +44,6 @@ class DatabaseConnectionTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestC
 
     /**
      * Set the test up
-     *
-     * @return void
      */
     protected function setUp()
     {
@@ -316,7 +313,6 @@ class DatabaseConnectionTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestC
      * @dataProvider stripOrderByForOrderByKeywordDataProvider
      * @param string $orderByClause The clause to test
      * @param string $expectedResult The expected result
-     * @return void
      */
     public function stripOrderByForOrderByKeyword($orderByClause, $expectedResult)
     {
@@ -386,7 +382,6 @@ class DatabaseConnectionTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestC
      * @dataProvider stripGroupByForGroupByKeywordDataProvider
      * @param string $groupByClause The clause to test
      * @param string $expectedResult The expected result
-     * @return void
      */
     public function stripGroupByForGroupByKeyword($groupByClause, $expectedResult)
     {
@@ -466,7 +461,6 @@ class DatabaseConnectionTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestC
      * @dataProvider cleanIntArrayDataProvider
      * @param array $exampleData The array to sanitize
      * @param array $expectedResult The expected result
-     * @return void
      */
     public function cleanIntArray($exampleData, $expectedResult)
     {
@@ -476,8 +470,6 @@ class DatabaseConnectionTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestC
 
     /**
      * @test
-     *
-     * @return void
      */
     public function cleanIntListReturnsCleanedString()
     {
@@ -601,8 +593,6 @@ class DatabaseConnectionTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestC
 
     /**
      * @test
-     *
-     * @return void
      */
     public function insertQueryCreateValidQuery()
     {
@@ -621,8 +611,6 @@ class DatabaseConnectionTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestC
 
     /**
      * @test
-     *
-     * @return void
      */
     public function insertQueryCreateValidQueryFromMultipleValues()
     {
@@ -644,8 +632,6 @@ class DatabaseConnectionTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestC
 
     /**
      * @test
-     *
-     * @return void
      */
     public function insertMultipleRowsCreateValidQuery()
     {
@@ -669,8 +655,6 @@ class DatabaseConnectionTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestC
 
     /**
      * @test
-     *
-     * @return void
      */
     public function updateQueryCreateValidQuery()
     {
@@ -689,8 +673,6 @@ class DatabaseConnectionTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestC
 
     /**
      * @test
-     *
-     * @return void
      */
     public function deleteQueryCreateValidQuery()
     {
@@ -701,8 +683,6 @@ class DatabaseConnectionTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestC
 
     /**
      * @test
-     *
-     * @return void
      */
     public function selectQueryCreateValidQuery()
     {
@@ -713,8 +693,6 @@ class DatabaseConnectionTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestC
 
     /**
      * @test
-     *
-     * @return void
      */
     public function selectQueryCreateValidQueryWithEmptyWhereClause()
     {
@@ -725,8 +703,6 @@ class DatabaseConnectionTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestC
 
     /**
      * @test
-     *
-     * @return void
      */
     public function selectQueryCreateValidQueryWithGroupByClause()
     {
@@ -737,8 +713,6 @@ class DatabaseConnectionTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestC
 
     /**
      * @test
-     *
-     * @return void
      */
     public function selectQueryCreateValidQueryWithOrderByClause()
     {
@@ -749,8 +723,6 @@ class DatabaseConnectionTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestC
 
     /**
      * @test
-     *
-     * @return void
      */
     public function selectQueryCreateValidQueryWithLimitClause()
     {
@@ -761,8 +733,6 @@ class DatabaseConnectionTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestC
 
     /**
      * @test
-     *
-     * @return void
      */
     public function selectSubQueryCreateValidQuery()
     {
@@ -773,8 +743,6 @@ class DatabaseConnectionTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestC
 
     /**
      * @test
-     *
-     * @return void
      */
     public function truncateQueryCreateValidQuery()
     {
diff --git a/typo3/sysext/core/Tests/Unit/Database/Mocks/MockPlatform.php b/typo3/sysext/core/Tests/Unit/Database/Mocks/MockPlatform.php
index 477491a475515cd85112b3e918ae5ceda9c01393..b4ec2dec922cb285a7510b6fc6b37fd343d9f5d6 100644
--- a/typo3/sysext/core/Tests/Unit/Database/Mocks/MockPlatform.php
+++ b/typo3/sysext/core/Tests/Unit/Database/Mocks/MockPlatform.php
@@ -159,8 +159,6 @@ class MockPlatform extends AbstractPlatform
 
     /**
      * Lazy load Doctrine Type Mappings.
-     *
-     * @return void
      */
     protected function initializeDoctrineTypeMappings()
     {
diff --git a/typo3/sysext/core/Tests/Unit/Database/PreparedStatementTest.php b/typo3/sysext/core/Tests/Unit/Database/PreparedStatementTest.php
index 834695911aa6f2816d39a53599873d16e66c0e33..8f79ef4cfd53ba7db09eaabccb6574334f9ea599 100644
--- a/typo3/sysext/core/Tests/Unit/Database/PreparedStatementTest.php
+++ b/typo3/sysext/core/Tests/Unit/Database/PreparedStatementTest.php
@@ -30,8 +30,6 @@ class PreparedStatementTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCa
     /**
      * Create a new database mock object for every test
      * and backup the original global database object.
-     *
-     * @return void
      */
     protected function setUp()
     {
@@ -77,7 +75,6 @@ class PreparedStatementTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCa
 
     /**
      * @test
-     * @return void
      */
     public function setUpAndReturnDatabaseStubReturnsMockObjectOfDatabaseConnection()
     {
@@ -86,7 +83,6 @@ class PreparedStatementTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCa
 
     /**
      * @test
-     * @return void
      */
     public function createPreparedStatementReturnsInstanceOfPreparedStatementClass()
     {
@@ -143,7 +139,6 @@ class PreparedStatementTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCa
      * @param string $query Query with unreplaced markers
      * @param array  $parameters Array of parameters to be replaced in the query
      * @param string $expectedResult Query with all markers replaced
-     * @return void
      */
     public function parametersAreReplacedByQuestionMarkInQueryByCallingExecute($query, $parameters, $expectedResult)
     {
@@ -163,7 +158,6 @@ class PreparedStatementTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCa
      * @param string $query Query with unreplaced markers
      * @param array  $parameters Array of parameters to be replaced in the query
      * @param string $expectedResult Query with all markers replaced
-     * @return void
      */
     public function parametersAreReplacedInQueryWhenBoundWithBindValues($query, $parameters, $expectedResult)
     {
@@ -241,7 +235,6 @@ class PreparedStatementTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCa
      * @param mixed $parameter Parameter to be replaced in the query
      * @param int $type Type of the parameter value
      * @param int $exceptionCode Expected exception code
-     * @return void
      */
     public function invalidParameterTypesPassedToBindValueThrowsException($parameter, $type, $exceptionCode)
     {
@@ -296,7 +289,6 @@ class PreparedStatementTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCa
      * @dataProvider passingInvalidMarkersThrowsExceptionDataProvider
      * @param string $query Query with unreplaced markers
      * @param array  $parameters Array of parameters to be replaced in the query
-     * @return void
      */
     public function passingInvalidMarkersThrowsException($query, $parameters)
     {
diff --git a/typo3/sysext/core/Tests/Unit/Database/Query/BulkInsertTest.php b/typo3/sysext/core/Tests/Unit/Database/Query/BulkInsertTest.php
index af4652e1aaa185c75bacdc4ed5ed3ee41528e9ae..11fb4e0a87af073672bf14076f40819187660fbd 100644
--- a/typo3/sysext/core/Tests/Unit/Database/Query/BulkInsertTest.php
+++ b/typo3/sysext/core/Tests/Unit/Database/Query/BulkInsertTest.php
@@ -38,8 +38,6 @@ class BulkInsertTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 
     /**
      * Create a new database connection mock object for every test.
-     *
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/core/Tests/Unit/Database/Query/Expression/ExpressionBuilderTest.php b/typo3/sysext/core/Tests/Unit/Database/Query/Expression/ExpressionBuilderTest.php
index 4926d90b5db05e00a03de745bf7379162ad4e7c0..11961722b62c9d243b60866ff1bff8a3694c7a12 100644
--- a/typo3/sysext/core/Tests/Unit/Database/Query/Expression/ExpressionBuilderTest.php
+++ b/typo3/sysext/core/Tests/Unit/Database/Query/Expression/ExpressionBuilderTest.php
@@ -42,8 +42,6 @@ class ExpressionBuilderTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCa
 
     /**
      * Create a new database connection mock object for every test.
-     *
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/core/Tests/Unit/Database/Query/QueryBuilderTest.php b/typo3/sysext/core/Tests/Unit/Database/Query/QueryBuilderTest.php
index e0bc76b4fa986fee6612affa9d17ad735350b3f6..4e0ed0f86fc47ae85960daf757218bd7be89f989 100644
--- a/typo3/sysext/core/Tests/Unit/Database/Query/QueryBuilderTest.php
+++ b/typo3/sysext/core/Tests/Unit/Database/Query/QueryBuilderTest.php
@@ -47,8 +47,6 @@ class QueryBuilderTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 
     /**
      * Create a new database connection mock object for every test.
-     *
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/core/Tests/Unit/Database/Query/Restriction/BackendWorkspaceRestrictionTest.php b/typo3/sysext/core/Tests/Unit/Database/Query/Restriction/BackendWorkspaceRestrictionTest.php
index bdcf311f826867cdfb2945e49f48989b0750e123..e5ebc7a2dea80798ce17fe608de375ba61463832 100644
--- a/typo3/sysext/core/Tests/Unit/Database/Query/Restriction/BackendWorkspaceRestrictionTest.php
+++ b/typo3/sysext/core/Tests/Unit/Database/Query/Restriction/BackendWorkspaceRestrictionTest.php
@@ -20,7 +20,6 @@ use TYPO3\CMS\Core\Database\Query\Restriction\BackendWorkspaceRestriction;
 class BackendWorkspaceRestrictionTest extends AbstractRestrictionTestCase
 {
     /**
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/core/Tests/Unit/Database/Query/Restriction/DefaultRestrictionContainerTest.php b/typo3/sysext/core/Tests/Unit/Database/Query/Restriction/DefaultRestrictionContainerTest.php
index cad43a7a7decab4f07434947514b5cf73c57d90b..f9b3a9ceb91a5e4863d09f0564ba094d1e3f0232 100644
--- a/typo3/sysext/core/Tests/Unit/Database/Query/Restriction/DefaultRestrictionContainerTest.php
+++ b/typo3/sysext/core/Tests/Unit/Database/Query/Restriction/DefaultRestrictionContainerTest.php
@@ -20,7 +20,6 @@ use TYPO3\CMS\Core\Database\Query\Restriction\DefaultRestrictionContainer;
 class DefaultRestrictionContainerTest extends AbstractRestrictionTestCase
 {
     /**
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/core/Tests/Unit/Database/Query/Restriction/DeletedRestrictionTest.php b/typo3/sysext/core/Tests/Unit/Database/Query/Restriction/DeletedRestrictionTest.php
index f7ed4a4a5daa897570f8d531622306ff65e770e4..aaad5c83261759cd371da5efd072a0e77c4dd8c6 100644
--- a/typo3/sysext/core/Tests/Unit/Database/Query/Restriction/DeletedRestrictionTest.php
+++ b/typo3/sysext/core/Tests/Unit/Database/Query/Restriction/DeletedRestrictionTest.php
@@ -20,7 +20,6 @@ use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
 class DeletedRestrictionTest extends AbstractRestrictionTestCase
 {
     /**
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/core/Tests/Unit/Database/Query/Restriction/EndTimeRestrictionTest.php b/typo3/sysext/core/Tests/Unit/Database/Query/Restriction/EndTimeRestrictionTest.php
index 24e65ebadf313467c296bcc0446b55373482e87b..1e43667127abd890bde7584e684fae58a65a3d8a 100644
--- a/typo3/sysext/core/Tests/Unit/Database/Query/Restriction/EndTimeRestrictionTest.php
+++ b/typo3/sysext/core/Tests/Unit/Database/Query/Restriction/EndTimeRestrictionTest.php
@@ -20,7 +20,6 @@ use TYPO3\CMS\Core\Database\Query\Restriction\EndTimeRestriction;
 class EndTimeRestrictionTest extends AbstractRestrictionTestCase
 {
     /**
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/core/Tests/Unit/Database/Query/Restriction/FrontendGroupRestrictionTest.php b/typo3/sysext/core/Tests/Unit/Database/Query/Restriction/FrontendGroupRestrictionTest.php
index 410d7b9ae8890db6e78bfb2e5c748a17d3de0e81..e460f970c0ccd05e61804eddb858bd9863e5a986 100644
--- a/typo3/sysext/core/Tests/Unit/Database/Query/Restriction/FrontendGroupRestrictionTest.php
+++ b/typo3/sysext/core/Tests/Unit/Database/Query/Restriction/FrontendGroupRestrictionTest.php
@@ -20,7 +20,6 @@ use TYPO3\CMS\Core\Database\Query\Restriction\FrontendGroupRestriction;
 class FrontendGroupRestrictionTest extends AbstractRestrictionTestCase
 {
     /**
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/core/Tests/Unit/Database/Query/Restriction/FrontendRestrictionContainerTest.php b/typo3/sysext/core/Tests/Unit/Database/Query/Restriction/FrontendRestrictionContainerTest.php
index 09ae82aecf45e1abaf0d203657629fd9e0f63799..82d8842e07acca88030ce716d02782a79184ebe9 100644
--- a/typo3/sysext/core/Tests/Unit/Database/Query/Restriction/FrontendRestrictionContainerTest.php
+++ b/typo3/sysext/core/Tests/Unit/Database/Query/Restriction/FrontendRestrictionContainerTest.php
@@ -21,7 +21,6 @@ use TYPO3\CMS\Frontend\Page\PageRepository;
 class FrontendRestrictionContainerTest extends AbstractRestrictionTestCase
 {
     /**
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/core/Tests/Unit/Database/Query/Restriction/FrontendWorkspaceRestrictionTest.php b/typo3/sysext/core/Tests/Unit/Database/Query/Restriction/FrontendWorkspaceRestrictionTest.php
index 5d54d866dcdab4cb221b59e6164434282222bd3b..8b31d7d1ed3b4bda04c68bd2d2f14d3a78aa6b52 100644
--- a/typo3/sysext/core/Tests/Unit/Database/Query/Restriction/FrontendWorkspaceRestrictionTest.php
+++ b/typo3/sysext/core/Tests/Unit/Database/Query/Restriction/FrontendWorkspaceRestrictionTest.php
@@ -21,7 +21,6 @@ use TYPO3\CMS\Frontend\Page\PageRepository;
 class FrontendWorkspaceRestrictionTest extends AbstractRestrictionTestCase
 {
     /**
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/core/Tests/Unit/Database/Query/Restriction/HiddenRestrictionTest.php b/typo3/sysext/core/Tests/Unit/Database/Query/Restriction/HiddenRestrictionTest.php
index 2815cfa746dd6511e878b174ccd9d350d881a981..111fb51bc99bd17e97f5c000934cd616649cbb01 100644
--- a/typo3/sysext/core/Tests/Unit/Database/Query/Restriction/HiddenRestrictionTest.php
+++ b/typo3/sysext/core/Tests/Unit/Database/Query/Restriction/HiddenRestrictionTest.php
@@ -20,7 +20,6 @@ use TYPO3\CMS\Core\Database\Query\Restriction\HiddenRestriction;
 class HiddenRestrictionTest extends AbstractRestrictionTestCase
 {
     /**
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/core/Tests/Unit/Database/Query/Restriction/StartTimeRestrictionTest.php b/typo3/sysext/core/Tests/Unit/Database/Query/Restriction/StartTimeRestrictionTest.php
index b4628606d659462363b3dfdb41e1808270491b21..10bcb05413854291e23618d0fc7548684a9fc723 100644
--- a/typo3/sysext/core/Tests/Unit/Database/Query/Restriction/StartTimeRestrictionTest.php
+++ b/typo3/sysext/core/Tests/Unit/Database/Query/Restriction/StartTimeRestrictionTest.php
@@ -20,7 +20,6 @@ use TYPO3\CMS\Core\Database\Query\Restriction\StartTimeRestriction;
 class StartTimeRestrictionTest extends AbstractRestrictionTestCase
 {
     /**
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/core/Tests/Unit/Database/RelationHandlerTest.php b/typo3/sysext/core/Tests/Unit/Database/RelationHandlerTest.php
index 3cc8d403d0b85c5fc58a54c23e241cd08c0bf0c2..c7377d05c2d5e64039bcd3039612ab378e645871 100644
--- a/typo3/sysext/core/Tests/Unit/Database/RelationHandlerTest.php
+++ b/typo3/sysext/core/Tests/Unit/Database/RelationHandlerTest.php
@@ -25,7 +25,6 @@ class RelationHandlerTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
     protected $subject;
 
     /**
-     * @return void
      */
     protected function setUp()
     {
@@ -35,7 +34,6 @@ class RelationHandlerTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
     }
 
     /**
-     * @return void
      */
     protected function tearDown()
     {
diff --git a/typo3/sysext/core/Tests/Unit/FormProtection/Fixtures/FormProtectionTesting.php b/typo3/sysext/core/Tests/Unit/FormProtection/Fixtures/FormProtectionTesting.php
index 6e34d2950687b1c63535d7193ef45adef199dc74..072e3115510cde6e0b8d5ef2128ac245136faeb3 100644
--- a/typo3/sysext/core/Tests/Unit/FormProtection/Fixtures/FormProtectionTesting.php
+++ b/typo3/sysext/core/Tests/Unit/FormProtection/Fixtures/FormProtectionTesting.php
@@ -35,8 +35,6 @@ class FormProtectionTesting extends \TYPO3\CMS\Core\FormProtection\AbstractFormP
     /**
      * Saves the tokens so that they can be used by a later incarnation of this
      * class.
-     *
-     * @return void
      */
     public function persistSessionToken()
     {
diff --git a/typo3/sysext/core/Tests/Unit/Imaging/DimensionTest.php b/typo3/sysext/core/Tests/Unit/Imaging/DimensionTest.php
index 463acb3317b59821dbd0c8783ee4ed1701cbcf62..f2db8817f9996f3e8d175310f28aa621edebd9fd 100644
--- a/typo3/sysext/core/Tests/Unit/Imaging/DimensionTest.php
+++ b/typo3/sysext/core/Tests/Unit/Imaging/DimensionTest.php
@@ -38,8 +38,6 @@ class DimensionTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 
     /**
      * Set up
-     *
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/core/Tests/Unit/Imaging/GraphicalFunctionsTest.php b/typo3/sysext/core/Tests/Unit/Imaging/GraphicalFunctionsTest.php
index c6ed64ed78d66477f8e820bcc2340fe451fc50c6..fbda54f43a4a0a59f3ec6030739ca24515727e93 100644
--- a/typo3/sysext/core/Tests/Unit/Imaging/GraphicalFunctionsTest.php
+++ b/typo3/sysext/core/Tests/Unit/Imaging/GraphicalFunctionsTest.php
@@ -26,8 +26,6 @@ class GraphicalFunctionsTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestC
 
     /**
      * Set up
-     *
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/core/Tests/Unit/Imaging/IconFactoryTest.php b/typo3/sysext/core/Tests/Unit/Imaging/IconFactoryTest.php
index 4d9b924b8b37ea1ac472bda20c5f0f4479fef2a5..ad9c041eebc2c573effbaf478d8ad5973346ebde 100644
--- a/typo3/sysext/core/Tests/Unit/Imaging/IconFactoryTest.php
+++ b/typo3/sysext/core/Tests/Unit/Imaging/IconFactoryTest.php
@@ -74,8 +74,6 @@ class IconFactoryTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 
     /**
      * Set up
-     *
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/core/Tests/Unit/Imaging/IconProvider/BitmapIconProviderTest.php b/typo3/sysext/core/Tests/Unit/Imaging/IconProvider/BitmapIconProviderTest.php
index c0a64664fdb770f19988689f94982920904361a0..7f7a46764c846e331172ec80ddd521a84a73e5f2 100644
--- a/typo3/sysext/core/Tests/Unit/Imaging/IconProvider/BitmapIconProviderTest.php
+++ b/typo3/sysext/core/Tests/Unit/Imaging/IconProvider/BitmapIconProviderTest.php
@@ -34,8 +34,6 @@ class BitmapIconProviderTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestC
 
     /**
      * Set up
-     *
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/core/Tests/Unit/Imaging/IconProvider/FontawesomeIconProviderTest.php b/typo3/sysext/core/Tests/Unit/Imaging/IconProvider/FontawesomeIconProviderTest.php
index 671bbd5b8ad6e29b97ce8ae47345c0c5bc75f9c6..8173ec9717e16d7591b12533664a20fc79a44739 100644
--- a/typo3/sysext/core/Tests/Unit/Imaging/IconProvider/FontawesomeIconProviderTest.php
+++ b/typo3/sysext/core/Tests/Unit/Imaging/IconProvider/FontawesomeIconProviderTest.php
@@ -34,8 +34,6 @@ class FontawesomeIconProviderTest extends \TYPO3\TestingFramework\Core\Unit\Unit
 
     /**
      * Set up
-     *
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/core/Tests/Unit/Imaging/IconProvider/SvgIconProviderTest.php b/typo3/sysext/core/Tests/Unit/Imaging/IconProvider/SvgIconProviderTest.php
index 7da9212f00766e0cc8b8aeee41b322d37e934a58..101b32063a0d05f22c6994b60d1201b1a97cb3b3 100644
--- a/typo3/sysext/core/Tests/Unit/Imaging/IconProvider/SvgIconProviderTest.php
+++ b/typo3/sysext/core/Tests/Unit/Imaging/IconProvider/SvgIconProviderTest.php
@@ -40,8 +40,6 @@ class SvgIconProviderTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 
     /**
      * Set up
-     *
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/core/Tests/Unit/Imaging/IconRegistryTest.php b/typo3/sysext/core/Tests/Unit/Imaging/IconRegistryTest.php
index 1d54e75e389f53e993a8362efa2801caf8e01510..169ce32baaf80b7ea8d360c07c80448c0e387a2f 100644
--- a/typo3/sysext/core/Tests/Unit/Imaging/IconRegistryTest.php
+++ b/typo3/sysext/core/Tests/Unit/Imaging/IconRegistryTest.php
@@ -35,8 +35,6 @@ class IconRegistryTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 
     /**
      * Set up
-     *
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/core/Tests/Unit/Imaging/IconTest.php b/typo3/sysext/core/Tests/Unit/Imaging/IconTest.php
index 96de43ed0a58eb51e0bc96141c31fbed9821ba9d..1cc71689133d6642be01229d33f11e83d743da04 100644
--- a/typo3/sysext/core/Tests/Unit/Imaging/IconTest.php
+++ b/typo3/sysext/core/Tests/Unit/Imaging/IconTest.php
@@ -40,8 +40,6 @@ class IconTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 
     /**
      * Set up
-     *
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/core/Tests/Unit/Locking/Fixtures/DummyLock.php b/typo3/sysext/core/Tests/Unit/Locking/Fixtures/DummyLock.php
index c83f6e262f30ec701e27e29236955c365f0e9222..c6f70252f09c73dadae24d77284970f5ca34fb60 100644
--- a/typo3/sysext/core/Tests/Unit/Locking/Fixtures/DummyLock.php
+++ b/typo3/sysext/core/Tests/Unit/Locking/Fixtures/DummyLock.php
@@ -77,8 +77,6 @@ class DummyLock implements LockingStrategyInterface
 
     /**
      * Destroys the resource associated with the lock
-     *
-     * @return void
      */
     public function destroy()
     {
diff --git a/typo3/sysext/core/Tests/Unit/Package/PackageManagerTest.php b/typo3/sysext/core/Tests/Unit/Package/PackageManagerTest.php
index 426fe80b51bca31623cc9c92ebb027867a9154ba..bcc9816cf6f68b17739ede627ef7f339c0eb06d9 100644
--- a/typo3/sysext/core/Tests/Unit/Package/PackageManagerTest.php
+++ b/typo3/sysext/core/Tests/Unit/Package/PackageManagerTest.php
@@ -22,7 +22,6 @@ use TYPO3\CMS\Core\Package\PackageManager;
 
 /**
  * Testcase for the default package manager
- *
  */
 class PackageManagerTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 {
@@ -33,7 +32,6 @@ class PackageManagerTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 
     /**
      * Sets up this test case
-     *
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/core/Tests/Unit/Package/PackageTest.php b/typo3/sysext/core/Tests/Unit/Package/PackageTest.php
index c2073b1dddcdae374ae338d3ce016257abb45fdf..3330e84282f8a5ca09661d3be6d5deab8da3e22b 100644
--- a/typo3/sysext/core/Tests/Unit/Package/PackageTest.php
+++ b/typo3/sysext/core/Tests/Unit/Package/PackageTest.php
@@ -19,7 +19,6 @@ use TYPO3\CMS\Core\Package\PackageManager;
 
 /**
  * Testcase for the package class
- *
  */
 class PackageTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 {
diff --git a/typo3/sysext/core/Tests/Unit/Resource/BaseTestCase.php b/typo3/sysext/core/Tests/Unit/Resource/BaseTestCase.php
index dde31bcd845be524980b744ad008f4997e4d51b0..5d45e70b3c140b720de6f56fed25ca2d6906101e 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/BaseTestCase.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/BaseTestCase.php
@@ -61,7 +61,6 @@ abstract class BaseTestCase extends \TYPO3\TestingFramework\Core\Unit\UnitTestCa
      * Adds the given directory structure to the mount folder in the VFS. Existing files will be overwritten!
      *
      * @param array $dirStructure
-     * @return void
      */
     protected function addToMount(array $dirStructure)
     {
@@ -83,7 +82,6 @@ abstract class BaseTestCase extends \TYPO3\TestingFramework\Core\Unit\UnitTestCa
      * Adds the given directory structure to the VFS. Existing files will be overwritten!
      *
      * @param array $dirStructure
-     * @return void
      */
     protected function addToVfs(array $dirStructure)
     {
diff --git a/typo3/sysext/core/Tests/Unit/Resource/Driver/AbstractDriverTest.php b/typo3/sysext/core/Tests/Unit/Resource/Driver/AbstractDriverTest.php
index af2ee506c78747ec47974ff73ebb2439ce9fe404..c9b51de4d38a819be1beeb04cd96fdf640a15e9c 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/Driver/AbstractDriverTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/Driver/AbstractDriverTest.php
@@ -16,7 +16,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Resource\Driver;
 
 /**
  * Test case for the abstract driver.
- *
  */
 class AbstractDriverTest extends \TYPO3\CMS\Core\Tests\Unit\Resource\BaseTestCase
 {
diff --git a/typo3/sysext/core/Tests/Unit/Resource/FileReferenceTest.php b/typo3/sysext/core/Tests/Unit/Resource/FileReferenceTest.php
index 4fb1aa55d004d1b7bcd58b4ef7d70f3a14afd4f2..6e05de83ecf50256d94118a8e5a402c57c438389 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/FileReferenceTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/FileReferenceTest.php
@@ -16,7 +16,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Resource;
 
 /**
  * Testcase for the file class of the TYPO3 FAL
- *
  */
 class FileReferenceTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 {
diff --git a/typo3/sysext/core/Tests/Unit/Tree/TableConfiguration/DatabaseTreeDataProviderTest.php b/typo3/sysext/core/Tests/Unit/Tree/TableConfiguration/DatabaseTreeDataProviderTest.php
index 7abc46b88bb8e7f0ba175ebad6266af788ef3c4c..8d70724e5a4887f41200c265873acb37b8c44869 100644
--- a/typo3/sysext/core/Tests/Unit/Tree/TableConfiguration/DatabaseTreeDataProviderTest.php
+++ b/typo3/sysext/core/Tests/Unit/Tree/TableConfiguration/DatabaseTreeDataProviderTest.php
@@ -48,8 +48,6 @@ class DatabaseTreeDataProviderTest extends \TYPO3\TestingFramework\Core\Unit\Uni
 
     /**
      * Set up
-     *
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/core/Tests/Unit/TypoScript/Parser/TypoScriptParserTest.php b/typo3/sysext/core/Tests/Unit/TypoScript/Parser/TypoScriptParserTest.php
index 34ef48cfef523a4565a8728822a77b965bd1f909..2e72196583a1deecbdeace85b09a001a8881f602 100644
--- a/typo3/sysext/core/Tests/Unit/TypoScript/Parser/TypoScriptParserTest.php
+++ b/typo3/sysext/core/Tests/Unit/TypoScript/Parser/TypoScriptParserTest.php
@@ -28,8 +28,6 @@ class TypoScriptParserTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCas
 
     /**
      * Set up
-     *
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/core/Tests/Unit/ViewHelpers/IconForRecordViewHelperTest.php b/typo3/sysext/core/Tests/Unit/ViewHelpers/IconForRecordViewHelperTest.php
index a18f93cc953ad48b2445d48e00cebd73d23982b1..ea061e3c7a09a24d9e7900e408ef210fe322ef91 100644
--- a/typo3/sysext/core/Tests/Unit/ViewHelpers/IconForRecordViewHelperTest.php
+++ b/typo3/sysext/core/Tests/Unit/ViewHelpers/IconForRecordViewHelperTest.php
@@ -56,7 +56,6 @@ class IconForRecordViewHelperTest extends ViewHelperBaseTestcase
 
     /**
      * @test
-     * @return void
      */
     public function renderRendersIconByWayOfTheIconFactoryAccordingToGivenArguments()
     {
diff --git a/typo3/sysext/cshmanual/Classes/Controller/HelpController.php b/typo3/sysext/cshmanual/Classes/Controller/HelpController.php
index 14df7b7ccdae78ae3247c742b09b5237829786fb..3f0fb770d80129326cef06216a61b348de72d26a 100644
--- a/typo3/sysext/cshmanual/Classes/Controller/HelpController.php
+++ b/typo3/sysext/cshmanual/Classes/Controller/HelpController.php
@@ -54,8 +54,6 @@ class HelpController extends ActionController
 
     /**
      * Initialize the controller
-     *
-     * @return void
      */
     public function initializeAction()
     {
@@ -66,7 +64,6 @@ class HelpController extends ActionController
      * Initialize the view
      *
      * @param ViewInterface $view The view
-     * @return void
      */
     public function initializeView(ViewInterface $view)
     {
@@ -78,8 +75,6 @@ class HelpController extends ActionController
 
     /**
      * Show table of contents
-     *
-     * @return void
      */
     public function indexAction()
     {
@@ -88,8 +83,6 @@ class HelpController extends ActionController
 
     /**
      * Show the table of contents and all manuals
-     *
-     * @return void
      */
     public function allAction()
     {
@@ -101,7 +94,6 @@ class HelpController extends ActionController
      *
      * @param string $table
      * @param string $field
-     * @return void
      */
     public function detailAction($table = '', $field = '*')
     {
diff --git a/typo3/sysext/cshmanual/Classes/Domain/Repository/TableManualRepository.php b/typo3/sysext/cshmanual/Classes/Domain/Repository/TableManualRepository.php
index 695c8842baa1f2c85d624cff964255f71e042c8e..2631f278be745263428771e426d9759565db73f8 100644
--- a/typo3/sysext/cshmanual/Classes/Domain/Repository/TableManualRepository.php
+++ b/typo3/sysext/cshmanual/Classes/Domain/Repository/TableManualRepository.php
@@ -158,7 +158,6 @@ class TableManualRepository
      * @param array $outputSections Array for accumulation of rendered HELP Content (in "renderALL" mode). Passed by reference!
      * @param array $tocArray TOC array; Here TOC index elements are created. Passed by reference!
      * @param array $CSHkeys CSH keys array. Every item rendered will be unset in this array so finally we can see what CSH keys are not processed yet. Passed by reference!
-     * @return void
      */
     protected function renderTableOfContentItem($mode, $table, $tocCat, &$outputSections, &$tocArray, &$CSHkeys)
     {
diff --git a/typo3/sysext/css_styled_content/Classes/Controller/CssStyledContentController.php b/typo3/sysext/css_styled_content/Classes/Controller/CssStyledContentController.php
index 744c1a65b33617c071764d6f5b8ac9dbcbd58539..c9665597a94eaa3b1db911cd5426eee6661747c2 100644
--- a/typo3/sysext/css_styled_content/Classes/Controller/CssStyledContentController.php
+++ b/typo3/sysext/css_styled_content/Classes/Controller/CssStyledContentController.php
@@ -826,7 +826,6 @@ class CssStyledContentController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlug
      *
      * @param int $fileUid The UID of the file or file reference (depending on $treatAsReference) that should be loaded.
      * @param bool $treatAsReference If TRUE the given UID will be used to load a file reference otherwise it will be used to load a regular file.
-     * @return void
      */
     protected function initializeCurrentFileInContentObjectRenderer($fileUid, $treatAsReference)
     {
@@ -956,7 +955,6 @@ class CssStyledContentController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlug
      *
      * @param string $selector The selector
      * @param string $declaration The declaration
-     * @return void
      */
     protected function addPageStyle($selector, $declaration)
     {
diff --git a/typo3/sysext/css_styled_content/Classes/ViewHelpers/Link/ClickEnlargeViewHelper.php b/typo3/sysext/css_styled_content/Classes/ViewHelpers/Link/ClickEnlargeViewHelper.php
index 6baa6147dc92f4d69f9c80595e3ca45ca41661e7..de4384f0d1e1ff3fb999ccf52669a13d20db8fbe 100644
--- a/typo3/sysext/css_styled_content/Classes/ViewHelpers/Link/ClickEnlargeViewHelper.php
+++ b/typo3/sysext/css_styled_content/Classes/ViewHelpers/Link/ClickEnlargeViewHelper.php
@@ -44,8 +44,6 @@ class ClickEnlargeViewHelper extends AbstractViewHelper
 
     /**
      * Initialize ViewHelper arguments
-     *
-     * @return void
      */
     public function initializeArguments()
     {
diff --git a/typo3/sysext/documentation/Classes/Controller/DocumentController.php b/typo3/sysext/documentation/Classes/Controller/DocumentController.php
index a0d84bf24235877e66e8e1f60ccdf2345be1577a..e1492c7424b3992c591ed3da1166e30df86f5693 100644
--- a/typo3/sysext/documentation/Classes/Controller/DocumentController.php
+++ b/typo3/sysext/documentation/Classes/Controller/DocumentController.php
@@ -145,8 +145,6 @@ class DocumentController extends ActionController
 
     /**
      * Lists the available documents.
-     *
-     * @return void
      */
     public function listAction()
     {
@@ -207,8 +205,6 @@ class DocumentController extends ActionController
 
     /**
      * Shows documents to be downloaded/fetched from a remote location.
-     *
-     * @return void
      */
     public function downloadAction()
     {
@@ -233,7 +229,6 @@ class DocumentController extends ActionController
      * @param string $url
      * @param string $key
      * @param string $version
-     * @return void
      */
     public function fetchAction($url, $key, $version = null)
     {
diff --git a/typo3/sysext/documentation/Classes/Domain/Model/Document.php b/typo3/sysext/documentation/Classes/Domain/Model/Document.php
index e2b5610c02d95f737c9523646bcc30bb0f6a0935..b391b0ba53d4a7238252c99abb37e25df8890c87 100644
--- a/typo3/sysext/documentation/Classes/Domain/Model/Document.php
+++ b/typo3/sysext/documentation/Classes/Domain/Model/Document.php
@@ -62,8 +62,6 @@ class Document extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * Initializes all ObjectStorage properties.
-     *
-     * @return void
      */
     protected function initStorageObjects()
     {
diff --git a/typo3/sysext/documentation/Classes/Domain/Model/DocumentTranslation.php b/typo3/sysext/documentation/Classes/Domain/Model/DocumentTranslation.php
index a619f6456c83ea2abe0e0cfd8be4f853777d5d32..4cbce5e6826366f25f76432be6dfc6483d34dd0f 100644
--- a/typo3/sysext/documentation/Classes/Domain/Model/DocumentTranslation.php
+++ b/typo3/sysext/documentation/Classes/Domain/Model/DocumentTranslation.php
@@ -62,8 +62,6 @@ class DocumentTranslation extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * Initializes all ObjectStorage properties.
-     *
-     * @return void
      */
     protected function initStorageObjects()
     {
diff --git a/typo3/sysext/documentation/Classes/Slots/ExtensionManager.php b/typo3/sysext/documentation/Classes/Slots/ExtensionManager.php
index 4d973c2e8aa2032e153c727b6ff4be0bd8046d45..eb7db48e6fab56cdb4bc1d68e46417f10a334358 100644
--- a/typo3/sysext/documentation/Classes/Slots/ExtensionManager.php
+++ b/typo3/sysext/documentation/Classes/Slots/ExtensionManager.php
@@ -50,7 +50,6 @@ class ExtensionManager
      *
      * @param array $extension
      * @param array $actions
-     * @return void
      */
     public function processActions(array $extension, array &$actions)
     {
diff --git a/typo3/sysext/extbase/Classes/Command/ExtbaseCommand.php b/typo3/sysext/extbase/Classes/Command/ExtbaseCommand.php
index 34c000cb14f56203bfef477a08d6b3c6aad56537..2f5e68ee0a781e2d5567e3e5678e6e5b8ffd6f91 100644
--- a/typo3/sysext/extbase/Classes/Command/ExtbaseCommand.php
+++ b/typo3/sysext/extbase/Classes/Command/ExtbaseCommand.php
@@ -70,7 +70,6 @@ class ExtbaseCommand extends Command
      *
      * @param InputInterface $input
      * @param OutputInterface $output
-     * @return void
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
diff --git a/typo3/sysext/extbase/Classes/Command/HelpCommandController.php b/typo3/sysext/extbase/Classes/Command/HelpCommandController.php
index 8886577a84129aa385b2f3dd3fb783ea36895e7b..fd6399d2d060d64d1e831fe18525a3323d7a2de2 100644
--- a/typo3/sysext/extbase/Classes/Command/HelpCommandController.php
+++ b/typo3/sysext/extbase/Classes/Command/HelpCommandController.php
@@ -45,7 +45,6 @@ class HelpCommandController extends \TYPO3\CMS\Extbase\Mvc\Controller\CommandCon
      * This only outputs the Extbase version number, context and some hint about how to
      * get more help about commands.
      *
-     * @return void
      * @internal
      */
     public function helpStubCommand()
@@ -83,8 +82,6 @@ class HelpCommandController extends \TYPO3\CMS\Extbase\Mvc\Controller\CommandCon
 
     /**
      * Builds an index of all commands that are available
-     *
-     * @return void
      */
     protected function displayHelpIndex()
     {
@@ -114,7 +111,6 @@ class HelpCommandController extends \TYPO3\CMS\Extbase\Mvc\Controller\CommandCon
      * Render help text for a single command
      *
      * @param \TYPO3\CMS\Extbase\Mvc\Cli\Command $command
-     * @return void
      */
     protected function displayHelpForCommand(\TYPO3\CMS\Extbase\Mvc\Cli\Command $command)
     {
@@ -189,7 +185,6 @@ class HelpCommandController extends \TYPO3\CMS\Extbase\Mvc\Controller\CommandCon
      *
      * @internal
      * @param \TYPO3\CMS\Extbase\Mvc\Exception\CommandException $exception
-     * @return void
      */
     public function errorCommand(\TYPO3\CMS\Extbase\Mvc\Exception\CommandException $exception)
     {
@@ -208,8 +203,6 @@ class HelpCommandController extends \TYPO3\CMS\Extbase\Mvc\Controller\CommandCon
     /**
      * Builds an index of available commands. For each of them a Command object is
      * added to the commands array of this class.
-     *
-     * @return void
      */
     protected function buildCommandsIndex()
     {
diff --git a/typo3/sysext/extbase/Classes/Configuration/AbstractConfigurationManager.php b/typo3/sysext/extbase/Classes/Configuration/AbstractConfigurationManager.php
index bd4a67d4b369c188c8b636b1ed07f31e9049f4ea..24095dcfd99c87e720cd72c9719bab44c3012039 100644
--- a/typo3/sysext/extbase/Classes/Configuration/AbstractConfigurationManager.php
+++ b/typo3/sysext/extbase/Classes/Configuration/AbstractConfigurationManager.php
@@ -98,7 +98,6 @@ abstract class AbstractConfigurationManager implements \TYPO3\CMS\Core\Singleton
 
     /**
      * @param \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer $contentObject
-     * @return void
      */
     public function setContentObject(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer $contentObject = null)
     {
@@ -121,7 +120,6 @@ abstract class AbstractConfigurationManager implements \TYPO3\CMS\Core\Singleton
      * Note that this is a low level method and only makes sense to be used by Extbase internally.
      *
      * @param array $configuration The new configuration
-     * @return void
      */
     public function setConfiguration(array $configuration = [])
     {
@@ -236,7 +234,6 @@ abstract class AbstractConfigurationManager implements \TYPO3\CMS\Core\Singleton
     /**
      * @param array &$frameworkConfiguration
      * @param array $switchableControllerActions
-     * @return void
      */
     protected function overrideSwitchableControllerActions(array &$frameworkConfiguration, array $switchableControllerActions)
     {
diff --git a/typo3/sysext/extbase/Classes/Configuration/ConfigurationManager.php b/typo3/sysext/extbase/Classes/Configuration/ConfigurationManager.php
index 45f5fb2c03b7929c4b13a14d3ca91a331600d272..1eda328404a52b4b9fe5911ba72b27f19ad43971 100644
--- a/typo3/sysext/extbase/Classes/Configuration/ConfigurationManager.php
+++ b/typo3/sysext/extbase/Classes/Configuration/ConfigurationManager.php
@@ -55,8 +55,6 @@ class ConfigurationManager implements \TYPO3\CMS\Extbase\Configuration\Configura
 
     /**
      * Initializes the object
-     *
-     * @return void
      */
     public function initializeObject()
     {
@@ -64,7 +62,6 @@ class ConfigurationManager implements \TYPO3\CMS\Extbase\Configuration\Configura
     }
 
     /**
-     * @return void
      */
     protected function initializeConcreteConfigurationManager()
     {
@@ -77,7 +74,6 @@ class ConfigurationManager implements \TYPO3\CMS\Extbase\Configuration\Configura
 
     /**
      * @param \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer $contentObject
-     * @return void
      */
     public function setContentObject(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer $contentObject = null)
     {
@@ -97,7 +93,6 @@ class ConfigurationManager implements \TYPO3\CMS\Extbase\Configuration\Configura
      * Note that this is a low level method and only makes sense to be used by Extbase internally.
      *
      * @param array $configuration The new configuration
-     * @return void
      */
     public function setConfiguration(array $configuration = [])
     {
diff --git a/typo3/sysext/extbase/Classes/Configuration/ConfigurationManagerInterface.php b/typo3/sysext/extbase/Classes/Configuration/ConfigurationManagerInterface.php
index 631c1e03270a9bff6d3a788c5ab0edc20e077fed..3dd4791c0f712647b859fda6b72e5e953209e16c 100644
--- a/typo3/sysext/extbase/Classes/Configuration/ConfigurationManagerInterface.php
+++ b/typo3/sysext/extbase/Classes/Configuration/ConfigurationManagerInterface.php
@@ -25,7 +25,6 @@ interface ConfigurationManagerInterface extends \TYPO3\CMS\Core\SingletonInterfa
 
     /**
      * @param \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer $contentObject
-     * @return void
      */
     public function setContentObject(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer $contentObject = null);
 
@@ -55,7 +54,6 @@ interface ConfigurationManagerInterface extends \TYPO3\CMS\Core\SingletonInterfa
      * Note that this is a low level method and only makes sense to be used by Extbase internally.
      *
      * @param array $configuration The new configuration
-     * @return void
      */
     public function setConfiguration(array $configuration = []);
 
diff --git a/typo3/sysext/extbase/Classes/Core/Bootstrap.php b/typo3/sysext/extbase/Classes/Core/Bootstrap.php
index 21b20f2eac206b404fac44776ba485795b4b20cc..39c84f587e31417a8205e2eecd4bd0b86cd39855 100644
--- a/typo3/sysext/extbase/Classes/Core/Bootstrap.php
+++ b/typo3/sysext/extbase/Classes/Core/Bootstrap.php
@@ -70,7 +70,6 @@ class Bootstrap implements \TYPO3\CMS\Extbase\Core\BootstrapInterface
      *
      * @param array $configuration The TS configuration array
      * @throws \RuntimeException
-     * @return void
      * @see run()
      * @api
      */
@@ -95,7 +94,6 @@ class Bootstrap implements \TYPO3\CMS\Extbase\Core\BootstrapInterface
     /**
      * Initializes the Object framework.
      *
-     * @return void
      * @see initialize()
      */
     protected function initializeObjectManager()
@@ -107,7 +105,6 @@ class Bootstrap implements \TYPO3\CMS\Extbase\Core\BootstrapInterface
      * Initializes the Object framework.
      *
      * @param array $configuration
-     * @return void
      * @see initialize()
      */
     public function initializeConfiguration($configuration)
@@ -123,7 +120,6 @@ class Bootstrap implements \TYPO3\CMS\Extbase\Core\BootstrapInterface
      * Configures the object manager object configuration from
      * config.tx_extbase.objects and plugin.tx_foo.objects
      *
-     * @return void
      * @see initialize()
      */
     public function configureObjectManager()
@@ -144,7 +140,6 @@ class Bootstrap implements \TYPO3\CMS\Extbase\Core\BootstrapInterface
     /**
      * Initializes the cache framework
      *
-     * @return void
      * @see initialize()
      */
     protected function initializeCache()
@@ -155,7 +150,6 @@ class Bootstrap implements \TYPO3\CMS\Extbase\Core\BootstrapInterface
     /**
      * Initializes the Reflection Service
      *
-     * @return void
      * @see initialize()
      */
     protected function initializeReflection()
@@ -170,7 +164,6 @@ class Bootstrap implements \TYPO3\CMS\Extbase\Core\BootstrapInterface
     /**
      * Initializes the persistence framework
      *
-     * @return void
      * @see initialize()
      */
     public function initializePersistence()
@@ -224,8 +217,6 @@ class Bootstrap implements \TYPO3\CMS\Extbase\Core\BootstrapInterface
 
     /**
      * Resets global singletons for the next plugin
-     *
-     * @return void
      */
     protected function resetSingletons()
     {
diff --git a/typo3/sysext/extbase/Classes/Domain/Model/BackendUser.php b/typo3/sysext/extbase/Classes/Domain/Model/BackendUser.php
index 065b763e1cfa152bfd39b918e9de851eab8225a1..1ab70d9a44ea00a6e6f32d5e62d80ecd5d0330f2 100644
--- a/typo3/sysext/extbase/Classes/Domain/Model/BackendUser.php
+++ b/typo3/sysext/extbase/Classes/Domain/Model/BackendUser.php
@@ -86,7 +86,6 @@ class BackendUser extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Sets the user name.
      *
      * @param string $userName the user name to set, must not be empty
-     * @return void
      */
     public function setUserName($userName)
     {
@@ -123,7 +122,6 @@ class BackendUser extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Sets whether this user should be an administrator.
      *
      * @param bool $isAdministrator whether this user should be an administrator
-     * @return void
      */
     public function setIsAdministrator($isAdministrator)
     {
@@ -144,7 +142,6 @@ class BackendUser extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Sets whether this user is disabled.
      *
      * @param bool $isDisabled whether this user is disabled
-     * @return void
      */
     public function setIsDisabled($isDisabled)
     {
@@ -165,7 +162,6 @@ class BackendUser extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Sets the point in time from which this user is enabled.
      *
      * @param \DateTime|NULL $dateAndTime the start date and time
-     * @return void
      */
     public function setStartDateAndTime(\DateTime $dateAndTime = null)
     {
@@ -186,7 +182,6 @@ class BackendUser extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Sets the point in time before which this user is enabled.
      *
      * @param \DateTime|NULL $dateAndTime the end date and time
-     * @return void
      */
     public function setEndDateAndTime(\DateTime $dateAndTime = null)
     {
@@ -207,7 +202,6 @@ class BackendUser extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Sets the e-mail address of this user.
      *
      * @param string $email the e-mail address, may be empty
-     * @return void
      */
     public function setEmail($email)
     {
@@ -278,7 +272,6 @@ class BackendUser extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Sets whether the IP lock for this user is disabled.
      *
      * @param bool $disableIpLock whether the IP lock for this user is disabled
-     * @return void
      */
     public function setIpLockIsDisabled($disableIpLock)
     {
@@ -309,7 +302,6 @@ class BackendUser extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Sets this user's last login date and time.
      *
      * @param \DateTime|NULL $dateAndTime this user's last login date and time
-     * @return void
      */
     public function setLastLoginDateAndTime(\DateTime $dateAndTime = null)
     {
diff --git a/typo3/sysext/extbase/Classes/Domain/Model/BackendUserGroup.php b/typo3/sysext/extbase/Classes/Domain/Model/BackendUserGroup.php
index ec2dcd6d0eb1756ecfe66e04da0e9c6d8a39b05b..c9b676b34662ea4f8b5fc46d4841b8339b7323ff 100644
--- a/typo3/sysext/extbase/Classes/Domain/Model/BackendUserGroup.php
+++ b/typo3/sysext/extbase/Classes/Domain/Model/BackendUserGroup.php
@@ -119,7 +119,6 @@ class BackendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Setter for title
      *
      * @param string $title
-     * @return void
      */
     public function setTitle($title)
     {
@@ -140,7 +139,6 @@ class BackendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Setter for description
      *
      * @param string $description
-     * @return void
      */
     public function setDescription($description)
     {
@@ -161,7 +159,6 @@ class BackendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Setter for the sub groups
      *
      * @param \TYPO3\CMS\Extbase\Persistence\ObjectStorage $subGroups
-     * @return void
      */
     public function setSubGroups(\TYPO3\CMS\Extbase\Persistence\ObjectStorage $subGroups)
     {
@@ -172,7 +169,6 @@ class BackendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Adds a sub group to this backend user group
      *
      * @param \TYPO3\CMS\Extbase\Domain\Model\BackendUserGroup $beGroup
-     * @return void
      */
     public function addSubGroup(\TYPO3\CMS\Extbase\Domain\Model\BackendUserGroup $beGroup)
     {
@@ -183,7 +179,6 @@ class BackendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Removes sub group from this backend user group
      *
      * @param \TYPO3\CMS\Extbase\Domain\Model\BackendUserGroup $groupToDelete
-     * @return void
      */
     public function removeSubGroup(\TYPO3\CMS\Extbase\Domain\Model\BackendUserGroup $groupToDelete)
     {
@@ -192,8 +187,6 @@ class BackendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * Remove all sub groups from this backend user group
-     *
-     * @return void
      */
     public function removeAllSubGroups()
     {
@@ -215,7 +208,6 @@ class BackendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Setter for modules
      *
      * @param string $modules
-     * @return void
      */
     public function setModules($modules)
     {
@@ -236,7 +228,6 @@ class BackendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Setter for tables listening
      *
      * @param string $tablesListening
-     * @return void
      */
     public function setTablesListening($tablesListening)
     {
@@ -257,7 +248,6 @@ class BackendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Setter for tables modify
      *
      * @param string $tablesModify
-     * @return void
      */
     public function setTablesModify($tablesModify)
     {
@@ -278,7 +268,6 @@ class BackendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Setter for page types
      *
      * @param string $pageTypes
-     * @return void
      */
     public function setPageTypes($pageTypes)
     {
@@ -299,7 +288,6 @@ class BackendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Setter for allowed exclude fields
      *
      * @param string $allowedExcludeFields
-     * @return void
      */
     public function setAllowedExcludeFields($allowedExcludeFields)
     {
@@ -320,7 +308,6 @@ class BackendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Setter for explicitly allow and deny
      *
      * @param string $explicitlyAllowAndDeny
-     * @return void
      */
     public function setExplicitlyAllowAndDeny($explicitlyAllowAndDeny)
     {
@@ -341,7 +328,6 @@ class BackendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Setter for allowed languages
      *
      * @param string $allowedLanguages
-     * @return void
      */
     public function setAllowedLanguages($allowedLanguages)
     {
@@ -362,7 +348,6 @@ class BackendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Setter for workspace permission
      *
      * @param bool $workspacePermission
-     * @return void
      */
     public function setWorkspacePermissions($workspacePermission)
     {
@@ -383,7 +368,6 @@ class BackendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Setter for database mounts
      *
      * @param string $databaseMounts
-     * @return void
      */
     public function setDatabaseMounts($databaseMounts)
     {
@@ -404,7 +388,6 @@ class BackendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Getter for file operation permissions
      *
      * @param int $fileOperationPermissions
-     * @return void
      */
     public function setFileOperationPermissions($fileOperationPermissions)
     {
@@ -436,7 +419,6 @@ class BackendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Set the the bit for file operations are allowed.
      *
      * @param bool $value
-     * @return void
      */
     public function setFileOperationAllowed($value)
     {
@@ -457,7 +439,6 @@ class BackendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Set the the bit for directory operations are allowed.
      *
      * @param bool $value
-     * @return void
      */
     public function setDirectoryOperationAllowed($value)
     {
@@ -478,7 +459,6 @@ class BackendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Set the the bit for copy directories.
      *
      * @param bool $value
-     * @return void
      */
     public function setDirectoryCopyAllowed($value)
     {
@@ -499,7 +479,6 @@ class BackendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Set the the bit for remove directories recursively.
      *
      * @param bool $value
-     * @return void
      */
     public function setDirectoryRemoveRecursivelyAllowed($value)
     {
@@ -510,7 +489,6 @@ class BackendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Setter for lock to domain
      *
      * @param string $lockToDomain
-     * @return void
      */
     public function setLockToDomain($lockToDomain)
     {
@@ -531,7 +509,6 @@ class BackendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Setter for hide in list
      *
      * @param bool $hideInList
-     * @return void
      */
     public function setHideInList($hideInList)
     {
@@ -584,7 +561,6 @@ class BackendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      *
      * @param int $permission
      * @param bool $value
-     * @return void
      */
     protected function setPermission($permission, $value)
     {
diff --git a/typo3/sysext/extbase/Classes/Domain/Model/Category.php b/typo3/sysext/extbase/Classes/Domain/Model/Category.php
index 0873e918da902937a5219262d3033b12208f6447..0aedd9b5a02623c93ac42a7df0c7175336a76402 100644
--- a/typo3/sysext/extbase/Classes/Domain/Model/Category.php
+++ b/typo3/sysext/extbase/Classes/Domain/Model/Category.php
@@ -58,7 +58,6 @@ class Category extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Sets the title.
      *
      * @param string $title the title to set, may be empty
-     * @return void
      * @api
      */
     public function setTitle($title)
@@ -81,7 +80,6 @@ class Category extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Sets the description.
      *
      * @param string $description the description to set, may be empty
-     * @return void
      * @api
      */
     public function setDescription($description)
@@ -105,7 +103,6 @@ class Category extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Sets the icon
      *
      * @param string $icon
-     * @return void
      * @deprecated since TYPO3 v8, will be removed in TYPO3 v9
      */
     public function setIcon($icon)
@@ -132,7 +129,6 @@ class Category extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Sets the parent category.
      *
      * @param \TYPO3\CMS\Extbase\Domain\Model\Category $parent the parent category
-     * @return void
      * @api
      */
     public function setParent(\TYPO3\CMS\Extbase\Domain\Model\Category $parent)
diff --git a/typo3/sysext/extbase/Classes/Domain/Model/FileMount.php b/typo3/sysext/extbase/Classes/Domain/Model/FileMount.php
index aa3e2884f55d7e68f74e4ea9851c274101130811..0ac47c06566a1841dc8b144c57630d8e30822c3f 100644
--- a/typo3/sysext/extbase/Classes/Domain/Model/FileMount.php
+++ b/typo3/sysext/extbase/Classes/Domain/Model/FileMount.php
@@ -76,7 +76,6 @@ class FileMount extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Setter for the title of the file mount.
      *
      * @param string $value
-     * @return void
      */
     public function setTitle($value)
     {
@@ -97,7 +96,6 @@ class FileMount extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Setter for the description of the file mount.
      *
      * @param string $description
-     * @return void
      */
     public function setDescription($description)
     {
@@ -118,7 +116,6 @@ class FileMount extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Setter for the path of the file mount.
      *
      * @param string $value
-     * @return void
      */
     public function setPath($value)
     {
@@ -139,7 +136,6 @@ class FileMount extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Setter for is absolute path of the file mount.
      *
      * @param bool $value
-     * @return void
      */
     public function setIsAbsolutePath($value)
     {
diff --git a/typo3/sysext/extbase/Classes/Domain/Model/FrontendUser.php b/typo3/sysext/extbase/Classes/Domain/Model/FrontendUser.php
index 195b4c005e62953c092df40a0a3b30eba4365528..fdc3a614cc7fd127203b9120fbd6c2e49d143967 100644
--- a/typo3/sysext/extbase/Classes/Domain/Model/FrontendUser.php
+++ b/typo3/sysext/extbase/Classes/Domain/Model/FrontendUser.php
@@ -139,7 +139,6 @@ class FrontendUser extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Sets the username value
      *
      * @param string $username
-     * @return void
      * @api
      */
     public function setUsername($username)
@@ -162,7 +161,6 @@ class FrontendUser extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Sets the password value
      *
      * @param string $password
-     * @return void
      * @api
      */
     public function setPassword($password)
@@ -186,7 +184,6 @@ class FrontendUser extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * although it can hold several usergroups.
      *
      * @param \TYPO3\CMS\Extbase\Persistence\ObjectStorage $usergroup
-     * @return void
      * @api
      */
     public function setUsergroup(\TYPO3\CMS\Extbase\Persistence\ObjectStorage $usergroup)
@@ -198,7 +195,6 @@ class FrontendUser extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Adds a usergroup to the frontend user
      *
      * @param \TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup $usergroup
-     * @return void
      * @api
      */
     public function addUsergroup(\TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup $usergroup)
@@ -210,7 +206,6 @@ class FrontendUser extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Removes a usergroup from the frontend user
      *
      * @param \TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup $usergroup
-     * @return void
      * @api
      */
     public function removeUsergroup(\TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup $usergroup)
@@ -234,7 +229,6 @@ class FrontendUser extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Sets the name value
      *
      * @param string $name
-     * @return void
      * @api
      */
     public function setName($name)
@@ -257,7 +251,6 @@ class FrontendUser extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Sets the firstName value
      *
      * @param string $firstName
-     * @return void
      * @api
      */
     public function setFirstName($firstName)
@@ -280,7 +273,6 @@ class FrontendUser extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Sets the middleName value
      *
      * @param string $middleName
-     * @return void
      * @api
      */
     public function setMiddleName($middleName)
@@ -303,7 +295,6 @@ class FrontendUser extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Sets the lastName value
      *
      * @param string $lastName
-     * @return void
      * @api
      */
     public function setLastName($lastName)
@@ -326,7 +317,6 @@ class FrontendUser extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Sets the address value
      *
      * @param string $address
-     * @return void
      * @api
      */
     public function setAddress($address)
@@ -349,7 +339,6 @@ class FrontendUser extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Sets the telephone value
      *
      * @param string $telephone
-     * @return void
      * @api
      */
     public function setTelephone($telephone)
@@ -372,7 +361,6 @@ class FrontendUser extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Sets the fax value
      *
      * @param string $fax
-     * @return void
      * @api
      */
     public function setFax($fax)
@@ -395,7 +383,6 @@ class FrontendUser extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Sets the email value
      *
      * @param string $email
-     * @return void
      * @api
      */
     public function setEmail($email)
@@ -418,7 +405,6 @@ class FrontendUser extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Sets the lockToDomain value
      *
      * @param string $lockToDomain
-     * @return void
      * @api
      */
     public function setLockToDomain($lockToDomain)
@@ -441,7 +427,6 @@ class FrontendUser extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Sets the title value
      *
      * @param string $title
-     * @return void
      * @api
      */
     public function setTitle($title)
@@ -464,7 +449,6 @@ class FrontendUser extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Sets the zip value
      *
      * @param string $zip
-     * @return void
      * @api
      */
     public function setZip($zip)
@@ -487,7 +471,6 @@ class FrontendUser extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Sets the city value
      *
      * @param string $city
-     * @return void
      * @api
      */
     public function setCity($city)
@@ -510,7 +493,6 @@ class FrontendUser extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Sets the country value
      *
      * @param string $country
-     * @return void
      * @api
      */
     public function setCountry($country)
@@ -533,7 +515,6 @@ class FrontendUser extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Sets the www value
      *
      * @param string $www
-     * @return void
      * @api
      */
     public function setWww($www)
@@ -556,7 +537,6 @@ class FrontendUser extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Sets the company value
      *
      * @param string $company
-     * @return void
      * @api
      */
     public function setCompany($company)
@@ -601,7 +581,6 @@ class FrontendUser extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Sets the lastlogin value
      *
      * @param \DateTime $lastlogin
-     * @return void
      * @api
      */
     public function setLastlogin(\DateTime $lastlogin)
diff --git a/typo3/sysext/extbase/Classes/Domain/Model/FrontendUserGroup.php b/typo3/sysext/extbase/Classes/Domain/Model/FrontendUserGroup.php
index b3b77b46738bfdfb9c03c7a8b1c411269362765e..5140042007ffc4564acc420cd3d34d6d74c37260 100644
--- a/typo3/sysext/extbase/Classes/Domain/Model/FrontendUserGroup.php
+++ b/typo3/sysext/extbase/Classes/Domain/Model/FrontendUserGroup.php
@@ -56,7 +56,6 @@ class FrontendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Sets the title value
      *
      * @param string $title
-     * @return void
      * @api
      */
     public function setTitle($title)
@@ -79,7 +78,6 @@ class FrontendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Sets the lockToDomain value
      *
      * @param string $lockToDomain
-     * @return void
      * @api
      */
     public function setLockToDomain($lockToDomain)
@@ -102,7 +100,6 @@ class FrontendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Sets the description value
      *
      * @param string $description
-     * @return void
      * @api
      */
     public function setDescription($description)
@@ -126,7 +123,6 @@ class FrontendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * although it can hold several subgroups.
      *
      * @param \TYPO3\CMS\Extbase\Persistence\ObjectStorage $subgroup An object storage containing the subgroups to add
-     * @return void
      * @api
      */
     public function setSubgroup(\TYPO3\CMS\Extbase\Persistence\ObjectStorage $subgroup)
@@ -138,7 +134,6 @@ class FrontendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Adds a subgroup to the frontend user
      *
      * @param \TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup $subgroup
-     * @return void
      * @api
      */
     public function addSubgroup(\TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup $subgroup)
@@ -150,7 +145,6 @@ class FrontendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Removes a subgroup from the frontend user group
      *
      * @param \TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup $subgroup
-     * @return void
      * @api
      */
     public function removeSubgroup(\TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup $subgroup)
diff --git a/typo3/sysext/extbase/Classes/Domain/Repository/BackendUserGroupRepository.php b/typo3/sysext/extbase/Classes/Domain/Repository/BackendUserGroupRepository.php
index 8dbaae429ee28c4936df58ded76fcfec1c873536..d84aa66fc6f536e9ea79c8c29ad27f2237147494 100644
--- a/typo3/sysext/extbase/Classes/Domain/Repository/BackendUserGroupRepository.php
+++ b/typo3/sysext/extbase/Classes/Domain/Repository/BackendUserGroupRepository.php
@@ -23,8 +23,6 @@ class BackendUserGroupRepository extends \TYPO3\CMS\Extbase\Persistence\Reposito
 {
     /**
      * Initializes the repository.
-     *
-     * @return void
      */
     public function initializeObject()
     {
diff --git a/typo3/sysext/extbase/Classes/Domain/Repository/BackendUserRepository.php b/typo3/sysext/extbase/Classes/Domain/Repository/BackendUserRepository.php
index 55cb1b2086fecd3f6a74580721d9e4059c7a94bd..7b4556454066c3e2a48913ac0a92b46947222e5f 100644
--- a/typo3/sysext/extbase/Classes/Domain/Repository/BackendUserRepository.php
+++ b/typo3/sysext/extbase/Classes/Domain/Repository/BackendUserRepository.php
@@ -23,8 +23,6 @@ class BackendUserRepository extends \TYPO3\CMS\Extbase\Persistence\Repository
 {
     /**
      * Initializes the repository.
-     *
-     * @return void
      */
     public function initializeObject()
     {
diff --git a/typo3/sysext/extbase/Classes/Domain/Repository/CategoryRepository.php b/typo3/sysext/extbase/Classes/Domain/Repository/CategoryRepository.php
index 2647f0ade2d343435123b51cdb52bbad3b63b16d..2ca871ad3a663e52e9b4647c657111832ed321d4 100644
--- a/typo3/sysext/extbase/Classes/Domain/Repository/CategoryRepository.php
+++ b/typo3/sysext/extbase/Classes/Domain/Repository/CategoryRepository.php
@@ -23,8 +23,6 @@ class CategoryRepository extends \TYPO3\CMS\Extbase\Persistence\Repository
 {
     /**
      * Initializes the repository.
-     *
-     * @return void
      */
     public function initializeObject()
     {
diff --git a/typo3/sysext/extbase/Classes/Domain/Repository/FileMountRepository.php b/typo3/sysext/extbase/Classes/Domain/Repository/FileMountRepository.php
index 2e9b8db769716339547b4ba9d8c6eef6e1091db8..a9f8155f1dff737f0209dfb8093fd0e51b6f49e7 100644
--- a/typo3/sysext/extbase/Classes/Domain/Repository/FileMountRepository.php
+++ b/typo3/sysext/extbase/Classes/Domain/Repository/FileMountRepository.php
@@ -23,8 +23,6 @@ class FileMountRepository extends \TYPO3\CMS\Extbase\Persistence\Repository
 {
     /**
      * Initializes the repository.
-     *
-     * @return void
      */
     public function initializeObject()
     {
diff --git a/typo3/sysext/extbase/Classes/DomainObject/AbstractDomainObject.php b/typo3/sysext/extbase/Classes/DomainObject/AbstractDomainObject.php
index 18997adce5e57a3da0d8cc8f251212a2a6bb2dad..e25cd56fd69bfddf98f4862ae72ba42fc5441a55 100644
--- a/typo3/sysext/extbase/Classes/DomainObject/AbstractDomainObject.php
+++ b/typo3/sysext/extbase/Classes/DomainObject/AbstractDomainObject.php
@@ -76,7 +76,6 @@ abstract class AbstractDomainObject implements DomainObjectInterface, \TYPO3\CMS
      * Setter for the pid.
      *
      * @param int|NULL $pid
-     * @return void
      */
     public function setPid($pid)
     {
@@ -170,7 +169,6 @@ abstract class AbstractDomainObject implements DomainObjectInterface, \TYPO3\CMS
      * from the database.
      *
      * @param string $propertyName The name of the property to be memorized. If omitted all persistable properties are memorized.
-     * @return void
      */
     public function _memorizeCleanState($propertyName = null)
     {
@@ -194,7 +192,6 @@ abstract class AbstractDomainObject implements DomainObjectInterface, \TYPO3\CMS
      * from the database.
      *
      * @param string $propertyName The name of the property to be memorized. If omittet all persistable properties are memorized.
-     * @return void
      */
     public function _memorizePropertyCleanState($propertyName)
     {
@@ -315,8 +312,6 @@ abstract class AbstractDomainObject implements DomainObjectInterface, \TYPO3\CMS
 
     /**
      * Clone method. Sets the _isClone property.
-     *
-     * @return void
      */
     public function __clone()
     {
diff --git a/typo3/sysext/extbase/Classes/DomainObject/DomainObjectInterface.php b/typo3/sysext/extbase/Classes/DomainObject/DomainObjectInterface.php
index 9708f0df809c535ddce8b7cb9498b2c659ffe9f6..d5e0c611fed3b38486aa481145719bc13215d18c 100644
--- a/typo3/sysext/extbase/Classes/DomainObject/DomainObjectInterface.php
+++ b/typo3/sysext/extbase/Classes/DomainObject/DomainObjectInterface.php
@@ -35,7 +35,6 @@ interface DomainObjectInterface
      * Setter for the pid.
      *
      * @param int $pid
-     * @return void
      */
     public function setPid($pid);
 
@@ -58,7 +57,6 @@ interface DomainObjectInterface
      *
      * @param string $propertyName
      * @param string $value
-     * @return void
      */
     public function _setProperty($propertyName, $value);
 
diff --git a/typo3/sysext/extbase/Classes/Error/Result.php b/typo3/sysext/extbase/Classes/Error/Result.php
index e4f4cdf9e323f921e0f7a743943849ea5c5bbba5..df5ee68a109a18ada04e1bc32939ddc6b792656b 100644
--- a/typo3/sysext/extbase/Classes/Error/Result.php
+++ b/typo3/sysext/extbase/Classes/Error/Result.php
@@ -78,7 +78,6 @@ class Result
      * cached error states upwards
      *
      * @param Result $parent
-     * @return void
      */
     public function setParent(Result $parent)
     {
@@ -100,7 +99,6 @@ class Result
      * Add an error to the current Result object
      *
      * @param \TYPO3\CMS\Extbase\Error\Error $error
-     * @return void
      * @api
      */
     public function addError(\TYPO3\CMS\Extbase\Error\Error $error)
@@ -113,7 +111,6 @@ class Result
      * Add a warning to the current Result object
      *
      * @param \TYPO3\CMS\Extbase\Error\Warning $warning
-     * @return void
      * @api
      */
     public function addWarning(\TYPO3\CMS\Extbase\Error\Warning $warning)
@@ -126,7 +123,6 @@ class Result
      * Add a notice to the current Result object
      *
      * @param \TYPO3\CMS\Extbase\Error\Notice $notice
-     * @return void
      * @api
      */
     public function addNotice(\TYPO3\CMS\Extbase\Error\Notice $notice)
@@ -254,8 +250,6 @@ class Result
     /**
      * Sets the error cache to TRUE and propagates the information
      * upwards the Result-Object Tree
-     *
-     * @return void
      */
     protected function setErrorsExist()
     {
@@ -268,8 +262,6 @@ class Result
     /**
      * Sets the warning cache to TRUE and propagates the information
      * upwards the Result-Object Tree
-     *
-     * @return void
      */
     protected function setWarningsExist()
     {
@@ -282,8 +274,6 @@ class Result
     /**
      * Sets the notices cache to TRUE and propagates the information
      * upwards the Result-Object Tree
-     *
-     * @return void
      */
     protected function setNoticesExist()
     {
@@ -305,8 +295,6 @@ class Result
 
     /**
      * Clears the result
-     *
-     * @return void
      */
     public function clear()
     {
@@ -427,7 +415,6 @@ class Result
      * @param string $propertyName
      * @param array $result
      * @param array $level
-     * @return void
      */
     public function flattenTree($propertyName, &$result, $level)
     {
@@ -445,7 +432,6 @@ class Result
      * Merge the given Result object into this one.
      *
      * @param \TYPO3\CMS\Extbase\Error\Result $otherResult
-     * @return void
      * @api
      */
     public function merge(Result $otherResult)
@@ -477,7 +463,6 @@ class Result
      * @param \TYPO3\CMS\Extbase\Error\Result $otherResult
      * @param string $getterName
      * @param string $adderName
-     * @return void
      */
     protected function mergeProperty(Result $otherResult, $getterName, $adderName)
     {
diff --git a/typo3/sysext/extbase/Classes/Hook/DataHandler/CheckFlexFormValue.php b/typo3/sysext/extbase/Classes/Hook/DataHandler/CheckFlexFormValue.php
index 5dec27032fa568f476dbece92aae1ab2cd9ecdba..c496fff9e6a6bcabaf18114656f195de6a56d631 100644
--- a/typo3/sysext/extbase/Classes/Hook/DataHandler/CheckFlexFormValue.php
+++ b/typo3/sysext/extbase/Classes/Hook/DataHandler/CheckFlexFormValue.php
@@ -35,7 +35,6 @@ class CheckFlexFormValue
      * @param DataHandler $dataHander
      * @param array &$currentValue
      * @param array &$newValue
-     * @return void
      */
     public function checkFlexFormValue_beforeMerge(DataHandler $dataHander, array &$currentValue, array &$newValue)
     {
diff --git a/typo3/sysext/extbase/Classes/Mvc/Cli/ConsoleOutput.php b/typo3/sysext/extbase/Classes/Mvc/Cli/ConsoleOutput.php
index 7174d8824aa70fc71a17dbc0eb1b1e2a8be7949e..9966c7c261e7a4e927c64e7e2aeb5fa18667a6b4 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Cli/ConsoleOutput.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Cli/ConsoleOutput.php
@@ -58,8 +58,6 @@ class ConsoleOutput
 
     /**
      * Creates and initializes the Symfony I/O instances
-     *
-     * @return void
      */
     public function __construct()
     {
@@ -88,7 +86,6 @@ class ConsoleOutput
      *
      * @param string $text Text to output
      * @param array $arguments Optional arguments to use for sprintf
-     * @return void
      */
     public function output($text, array $arguments = [])
     {
@@ -103,7 +100,6 @@ class ConsoleOutput
      *
      * @param string $text Text to output
      * @param array $arguments Optional arguments to use for sprintf
-     * @return void
      * @see output()
      * @see outputLines()
      */
@@ -119,7 +115,6 @@ class ConsoleOutput
      * @param string $text Text to output
      * @param array $arguments Optional arguments to use for sprintf
      * @param int $leftPadding The number of spaces to use for indentation
-     * @return void
      * @see outputLine()
      */
     public function outputFormatted($text = '', array $arguments = [], $leftPadding = 0)
@@ -273,7 +268,6 @@ class ConsoleOutput
      * Starts the progress output
      *
      * @param int $max Maximum steps. If NULL an indeterminate progress bar is rendered
-     * @return void
      */
     public function progressStart($max = null)
     {
@@ -284,7 +278,6 @@ class ConsoleOutput
      * Advances the progress output X steps
      *
      * @param int $step Number of steps to advance
-     * @return void
      * @throws \LogicException
      */
     public function progressAdvance($step = 1)
@@ -296,7 +289,6 @@ class ConsoleOutput
      * Sets the current progress
      *
      * @param int $current The current progress
-     * @return void
      * @throws \LogicException
      */
     public function progressSet($current)
@@ -306,8 +298,6 @@ class ConsoleOutput
 
     /**
      * Finishes the progress output
-     *
-     * @return void
      */
     public function progressFinish()
     {
diff --git a/typo3/sysext/extbase/Classes/Mvc/Cli/Request.php b/typo3/sysext/extbase/Classes/Mvc/Cli/Request.php
index b1a14d3d5c86b356420c5c4262596a1998c5897e..b401ff6cc332a1dacf54e817b3277c7e0b2cb20d 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Cli/Request.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Cli/Request.php
@@ -104,7 +104,6 @@ class Request implements \TYPO3\CMS\Extbase\Mvc\RequestInterface
      * Sets the dispatched flag
      *
      * @param bool $flag If this request has been dispatched
-     * @return void
      */
     public function setDispatched($flag)
     {
@@ -129,7 +128,6 @@ class Request implements \TYPO3\CMS\Extbase\Mvc\RequestInterface
      * Sets the object name of the controller
      *
      * @param string $controllerObjectName The fully qualified controller object name
-     * @return void
      */
     public function setControllerObjectName($controllerObjectName)
     {
@@ -166,7 +164,6 @@ class Request implements \TYPO3\CMS\Extbase\Mvc\RequestInterface
      * Note that the command name must start with a lower case letter and is case sensitive.
      *
      * @param string $commandName Name of the command to execute by the controller
-     * @return void
      */
     public function setControllerCommandName($commandName)
     {
@@ -203,7 +200,6 @@ class Request implements \TYPO3\CMS\Extbase\Mvc\RequestInterface
      * @param string $argumentName Name of the argument to set
      * @param mixed $value The new value
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\InvalidArgumentNameException
-     * @return void
      */
     public function setArgument($argumentName, $value)
     {
@@ -218,7 +214,6 @@ class Request implements \TYPO3\CMS\Extbase\Mvc\RequestInterface
      * which existed before.
      *
      * @param array $arguments An array of argument names and their values
-     * @return void
      */
     public function setArguments(array $arguments)
     {
@@ -265,7 +260,6 @@ class Request implements \TYPO3\CMS\Extbase\Mvc\RequestInterface
      * Sets the exceeding arguments
      *
      * @param array $exceedingArguments Numeric array of exceeding arguments
-     * @return void
      */
     public function setExceedingArguments(array $exceedingArguments)
     {
diff --git a/typo3/sysext/extbase/Classes/Mvc/Cli/Response.php b/typo3/sysext/extbase/Classes/Mvc/Cli/Response.php
index 1fa1906e0339fb0bde779d24873e9acc521da08f..1254b1f9b23ba26e51f99c4f6491725bec2c4615 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Cli/Response.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Cli/Response.php
@@ -31,7 +31,6 @@ class Response extends \TYPO3\CMS\Extbase\Mvc\Response
      *
      * @param int $exitCode
      * @throws \InvalidArgumentException
-     * @return void
      * @api
      */
     public function setExitCode($exitCode)
@@ -56,7 +55,6 @@ class Response extends \TYPO3\CMS\Extbase\Mvc\Response
     /**
      * Renders and sends the whole web response
      *
-     * @return void
      * @api
      */
     public function send()
diff --git a/typo3/sysext/extbase/Classes/Mvc/Controller/AbstractController.php b/typo3/sysext/extbase/Classes/Mvc/Controller/AbstractController.php
index b28405527ecdd7ad7ebd4ba01e7b9d270174fcea..79868394f2150bca3564fe94cf9be759441d0294 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Controller/AbstractController.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Controller/AbstractController.php
@@ -146,7 +146,6 @@ abstract class AbstractController implements ControllerInterface
 
     /**
      * @param ConfigurationManagerInterface $configurationManager
-     * @return void
      */
     public function injectConfigurationManager(ConfigurationManagerInterface $configurationManager)
     {
@@ -158,7 +157,6 @@ abstract class AbstractController implements ControllerInterface
      * Injects the object manager
      *
      * @param \TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager
-     * @return void
      */
     public function injectObjectManager(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager)
     {
@@ -173,7 +171,6 @@ abstract class AbstractController implements ControllerInterface
      * @param string $messageTitle Optional message title
      * @param int $severity Optional severity, must be one of \TYPO3\CMS\Core\Messaging\FlashMessage constants
      * @param bool $storeInSession Optional, defines whether the message should be stored in the session (default) or not
-     * @return void
      * @throws \InvalidArgumentException if the message body is no string
      * @see \TYPO3\CMS\Core\Messaging\FlashMessage
      * @api
@@ -216,7 +213,6 @@ abstract class AbstractController implements ControllerInterface
      *
      * @param \TYPO3\CMS\Extbase\Mvc\RequestInterface $request The request object
      * @param \TYPO3\CMS\Extbase\Mvc\ResponseInterface $response The response, modified by this handler
-     * @return void
      * @throws UnsupportedRequestTypeException if the controller doesn't support the current request type
      * @api
      */
@@ -268,7 +264,6 @@ abstract class AbstractController implements ControllerInterface
      * @param string $controllerName Unqualified object name of the controller to forward to. If not specified, the current controller is used.
      * @param string $extensionName Name of the extension containing the controller to forward to. If not specified, the current extension is assumed.
      * @param array $arguments Arguments to pass to the target action
-     * @return void
      * @throws StopActionException
      * @see redirect()
      * @api
@@ -306,7 +301,6 @@ abstract class AbstractController implements ControllerInterface
      * @param int $pageUid Target page uid. If NULL, the current page uid is used
      * @param int $delay (optional) The delay in seconds. Default is no delay.
      * @param int $statusCode (optional) The HTTP status code for the redirect. Default is "303 See Other
-     * @return void
      * @throws UnsupportedRequestTypeException If the request is not a web request
      * @throws StopActionException
      * @see forward()
@@ -399,8 +393,6 @@ abstract class AbstractController implements ControllerInterface
     /**
      * Collects the base validators which were defined for the data type of each
      * controller argument and adds them to the argument's validator chain.
-     *
-     * @return void
      */
     public function initializeControllerArgumentsBaseValidators()
     {
@@ -417,7 +409,6 @@ abstract class AbstractController implements ControllerInterface
      * Maps arguments delivered by the request object to the local controller arguments.
      *
      * @throws Exception\RequiredArgumentMissingException
-     * @return void
      */
     protected function mapRequestArgumentsToControllerArguments()
     {
diff --git a/typo3/sysext/extbase/Classes/Mvc/Controller/ActionController.php b/typo3/sysext/extbase/Classes/Mvc/Controller/ActionController.php
index 07401efb7ac7f5f398562df88a74442e02cdf5f1..a3ff0745b1331e37b0c3e67fdc97c9d4996727c1 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Controller/ActionController.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Controller/ActionController.php
@@ -143,7 +143,6 @@ class ActionController extends AbstractController
      * @param \TYPO3\CMS\Extbase\Mvc\ResponseInterface $response The response, modified by this handler
      *
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException
-     * @return void
      */
     public function processRequest(\TYPO3\CMS\Extbase\Mvc\RequestInterface $request, \TYPO3\CMS\Extbase\Mvc\ResponseInterface $response)
     {
@@ -192,7 +191,6 @@ class ActionController extends AbstractController
      * for example you do this in a plugin that gets used multiple time on a page.
      *
      * @param \TYPO3\CMS\Extbase\Mvc\RequestInterface $request
-     * @return void
      */
     protected function renderAssetsForRequest($request)
     {
@@ -222,7 +220,6 @@ class ActionController extends AbstractController
      * Don't override this method - use initializeAction() instead.
      *
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\InvalidArgumentTypeException
-     * @return void
      * @see initializeArguments()
      */
     protected function initializeActionMethodArguments()
@@ -250,8 +247,6 @@ class ActionController extends AbstractController
      * - Custom validators specified with validate annotations.
      * - Model-based validators (validate annotations in the model)
      * - Custom model validator classes
-     *
-     * @return void
      */
     protected function initializeActionMethodValidators()
     {
@@ -306,7 +301,6 @@ class ActionController extends AbstractController
      * response object. If the action doesn't return anything and a valid
      * view exists, the view is rendered automatically.
      *
-     * @return void
      * @api
      */
     protected function callActionMethod()
@@ -410,8 +404,6 @@ class ActionController extends AbstractController
 
     /**
      * @param ViewInterface $view
-     *
-     * @return void
      */
     protected function setViewConfiguration(ViewInterface $view)
     {
@@ -524,7 +516,6 @@ class ActionController extends AbstractController
      *
      * @param ViewInterface $view The view to be initialized
      *
-     * @return void
      * @api
      */
     protected function initializeView(ViewInterface $view)
@@ -537,7 +528,6 @@ class ActionController extends AbstractController
      * Override this method to solve tasks which all actions have in
      * common.
      *
-     * @return void
      * @api
      */
     protected function initializeAction()
@@ -569,8 +559,6 @@ class ActionController extends AbstractController
     /**
      * Clear cache of current page on error. Needed because we want a re-evaluation of the data.
      * Better would be just do delete the cache for the error action, but that is not possible right now.
-     *
-     * @return void
      */
     protected function clearCacheOnError()
     {
@@ -586,8 +574,6 @@ class ActionController extends AbstractController
     /**
      * If an error occurred during this request, this adds a flash message describing the error to the flash
      * message container.
-     *
-     * @return void
      */
     protected function addErrorFlashMessage()
     {
@@ -615,7 +601,6 @@ class ActionController extends AbstractController
      * to the originating request. This effectively ends processing of the current request, so do not
      * call this method before you have finished the necessary business logic!
      *
-     * @return void
      * @throws StopActionException
      */
     protected function forwardToReferringRequest()
diff --git a/typo3/sysext/extbase/Classes/Mvc/Controller/Arguments.php b/typo3/sysext/extbase/Classes/Mvc/Controller/Arguments.php
index d8838785b9b5a58cb515ea0412cc1ddab919c886..c70dc455ce75d4cf7ad28a7a8c90d16e711e490f 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Controller/Arguments.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Controller/Arguments.php
@@ -57,7 +57,6 @@ class Arguments extends \ArrayObject
      * @param mixed $offset Offset - not used here
      * @param mixed $value The argument
      * @throws \InvalidArgumentException if the argument is not a valid Controller Argument object
-     * @return void
      */
     public function offsetSet($offset, $value)
     {
@@ -74,7 +73,6 @@ class Arguments extends \ArrayObject
      *
      * @param mixed $value The value
      * @throws \InvalidArgumentException if the argument is not a valid Controller Argument object
-     * @return void
      */
     public function append($value)
     {
@@ -88,7 +86,6 @@ class Arguments extends \ArrayObject
      * Unsets an argument
      *
      * @param mixed $offset Offset
-     * @return void
      */
     public function offsetUnset($offset)
     {
@@ -157,7 +154,6 @@ class Arguments extends \ArrayObject
      * Note that the argument will be cloned, not referenced.
      *
      * @param Argument $argument The argument to add
-     * @return void
      */
     public function addArgument(Argument $argument)
     {
@@ -223,7 +219,6 @@ class Arguments extends \ArrayObject
      * @param string $methodName Name of the method
      * @param array $arguments Method arguments
      * @throws \LogicException
-     * @return void
      */
     public function __call($methodName, array $arguments)
     {
@@ -267,8 +262,6 @@ class Arguments extends \ArrayObject
 
     /**
      * Remove all arguments and resets this object
-     *
-     * @return void
      */
     public function removeAll()
     {
diff --git a/typo3/sysext/extbase/Classes/Mvc/Controller/CommandController.php b/typo3/sysext/extbase/Classes/Mvc/Controller/CommandController.php
index 4c286f8d7c8d8f0949e951d1e6d4129ad05ed413..007ecb7ee609b30f79d7c278df84aa87f70b3849 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Controller/CommandController.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Controller/CommandController.php
@@ -83,7 +83,6 @@ class CommandController implements CommandControllerInterface
 
     /**
      * @param \TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager
-     * @return void
      */
     public function injectObjectManager(ObjectManagerInterface $objectManager)
     {
@@ -114,7 +113,6 @@ class CommandController implements CommandControllerInterface
      *
      * @param RequestInterface $request The request object
      * @param ResponseInterface $response The response, modified by this handler
-     * @return void
      * @throws UnsupportedRequestTypeException if the controller doesn't support the current request type
      * @api
      */
@@ -160,7 +158,6 @@ class CommandController implements CommandControllerInterface
      * method arguments found in the designated command method.
      *
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\InvalidArgumentTypeException
-     * @return void
      * @throws InvalidArgumentTypeException
      */
     protected function initializeCommandMethodArguments()
@@ -184,8 +181,6 @@ class CommandController implements CommandControllerInterface
 
     /**
      * Maps arguments delivered by the request object to the local controller arguments.
-     *
-     * @return void
      */
     protected function mapRequestArgumentsToControllerArguments()
     {
@@ -217,7 +212,6 @@ class CommandController implements CommandControllerInterface
      * @param string $commandName
      * @param string $controllerObjectName
      * @param array $arguments
-     * @return void
      * @throws StopActionException
      */
     protected function forward($commandName, $controllerObjectName = null, array $arguments = [])
@@ -239,8 +233,6 @@ class CommandController implements CommandControllerInterface
      * If the command returns a string, it is appended to the content in the
      * response object. If the command doesn't return anything and a valid
      * view exists, the view is rendered automatically.
-     *
-     * @return void
      */
     protected function callCommandMethod()
     {
@@ -301,7 +293,6 @@ class CommandController implements CommandControllerInterface
      * @see http://www.php.net/sprintf
      * @param string $text Text to output
      * @param array $arguments Optional arguments to use for sprintf
-     * @return void
      */
     protected function output($text, array $arguments = [])
     {
@@ -313,7 +304,6 @@ class CommandController implements CommandControllerInterface
      *
      * @param string $text Text to output
      * @param array $arguments Optional arguments to use for sprintf
-     * @return void
      * @see output()
      */
     protected function outputLine($text = '', array $arguments = [])
@@ -328,7 +318,6 @@ class CommandController implements CommandControllerInterface
      * @param string $text Text to output
      * @param array $arguments Optional arguments to use for sprintf
      * @param int $leftPadding The number of spaces to use for indentation
-     * @return void
      * @see outputLine()
      */
     protected function outputFormatted($text = '', array $arguments = [], $leftPadding = 0)
@@ -342,7 +331,6 @@ class CommandController implements CommandControllerInterface
      *
      * @param int $exitCode Exit code to return on exit
      * @throws StopActionException
-     * @return void
      */
     protected function quit($exitCode = 0)
     {
@@ -355,7 +343,6 @@ class CommandController implements CommandControllerInterface
      * Should be used for commands that flush code caches.
      *
      * @param int $exitCode Exit code to return on exit
-     * @return void
      */
     protected function sendAndExit($exitCode = 0)
     {
diff --git a/typo3/sysext/extbase/Classes/Mvc/Controller/ControllerContext.php b/typo3/sysext/extbase/Classes/Mvc/Controller/ControllerContext.php
index 96f28bb40475d2a64e33353f73ea152b0e4aeafc..cd3f96c2df1d32ee16e4202cb334e6d88d53395c 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Controller/ControllerContext.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Controller/ControllerContext.php
@@ -77,7 +77,6 @@ class ControllerContext
      * Set the request of the controller
      *
      * @param \TYPO3\CMS\Extbase\Mvc\Request $request
-     * @return void
      */
     public function setRequest(\TYPO3\CMS\Extbase\Mvc\Request $request)
     {
@@ -99,7 +98,6 @@ class ControllerContext
      * Set the response of the controller
      *
      * @param \TYPO3\CMS\Extbase\Mvc\Response $response
-     * @return void
      */
     public function setResponse(\TYPO3\CMS\Extbase\Mvc\Response $response)
     {
@@ -121,7 +119,6 @@ class ControllerContext
      * Set the arguments of the controller
      *
      * @param \TYPO3\CMS\Extbase\Mvc\Controller\Arguments $arguments
-     * @return void
      */
     public function setArguments(\TYPO3\CMS\Extbase\Mvc\Controller\Arguments $arguments)
     {
@@ -141,7 +138,6 @@ class ControllerContext
 
     /**
      * @param \TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder $uriBuilder
-     * @return void
      */
     public function setUriBuilder(\TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder $uriBuilder)
     {
diff --git a/typo3/sysext/extbase/Classes/Mvc/Controller/ControllerInterface.php b/typo3/sysext/extbase/Classes/Mvc/Controller/ControllerInterface.php
index 913bb0d4ca369c7f9845bfa81917a56a43ad04de..6a6a0e2a146f003f7973e0d8a0ab50bd7d9b329a 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Controller/ControllerInterface.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Controller/ControllerInterface.php
@@ -35,7 +35,6 @@ interface ControllerInterface
      *
      * @param \TYPO3\CMS\Extbase\Mvc\RequestInterface $request The request object
      * @param \TYPO3\CMS\Extbase\Mvc\ResponseInterface $response The response, modified by the controller
-     * @return void
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException if the controller doesn't support the current request type
      * @api
      */
diff --git a/typo3/sysext/extbase/Classes/Mvc/Controller/MvcPropertyMappingConfiguration.php b/typo3/sysext/extbase/Classes/Mvc/Controller/MvcPropertyMappingConfiguration.php
index 209638b6c864c089e347c5e704cad16833b5cb4d..9af9cd3e38afa6c39676f2446089f800887c02f6 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Controller/MvcPropertyMappingConfiguration.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Controller/MvcPropertyMappingConfiguration.php
@@ -33,7 +33,6 @@ class MvcPropertyMappingConfiguration extends \TYPO3\CMS\Extbase\Property\Proper
      * Allow creation of a certain sub property
      *
      * @param string $propertyPath
-     * @return void
      * @api
      */
     public function allowCreationForSubProperty($propertyPath)
@@ -45,7 +44,6 @@ class MvcPropertyMappingConfiguration extends \TYPO3\CMS\Extbase\Property\Proper
      * Allow modification for a given property path
      *
      * @param string $propertyPath
-     * @return void
      * @api
      */
     public function allowModificationForSubProperty($propertyPath)
@@ -60,7 +58,6 @@ class MvcPropertyMappingConfiguration extends \TYPO3\CMS\Extbase\Property\Proper
      *
      * @param string $propertyPath
      * @param string $targetType
-     * @return void
      * @api
      */
     public function setTargetTypeForSubProperty($propertyPath, $targetType)
diff --git a/typo3/sysext/extbase/Classes/Mvc/Controller/MvcPropertyMappingConfigurationService.php b/typo3/sysext/extbase/Classes/Mvc/Controller/MvcPropertyMappingConfigurationService.php
index d7fec78a896cb4b7cf8ae717f5c3c7c3edb57698..9d2f52c21bbe59d8789db3a96cb610f2a5d2ba41 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Controller/MvcPropertyMappingConfigurationService.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Controller/MvcPropertyMappingConfigurationService.php
@@ -115,8 +115,6 @@ class MvcPropertyMappingConfigurationService implements \TYPO3\CMS\Core\Singleto
      *
      * @param \TYPO3\CMS\Extbase\Mvc\Request $request
      * @param \TYPO3\CMS\Extbase\Mvc\Controller\Arguments $controllerArguments
-     *
-     * @return void
      */
     public function initializePropertyMappingConfigurationFromRequest(\TYPO3\CMS\Extbase\Mvc\Request $request, \TYPO3\CMS\Extbase\Mvc\Controller\Arguments $controllerArguments)
     {
@@ -145,8 +143,6 @@ class MvcPropertyMappingConfigurationService implements \TYPO3\CMS\Core\Singleto
      *
      * @param array $propertyConfiguration
      * @param \TYPO3\CMS\Extbase\Property\PropertyMappingConfiguration $propertyMappingConfiguration
-     *
-     * @return void
      */
     protected function modifyPropertyMappingConfiguration($propertyConfiguration, \TYPO3\CMS\Extbase\Property\PropertyMappingConfiguration $propertyMappingConfiguration)
     {
diff --git a/typo3/sysext/extbase/Classes/Mvc/Dispatcher.php b/typo3/sysext/extbase/Classes/Mvc/Dispatcher.php
index f4d0a905152ef707de5beb3cee09dbd0c76a8749..c02e80ea1254199926b0b23a4443be5a27ea6b84 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Dispatcher.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Dispatcher.php
@@ -72,7 +72,6 @@ class Dispatcher implements \TYPO3\CMS\Core\SingletonInterface
      * @param \TYPO3\CMS\Extbase\Mvc\RequestInterface $request The request to dispatch
      * @param \TYPO3\CMS\Extbase\Mvc\ResponseInterface $response The response, to be modified by the controller
      * @throws Exception\InfiniteLoopException
-     * @return void
      */
     public function dispatch(\TYPO3\CMS\Extbase\Mvc\RequestInterface $request, \TYPO3\CMS\Extbase\Mvc\ResponseInterface $response)
     {
diff --git a/typo3/sysext/extbase/Classes/Mvc/Request.php b/typo3/sysext/extbase/Classes/Mvc/Request.php
index a14ad939ceb7f98f56ca3dcb6b060e76342e018c..9d9dad9c4ffa9001ffb460a3b02b4cfc495c9ef9 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Request.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Request.php
@@ -114,7 +114,6 @@ class Request implements RequestInterface
      * Sets the dispatched flag
      *
      * @param bool $flag If this request has been dispatched
-     * @return void
      * @api
      */
     public function setDispatched($flag)
@@ -194,8 +193,6 @@ class Request implements RequestInterface
      * Explicitly sets the object name of the controller
      *
      * @param string $controllerObjectName The fully qualified controller object name
-     *
-     * @return void
      */
     public function setControllerObjectName($controllerObjectName)
     {
@@ -210,8 +207,6 @@ class Request implements RequestInterface
      * Sets the plugin name.
      *
      * @param string|NULL $pluginName
-     *
-     * @return void
      */
     public function setPluginName($pluginName = null)
     {
@@ -236,7 +231,6 @@ class Request implements RequestInterface
      *
      * @param string $controllerExtensionName The extension name.
      *
-     * @return void
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\InvalidExtensionNameException if the extension name is not valid
      */
     public function setControllerExtensionName($controllerExtensionName)
@@ -272,8 +266,6 @@ class Request implements RequestInterface
      * Sets the subpackage key of the controller.
      *
      * @param string $subpackageKey The subpackage key.
-     *
-     * @return void
      */
     public function setControllerSubpackageKey($subpackageKey)
     {
@@ -298,7 +290,6 @@ class Request implements RequestInterface
      * @param string $controllerName Name of the controller
      *
      * @throws Exception\InvalidControllerNameException
-     * @return void
      */
     public function setControllerName($controllerName)
     {
@@ -332,7 +323,6 @@ class Request implements RequestInterface
      *
      * @param string $actionName Name of the action to execute by the controller
      *
-     * @return void
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\InvalidActionNameException if the action name is not valid
      */
     public function setControllerActionName($actionName)
@@ -379,7 +369,6 @@ class Request implements RequestInterface
      * @param mixed $value The new value
      *
      * @throws Exception\InvalidArgumentNameException
-     * @return void
      */
     public function setArgument($argumentName, $value)
     {
@@ -399,8 +388,6 @@ class Request implements RequestInterface
      * sets the VendorName
      *
      * @param string $vendorName
-     *
-     * @return void
      */
     public function setControllerVendorName($vendorName)
     {
@@ -422,8 +409,6 @@ class Request implements RequestInterface
      * which existed before.
      *
      * @param array $arguments An array of argument names and their values
-     *
-     * @return void
      */
     public function setArguments(array $arguments)
     {
@@ -478,8 +463,6 @@ class Request implements RequestInterface
      * Sets the requested representation format
      *
      * @param string $format The desired format, something like "html", "xml", "png", "json" or the like. Can even be something like "rss.xml".
-     *
-     * @return void
      */
     public function setFormat($format)
     {
@@ -509,8 +492,6 @@ class Request implements RequestInterface
 
     /**
      * @param \TYPO3\CMS\Extbase\Mvc\Request $originalRequest
-     *
-     * @return void
      */
     public function setOriginalRequest(\TYPO3\CMS\Extbase\Mvc\Request $originalRequest)
     {
diff --git a/typo3/sysext/extbase/Classes/Mvc/RequestInterface.php b/typo3/sysext/extbase/Classes/Mvc/RequestInterface.php
index 2225e977e6af412eab1589501455b94f4eb33bb1..4a7e531a86fb5a3eff06a3bb0ce8a80761edf504 100644
--- a/typo3/sysext/extbase/Classes/Mvc/RequestInterface.php
+++ b/typo3/sysext/extbase/Classes/Mvc/RequestInterface.php
@@ -25,7 +25,6 @@ interface RequestInterface
      * Sets the dispatched flag
      *
      * @param bool $flag If this request has been dispatched
-     * @return void
      * @api
      */
     public function setDispatched($flag);
@@ -57,7 +56,6 @@ interface RequestInterface
      *
      * @param string $argumentName Name of the argument to set
      * @param mixed $value The new value
-     * @return void
      * @api
      */
     public function setArgument($argumentName, $value);
@@ -67,7 +65,6 @@ interface RequestInterface
      * which existed before.
      *
      * @param array $arguments An array of argument names and their values
-     * @return void
      * @api
      */
     public function setArguments(array $arguments);
diff --git a/typo3/sysext/extbase/Classes/Mvc/Response.php b/typo3/sysext/extbase/Classes/Mvc/Response.php
index 1d46f84f7ce1827c01b1bcf3bb025bb5aa0cff6f..aff3bdc60dfba848fd10b1e1e232a73953ea11eb 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Response.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Response.php
@@ -30,7 +30,6 @@ class Response implements \TYPO3\CMS\Extbase\Mvc\ResponseInterface
      * Overrides and sets the content of the response
      *
      * @param string $content The response content
-     * @return void
      * @api
      */
     public function setContent($content)
@@ -42,7 +41,6 @@ class Response implements \TYPO3\CMS\Extbase\Mvc\ResponseInterface
      * Appends content to the already existing content.
      *
      * @param string $content More response content
-     * @return void
      * @api
      */
     public function appendContent($content)
diff --git a/typo3/sysext/extbase/Classes/Mvc/ResponseInterface.php b/typo3/sysext/extbase/Classes/Mvc/ResponseInterface.php
index c3421359f0fb2eb6564d350df1e030a0ecec3370..adc2eea6e521d6ada690d8d5e1880c09d04002d2 100644
--- a/typo3/sysext/extbase/Classes/Mvc/ResponseInterface.php
+++ b/typo3/sysext/extbase/Classes/Mvc/ResponseInterface.php
@@ -25,7 +25,6 @@ interface ResponseInterface
      * Overrides and sets the content of the response
      *
      * @param string $content The response content
-     * @return void
      * @api
      */
     public function setContent($content);
@@ -34,7 +33,6 @@ interface ResponseInterface
      * Appends content to the already existing content.
      *
      * @param string $content More response content
-     * @return void
      * @api
      */
     public function appendContent($content);
diff --git a/typo3/sysext/extbase/Classes/Mvc/View/AbstractView.php b/typo3/sysext/extbase/Classes/Mvc/View/AbstractView.php
index a1898b8d6295d0dcd8f88c284f01eb45753abdce..8c121baf71e77f60340ed44602964e7fa20cb118 100644
--- a/typo3/sysext/extbase/Classes/Mvc/View/AbstractView.php
+++ b/typo3/sysext/extbase/Classes/Mvc/View/AbstractView.php
@@ -39,7 +39,6 @@ abstract class AbstractView implements \TYPO3\CMS\Extbase\Mvc\View\ViewInterface
      * Sets the current controller context
      *
      * @param \TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext $controllerContext
-     * @return void
      */
     public function setControllerContext(\TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext $controllerContext)
     {
@@ -96,7 +95,6 @@ abstract class AbstractView implements \TYPO3\CMS\Extbase\Mvc\View\ViewInterface
      *
      * Override this method for initializing your concrete view implementation.
      *
-     * @return void
      * @api
      */
     public function initializeView()
diff --git a/typo3/sysext/extbase/Classes/Mvc/View/EmptyView.php b/typo3/sysext/extbase/Classes/Mvc/View/EmptyView.php
index cbe3cdb43d931edc013497f5c52dc3a87b2669d4..f2329aa3116c0fdb1ac2361224f06a3777967a50 100644
--- a/typo3/sysext/extbase/Classes/Mvc/View/EmptyView.php
+++ b/typo3/sysext/extbase/Classes/Mvc/View/EmptyView.php
@@ -25,7 +25,6 @@ class EmptyView implements \TYPO3\CMS\Extbase\Mvc\View\ViewInterface
      * Dummy method to satisfy the ViewInterface
      *
      * @param \TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext $controllerContext
-     * @return void
      */
     public function setControllerContext(\TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext $controllerContext)
     {
@@ -88,7 +87,6 @@ class EmptyView implements \TYPO3\CMS\Extbase\Mvc\View\ViewInterface
      *
      * @param string $methodName
      * @param array $arguments
-     * @return void
      */
     public function __call($methodName, array $arguments)
     {
@@ -99,7 +97,6 @@ class EmptyView implements \TYPO3\CMS\Extbase\Mvc\View\ViewInterface
      *
      * Override this method for initializing your concrete view implementation.
      *
-     * @return void
      * @api
      */
     public function initializeView()
diff --git a/typo3/sysext/extbase/Classes/Mvc/View/JsonView.php b/typo3/sysext/extbase/Classes/Mvc/View/JsonView.php
index 00f482c5d37a858e6bc61457311892ac45d6b402..6659fc4391c98d0733f8e999b3208626474365ed 100644
--- a/typo3/sysext/extbase/Classes/Mvc/View/JsonView.php
+++ b/typo3/sysext/extbase/Classes/Mvc/View/JsonView.php
@@ -183,7 +183,6 @@ class JsonView extends AbstractView
      * By default only the variable 'value' will be rendered
      *
      * @param array $variablesToRender
-     * @return void
      * @api
      */
     public function setVariablesToRender(array $variablesToRender)
@@ -193,7 +192,6 @@ class JsonView extends AbstractView
 
     /**
      * @param array $configuration The rendering configuration for this JSON view
-     * @return void
      */
     public function setConfiguration(array $configuration)
     {
diff --git a/typo3/sysext/extbase/Classes/Mvc/View/NotFoundView.php b/typo3/sysext/extbase/Classes/Mvc/View/NotFoundView.php
index fedc567726cf742af29bd8051f181ce2170effd3..64e1b357835cc21be1f8d8e301ff9830a6380112 100644
--- a/typo3/sysext/extbase/Classes/Mvc/View/NotFoundView.php
+++ b/typo3/sysext/extbase/Classes/Mvc/View/NotFoundView.php
@@ -69,7 +69,6 @@ class NotFoundView extends \TYPO3\CMS\Extbase\Mvc\View\AbstractView
      *
      * @param string $methodName
      * @param array $arguments
-     * @return void
      */
     public function __call($methodName, array $arguments)
     {
diff --git a/typo3/sysext/extbase/Classes/Mvc/View/ViewInterface.php b/typo3/sysext/extbase/Classes/Mvc/View/ViewInterface.php
index 1fd4e9af17559ca6826e02e83aa2b93320d9a3b9..6efc57429017316ccefdb20572ec0dd0d26078bc 100644
--- a/typo3/sysext/extbase/Classes/Mvc/View/ViewInterface.php
+++ b/typo3/sysext/extbase/Classes/Mvc/View/ViewInterface.php
@@ -25,7 +25,6 @@ interface ViewInterface
      * Sets the current controller context
      *
      * @param \TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext $controllerContext
-     * @return void
      */
     public function setControllerContext(\TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext $controllerContext);
 
@@ -69,7 +68,6 @@ interface ViewInterface
     /**
      * Initializes this view.
      *
-     * @return void
      * @api
      */
     public function initializeView();
diff --git a/typo3/sysext/extbase/Classes/Mvc/Web/Request.php b/typo3/sysext/extbase/Classes/Mvc/Web/Request.php
index 4bba08a50d54fa5066691044ce2fa1cee6770ba1..4da614e7d538b5cb704fc5006d3ca8976c1bb42a 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Web/Request.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Web/Request.php
@@ -89,7 +89,6 @@ class Request extends \TYPO3\CMS\Extbase\Mvc\Request
      * Sets the request method
      *
      * @param string $method Name of the request method
-     * @return void
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\InvalidRequestMethodException if the request method is not supported
      */
     public function setMethod($method)
@@ -115,7 +114,6 @@ class Request extends \TYPO3\CMS\Extbase\Mvc\Request
      * Sets the request URI
      *
      * @param string $requestUri URI of this web request
-     * @return void
      */
     public function setRequestUri($requestUri)
     {
@@ -137,7 +135,6 @@ class Request extends \TYPO3\CMS\Extbase\Mvc\Request
      * Sets the base URI for this request.
      *
      * @param string $baseUri New base URI
-     * @return void
      */
     public function setBaseUri($baseUri)
     {
diff --git a/typo3/sysext/extbase/Classes/Mvc/Web/RequestBuilder.php b/typo3/sysext/extbase/Classes/Mvc/Web/RequestBuilder.php
index 3a95b47e198f93fa6ddd8e325848428e862422e3..24bc638bb7295b20cecdcf9e1f9bf922be43f14a 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Web/RequestBuilder.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Web/RequestBuilder.php
@@ -118,7 +118,6 @@ class RequestBuilder implements \TYPO3\CMS\Core\SingletonInterface
 
     /**
      * @throws MvcException
-     * @return void
      */
     protected function loadDefaultValues()
     {
diff --git a/typo3/sysext/extbase/Classes/Mvc/Web/Response.php b/typo3/sysext/extbase/Classes/Mvc/Web/Response.php
index 37e2c73fdbb89c2c9d1cb7aa0dfc113eb9238fb2..ea744ce6b3935d5a91caff84f89053558fcd99fa 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Web/Response.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Web/Response.php
@@ -132,7 +132,6 @@ class Response extends \TYPO3\CMS\Extbase\Mvc\Response
      * @param int $code The status code
      * @param string $message If specified, this message is sent instead of the standard message
      * @throws \InvalidArgumentException if the specified status code is not valid
-     * @return void
      * @api
      */
     public function setStatus($code, $message = null)
@@ -165,7 +164,6 @@ class Response extends \TYPO3\CMS\Extbase\Mvc\Response
      * @param mixed $value The value of the given header
      * @param bool $replaceExistingHeader If a header with the same name should be replaced. Default is TRUE.
      * @throws \InvalidArgumentException
-     * @return void
      * @api
      */
     public function setHeader($name, $value, $replaceExistingHeader = true)
@@ -207,7 +205,6 @@ class Response extends \TYPO3\CMS\Extbase\Mvc\Response
      *
      * If headers have already been sent, this method fails silently.
      *
-     * @return void
      * @api
      */
     public function sendHeaders()
@@ -223,7 +220,6 @@ class Response extends \TYPO3\CMS\Extbase\Mvc\Response
     /**
      * Renders and sends the whole web response
      *
-     * @return void
      * @api
      */
     public function send()
@@ -242,7 +238,6 @@ class Response extends \TYPO3\CMS\Extbase\Mvc\Response
      * @TODO The workround and the $request member should be removed again, once the PageRender does support non-cached USER_INTs
      * @param string $additionalHeaderData The value additional header
      * @throws \InvalidArgumentException
-     * @return void
      * @api
      */
     public function addAdditionalHeaderData($additionalHeaderData)
diff --git a/typo3/sysext/extbase/Classes/Mvc/Web/Routing/UriBuilder.php b/typo3/sysext/extbase/Classes/Mvc/Web/Routing/UriBuilder.php
index 171c15053e70ed5161da37fcc022be91e76312e8..5177f26acebae8738ca03474dff515013a75a16a 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Web/Routing/UriBuilder.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Web/Routing/UriBuilder.php
@@ -156,8 +156,6 @@ class UriBuilder
 
     /**
      * Life-cycle method that is called by the DI container as soon as this object is completely built
-     *
-     * @return void
      */
     public function initializeObject()
     {
diff --git a/typo3/sysext/extbase/Classes/Object/Container/Container.php b/typo3/sysext/extbase/Classes/Object/Container/Container.php
index ab0e9a9f0533e721bd1dd529a870b954485bc795..e4d2d39e1f70e66279e7d618a25e4704d7139995 100644
--- a/typo3/sysext/extbase/Classes/Object/Container/Container.php
+++ b/typo3/sysext/extbase/Classes/Object/Container/Container.php
@@ -218,7 +218,6 @@ class Container implements \TYPO3\CMS\Core\SingletonInterface
      *
      * @param object $instance
      * @param \TYPO3\CMS\Extbase\Object\Container\ClassInfo $classInfo
-     * @return void
      */
     protected function injectDependencies($instance, \TYPO3\CMS\Extbase\Object\Container\ClassInfo $classInfo)
     {
@@ -264,7 +263,6 @@ class Container implements \TYPO3\CMS\Core\SingletonInterface
      *
      * @param string $message Message (in english).
      * @param int $severity Severity: 0 is info, 1 is notice, 2 is warning, 3 is fatal error, -1 is "OK" message
-     * @return void
      */
     protected function log($message, $severity)
     {
diff --git a/typo3/sysext/extbase/Classes/Object/ObjectManager.php b/typo3/sysext/extbase/Classes/Object/ObjectManager.php
index 8016274a8184625057443279f8d6671e22bf1a7e..b3c0a46cf1cd07e43444b5c95cf7b508707c2059 100644
--- a/typo3/sysext/extbase/Classes/Object/ObjectManager.php
+++ b/typo3/sysext/extbase/Classes/Object/ObjectManager.php
@@ -63,7 +63,6 @@ class ObjectManager implements ObjectManagerInterface
      * a call to the __sleep() method on serialization before.
      *
      * @see http://forge.typo3.org/issues/36820
-     * @return void
      */
     public function __wakeup()
     {
diff --git a/typo3/sysext/extbase/Classes/Object/ObjectManagerException.php b/typo3/sysext/extbase/Classes/Object/ObjectManagerException.php
index 8046ce66cb7cc9b0fb320c5242cb14c41a0eda11..4fe5a3600b76b4125f0ca8449a6dc3f6b3539371 100644
--- a/typo3/sysext/extbase/Classes/Object/ObjectManagerException.php
+++ b/typo3/sysext/extbase/Classes/Object/ObjectManagerException.php
@@ -61,7 +61,6 @@ class ObjectManagerException implements \TYPO3\CMS\Extbase\Object\ObjectManagerI
      * a call to the __sleep() method on serialization before.
      *
      * @see http://forge.typo3.org/issues/36820
-     * @return void
      */
     public function __wakeup()
     {
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Backend.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Backend.php
index c27076b69dc9d62cf1f5ba3f78a218ae25a5d56b..2c34f1fddd6e62613a809e7a54be09b452ecee52 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/Backend.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Backend.php
@@ -306,7 +306,6 @@ class Backend implements \TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface
      * Sets the aggregate root objects
      *
      * @param \TYPO3\CMS\Extbase\Persistence\ObjectStorage $objects
-     * @return void
      */
     public function setAggregateRootObjects(\TYPO3\CMS\Extbase\Persistence\ObjectStorage $objects)
     {
@@ -317,7 +316,6 @@ class Backend implements \TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface
      * Sets the changed objects
      *
      * @param \TYPO3\CMS\Extbase\Persistence\ObjectStorage $entities
-     * @return void
      */
     public function setChangedEntities(\TYPO3\CMS\Extbase\Persistence\ObjectStorage $entities)
     {
@@ -328,7 +326,6 @@ class Backend implements \TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface
      * Sets the deleted objects
      *
      * @param \TYPO3\CMS\Extbase\Persistence\ObjectStorage $entities
-     * @return void
      */
     public function setDeletedEntities(\TYPO3\CMS\Extbase\Persistence\ObjectStorage $entities)
     {
@@ -337,8 +334,6 @@ class Backend implements \TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface
 
     /**
      * Commits the current persistence session.
-     *
-     * @return void
      */
     public function commit()
     {
@@ -348,8 +343,6 @@ class Backend implements \TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface
 
     /**
      * Traverse and persist all aggregate roots and their object graph.
-     *
-     * @return void
      */
     protected function persistObjects()
     {
@@ -370,7 +363,6 @@ class Backend implements \TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface
      * Persists the given object.
      *
      * @param \TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $object The object to be inserted
-     * @return void
      */
     protected function persistObject(\TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $object)
     {
@@ -455,7 +447,6 @@ class Backend implements \TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface
      * @param \TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $parentObject The parent object. One of the properties holds the object storage.
      * @param string $propertyName The name of the property holding the object storage.
      * @param array &$row The row array of the parent object to be persisted. It's passed by reference and gets filled with either a comma separated list of uids (csv) or the number of contained objects.
-     * @return void
      */
     protected function persistObjectStorage(\TYPO3\CMS\Extbase\Persistence\ObjectStorage $objectStorage, \TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $parentObject, $propertyName, array &$row)
     {
@@ -541,7 +532,6 @@ class Backend implements \TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface
      * @param \TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $parentObject
      * @param string $parentPropertyName
      * @param int $sortingPosition
-     * @return void
      */
     protected function attachObjectToParentObject(\TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $object, \TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $parentObject, $parentPropertyName, $sortingPosition = 0)
     {
@@ -561,7 +551,6 @@ class Backend implements \TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface
      * @param \TYPO3\CMS\Extbase\DomainObject\AbstractEntity $parentObject
      * @param string $parentPropertyName
      * @param int $sortingPosition
-     * @return void
      */
     protected function updateRelationOfObjectToParentObject(\TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $object, \TYPO3\CMS\Extbase\DomainObject\AbstractEntity $parentObject, $parentPropertyName, $sortingPosition = 0)
     {
@@ -582,7 +571,6 @@ class Backend implements \TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface
      * @param string $parentPropertyName
      * @param int $sortingPosition
      * @throws \TYPO3\CMS\Extbase\Persistence\Exception\IllegalRelationTypeException
-     * @return void
      */
     protected function attachObjectToParentObjectRelationHasMany(\TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $object, \TYPO3\CMS\Extbase\DomainObject\AbstractEntity $parentObject, $parentPropertyName, $sortingPosition = 0)
     {
@@ -623,7 +611,6 @@ class Backend implements \TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface
      * @param \TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $object
      * @param \TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $parentObject
      * @param string $parentPropertyName
-     * @return void
      */
     protected function detachObjectFromParentObject(\TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $object, \TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $parentObject, $parentPropertyName)
     {
@@ -661,7 +648,6 @@ class Backend implements \TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface
      * @param \TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $object The object to be insterted in the storage
      * @param \TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $parentObject The parentobject.
      * @param string $parentPropertyName
-     * @return void
      */
     protected function insertObject(\TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $object, \TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $parentObject = null, $parentPropertyName = '')
     {
@@ -987,7 +973,6 @@ class Backend implements \TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface
      *
      * @param \TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $object
      * @param array &$row
-     * @return void
      */
     protected function addCommonFieldsToRow(\TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $object, array &$row)
     {
@@ -1006,7 +991,6 @@ class Backend implements \TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface
      *
      * @param \TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $object
      * @param array &$row The row to be updated
-     * @return void
      */
     protected function addCommonDateFieldsToRow(\TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $object, array &$row)
     {
@@ -1021,8 +1005,6 @@ class Backend implements \TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface
 
     /**
      * Iterate over deleted aggregate root objects and process them
-     *
-     * @return void
      */
     protected function processDeletedObjects()
     {
@@ -1041,7 +1023,6 @@ class Backend implements \TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface
      *
      * @param \TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $object The object to be removed from the storage
      * @param bool $markAsDeleted Whether to just flag the row deleted (default) or really delete it
-     * @return void
      */
     protected function removeEntity(\TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $object, $markAsDeleted = true)
     {
@@ -1082,7 +1063,6 @@ class Backend implements \TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface
      * Remove related objects
      *
      * @param \TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $object The object to scanned for related objects
-     * @return void
      */
     protected function removeRelatedObjects(\TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $object)
     {
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/BackendInterface.php b/typo3/sysext/extbase/Classes/Persistence/Generic/BackendInterface.php
index 0119bc06068991d618d4ab2f16c1215da95863e0..9ce84c59cb7bff1fcadbb99fa35da8cfb45e715f 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/BackendInterface.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/BackendInterface.php
@@ -23,7 +23,6 @@ interface BackendInterface
      * Set a PersistenceManager instance.
      *
      * @param \TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface $persistenceManager
-     * @return void
      */
     public function setPersistenceManager(\TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface $persistenceManager);
 
@@ -31,7 +30,6 @@ interface BackendInterface
      * Sets the aggregate root objects
      *
      * @param \TYPO3\CMS\Extbase\Persistence\ObjectStorage $objects
-     * @return void
      */
     public function setAggregateRootObjects(\TYPO3\CMS\Extbase\Persistence\ObjectStorage $objects);
 
@@ -39,7 +37,6 @@ interface BackendInterface
      * Sets the deleted entities
      *
      * @param \TYPO3\CMS\Extbase\Persistence\ObjectStorage $entities
-     * @return void
      * @api
      */
     public function setDeletedEntities(\TYPO3\CMS\Extbase\Persistence\ObjectStorage $entities);
@@ -48,14 +45,11 @@ interface BackendInterface
      * Sets the changed objects
      *
      * @param \TYPO3\CMS\Extbase\Persistence\ObjectStorage $entities
-     * @return void
      */
     public function setChangedEntities(\TYPO3\CMS\Extbase\Persistence\ObjectStorage $entities);
 
     /**
      * Commits the current persistence session
-     *
-     * @return void
      */
     public function commit();
 
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/LazyLoadingProxy.php b/typo3/sysext/extbase/Classes/Persistence/Generic/LazyLoadingProxy.php
index 4953a95820000d78e965966121124f6d558f9e00..f92d070ed944a5faa4bbd695b73744896dd4278a 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/LazyLoadingProxy.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/LazyLoadingProxy.php
@@ -124,7 +124,6 @@ class LazyLoadingProxy implements \Iterator, \TYPO3\CMS\Extbase\Persistence\Gene
      *
      * @param string $propertyName The name of the property to set
      * @param mixed $value The value for the property to set
-     * @return void
      */
     public function __set($propertyName, $value)
     {
@@ -148,7 +147,6 @@ class LazyLoadingProxy implements \Iterator, \TYPO3\CMS\Extbase\Persistence\Gene
      * Magic unset call implementation.
      *
      * @param string $propertyName The name of the property to unset
-     * @return void
      */
     public function __unset($propertyName)
     {
@@ -191,8 +189,6 @@ class LazyLoadingProxy implements \Iterator, \TYPO3\CMS\Extbase\Persistence\Gene
 
     /**
      * Returns the next position of the storage array
-     *
-     * @return void
      */
     public function next()
     {
@@ -202,8 +198,6 @@ class LazyLoadingProxy implements \Iterator, \TYPO3\CMS\Extbase\Persistence\Gene
 
     /**
      * Resets the array pointer of the storage
-     *
-     * @return void
      */
     public function rewind()
     {
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/LazyObjectStorage.php b/typo3/sysext/extbase/Classes/Persistence/Generic/LazyObjectStorage.php
index f60530c5cdf3e155959054b3d556881c7cd5f401..eec0f742c321f228f28b3fc2606f62efc268a354 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/LazyObjectStorage.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/LazyObjectStorage.php
@@ -98,8 +98,6 @@ class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\ObjectStorage imp
 
     /**
      * This is a function lazy load implementation.
-     *
-     * @return void
      */
     protected function initialize()
     {
@@ -262,7 +260,6 @@ class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\ObjectStorage imp
 
     /**
      * @param object $object The object to remove.
-     * @return void
      *
      * @see \TYPO3\CMS\Extbase\Persistence\ObjectStorage::offsetUnset
      */
@@ -274,7 +271,6 @@ class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\ObjectStorage imp
 
     /**
      * @param \TYPO3\CMS\Extbase\Persistence\ObjectStorage $storage The storage containing the elements to remove.
-     * @return void
      *
      * @see \TYPO3\CMS\Extbase\Persistence\ObjectStorage::removeAll
      */
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Mapper/DataMap.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Mapper/DataMap.php
index 5ca429fdfbe707125acfcd2e2abeae2ed0127d15..72f81a66ff076f1997d890af3af02ebc9cd86a61 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/Mapper/DataMap.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Mapper/DataMap.php
@@ -149,7 +149,6 @@ class DataMap
      * Sets the name of the class the column map represents
      *
      * @param string $className
-     * @return void
      */
     public function setClassName($className)
     {
@@ -170,7 +169,6 @@ class DataMap
      * Sets the name of the table the column map represents
      *
      * @param string $tableName
-     * @return void
      */
     public function setTableName($tableName)
     {
@@ -191,7 +189,6 @@ class DataMap
      * Sets the record type
      *
      * @param string $recordType The record type
-     * @return void
      */
     public function setRecordType($recordType)
     {
@@ -212,7 +209,6 @@ class DataMap
      * Sets the subclasses
      *
      * @param array $subclasses An array of subclasses
-     * @return void
      */
     public function setSubclasses(array $subclasses)
     {
@@ -233,7 +229,6 @@ class DataMap
      * Adds a given column map to the data map.
      *
      * @param \TYPO3\CMS\Extbase\Persistence\Generic\Mapper\ColumnMap $columnMap The column map
-     * @return void
      */
     public function addColumnMap(ColumnMap $columnMap)
     {
@@ -266,7 +261,6 @@ class DataMap
      * Sets the name of a column holding the page id
      *
      * @param string $pageIdColumnName The field name
-     * @return void
      */
     public function setPageIdColumnName($pageIdColumnName)
     {
@@ -287,7 +281,6 @@ class DataMap
      * Sets the name of a column holding the language id of the record
      *
      * @param string $languageIdColumnName The field name
-     * @return void
      */
     public function setLanguageIdColumnName($languageIdColumnName)
     {
@@ -308,7 +301,6 @@ class DataMap
      * Sets the name of a column holding the the uid of the record which this record is a translation of.
      *
      * @param string $translationOriginColumnName The field name
-     * @return void
      */
     public function setTranslationOriginColumnName($translationOriginColumnName)
     {
@@ -329,7 +321,6 @@ class DataMap
      * Sets the name of a column holding the the diff data for the record which this record is a translation of.
      *
      * @param string $translationOriginDiffSourceName The field name
-     * @return void
      */
     public function setTranslationOriginDiffSourceName($translationOriginDiffSourceName)
     {
@@ -350,7 +341,6 @@ class DataMap
      * Sets the name of a column holding the timestamp the record was modified
      *
      * @param string $modificationDateColumnName The field name
-     * @return void
      */
     public function setModificationDateColumnName($modificationDateColumnName)
     {
@@ -371,7 +361,6 @@ class DataMap
      * Sets the name of a column holding the creation date timestamp
      *
      * @param string $creationDateColumnName The field name
-     * @return void
      */
     public function setCreationDateColumnName($creationDateColumnName)
     {
@@ -392,7 +381,6 @@ class DataMap
      * Sets the name of a column holding the uid of the back-end user who created this record
      *
      * @param string $creatorColumnName The field name
-     * @return void
      */
     public function setCreatorColumnName($creatorColumnName)
     {
@@ -413,7 +401,6 @@ class DataMap
      * Sets the name of a column indicating the 'deleted' state of the row
      *
      * @param string $deletedFlagColumnName The field name
-     * @return void
      */
     public function setDeletedFlagColumnName($deletedFlagColumnName)
     {
@@ -434,7 +421,6 @@ class DataMap
      * Sets the name of a column indicating the 'hidden' state of the row
      *
      * @param string $disabledFlagColumnName The field name
-     * @return void
      */
     public function setDisabledFlagColumnName($disabledFlagColumnName)
     {
@@ -455,7 +441,6 @@ class DataMap
      * Sets the name of a column holding the timestamp the record should not displayed before
      *
      * @param string $startTimeColumnName The field name
-     * @return void
      */
     public function setStartTimeColumnName($startTimeColumnName)
     {
@@ -476,7 +461,6 @@ class DataMap
      * Sets the name of a column holding the timestamp the record should not displayed afterwards
      *
      * @param string $endTimeColumnName The field name
-     * @return void
      */
     public function setEndTimeColumnName($endTimeColumnName)
     {
@@ -497,7 +481,6 @@ class DataMap
      * Sets the name of a column holding the uid of the front-end user group which is allowed to edit this record
      *
      * @param string $frontendUserGroupColumnName The field name
-     * @return void
      */
     public function setFrontEndUserGroupColumnName($frontendUserGroupColumnName)
     {
@@ -518,7 +501,6 @@ class DataMap
      * Sets the name of a column holding the record type
      *
      * @param string $recordTypeColumnName The field name
-     * @return void
      */
     public function setRecordTypeColumnName($recordTypeColumnName)
     {
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Mapper/DataMapFactory.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Mapper/DataMapFactory.php
index 676a7b32314cd7046932dd04cc7d7e157888e1d8..4a9d25ac5045a6ba8672f9d3772f62e1e691f919 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/Mapper/DataMapFactory.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Mapper/DataMapFactory.php
@@ -78,8 +78,6 @@ class DataMapFactory implements \TYPO3\CMS\Core\SingletonInterface
 
     /**
      * Lifecycle method
-     *
-     * @return void
      */
     public function initializeObject()
     {
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Mapper/DataMapper.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Mapper/DataMapper.php
index b4a85ab7f3a3d046f0f9f4d95472b0ef358cd43b..af3c544b6a821b84a6145a40b4c33f8a6a45cb62 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/Mapper/DataMapper.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Mapper/DataMapper.php
@@ -225,7 +225,6 @@ class DataMapper implements \TYPO3\CMS\Core\SingletonInterface
      *
      * @param DomainObjectInterface $object The object to set properties on
      * @param array $row
-     * @return void
      */
     protected function thawProperties(DomainObjectInterface $object, array $row)
     {
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/PersistenceManager.php b/typo3/sysext/extbase/Classes/Persistence/Generic/PersistenceManager.php
index cbc0d6cda55c396e9caa44f3a28e7ebf209b363f..65d46e36622af3308d7ee705ee0b96a791aa8333 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/PersistenceManager.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/PersistenceManager.php
@@ -97,7 +97,6 @@ class PersistenceManager implements \TYPO3\CMS\Extbase\Persistence\PersistenceMa
      * Registers a repository
      *
      * @param string $className The class name of the repository to be registered
-     * @return void
      */
     public function registerRepositoryClassName($className)
     {
@@ -170,7 +169,6 @@ class PersistenceManager implements \TYPO3\CMS\Extbase\Persistence\PersistenceMa
      * Commits new objects and changes to objects in the current persistence
      * session into the backend
      *
-     * @return void
      * @api
      */
     public function persistAll()
@@ -204,7 +202,6 @@ class PersistenceManager implements \TYPO3\CMS\Extbase\Persistence\PersistenceMa
      * Adds an object to the persistence.
      *
      * @param object $object The object to add
-     * @return void
      * @api
      */
     public function add($object)
@@ -217,7 +214,6 @@ class PersistenceManager implements \TYPO3\CMS\Extbase\Persistence\PersistenceMa
      * Removes an object to the persistence.
      *
      * @param object $object The object to remove
-     * @return void
      * @api
      */
     public function remove($object)
@@ -233,7 +229,6 @@ class PersistenceManager implements \TYPO3\CMS\Extbase\Persistence\PersistenceMa
      * Update an object in the persistence.
      *
      * @param object $object The modified object
-     * @return void
      * @throws \TYPO3\CMS\Extbase\Persistence\Exception\UnknownObjectException
      * @api
      */
@@ -249,7 +244,6 @@ class PersistenceManager implements \TYPO3\CMS\Extbase\Persistence\PersistenceMa
      * Injects the Extbase settings, called by Extbase.
      *
      * @param array $settings
-     * @return void
      * @throws \TYPO3\CMS\Extbase\Persistence\Generic\Exception\NotImplementedException
      * @api
      */
@@ -260,8 +254,6 @@ class PersistenceManager implements \TYPO3\CMS\Extbase\Persistence\PersistenceMa
 
     /**
      * Initializes the persistence manager, called by Extbase.
-     *
-     * @return void
      */
     public function initializeObject()
     {
@@ -275,7 +267,6 @@ class PersistenceManager implements \TYPO3\CMS\Extbase\Persistence\PersistenceMa
      * return data directly from the persistence "backend".
      *
      * @throws \TYPO3\CMS\Extbase\Persistence\Generic\Exception\NotImplementedException
-     * @return void
      */
     public function clearState()
     {
@@ -308,7 +299,6 @@ class PersistenceManager implements \TYPO3\CMS\Extbase\Persistence\PersistenceMa
      * method.
      *
      * @param object $object The new object to register
-     * @return void
      */
     public function registerNewObject($object)
     {
@@ -349,8 +339,6 @@ class PersistenceManager implements \TYPO3\CMS\Extbase\Persistence\PersistenceMa
      *
      * This method is called in functional tests to reset the storage between tests.
      * The implementation is optional and depends on the underlying persistence backend.
-     *
-     * @return void
      */
     public function tearDown()
     {
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Qom/BindVariableValue.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Qom/BindVariableValue.php
index ba9395d9f8de41b889240ae857627b717fc35081..46a916c2cdd5413ee8811935e093a935d0d33358 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/Qom/BindVariableValue.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Qom/BindVariableValue.php
@@ -38,7 +38,6 @@ class BindVariableValue implements \TYPO3\CMS\Extbase\Persistence\Generic\Qom\Bi
      * Fills an array with the names of all bound variables in the operand
      *
      * @param array &$boundVariables
-     * @return void
      */
     public function collectBoundVariableNames(&$boundVariables)
     {
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Qom/Comparison.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Qom/Comparison.php
index 54f31c70d01cdce41edfb3e6fd384c76284d27a9..c1329358430eaf5d5732768895855cfe2496ab5a 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/Qom/Comparison.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Qom/Comparison.php
@@ -139,7 +139,6 @@ class Comparison implements ComparisonInterface
 
     /**
      * @param string $parameterIdentifier
-     * @return void
      * @deprecated since TYPO3 v8, will be removed in TYPO3 v9
      */
     public function setParameterIdentifier($parameterIdentifier)
@@ -162,7 +161,6 @@ class Comparison implements ComparisonInterface
      * Fills an array with the names of all bound variables in the constraints
      *
      * @param array &$boundVariables
-     * @return void
      */
     public function collectBoundVariableNames(&$boundVariables)
     {
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Qom/ConstraintInterface.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Qom/ConstraintInterface.php
index b87001fd51cc061fb605642bc1301262c3cd27fb..2cc4640214aec5f753be3734d680b7f684de8f09 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/Qom/ConstraintInterface.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Qom/ConstraintInterface.php
@@ -26,7 +26,6 @@ interface ConstraintInterface
      * Fills an array with the names of all bound variables in the constraints
      *
      * @param array &$boundVariables
-     * @return void
      */
     public function collectBoundVariableNames(&$boundVariables);
 }
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Qom/LogicalAnd.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Qom/LogicalAnd.php
index 9dc9e9c6de1e7194a0583f831b00bebca55030cc..80bf9c36e6676a13b228c4e8f2475a8ef81be7f5 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/Qom/LogicalAnd.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Qom/LogicalAnd.php
@@ -46,7 +46,6 @@ class LogicalAnd implements AndInterface
      * Fills an array with the names of all bound variables in the constraints
      *
      * @param array &$boundVariables
-     * @return void
      */
     public function collectBoundVariableNames(&$boundVariables)
     {
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Qom/LogicalNot.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Qom/LogicalNot.php
index 0c88940d8787475bec7d9a3aa342ca839fabd55f..8aa876a135dfb9002eefe6cc8c4a6e9028470204 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/Qom/LogicalNot.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Qom/LogicalNot.php
@@ -38,7 +38,6 @@ class LogicalNot implements NotInterface
      * Fills an array with the names of all bound variables in the constraint
      *
      * @param array &$boundVariables
-     * @return void
      */
     public function collectBoundVariableNames(&$boundVariables)
     {
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Qom/LogicalOr.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Qom/LogicalOr.php
index 431c2bcd754797b84063002e79859cbacf3c7dc5..a9b7973fde0af6d2a4ae2f42370d03372615e364 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/Qom/LogicalOr.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Qom/LogicalOr.php
@@ -48,7 +48,6 @@ class LogicalOr implements OrInterface
      * Fills an array with the names of all bound variables in the constraints
      *
      * @param array &$boundVariables
-     * @return void
      */
     public function collectBoundVariableNames(&$boundVariables)
     {
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Qom/Statement.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Qom/Statement.php
index 4d28fdd0ad91b10c27fea030822e277281284208..f0049f96b95216ce5eda9d52e7f7d6aefead2700 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/Qom/Statement.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Qom/Statement.php
@@ -65,7 +65,6 @@ class Statement implements ConstraintInterface
      * Fills an array with the names of all bound variables in the constraints
      *
      * @param array &$boundVariables
-     * @return void
      */
     public function collectBoundVariableNames(&$boundVariables)
     {
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Query.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Query.php
index 835560551587305d888feab8b39ee99f19c06a22..c90660b27b210d37e6cbfd1f5d51ff44da7ff1f2 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/Query.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Query.php
@@ -154,7 +154,6 @@ class Query implements QueryInterface
      * the specific Storage Backend.
      *
      * @param QuerySettingsInterface $querySettings The Query Settings
-     * @return void
      * @api This method is not part of TYPO3.Flow API
      */
     public function setQuerySettings(QuerySettingsInterface $querySettings)
@@ -619,7 +618,6 @@ class Query implements QueryInterface
     }
 
     /**
-     * @return void
      */
     public function __wakeup()
     {
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/QueryResult.php b/typo3/sysext/extbase/Classes/Persistence/Generic/QueryResult.php
index 382a5d62865984ab210d3cf5c3585485f319ab19..65574b9076db0fc22c84a1c5aa0ea6381053dec0 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/QueryResult.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/QueryResult.php
@@ -77,8 +77,6 @@ class QueryResult implements QueryResultInterface
 
     /**
      * Loads the objects this QueryResult is supposed to hold
-     *
-     * @return void
      */
     protected function initialize()
     {
@@ -181,7 +179,6 @@ class QueryResult implements QueryResultInterface
      *
      * @param mixed $offset
      * @param mixed $value
-     * @return void
      * @see ArrayAccess::offsetSet()
      */
     public function offsetSet($offset, $value)
@@ -194,7 +191,6 @@ class QueryResult implements QueryResultInterface
      * This method has no effect on the persisted objects but only on the result set
      *
      * @param mixed $offset
-     * @return void
      * @see ArrayAccess::offsetUnset()
      */
     public function offsetUnset($offset)
@@ -224,7 +220,6 @@ class QueryResult implements QueryResultInterface
     }
 
     /**
-     * @return void
      * @see Iterator::next()
      */
     public function next()
@@ -234,7 +229,6 @@ class QueryResult implements QueryResultInterface
     }
 
     /**
-     * @return void
      * @see Iterator::rewind()
      */
     public function rewind()
@@ -256,7 +250,6 @@ class QueryResult implements QueryResultInterface
     /**
      * Ensures that the objectManager, persistenceManager and dataMapper are back when loading the QueryResult
      * from the cache
-     * @return void
      */
     public function __wakeup()
     {
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Session.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Session.php
index ab89c64caff8870f2c5b29b87c4f43b785284b9b..2b56c98722327e8d7e54bcfc6b02e180c83db0a9 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/Session.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Session.php
@@ -77,7 +77,6 @@ class Session implements \TYPO3\CMS\Core\SingletonInterface
      *
      * @param object $entity
      * @param array $entityData
-     * @return void
      */
     public function registerReconstitutedEntity($entity, array $entityData = [])
     {
@@ -90,7 +89,6 @@ class Session implements \TYPO3\CMS\Core\SingletonInterface
      *
      * @param object $oldEntity
      * @param object $newEntity
-     * @return void
      */
     public function replaceReconstitutedEntity($oldEntity, $newEntity)
     {
@@ -102,7 +100,6 @@ class Session implements \TYPO3\CMS\Core\SingletonInterface
      * Unregisters data for a reconstituted object
      *
      * @param object $entity
-     * @return void
      */
     public function unregisterReconstitutedEntity($entity)
     {
@@ -206,7 +203,6 @@ class Session implements \TYPO3\CMS\Core\SingletonInterface
      * Unregister an object
      *
      * @param object $object
-     * @return void
      */
     public function unregisterObject($object)
     {
@@ -217,8 +213,6 @@ class Session implements \TYPO3\CMS\Core\SingletonInterface
     /**
      * Destroy the state of the persistence session and reset
      * all internal data.
-     *
-     * @return void
      */
     public function destroy()
     {
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Storage/Typo3DbBackend.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Storage/Typo3DbBackend.php
index d039292e5b23e037f72481b85c874b54752e1c01..9a725fdac2900290b76c8b8459e084ffbe624de4 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/Storage/Typo3DbBackend.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Storage/Typo3DbBackend.php
@@ -629,7 +629,6 @@ class Typo3DbBackend implements BackendInterface, SingletonInterface
      *
      * @param string $tableName Table name of the record
      * @param int $uid UID of the record
-     * @return void
      */
     protected function clearPageCache($tableName, $uid)
     {
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Storage/Typo3DbQueryParser.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Storage/Typo3DbQueryParser.php
index 51810ae641ff08473eb2fe258b9a35174b972e31..f5d538e18af72823c1dfa56da92fda69aed7e7a9 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/Storage/Typo3DbQueryParser.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Storage/Typo3DbQueryParser.php
@@ -142,7 +142,6 @@ class Typo3DbQueryParser
      * Creates the queryBuilder object whether it is a regular select or a JOIN
      *
      * @param Qom\SourceInterface $source The source
-     * @return void
      */
     protected function initializeQueryBuilder(Qom\SourceInterface $source)
     {
@@ -230,7 +229,6 @@ class Typo3DbQueryParser
      * @param array $orderings An array of orderings (Qom\Ordering)
      * @param Qom\SourceInterface $source The source
      * @throws UnsupportedOrderException
-     * @return void
      */
     protected function parseOrderings(array $orderings, Qom\SourceInterface $source)
     {
@@ -263,7 +261,6 @@ class Typo3DbQueryParser
      * add TYPO3 Constraints for all tables to the queryBuilder
      *
      * @param QueryInterface $query
-     * @return void
      */
     protected function addTypo3Constraints(QueryInterface $query)
     {
@@ -496,7 +493,6 @@ class Typo3DbQueryParser
      * Add a constraint to ensure that the record type of the returned tuples is matching the data type of the repository.
      *
      * @param string $className The class name
-     * @return void
      */
     protected function addRecordTypeConstraint($className)
     {
@@ -803,7 +799,6 @@ class Typo3DbQueryParser
      *
      * @param Qom\JoinInterface $join The join
      * @param string $leftTableAlias The alias from the table to main
-     * @return void
      */
     protected function parseJoin(Qom\JoinInterface $join, $leftTableAlias)
     {
diff --git a/typo3/sysext/extbase/Classes/Persistence/ObjectMonitoringInterface.php b/typo3/sysext/extbase/Classes/Persistence/ObjectMonitoringInterface.php
index e69f6c45a5ba5afc19d4995e36368fb3e13e1833..ec60f61cdc8d1045bdc2b5bba6076cc6e32287ff 100644
--- a/typo3/sysext/extbase/Classes/Persistence/ObjectMonitoringInterface.php
+++ b/typo3/sysext/extbase/Classes/Persistence/ObjectMonitoringInterface.php
@@ -25,8 +25,6 @@ interface ObjectMonitoringInterface
     /**
      * Register an object's clean state, e.g. after it has been reconstituted
      * from the database
-     *
-     * @return void
      */
     public function _memorizeCleanState();
 
diff --git a/typo3/sysext/extbase/Classes/Persistence/ObjectStorage.php b/typo3/sysext/extbase/Classes/Persistence/ObjectStorage.php
index ce5c33023260431abfcbc30402ce29339213f557..9e3c804abb856985b4b88e5dd1dcff7130555180 100644
--- a/typo3/sysext/extbase/Classes/Persistence/ObjectStorage.php
+++ b/typo3/sysext/extbase/Classes/Persistence/ObjectStorage.php
@@ -81,8 +81,6 @@ class ObjectStorage implements \Countable, \Iterator, \ArrayAccess, ObjectMonito
 
     /**
      * Rewinds the iterator to the first storage element.
-     *
-     * @return void
      */
     public function rewind()
     {
@@ -124,8 +122,6 @@ class ObjectStorage implements \Countable, \Iterator, \ArrayAccess, ObjectMonito
 
     /**
      * Moves to the next entry.
-     *
-     * @return void
      */
     public function next()
     {
@@ -147,7 +143,6 @@ class ObjectStorage implements \Countable, \Iterator, \ArrayAccess, ObjectMonito
      *
      * @param object $object The object to add.
      * @param mixed $information The data to associate with the object.
-     * @return void
      */
     public function offsetSet($object, $information)
     {
@@ -173,7 +168,6 @@ class ObjectStorage implements \Countable, \Iterator, \ArrayAccess, ObjectMonito
      * Removes an object from the storage. offsetUnset() is an alias of detach().
      *
      * @param object $object The object to remove.
-     * @return void
      */
     public function offsetUnset($object)
     {
@@ -215,7 +209,6 @@ class ObjectStorage implements \Countable, \Iterator, \ArrayAccess, ObjectMonito
      *
      * @param object $object The object to add.
      * @param mixed $information The data to associate with the object.
-     * @return void
      */
     public function attach($object, $information = null)
     {
@@ -226,7 +219,6 @@ class ObjectStorage implements \Countable, \Iterator, \ArrayAccess, ObjectMonito
      * Removes an object from the storage.
      *
      * @param object $object The object to remove.
-     * @return void
      */
     public function detach($object)
     {
@@ -248,7 +240,6 @@ class ObjectStorage implements \Countable, \Iterator, \ArrayAccess, ObjectMonito
      * Associates data, or info, with the object currently pointed to by the iterator.
      *
      * @param mixed $data
-     * @return void
      */
     public function setInfo($data)
     {
@@ -261,7 +252,6 @@ class ObjectStorage implements \Countable, \Iterator, \ArrayAccess, ObjectMonito
      * Adds all objects-data pairs from a different storage in the current storage.
      *
      * @param ObjectStorage $objectStorage
-     * @return void
      */
     public function addAll(ObjectStorage $objectStorage)
     {
@@ -274,7 +264,6 @@ class ObjectStorage implements \Countable, \Iterator, \ArrayAccess, ObjectMonito
      * Removes objects contained in another storage from the current storage.
      *
      * @param ObjectStorage $objectStorage The storage containing the elements to remove.
-     * @return void
      */
     public function removeAll(ObjectStorage $objectStorage)
     {
@@ -314,7 +303,6 @@ class ObjectStorage implements \Countable, \Iterator, \ArrayAccess, ObjectMonito
      * Dummy method to avoid serialization.
      *
      * @throws \RuntimeException
-     * @return void
      */
     public function serialize()
     {
@@ -326,7 +314,6 @@ class ObjectStorage implements \Countable, \Iterator, \ArrayAccess, ObjectMonito
      *
      * @param string $serialized
      * @throws \RuntimeException
-     * @return void
      */
     public function unserialize($serialized)
     {
@@ -335,8 +322,6 @@ class ObjectStorage implements \Countable, \Iterator, \ArrayAccess, ObjectMonito
 
     /**
      * Register the storage's clean state, e.g. after it has been reconstituted from the database.
-     *
-     * @return void
      */
     public function _memorizeCleanState()
     {
diff --git a/typo3/sysext/extbase/Classes/Persistence/PersistenceManagerInterface.php b/typo3/sysext/extbase/Classes/Persistence/PersistenceManagerInterface.php
index 1ca9484c95ef5929ec697edbd3aeec0f58563eca..3d2d93cfc068cf4753ee4d6d983404948f0b0c60 100644
--- a/typo3/sysext/extbase/Classes/Persistence/PersistenceManagerInterface.php
+++ b/typo3/sysext/extbase/Classes/Persistence/PersistenceManagerInterface.php
@@ -23,7 +23,6 @@ interface PersistenceManagerInterface
      * Commits new objects and changes to objects in the current persistence
      * session into the backend
      *
-     * @return void
      * @api
      */
     public function persistAll();
@@ -33,8 +32,6 @@ interface PersistenceManagerInterface
      *
      * Managed instances become detached, any fetches will
      * return data directly from the persistence "backend".
-     *
-     * @return void
      */
     public function clearState();
 
@@ -103,7 +100,6 @@ interface PersistenceManagerInterface
      * @param string $className The class name of the repository to be registered
      * @deprecated since Extbase 6.0, will be removed in Extbase 7.0. It is deprecated only in the interface to be more
      * in sync with Flow in future and will stay in Generic Persistence.
-     * @return void
      */
     public function registerRepositoryClassName($className);
 
@@ -111,7 +107,6 @@ interface PersistenceManagerInterface
      * Adds an object to the persistence.
      *
      * @param object $object The object to add
-     * @return void
      * @api
      */
     public function add($object);
@@ -120,7 +115,6 @@ interface PersistenceManagerInterface
      * Removes an object to the persistence.
      *
      * @param object $object The object to remove
-     * @return void
      * @api
      */
     public function remove($object);
@@ -129,7 +123,6 @@ interface PersistenceManagerInterface
      * Update an object in the persistence.
      *
      * @param object $object The modified object
-     * @return void
      * @throws \TYPO3\CMS\Extbase\Persistence\Exception\UnknownObjectException
      * @api
      */
@@ -139,7 +132,6 @@ interface PersistenceManagerInterface
      * Injects the Extbase settings, called by Extbase.
      *
      * @param array $settings
-     * @return void
      * @api
      */
     public function injectSettings(array $settings);
diff --git a/typo3/sysext/extbase/Classes/Persistence/QueryInterface.php b/typo3/sysext/extbase/Classes/Persistence/QueryInterface.php
index a48ecd5a18ae56c979edc85ac6e75330fe441a7b..0b632c5905388289788915afaaafe1e7563c9e13 100644
--- a/typo3/sysext/extbase/Classes/Persistence/QueryInterface.php
+++ b/typo3/sysext/extbase/Classes/Persistence/QueryInterface.php
@@ -327,7 +327,6 @@ interface QueryInterface
      * the specific Storage Backend.
      *
      * @param \TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface $querySettings The Query Settings
-     * @return void
      * @todo decide whether this can be deprecated somewhen
      * @api This method is not part of TYPO3Flow API
      */
diff --git a/typo3/sysext/extbase/Classes/Persistence/Repository.php b/typo3/sysext/extbase/Classes/Persistence/Repository.php
index c67ac49349d4f81b5cee87146c01d92779ffc082..9932903b1ec740af5a568fb6e3e364ebf9c6c5c5 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Repository.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Repository.php
@@ -72,7 +72,6 @@ class Repository implements RepositoryInterface, \TYPO3\CMS\Core\SingletonInterf
      *
      * @param object $object The object to add
      * @throws Exception\IllegalObjectTypeException
-     * @return void
      * @api
      */
     public function add($object)
@@ -88,7 +87,6 @@ class Repository implements RepositoryInterface, \TYPO3\CMS\Core\SingletonInterf
      *
      * @param object $object The object to remove
      * @throws Exception\IllegalObjectTypeException
-     * @return void
      * @api
      */
     public function remove($object)
@@ -105,7 +103,6 @@ class Repository implements RepositoryInterface, \TYPO3\CMS\Core\SingletonInterf
      * @param object $modifiedObject The modified object
      * @throws Exception\UnknownObjectException
      * @throws Exception\IllegalObjectTypeException
-     * @return void
      * @api
      */
     public function update($modifiedObject)
@@ -142,7 +139,6 @@ class Repository implements RepositoryInterface, \TYPO3\CMS\Core\SingletonInterf
      * Removes all objects of this repository as if remove() was called for
      * all of them.
      *
-     * @return void
      * @api
      */
     public function removeAll()
@@ -185,7 +181,6 @@ class Repository implements RepositoryInterface, \TYPO3\CMS\Core\SingletonInterf
      * )
      *
      * @param array $defaultOrderings The property names to order by
-     * @return void
      * @api
      */
     public function setDefaultOrderings(array $defaultOrderings)
@@ -197,7 +192,6 @@ class Repository implements RepositoryInterface, \TYPO3\CMS\Core\SingletonInterf
      * Sets the default query settings to be used in this repository
      *
      * @param \TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface $defaultQuerySettings The query settings to be used by default
-     * @return void
      * @api
      */
     public function setDefaultQuerySettings(\TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface $defaultQuerySettings)
diff --git a/typo3/sysext/extbase/Classes/Persistence/RepositoryInterface.php b/typo3/sysext/extbase/Classes/Persistence/RepositoryInterface.php
index 150ec50f8148e261d68ab8e1b183b3565f5bf4a1..3daaee392a55887e607c2a4a4812118e32304db4 100644
--- a/typo3/sysext/extbase/Classes/Persistence/RepositoryInterface.php
+++ b/typo3/sysext/extbase/Classes/Persistence/RepositoryInterface.php
@@ -25,7 +25,6 @@ interface RepositoryInterface
      * Adds an object to this repository.
      *
      * @param object $object The object to add
-     * @return void
      * @api
      */
     public function add($object);
@@ -34,7 +33,6 @@ interface RepositoryInterface
      * Removes an object from this repository.
      *
      * @param object $object The object to remove
-     * @return void
      * @api
      */
     public function remove($object);
@@ -67,7 +65,6 @@ interface RepositoryInterface
      * Removes all objects of this repository as if remove() was called for
      * all of them.
      *
-     * @return void
      * @api
      */
     public function removeAll();
@@ -99,7 +96,6 @@ interface RepositoryInterface
      * )
      *
      * @param array $defaultOrderings The property names to order by
-     * @return void
      * @api
      */
     public function setDefaultOrderings(array $defaultOrderings);
@@ -108,7 +104,6 @@ interface RepositoryInterface
      * Sets the default query settings to be used in this repository
      *
      * @param \TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface $defaultQuerySettings The query settings to be used by default
-     * @return void
      * @api
      */
     public function setDefaultQuerySettings(\TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface $defaultQuerySettings);
diff --git a/typo3/sysext/extbase/Classes/Property/PropertyMapper.php b/typo3/sysext/extbase/Classes/Property/PropertyMapper.php
index 712db66b301a4156e156714b9bbdc2199140773d..727cf99d5248dde92b12302821cb548c97e933f3 100644
--- a/typo3/sysext/extbase/Classes/Property/PropertyMapper.php
+++ b/typo3/sysext/extbase/Classes/Property/PropertyMapper.php
@@ -83,7 +83,6 @@ class PropertyMapper implements \TYPO3\CMS\Core\SingletonInterface
      * Here, the typeConverter array gets initialized.
      *
      * @throws Exception\DuplicateTypeConverterException
-     * @return void
      */
     public function initializeObject()
     {
diff --git a/typo3/sysext/extbase/Classes/Property/TypeConverter/DateTimeConverter.php b/typo3/sysext/extbase/Classes/Property/TypeConverter/DateTimeConverter.php
index 0d92302506a8aa4660ccd5100e7a9886265e96af..e43413ba9eb6cd56a14f976246cf2123edf533fc 100644
--- a/typo3/sysext/extbase/Classes/Property/TypeConverter/DateTimeConverter.php
+++ b/typo3/sysext/extbase/Classes/Property/TypeConverter/DateTimeConverter.php
@@ -210,7 +210,6 @@ class DateTimeConverter extends \TYPO3\CMS\Extbase\Property\TypeConverter\Abstra
      *
      * @param \DateTime $date
      * @param array $source
-     * @return void
      */
     protected function overrideTimeIfSpecified(\DateTime $date, array $source)
     {
diff --git a/typo3/sysext/extbase/Classes/Reflection/ClassSchema.php b/typo3/sysext/extbase/Classes/Reflection/ClassSchema.php
index fe47cbc2e91b66b8f57ec84fd54b6c5adc6871c6..5f8b37d5db0173fe02193b9512490940af4af999 100644
--- a/typo3/sysext/extbase/Classes/Reflection/ClassSchema.php
+++ b/typo3/sysext/extbase/Classes/Reflection/ClassSchema.php
@@ -98,7 +98,6 @@ class ClassSchema
      * @param string $type Type of the property
      * @param bool $lazy Whether the property should be lazy-loaded when reconstituting
      * @param string $cascade Strategy to cascade the object graph.
-     * @return void
      */
     public function addProperty($name, $type, $lazy = false, $cascade = '')
     {
@@ -138,7 +137,6 @@ class ClassSchema
      *
      * @param int $modelType The model type, one of the MODELTYPE_* constants.
      * @throws \InvalidArgumentException
-     * @return void
      */
     public function setModelType($modelType)
     {
@@ -163,7 +161,6 @@ class ClassSchema
      * through a repository - or not.
      *
      * @param bool $isRoot TRUE if it is the root of an aggregate
-     * @return void
      */
     public function setAggregateRoot($isRoot)
     {
@@ -197,7 +194,6 @@ class ClassSchema
      *
      * @param string $propertyName
      * @throws \InvalidArgumentException
-     * @return void
      */
     public function setUuidPropertyName($propertyName)
     {
@@ -224,7 +220,6 @@ class ClassSchema
      *
      * @param string $propertyName
      * @throws \InvalidArgumentException
-     * @return void
      */
     public function markAsIdentityProperty($propertyName)
     {
diff --git a/typo3/sysext/extbase/Classes/Reflection/DocCommentParser.php b/typo3/sysext/extbase/Classes/Reflection/DocCommentParser.php
index b76fd57ddc248dbf9a2f03778d1ed179ff5f4f49..bd15ceeff89a40c24c987e0163947a3cbda4146d 100644
--- a/typo3/sysext/extbase/Classes/Reflection/DocCommentParser.php
+++ b/typo3/sysext/extbase/Classes/Reflection/DocCommentParser.php
@@ -35,7 +35,6 @@ class DocCommentParser
      * getTags() getTagValues() and getDescription() methods.
      *
      * @param string $docComment A doc comment as returned by the reflection getDocComment() method
-     * @return void
      */
     public function parseDocComment($docComment)
     {
@@ -105,7 +104,6 @@ class DocCommentParser
      * The result is stored in the interal tags array.
      *
      * @param string $line A line of a doc comment which starts with an @-sign
-     * @return void
      */
     protected function parseTag($line)
     {
diff --git a/typo3/sysext/extbase/Classes/Reflection/ReflectionService.php b/typo3/sysext/extbase/Classes/Reflection/ReflectionService.php
index 8d74e5726cb9682a55cc410a1a7f6dc25041983a..e775cbc64ab9cc6d5ead4373ee04d767a50034e3 100644
--- a/typo3/sysext/extbase/Classes/Reflection/ReflectionService.php
+++ b/typo3/sysext/extbase/Classes/Reflection/ReflectionService.php
@@ -172,7 +172,6 @@ class ReflectionService implements \TYPO3\CMS\Core\SingletonInterface
      * The cache must be set before initializing the Reflection Service.
      *
      * @param \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend $dataCache Cache for the Reflection service
-     * @return void
      */
     public function setDataCache(\TYPO3\CMS\Core\Cache\Frontend\VariableFrontend $dataCache)
     {
@@ -183,7 +182,6 @@ class ReflectionService implements \TYPO3\CMS\Core\SingletonInterface
      * Initializes this service
      *
      * @throws Exception
-     * @return void
      */
     public function initialize()
     {
@@ -208,8 +206,6 @@ class ReflectionService implements \TYPO3\CMS\Core\SingletonInterface
 
     /**
      * Shuts the Reflection Service down.
-     *
-     * @return void
      */
     public function shutdown()
     {
@@ -442,7 +438,6 @@ class ReflectionService implements \TYPO3\CMS\Core\SingletonInterface
      * Reflects the given class and stores the results in this service's properties.
      *
      * @param string $className Full qualified name of the class to reflect
-     * @return void
      */
     protected function reflectClass($className)
     {
@@ -581,8 +576,6 @@ class ReflectionService implements \TYPO3\CMS\Core\SingletonInterface
 
     /**
      * Tries to load the reflection data from this service's cache.
-     *
-     * @return void
      */
     protected function loadFromCache()
     {
@@ -598,7 +591,6 @@ class ReflectionService implements \TYPO3\CMS\Core\SingletonInterface
      * Exports the internal reflection data into the ReflectionData cache.
      *
      * @throws Exception
-     * @return void
      */
     protected function saveToCache()
     {
diff --git a/typo3/sysext/extbase/Classes/Scheduler/Task.php b/typo3/sysext/extbase/Classes/Scheduler/Task.php
index 45ab9e5f53ffe7ebc30e10a3abad8e7401263acf..bd81c92aa9c6aaa76ee24d659c0320b6072a9ae4 100644
--- a/typo3/sysext/extbase/Classes/Scheduler/Task.php
+++ b/typo3/sysext/extbase/Classes/Scheduler/Task.php
@@ -76,8 +76,6 @@ class Task extends \TYPO3\CMS\Scheduler\Task\AbstractTask
 
     /**
      * Wakeup
-     *
-     * @return void
      */
     public function __wakeup()
     {
diff --git a/typo3/sysext/extbase/Classes/Scheduler/TaskExecutor.php b/typo3/sysext/extbase/Classes/Scheduler/TaskExecutor.php
index 69bdaa279095ca7c8968eb05ec65a9d590ae1784..cace8572034586c8b90f623b3e2e7f02e533f7bf 100644
--- a/typo3/sysext/extbase/Classes/Scheduler/TaskExecutor.php
+++ b/typo3/sysext/extbase/Classes/Scheduler/TaskExecutor.php
@@ -88,7 +88,6 @@ class TaskExecutor implements \TYPO3\CMS\Core\SingletonInterface
      * Initializes configuration manager, object container and reflection service
      *
      * @param array $configuration
-     * @return void
      */
     protected function initialize(array $configuration)
     {
@@ -124,7 +123,6 @@ class TaskExecutor implements \TYPO3\CMS\Core\SingletonInterface
      * must be caught manually if you manually execute Tasks through your code.
      *
      * @param \TYPO3\CMS\Extbase\Scheduler\Task $task the task to execute
-     * @return void
      */
     public function execute(\TYPO3\CMS\Extbase\Scheduler\Task $task)
     {
@@ -143,8 +141,6 @@ class TaskExecutor implements \TYPO3\CMS\Core\SingletonInterface
 
     /**
      * Resets framework singletons
-     *
-     * @return void
      */
     protected function shutdown()
     {
diff --git a/typo3/sysext/extbase/Classes/Service/CacheService.php b/typo3/sysext/extbase/Classes/Service/CacheService.php
index b1c2911ba05fe43d99228a264088bc3b69b201f1..da5ac0d8afa66f1eb63b6cfa5b5317a256b0f4a6 100644
--- a/typo3/sysext/extbase/Classes/Service/CacheService.php
+++ b/typo3/sysext/extbase/Classes/Service/CacheService.php
@@ -57,7 +57,6 @@ class CacheService implements \TYPO3\CMS\Core\SingletonInterface
      * Clears the page cache
      *
      * @param mixed $pageIdsToClear (int) single or (array) multiple pageIds to clear the cache for
-     * @return void
      */
     public function clearPageCache($pageIdsToClear = null)
     {
@@ -77,8 +76,6 @@ class CacheService implements \TYPO3\CMS\Core\SingletonInterface
     /**
      * Walks through the pageIdStack, collects all pageIds
      * as array and passes them on to clearPageCache.
-     *
-     * @return void
      */
     public function clearCachesOfRegisteredPageIds()
     {
diff --git a/typo3/sysext/extbase/Classes/Service/ImageService.php b/typo3/sysext/extbase/Classes/Service/ImageService.php
index 841f7ed08eb17ebc0d4054388da6697556a7e2bb..807e014b56ef5b1a8aadd1738bc0f8e30f7d2295 100644
--- a/typo3/sysext/extbase/Classes/Service/ImageService.php
+++ b/typo3/sysext/extbase/Classes/Service/ImageService.php
@@ -166,7 +166,6 @@ class ImageService implements \TYPO3\CMS\Core\SingletonInterface
      * in case we are in frontend environment.
      *
      * @param ProcessedFile $processedImage
-     * @return void
      */
     protected function setCompatibilityValues(ProcessedFile $processedImage)
     {
diff --git a/typo3/sysext/extbase/Classes/SignalSlot/Dispatcher.php b/typo3/sysext/extbase/Classes/SignalSlot/Dispatcher.php
index 5974bf773483826b252546da3b82d49db7b8e9fa..e6dc178feee98faebe044ba20aedd372351cf372 100644
--- a/typo3/sysext/extbase/Classes/SignalSlot/Dispatcher.php
+++ b/typo3/sysext/extbase/Classes/SignalSlot/Dispatcher.php
@@ -49,8 +49,6 @@ class Dispatcher implements \TYPO3\CMS\Core\SingletonInterface
      * Since this dispatches is used very early when the ObjectManager
      * is not fully initialized (especially concerning caching framework),
      * this is the only way.
-     *
-     * @return void
      */
     public function initializeObject()
     {
@@ -70,7 +68,6 @@ class Dispatcher implements \TYPO3\CMS\Core\SingletonInterface
      * @param string $slotMethodName Name of the method to be used as a slot. If $slotClassNameOrObject is a Closure object, this parameter is ignored
      * @param bool $passSignalInformation If set to TRUE, the last argument passed to the slot will be information about the signal (EmitterClassName::signalName)
      * @throws \InvalidArgumentException
-     * @return void
      * @api
      */
     public function connect($signalClassName, $signalName, $slotClassNameOrObject, $slotMethodName = '', $passSignalInformation = true)
diff --git a/typo3/sysext/extbase/Classes/Utility/DebuggerUtility.php b/typo3/sysext/extbase/Classes/Utility/DebuggerUtility.php
index 4cac342664090266148155efe7d424bb89520994..5711fb2ec88f60a148182a12e6d7eebbaaba01b6 100644
--- a/typo3/sysext/extbase/Classes/Utility/DebuggerUtility.php
+++ b/typo3/sysext/extbase/Classes/Utility/DebuggerUtility.php
@@ -78,8 +78,6 @@ class DebuggerUtility
 
     /**
      * Clear the state of the debugger
-     *
-     * @return void
      */
     protected static function clearState()
     {
diff --git a/typo3/sysext/extbase/Classes/Utility/Exception/InvalidTypeException.php b/typo3/sysext/extbase/Classes/Utility/Exception/InvalidTypeException.php
index b746eaba256d17b64781f40b64c377f4d0f051e7..d991c7ecfc16544132083bd01a003fc68a1104dc 100644
--- a/typo3/sysext/extbase/Classes/Utility/Exception/InvalidTypeException.php
+++ b/typo3/sysext/extbase/Classes/Utility/Exception/InvalidTypeException.php
@@ -23,7 +23,6 @@ namespace TYPO3\CMS\Extbase\Utility\Exception;
 
 /**
  * An Invalid Type Exception
- *
  */
 class InvalidTypeException extends \TYPO3\CMS\Extbase\Exception
 {
diff --git a/typo3/sysext/extbase/Classes/Utility/ExtensionUtility.php b/typo3/sysext/extbase/Classes/Utility/ExtensionUtility.php
index 64027eb3f5ff94b498bbd169cd33d5e05ba7191e..c8fcd17390d2c6af6f51d0b8f0245197fe414eab 100644
--- a/typo3/sysext/extbase/Classes/Utility/ExtensionUtility.php
+++ b/typo3/sysext/extbase/Classes/Utility/ExtensionUtility.php
@@ -40,7 +40,6 @@ class ExtensionUtility
      * @param array $nonCacheableControllerActions is an optional array of controller name and  action names which should not be cached (array as defined in $controllerActions)
      * @param string $pluginType either \TYPO3\CMS\Extbase\Utility\ExtensionUtility::PLUGIN_TYPE_PLUGIN (default) or \TYPO3\CMS\Extbase\Utility\ExtensionUtility::PLUGIN_TYPE_CONTENT_ELEMENT
      * @throws \InvalidArgumentException
-     * @return void
      */
     public static function configurePlugin($extensionName, $pluginName, array $controllerActions, array $nonCacheableControllerActions = [], $pluginType = self::PLUGIN_TYPE_PLUGIN)
     {
@@ -112,7 +111,6 @@ tt_content.' . $pluginSignature . ' {
      * @param string $pluginTitle is a speaking title of the plugin that will be displayed in the drop down menu in the backend
      * @param string $pluginIconPathAndFilename is a path to an icon file (relative to TYPO3_mainDir), that will be displayed in the drop down menu in the backend (optional)
      * @throws \InvalidArgumentException
-     * @return void
      */
     public static function registerPlugin($extensionName, $pluginName, $pluginTitle, $pluginIconPathAndFilename = null)
     {
@@ -153,7 +151,6 @@ tt_content.' . $pluginSignature . ' {
      * @param array $controllerActions is an array of allowed combinations of controller and action stored in an array (controller name as key and a comma separated list of action names as value, the first controller and its first action is chosen as default)
      * @param array $moduleConfiguration The configuration options of the module (icon, locallang.xlf file)
      * @throws \InvalidArgumentException
-     * @return void
      */
     public static function registerModule($extensionName, $mainModuleName = '', $subModuleName = '', $position = '', array $controllerActions = [], array $moduleConfiguration = [])
     {
@@ -214,7 +211,6 @@ tt_content.' . $pluginSignature . ' {
      * Register a type converter by class name.
      *
      * @param string $typeConverterClassName
-     * @return void
      * @api
      */
     public static function registerTypeConverter($typeConverterClassName)
@@ -231,7 +227,6 @@ tt_content.' . $pluginSignature . ' {
      *
      * @param string $vendorName The vendor name to check
      * @param string $extensionName The extension name that is affected
-     * @return void
      */
     protected static function checkVendorNameFormat($vendorName, $extensionName)
     {
@@ -245,7 +240,6 @@ tt_content.' . $pluginSignature . ' {
      *
      * @param string $extensionName The name of the extension
      * @throws \InvalidArgumentException
-     * @return void
      */
     protected static function checkExtensionNameFormat($extensionName)
     {
@@ -259,7 +253,6 @@ tt_content.' . $pluginSignature . ' {
      *
      * @param string $pluginName The name of the plugin
      * @throws \InvalidArgumentException
-     * @return void
      */
     protected static function checkPluginNameFormat($pluginName)
     {
diff --git a/typo3/sysext/extbase/Classes/Utility/FrontendSimulatorUtility.php b/typo3/sysext/extbase/Classes/Utility/FrontendSimulatorUtility.php
index 13f9f1db070b5dd7b042b4378747184b1cc14991..5383820fb9292140cea89b500417d40110328a3c 100644
--- a/typo3/sysext/extbase/Classes/Utility/FrontendSimulatorUtility.php
+++ b/typo3/sysext/extbase/Classes/Utility/FrontendSimulatorUtility.php
@@ -31,7 +31,6 @@ class FrontendSimulatorUtility
      * This somewhat hacky work around is currently needed because the cObjGetSingle() function of \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer relies on this setting
      *
      * @param \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer|NULL $cObj
-     * @return void
      */
     public static function simulateFrontendEnvironment(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer $cObj = null)
     {
@@ -44,7 +43,6 @@ class FrontendSimulatorUtility
     /**
      * Resets $GLOBALS['TSFE'] if it was previously changed by simulateFrontendEnvironment()
      *
-     * @return void
      * @see simulateFrontendEnvironment()
      */
     public static function resetFrontendEnvironment()
diff --git a/typo3/sysext/extbase/Classes/Utility/LocalizationUtility.php b/typo3/sysext/extbase/Classes/Utility/LocalizationUtility.php
index d411f95a3013411abc5cabfe8781d5bf0588f9be..25abcf179dae8f92b286792c0c051bca861004d5 100644
--- a/typo3/sysext/extbase/Classes/Utility/LocalizationUtility.php
+++ b/typo3/sysext/extbase/Classes/Utility/LocalizationUtility.php
@@ -144,7 +144,6 @@ class LocalizationUtility
      * Also locallang values set in the TypoScript property "_LOCAL_LANG" are merged onto the values found in the "locallang.xlf" file.
      *
      * @param string $extensionName
-     * @return void
      */
     protected static function initializeLocalization($extensionName)
     {
@@ -170,8 +169,6 @@ class LocalizationUtility
     /**
      * Sets the currently active language/language_alt keys.
      * Default values are "default" for language key and "" for language_alt key.
-     *
-     * @return void
      */
     protected static function setLanguageKeys()
     {
@@ -205,7 +202,6 @@ class LocalizationUtility
      * plugin.tx_myextension._LOCAL_LANG.languageKey.key = value
      *
      * @param string $extensionName
-     * @return void
      */
     protected static function loadTypoScriptLabels($extensionName)
     {
diff --git a/typo3/sysext/extbase/Classes/Utility/TypeHandlingUtility.php b/typo3/sysext/extbase/Classes/Utility/TypeHandlingUtility.php
index e464f2ed736d1b6f3c6c7b4d71b1e68c26f56eab..da0b32daff798b31952aa4c8d84a524e8a05e101 100644
--- a/typo3/sysext/extbase/Classes/Utility/TypeHandlingUtility.php
+++ b/typo3/sysext/extbase/Classes/Utility/TypeHandlingUtility.php
@@ -13,7 +13,6 @@ namespace TYPO3\CMS\Extbase\Utility;
 
 /**
  * PHP type handling functions
- *
  */
 class TypeHandlingUtility
 {
diff --git a/typo3/sysext/extbase/Classes/Validation/Error.php b/typo3/sysext/extbase/Classes/Validation/Error.php
index 0610dc624249b6a7d97d9123e3b7c2d11f170023..ce9b670f57259fbb2070e313f79ec089cad9c847 100644
--- a/typo3/sysext/extbase/Classes/Validation/Error.php
+++ b/typo3/sysext/extbase/Classes/Validation/Error.php
@@ -16,7 +16,6 @@ namespace TYPO3\CMS\Extbase\Validation;
 
 /**
  * This object holds a validation error.
- *
  */
 class Error extends \TYPO3\CMS\Extbase\Error\Error
 {
diff --git a/typo3/sysext/extbase/Classes/Validation/Validator/AbstractCompositeValidator.php b/typo3/sysext/extbase/Classes/Validation/Validator/AbstractCompositeValidator.php
index e256411cf24f7088873983b45ee88664a4361ed1..9a3ef8a76c99278b9c114f957fbe6c5da910b3c2 100644
--- a/typo3/sysext/extbase/Classes/Validation/Validator/AbstractCompositeValidator.php
+++ b/typo3/sysext/extbase/Classes/Validation/Validator/AbstractCompositeValidator.php
@@ -85,7 +85,6 @@ abstract class AbstractCompositeValidator implements ObjectValidatorInterface, \
      * Adds a new validator to the conjunction.
      *
      * @param \TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface $validator The validator that should be added
-     * @return void
      * @api
      */
     public function addValidator(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface $validator)
@@ -102,7 +101,6 @@ abstract class AbstractCompositeValidator implements ObjectValidatorInterface, \
      *
      * @param \TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface $validator The validator to remove
      * @throws \TYPO3\CMS\Extbase\Validation\Exception\NoSuchValidatorException
-     * @return void
      */
     public function removeValidator(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface $validator)
     {
@@ -147,7 +145,6 @@ abstract class AbstractCompositeValidator implements ObjectValidatorInterface, \
      * Allows to set a container to keep track of validated instances.
      *
      * @param \SplObjectStorage $validatedInstancesContainer A container to keep track of validated instances
-     * @return void
      * @api
      */
     public function setValidatedInstancesContainer(\SplObjectStorage $validatedInstancesContainer)
diff --git a/typo3/sysext/extbase/Classes/Validation/Validator/AbstractValidator.php b/typo3/sysext/extbase/Classes/Validation/Validator/AbstractValidator.php
index 37764210bd62c4ca3f6ca41015345d9d33710a10..6dc277fc227148ed2f95aadb1c3021a66ec3492e 100644
--- a/typo3/sysext/extbase/Classes/Validation/Validator/AbstractValidator.php
+++ b/typo3/sysext/extbase/Classes/Validation/Validator/AbstractValidator.php
@@ -108,7 +108,6 @@ abstract class AbstractValidator implements ValidatorInterface
      * to result.
      *
      * @param mixed $value
-     * @return void
      */
     abstract protected function isValid($value);
 
@@ -119,7 +118,6 @@ abstract class AbstractValidator implements ValidatorInterface
      * @param int $code The error code (a unix timestamp)
      * @param array $arguments Arguments to be replaced in message
      * @param string $title title of the error
-     * @return void
      */
     protected function addError($message, $code, array $arguments = [], $title = '')
     {
diff --git a/typo3/sysext/extbase/Classes/Validation/Validator/AlphanumericValidator.php b/typo3/sysext/extbase/Classes/Validation/Validator/AlphanumericValidator.php
index 80cef00650df679c93608dd62d0adeb196326243..58e292a9f0c0582af17214806dec602e25465393 100644
--- a/typo3/sysext/extbase/Classes/Validation/Validator/AlphanumericValidator.php
+++ b/typo3/sysext/extbase/Classes/Validation/Validator/AlphanumericValidator.php
@@ -25,7 +25,6 @@ class AlphanumericValidator extends AbstractValidator
      * The given $value is valid if it is an alphanumeric string, which is defined as [\pL\d]*.
      *
      * @param mixed $value The value that should be validated
-     * @return void
      * @api
      */
     public function isValid($value)
diff --git a/typo3/sysext/extbase/Classes/Validation/Validator/BooleanValidator.php b/typo3/sysext/extbase/Classes/Validation/Validator/BooleanValidator.php
index 06414e1e979e53598c9ffd9c4681377d56d7cd49..9a8feee1ff8afe7b9bb0e548c8c81094b8198b0e 100644
--- a/typo3/sysext/extbase/Classes/Validation/Validator/BooleanValidator.php
+++ b/typo3/sysext/extbase/Classes/Validation/Validator/BooleanValidator.php
@@ -39,7 +39,6 @@ class BooleanValidator extends AbstractValidator
      * tests and actual usage. This makes the validator loose but still keeping functionality.
      *
      * @param mixed $value The value that should be validated
-     * @return void
      */
     public function isValid($value)
     {
diff --git a/typo3/sysext/extbase/Classes/Validation/Validator/CollectionValidator.php b/typo3/sysext/extbase/Classes/Validation/Validator/CollectionValidator.php
index 4f1da36996d53301608cb65fdfc29a74e4e63db6..9c0d47bddfc42ab7303856998876a618f08a806f 100644
--- a/typo3/sysext/extbase/Classes/Validation/Validator/CollectionValidator.php
+++ b/typo3/sysext/extbase/Classes/Validation/Validator/CollectionValidator.php
@@ -79,7 +79,6 @@ class CollectionValidator extends GenericObjectValidator
      * will be skipped.
      *
      * @param mixed $value A collection to be validated
-     * @return void
      */
     protected function isValid($value)
     {
diff --git a/typo3/sysext/extbase/Classes/Validation/Validator/DateTimeValidator.php b/typo3/sysext/extbase/Classes/Validation/Validator/DateTimeValidator.php
index dfed549edd256cce78226569f8b242390fec01c6..023970ac5f92b1859222fe5755388f2d701cf2dd 100644
--- a/typo3/sysext/extbase/Classes/Validation/Validator/DateTimeValidator.php
+++ b/typo3/sysext/extbase/Classes/Validation/Validator/DateTimeValidator.php
@@ -26,7 +26,6 @@ class DateTimeValidator extends AbstractValidator
      * the case, the function adds an error.
      *
      * @param mixed $value The value that should be validated
-     * @return void
      */
     public function isValid($value)
     {
diff --git a/typo3/sysext/extbase/Classes/Validation/Validator/EmailAddressValidator.php b/typo3/sysext/extbase/Classes/Validation/Validator/EmailAddressValidator.php
index 05b5a30cb8a823e58c11afea5dbc71915cd715fb..807923071c7456b596a3eced8fc986eeac4ddb4e 100644
--- a/typo3/sysext/extbase/Classes/Validation/Validator/EmailAddressValidator.php
+++ b/typo3/sysext/extbase/Classes/Validation/Validator/EmailAddressValidator.php
@@ -25,7 +25,6 @@ class EmailAddressValidator extends AbstractValidator
      * Checks if the given value is a valid email address.
      *
      * @param mixed $value The value that should be validated
-     * @return void
      * @api
      */
     public function isValid($value)
diff --git a/typo3/sysext/extbase/Classes/Validation/Validator/FloatValidator.php b/typo3/sysext/extbase/Classes/Validation/Validator/FloatValidator.php
index 6f363288f60fdf784e27b5dd70286798191aa992..daea48763ae7e4bab0b3e59cfc6ddfda07f9c3c9 100644
--- a/typo3/sysext/extbase/Classes/Validation/Validator/FloatValidator.php
+++ b/typo3/sysext/extbase/Classes/Validation/Validator/FloatValidator.php
@@ -25,7 +25,6 @@ class FloatValidator extends AbstractValidator
      * The given value is valid if it is of type float or a string matching the regular expression [0-9.e+-]
      *
      * @param mixed $value The value that should be validated
-     * @return void
      * @api
      */
     public function isValid($value)
diff --git a/typo3/sysext/extbase/Classes/Validation/Validator/GenericObjectValidator.php b/typo3/sysext/extbase/Classes/Validation/Validator/GenericObjectValidator.php
index 4c96cfe575de37bd6423edbb10f4e9acd25c8f54..97ccecccb27b0e7f88c288f374725f0fa87e3344 100644
--- a/typo3/sysext/extbase/Classes/Validation/Validator/GenericObjectValidator.php
+++ b/typo3/sysext/extbase/Classes/Validation/Validator/GenericObjectValidator.php
@@ -74,7 +74,6 @@ class GenericObjectValidator extends AbstractValidator implements ObjectValidato
      * @param mixed $value The value to be validated
      * @param \Traversable $validators The validators to be called on the value
      * @param string $propertyName Name of ther property to check
-     * @return void
      */
     protected function checkProperty($value, $validators, $propertyName)
     {
@@ -102,7 +101,6 @@ class GenericObjectValidator extends AbstractValidator implements ObjectValidato
      * Checks if the given value is valid according to the property validators.
      *
      * @param mixed $object The value that should be validated
-     * @return void
      * @api
      */
     protected function isValid($object)
@@ -130,7 +128,6 @@ class GenericObjectValidator extends AbstractValidator implements ObjectValidato
      *
      * @param string $propertyName Name of the property to validate
      * @param ValidatorInterface $validator The property validator
-     * @return void
      * @api
      */
     public function addPropertyValidator($propertyName, ValidatorInterface $validator)
@@ -183,7 +180,6 @@ class GenericObjectValidator extends AbstractValidator implements ObjectValidato
      * Allows to set a container to keep track of validated instances.
      *
      * @param \SplObjectStorage $validatedInstancesContainer A container to keep track of validated instances
-     * @return void
      * @api
      */
     public function setValidatedInstancesContainer(\SplObjectStorage $validatedInstancesContainer)
diff --git a/typo3/sysext/extbase/Classes/Validation/Validator/IntegerValidator.php b/typo3/sysext/extbase/Classes/Validation/Validator/IntegerValidator.php
index 33dde07c107506e8b45f739f9a8f6ae83b9c4225..f1efc53deb93238a55cefc4860cd33c0014bf212 100644
--- a/typo3/sysext/extbase/Classes/Validation/Validator/IntegerValidator.php
+++ b/typo3/sysext/extbase/Classes/Validation/Validator/IntegerValidator.php
@@ -25,7 +25,6 @@ class IntegerValidator extends AbstractValidator
      * Checks if the given value is a valid integer.
      *
      * @param mixed $value The value that should be validated
-     * @return void
      * @api
      */
     public function isValid($value)
diff --git a/typo3/sysext/extbase/Classes/Validation/Validator/NotEmptyValidator.php b/typo3/sysext/extbase/Classes/Validation/Validator/NotEmptyValidator.php
index 692c260babf26cbe053c398d6ca657112332d583..9e954d99a4af190d243dea566f4a43f177bf2ade 100644
--- a/typo3/sysext/extbase/Classes/Validation/Validator/NotEmptyValidator.php
+++ b/typo3/sysext/extbase/Classes/Validation/Validator/NotEmptyValidator.php
@@ -33,7 +33,6 @@ class NotEmptyValidator extends AbstractValidator
      * Checks if the given property ($propertyValue) is not empty (NULL, empty string, empty array or empty object).
      *
      * @param mixed $value The value that should be validated
-     * @return void
      */
     public function isValid($value)
     {
diff --git a/typo3/sysext/extbase/Classes/Validation/Validator/NumberRangeValidator.php b/typo3/sysext/extbase/Classes/Validation/Validator/NumberRangeValidator.php
index 61607551ef30a45144898691a0373d64674f6994..6d269d7336c4727cf7e4492f81edbbe650e49945 100644
--- a/typo3/sysext/extbase/Classes/Validation/Validator/NumberRangeValidator.php
+++ b/typo3/sysext/extbase/Classes/Validation/Validator/NumberRangeValidator.php
@@ -33,7 +33,6 @@ class NumberRangeValidator extends AbstractValidator
      * The given value is valid if it is a number in the specified range.
      *
      * @param mixed $value The value that should be validated
-     * @return void
      * @api
      */
     public function isValid($value)
diff --git a/typo3/sysext/extbase/Classes/Validation/Validator/NumberValidator.php b/typo3/sysext/extbase/Classes/Validation/Validator/NumberValidator.php
index df29360f5c55978b614373b7844289af7370d204..c11804b99bfb34fc286b1eba337ef719890b12c0 100644
--- a/typo3/sysext/extbase/Classes/Validation/Validator/NumberValidator.php
+++ b/typo3/sysext/extbase/Classes/Validation/Validator/NumberValidator.php
@@ -25,7 +25,6 @@ class NumberValidator extends AbstractValidator
      * Checks if the given value is a valid number.
      *
      * @param mixed $value The value that should be validated
-     * @return void
      */
     public function isValid($value)
     {
diff --git a/typo3/sysext/extbase/Classes/Validation/Validator/ObjectValidatorInterface.php b/typo3/sysext/extbase/Classes/Validation/Validator/ObjectValidatorInterface.php
index 3e0908e3fc049eb4f64362e544fc4e4079659db7..2c9cc5af453e97ee4f05224dd598f0d1265c2e85 100644
--- a/typo3/sysext/extbase/Classes/Validation/Validator/ObjectValidatorInterface.php
+++ b/typo3/sysext/extbase/Classes/Validation/Validator/ObjectValidatorInterface.php
@@ -25,7 +25,6 @@ interface ObjectValidatorInterface extends ValidatorInterface
      * Allows to set a container to keep track of validated instances.
      *
      * @param \SplObjectStorage $validatedInstancesContainer A container to keep track of validated instances
-     * @return void
      * @api
      */
     public function setValidatedInstancesContainer(\SplObjectStorage $validatedInstancesContainer);
diff --git a/typo3/sysext/extbase/Classes/Validation/Validator/RawValidator.php b/typo3/sysext/extbase/Classes/Validation/Validator/RawValidator.php
index 9e04177d3227dc06adf2e62e8be885ed7d308a0e..266c67c5802dcbdf1d7564aafb860097309b6318 100644
--- a/typo3/sysext/extbase/Classes/Validation/Validator/RawValidator.php
+++ b/typo3/sysext/extbase/Classes/Validation/Validator/RawValidator.php
@@ -25,7 +25,6 @@ class RawValidator extends AbstractValidator
      * This validator is always valid.
      *
      * @param mixed $value The value that should be validated (not used here)
-     * @return void
      * @api
      */
     public function isValid($value)
diff --git a/typo3/sysext/extbase/Classes/Validation/Validator/RegularExpressionValidator.php b/typo3/sysext/extbase/Classes/Validation/Validator/RegularExpressionValidator.php
index c86591f5ec2bcb67e03323abd82e049699b77450..c5829513a2fb6f770aa877e26371c3b0caa94cb2 100644
--- a/typo3/sysext/extbase/Classes/Validation/Validator/RegularExpressionValidator.php
+++ b/typo3/sysext/extbase/Classes/Validation/Validator/RegularExpressionValidator.php
@@ -32,7 +32,6 @@ class RegularExpressionValidator extends AbstractValidator
      * Checks if the given value matches the specified regular expression.
      *
      * @param mixed $value The value that should be validated
-     * @return void
      * @throws \TYPO3\CMS\Extbase\Validation\Exception\InvalidValidationOptionsException
      * @api
      */
diff --git a/typo3/sysext/extbase/Classes/Validation/Validator/StringLengthValidator.php b/typo3/sysext/extbase/Classes/Validation/Validator/StringLengthValidator.php
index 68fd428f98095b5987a2012abea14caf760f44ee..985c82dbf7517b32bbe88522b7c48a0d4795cd71 100644
--- a/typo3/sysext/extbase/Classes/Validation/Validator/StringLengthValidator.php
+++ b/typo3/sysext/extbase/Classes/Validation/Validator/StringLengthValidator.php
@@ -35,7 +35,6 @@ class StringLengthValidator extends AbstractValidator
      * specified in the validation options.
      *
      * @param mixed $value The value that should be validated
-     * @return void
      * @throws \TYPO3\CMS\Extbase\Validation\Exception\InvalidValidationOptionsException
      * @api
      */
diff --git a/typo3/sysext/extbase/Classes/Validation/Validator/StringValidator.php b/typo3/sysext/extbase/Classes/Validation/Validator/StringValidator.php
index 3959aefd3df719f14d98d94284bf49e90379d9d1..b0738e77362d1437a73f40ae24367e984d613028 100644
--- a/typo3/sysext/extbase/Classes/Validation/Validator/StringValidator.php
+++ b/typo3/sysext/extbase/Classes/Validation/Validator/StringValidator.php
@@ -25,7 +25,6 @@ class StringValidator extends AbstractValidator
      * Checks if the given value is a string.
      *
      * @param mixed $value The value that should be validated
-     * @return void
      * @api
      */
     public function isValid($value)
diff --git a/typo3/sysext/extbase/Classes/Validation/Validator/TextValidator.php b/typo3/sysext/extbase/Classes/Validation/Validator/TextValidator.php
index 3b7ff2ad4d15aee1fceaa913f7d7dd4aa1ff1bde..6f2b2c19774e1cb77e8464ac06f0e79dc5658a3d 100644
--- a/typo3/sysext/extbase/Classes/Validation/Validator/TextValidator.php
+++ b/typo3/sysext/extbase/Classes/Validation/Validator/TextValidator.php
@@ -31,7 +31,6 @@ class TextValidator extends AbstractValidator
      * See http://php.net/filter_var for details.
      *
      * @param mixed $value The value that should be validated
-     * @return void
      * @api
      */
     public function isValid($value)
diff --git a/typo3/sysext/extbase/Classes/Validation/ValidatorResolver.php b/typo3/sysext/extbase/Classes/Validation/ValidatorResolver.php
index 98afcd243ca3027b38c33148d52dbd974fecd903..d35d230e7bbe45756e8d533247b3e6c7e4d1848c 100644
--- a/typo3/sysext/extbase/Classes/Validation/ValidatorResolver.php
+++ b/typo3/sysext/extbase/Classes/Validation/ValidatorResolver.php
@@ -259,7 +259,6 @@ class ValidatorResolver implements \TYPO3\CMS\Core\SingletonInterface
      * @param string $indexKey The key to use as index in $this->baseValidatorConjunctions; calculated from target class name and validation groups
      * @param string $targetClassName The data type to build the validation conjunction for. Needs to be the fully qualified class name.
      * @param array $validationGroups The validation groups to build the validator for
-     * @return void
      * @throws \TYPO3\CMS\Extbase\Validation\Exception\NoSuchValidatorException
      * @throws \InvalidArgumentException
      */
@@ -412,7 +411,6 @@ class ValidatorResolver implements \TYPO3\CMS\Core\SingletonInterface
      * This method is meant as a helper for regular expression results.
      *
      * @param string &$quotedValue Value to unquote
-     * @return void
      */
     protected function unquoteString(&$quotedValue)
     {
diff --git a/typo3/sysext/extbase/Tests/Fixture/ClassWithSetters.php b/typo3/sysext/extbase/Tests/Fixture/ClassWithSetters.php
index 3cb1020a68abd1264e48f00a18ad1f8bd2b0ecae..c10ca9311df060c64daa7cb6fea35c4efda84c91 100644
--- a/typo3/sysext/extbase/Tests/Fixture/ClassWithSetters.php
+++ b/typo3/sysext/extbase/Tests/Fixture/ClassWithSetters.php
@@ -22,7 +22,6 @@ namespace TYPO3\CMS\Extbase\Tests\Fixture;
  *                                                                        */
 /**
  * A dummy class with setters for testing data mapping
- *
  */
 class ClassWithSetters
 {
diff --git a/typo3/sysext/extbase/Tests/Fixture/ClassWithSettersAndConstructor.php b/typo3/sysext/extbase/Tests/Fixture/ClassWithSettersAndConstructor.php
index 3d565eadac7f99eaf19d6cbbbadfa355115c5ae1..559969731a19a0e84a6c6ad31c6f20d3551da661 100644
--- a/typo3/sysext/extbase/Tests/Fixture/ClassWithSettersAndConstructor.php
+++ b/typo3/sysext/extbase/Tests/Fixture/ClassWithSettersAndConstructor.php
@@ -22,7 +22,6 @@ namespace TYPO3\CMS\Extbase\Tests\Fixture;
  *                                                                        */
 /**
  * A dummy class with setters for testing data mapping
- *
  */
 class ClassWithSettersAndConstructor
 {
diff --git a/typo3/sysext/extbase/Tests/Fixture/Entity.php b/typo3/sysext/extbase/Tests/Fixture/Entity.php
index c637de9e45eada7031a51a4feab9a3c888b90682..2e6271075596159aad2e332a5bddb21f8c5e9531 100644
--- a/typo3/sysext/extbase/Tests/Fixture/Entity.php
+++ b/typo3/sysext/extbase/Tests/Fixture/Entity.php
@@ -40,7 +40,6 @@ class Entity extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Sets this entity's name
      *
      * @param string $name The entity's name
-     * @return void
      */
     public function setName($name)
     {
diff --git a/typo3/sysext/extbase/Tests/Fixture/ValueObject.php b/typo3/sysext/extbase/Tests/Fixture/ValueObject.php
index 220d649d92e035d0ad1030af6708b33014ae0b89..5294df411ddf292235017648491036d671f5d8bd 100644
--- a/typo3/sysext/extbase/Tests/Fixture/ValueObject.php
+++ b/typo3/sysext/extbase/Tests/Fixture/ValueObject.php
@@ -40,7 +40,6 @@ class ValueObject extends \TYPO3\CMS\Extbase\DomainObject\AbstractValueObject
      * Sets this value object's name
      *
      * @param string $name The value object's name
-     * @return void
      */
     public function setName($name)
     {
diff --git a/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Classes/Domain/Model/Blog.php b/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Classes/Domain/Model/Blog.php
index 3d1972ddc56979adaefa67562f16aeec50e9312e..7a96e03ec68d19042b6f806972b4d2933eb57c42 100644
--- a/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Classes/Domain/Model/Blog.php
+++ b/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Classes/Domain/Model/Blog.php
@@ -66,7 +66,6 @@ class Blog extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * Constructs a new Blog
-     *
      */
     public function __construct()
     {
@@ -77,7 +76,6 @@ class Blog extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Sets this blog's title
      *
      * @param string $title The blog's title
-     * @return void
      */
     public function setTitle($title)
     {
@@ -96,7 +94,6 @@ class Blog extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * @param string $logo
-     * @return void
      */
     public function setLogo($logo)
     {
@@ -115,7 +112,6 @@ class Blog extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Sets the description for the blog
      *
      * @param string $description
-     * @return void
      */
     public function setDescription($description)
     {
@@ -136,7 +132,6 @@ class Blog extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Adds a post to this blog
      *
      * @param Post $post
-     * @return void
      */
     public function addPost(Post $post)
     {
@@ -147,7 +142,6 @@ class Blog extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Remove a post from this blog
      *
      * @param Post $postToRemove The post to be removed
-     * @return void
      */
     public function removePost(Post $postToRemove)
     {
@@ -156,8 +150,6 @@ class Blog extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * Remove all posts from this blog
-     *
-     * @return void
      */
     public function removeAllPosts()
     {
@@ -218,7 +210,6 @@ class Blog extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Sets the administrator value
      *
      * @param Administrator $administrator The Administrator of this Blog
-     * @return void
      */
     public function setAdministrator(Administrator $administrator)
     {
diff --git a/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Classes/Domain/Model/Comment.php b/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Classes/Domain/Model/Comment.php
index 858450d13c1a6d9219639e4bec676c770c0a4f8f..bb38752c6aeaff2f43efe17507fc18bb28240d18 100644
--- a/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Classes/Domain/Model/Comment.php
+++ b/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Classes/Domain/Model/Comment.php
@@ -54,7 +54,6 @@ class Comment extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Setter for date
      *
      * @param \DateTime $date
-     * @return void
      */
     public function setDate(\DateTime $date)
     {
@@ -75,7 +74,6 @@ class Comment extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Sets the author for this comment
      *
      * @param string $author
-     * @return void
      */
     public function setAuthor($author)
     {
@@ -96,7 +94,6 @@ class Comment extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Sets the authors email for this comment
      *
      * @param string $email email of the author
-     * @return void
      */
     public function setEmail($email)
     {
@@ -117,7 +114,6 @@ class Comment extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Sets the content for this comment
      *
      * @param string $content
-     * @return void
      */
     public function setContent($content)
     {
diff --git a/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Classes/Domain/Model/Person.php b/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Classes/Domain/Model/Person.php
index 3fb134e1b96f47338570160dc04912b4abd8ea49..5a24ef9f8114ebc0b2e2cc69a6e10ea160c0d68a 100644
--- a/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Classes/Domain/Model/Person.php
+++ b/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Classes/Domain/Model/Person.php
@@ -46,7 +46,6 @@ class Person extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * Constructs a new Person
-     *
      */
     public function __construct($firstname, $lastname, $email)
     {
@@ -59,7 +58,6 @@ class Person extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Sets this persons's firstname
      *
      * @param string $firstname The person's firstname
-     * @return void
      */
     public function setFirstname($firstname)
     {
@@ -80,7 +78,6 @@ class Person extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Sets this persons's lastname
      *
      * @param string $lastname The person's lastname
-     * @return void
      */
     public function setLastname($lastname)
     {
@@ -111,7 +108,6 @@ class Person extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Sets this persons's email address
      *
      * @param string $email The person's email address
-     * @return void
      */
     public function setEmail($email)
     {
diff --git a/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Classes/Domain/Model/Post.php b/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Classes/Domain/Model/Post.php
index bdfbeb62aca57bffec06536fd0525975e8d0de37..ea070b50675ae24e5f7d800619867b3b16e3f747 100644
--- a/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Classes/Domain/Model/Post.php
+++ b/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Classes/Domain/Model/Post.php
@@ -85,7 +85,6 @@ class Post extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Sets the blog this post is part of
      *
      * @param \ExtbaseTeam\BlogExample\Domain\Model\Blog $blog The blog
-     * @return void
      */
     public function setBlog(\ExtbaseTeam\BlogExample\Domain\Model\Blog $blog)
     {
@@ -106,7 +105,6 @@ class Post extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Setter for title
      *
      * @param string $title
-     * @return void
      */
     public function setTitle($title)
     {
@@ -127,7 +125,6 @@ class Post extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Setter for date
      *
      * @param \DateTime $date
-     * @return void
      */
     public function setDate(\DateTime $date)
     {
@@ -149,7 +146,6 @@ class Post extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Setter for tags
      *
      * @param \TYPO3\CMS\Extbase\Persistence\ObjectStorage $tags One or more Tag objects
-     * @return void
      */
     public function setTags(\TYPO3\CMS\Extbase\Persistence\ObjectStorage $tags)
     {
@@ -160,7 +156,6 @@ class Post extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Adds a tag to this post
      *
      * @param Tag $tag
-     * @return void
      */
     public function addTag(Tag $tag)
     {
@@ -171,7 +166,6 @@ class Post extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Removes a tag from this post
      *
      * @param Tag $tag
-     * @return void
      */
     public function removeTag(Tag $tag)
     {
@@ -180,8 +174,6 @@ class Post extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * Remove all tags from this post
-     *
-     * @return void
      */
     public function removeAllTags()
     {
@@ -243,7 +235,6 @@ class Post extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Sets the author for this post
      *
      * @param \ExtbaseTeam\BlogExample\Domain\Model\Person $author
-     * @return void
      */
     public function setAuthor(\ExtbaseTeam\BlogExample\Domain\Model\Person $author)
     {
@@ -264,7 +255,6 @@ class Post extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Sets the content for this post
      *
      * @param string $content
-     * @return void
      */
     public function setContent($content)
     {
@@ -285,7 +275,6 @@ class Post extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Setter for the comments to this post
      *
      * @param \TYPO3\CMS\Extbase\Persistence\ObjectStorage $comments An Object Storage of related Comment instances
-     * @return void
      */
     public function setComments(\TYPO3\CMS\Extbase\Persistence\ObjectStorage $comments)
     {
@@ -296,7 +285,6 @@ class Post extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Adds a comment to this post
      *
      * @param Comment $comment
-     * @return void
      */
     public function addComment(Comment $comment)
     {
@@ -307,7 +295,6 @@ class Post extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Removes Comment from this post
      *
      * @param Comment $commentToDelete
-     * @return void
      */
     public function removeComment(Comment $commentToDelete)
     {
@@ -316,8 +303,6 @@ class Post extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * Remove all comments from this post
-     *
-     * @return void
      */
     public function removeAllComments()
     {
@@ -339,7 +324,6 @@ class Post extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Setter for the related posts
      *
      * @param \TYPO3\CMS\Extbase\Persistence\ObjectStorage $relatedPosts An Object Storage containing related Posts instances
-     * @return void
      */
     public function setRelatedPosts(\TYPO3\CMS\Extbase\Persistence\ObjectStorage $relatedPosts)
     {
@@ -350,7 +334,6 @@ class Post extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Adds a related post
      *
      * @param Post $post
-     * @return void
      */
     public function addRelatedPost(Post $post)
     {
@@ -359,8 +342,6 @@ class Post extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * Remove all related posts
-     *
-     * @return void
      */
     public function removeAllRelatedPosts()
     {
diff --git a/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Classes/Domain/Repository/BlogRepository.php b/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Classes/Domain/Repository/BlogRepository.php
index 7f4a5239f426fc65accc13b31a7bf7cd4da1e2df..74a63b11440b30201ccbf2ae2233bde4228bc431 100644
--- a/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Classes/Domain/Repository/BlogRepository.php
+++ b/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Classes/Domain/Repository/BlogRepository.php
@@ -26,8 +26,6 @@ class BlogRepository extends \TYPO3\CMS\Extbase\Persistence\Repository
 
     /**
      * Life cycle method.
-     *
-     * @return void
      */
     public function initializeObject()
     {
diff --git a/typo3/sysext/extbase/Tests/Unit/Mvc/Cli/CommandTest.php b/typo3/sysext/extbase/Tests/Unit/Mvc/Cli/CommandTest.php
index 5fd4c4efc824ca036aaae325950e082f414ef91c..c6bb34dcf4d482099fcc67c438b53076275c1669 100644
--- a/typo3/sysext/extbase/Tests/Unit/Mvc/Cli/CommandTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Mvc/Cli/CommandTest.php
@@ -42,7 +42,6 @@ class CommandTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
     protected $mockObjectManager;
 
     /**
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/extbase/Tests/Unit/Mvc/View/JsonViewTest.php b/typo3/sysext/extbase/Tests/Unit/Mvc/View/JsonViewTest.php
index 40339ac127c791c449e0ef6372e0643888390bcd..5ef1c6c858d769f7fdb8b593ec75f1d99ba4e23b 100644
--- a/typo3/sysext/extbase/Tests/Unit/Mvc/View/JsonViewTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Mvc/View/JsonViewTest.php
@@ -18,7 +18,6 @@ use TYPO3\CMS\Extbase\Mvc\View\JsonView;
 
 /**
  * Testcase for the JSON view
- *
  */
 class JsonViewTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 {
@@ -39,7 +38,6 @@ class JsonViewTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 
     /**
      * Sets up this test case
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/extbase/Tests/Unit/Mvc/Web/RequestBuilderTest.php b/typo3/sysext/extbase/Tests/Unit/Mvc/Web/RequestBuilderTest.php
index f5ea8cd5fdc3f3281de02e87b1824fea789c4a1e..699b5a17a57884b0494572500c7746e5a3778936 100644
--- a/typo3/sysext/extbase/Tests/Unit/Mvc/Web/RequestBuilderTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Mvc/Web/RequestBuilderTest.php
@@ -89,7 +89,6 @@ class RequestBuilderTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
     }
 
     /**
-     * @return void
      */
     protected function injectDependencies()
     {
diff --git a/typo3/sysext/extbase/Tests/Unit/Object/Container/ContainerTest.php b/typo3/sysext/extbase/Tests/Unit/Object/Container/ContainerTest.php
index 77eeec0e5f59199d7169ccc86271c9bba29fbd0c..2a98dcd9f28d54e77f6d1c9968a9aa31e8cbbe60 100644
--- a/typo3/sysext/extbase/Tests/Unit/Object/Container/ContainerTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Object/Container/ContainerTest.php
@@ -221,7 +221,6 @@ class ContainerTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
      *
      * @param string $id
      * @param \TYPO3\CMS\Extbase\Object\Container\ClassInfo $value
-     * @return void
      */
     public function setClassInfoCacheCallback($id, \TYPO3\CMS\Extbase\Object\Container\ClassInfo $value)
     {
diff --git a/typo3/sysext/extbase/Tests/Unit/Persistence/Fixture/Model/Entity2.php b/typo3/sysext/extbase/Tests/Unit/Persistence/Fixture/Model/Entity2.php
index cc8c9d368811654a3d2c244faab4bd5c670834df..248e9c27c2ce765ae915359dd7493fc164ec5af8 100644
--- a/typo3/sysext/extbase/Tests/Unit/Persistence/Fixture/Model/Entity2.php
+++ b/typo3/sysext/extbase/Tests/Unit/Persistence/Fixture/Model/Entity2.php
@@ -16,7 +16,6 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Persistence\Fixture\Model;
 
 /**
  * A model fixture used for testing the persistence manager
- *
  */
 class Entity2 extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 {
diff --git a/typo3/sysext/extbase/Tests/Unit/Persistence/Fixture/Model/Entity3.php b/typo3/sysext/extbase/Tests/Unit/Persistence/Fixture/Model/Entity3.php
index 1bf0750ee3fa5a84390557ed6e4c6acf03c7eed9..ea4923270275446d3c3204f898a8140c1ba3008b 100644
--- a/typo3/sysext/extbase/Tests/Unit/Persistence/Fixture/Model/Entity3.php
+++ b/typo3/sysext/extbase/Tests/Unit/Persistence/Fixture/Model/Entity3.php
@@ -13,7 +13,6 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Persistence\Fixture\Model;
 
 /**
  * A model fixture used for testing the persistence manager
- *
  */
 class Entity3 extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 {
diff --git a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/QueryResultTest.php b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/QueryResultTest.php
index facaafcc2ba9820490fe83472b4c62c9aa530af9..e0919d83258248fe31b53d998d66059f41acf61c 100644
--- a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/QueryResultTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/QueryResultTest.php
@@ -46,8 +46,6 @@ class QueryResultTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 
     /**
      * Sets up this test case
-     *
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/QueryTest.php b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/QueryTest.php
index ee4c42326af86f18701cae70a795bfc93f582527..d472640e3c7670dfae98c1d7ffab91da1c494a24 100644
--- a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/QueryTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/QueryTest.php
@@ -41,8 +41,6 @@ class QueryTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 
     /**
      * Sets up this test case
-     *
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/extbase/Tests/Unit/Property/PropertyMapperTest.php b/typo3/sysext/extbase/Tests/Unit/Property/PropertyMapperTest.php
index accadace05b941089b2f6ff8150ab28d4222f78c..434041ae304432f797a187bbd18eb6db0877d50e 100644
--- a/typo3/sysext/extbase/Tests/Unit/Property/PropertyMapperTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Property/PropertyMapperTest.php
@@ -45,8 +45,6 @@ class PropertyMapperTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 
     /**
      * Sets up this test case
-     *
-     * @return void
      */
     protected function setUp()
     {
@@ -321,7 +319,6 @@ class PropertyMapperTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
      * @param mixed $typeConverters
      * @param bool $shouldFailWithException
      * @throws \Exception
-     * @return void
      */
     public function findTypeConverterShouldReturnConverterForTargetObjectIfItExists($targetClass, $expectedTypeConverter, $typeConverters, $shouldFailWithException = false)
     {
diff --git a/typo3/sysext/extbase/Tests/Unit/Reflection/Fixture/DummyClassWithGettersAndSetters.php b/typo3/sysext/extbase/Tests/Unit/Reflection/Fixture/DummyClassWithGettersAndSetters.php
index 58fea9006adbe001fe7d8e19f0ae4d12a2119fa4..4cec6ce2ab192aee6255052e14839ee2a3b97a0b 100644
--- a/typo3/sysext/extbase/Tests/Unit/Reflection/Fixture/DummyClassWithGettersAndSetters.php
+++ b/typo3/sysext/extbase/Tests/Unit/Reflection/Fixture/DummyClassWithGettersAndSetters.php
@@ -157,8 +157,6 @@ class DummyClassWithGettersAndSetters
      * sets the AnotherBooleanProperty
      *
      * @param bool $anotherBooleanProperty
-     *
-     * @return void
      */
     public function setAnotherBooleanProperty($anotherBooleanProperty)
     {
diff --git a/typo3/sysext/extbase/Tests/Unit/Reflection/ReflectionServiceTest.php b/typo3/sysext/extbase/Tests/Unit/Reflection/ReflectionServiceTest.php
index 772b55bb6205131e2236ca7a9a5987a3ee5e2f91..3c1b93abfa8e8f89a20b046f90f538261e12fcc6 100644
--- a/typo3/sysext/extbase/Tests/Unit/Reflection/ReflectionServiceTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Reflection/ReflectionServiceTest.php
@@ -26,7 +26,7 @@ class ReflectionServiceTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCa
 {
     /**
      * @param array $foo The foo parameter
-     * @return void
+     * @return string
      */
     public function fixtureMethodForMethodTagsValues(array $foo)
     {
@@ -35,7 +35,6 @@ class ReflectionServiceTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCa
     /**
      * @param bool $dummy
      * @param int $foo
-     * @return void
      */
     public function fixtureMethodForMethodTagsValuesWithShortTypes($dummy, $foo)
     {
@@ -85,7 +84,7 @@ class ReflectionServiceTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCa
         $tagsValues = $service->getMethodTagsValues(get_class($this), 'fixtureMethodForMethodTagsValues');
         $this->assertEquals([
             'param' => ['array $foo The foo parameter'],
-            'return' => ['void']
+            'return' => ['string']
         ], $tagsValues);
     }
 
diff --git a/typo3/sysext/extbase/Tests/Unit/Utility/DebuggerUtilityTest.php b/typo3/sysext/extbase/Tests/Unit/Utility/DebuggerUtilityTest.php
index d7f0c85dbe02252b09e884b2c58a4965389c253f..bfbef64e54d406734a8100a9d3b3fc8c540fa869 100644
--- a/typo3/sysext/extbase/Tests/Unit/Utility/DebuggerUtilityTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Utility/DebuggerUtilityTest.php
@@ -51,7 +51,6 @@ class DebuggerUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 
     /**
      * @test
-     * @return void
      */
     public function varDumpRespectsBlacklistedProperties()
     {
@@ -65,7 +64,6 @@ class DebuggerUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 
     /**
      * @test
-     * @return void
      */
     public function varDumpRespectsBlacklistedClasses()
     {
diff --git a/typo3/sysext/extbase/Tests/Unit/Utility/LocalizationUtilityTest.php b/typo3/sysext/extbase/Tests/Unit/Utility/LocalizationUtilityTest.php
index 552397a947e963fbf8ebb99a6eda92be0e7db052..a68680c63dccfcf916b04d9f276f6d235ec96db8 100644
--- a/typo3/sysext/extbase/Tests/Unit/Utility/LocalizationUtilityTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Utility/LocalizationUtilityTest.php
@@ -270,7 +270,6 @@ class LocalizationUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTest
      * @param string $expected
      * @param array $altLanguageKeys
      * @param array $arguments
-     * @return void
      * @dataProvider translateDataProvider
      * @test
      */
@@ -392,7 +391,6 @@ class LocalizationUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTest
      * @param array $typoScriptLocalLang
      * @param string $languageKey
      * @param array $expected
-     * @return void
      * @dataProvider loadTypoScriptLabelsProvider
      * @test
      */
@@ -423,7 +421,6 @@ class LocalizationUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTest
     }
 
     /**
-     * @return void
      * @test
      */
     public function clearLabelWithTypoScript()
diff --git a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/CollectionValidatorTest.php b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/CollectionValidatorTest.php
index 394e7e9068d652af2443f51c96fa8039bcda54c9..38c5a459ad184debc31f8cb25ab0094d5afd29c5 100644
--- a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/CollectionValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/CollectionValidatorTest.php
@@ -52,7 +52,6 @@ class CollectionValidatorTest extends \TYPO3\TestingFramework\Core\Unit\UnitTest
     }
 
     /**
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/Fixture/AbstractCompositeValidatorClass.php b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/Fixture/AbstractCompositeValidatorClass.php
index b453e6ed358f0051a66b6ce27025fb5f9d615f80..e28b6be2087e0349c87139829ea8201feff902be 100644
--- a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/Fixture/AbstractCompositeValidatorClass.php
+++ b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/Fixture/AbstractCompositeValidatorClass.php
@@ -41,7 +41,6 @@ class AbstractCompositeValidatorClass extends \TYPO3\CMS\Extbase\Validation\Vali
      * to Result.
      *
      * @param mixed $value
-     * @return void
      */
     protected function isValid($value)
     {
diff --git a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/Fixture/AbstractValidatorClass.php b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/Fixture/AbstractValidatorClass.php
index d167f6df363ff8f2d8020edb933b51686f7c59fe..14a7bd14b79b7ccb3717f4e5f80d675f7c616e94 100644
--- a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/Fixture/AbstractValidatorClass.php
+++ b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/Fixture/AbstractValidatorClass.php
@@ -41,7 +41,6 @@ class AbstractValidatorClass extends \TYPO3\CMS\Extbase\Validation\Validator\Abs
      * to Result.
      *
      * @param mixed $value
-     * @return void
      */
     protected function isValid($value)
     {
diff --git a/typo3/sysext/extensionmanager/Classes/Command/ExtensionCommandController.php b/typo3/sysext/extensionmanager/Classes/Command/ExtensionCommandController.php
index 5389271e5424bbc2def127e5c6fdb23f581bc0aa..f878822994970609396c6c99bacf41bd71454ac4 100644
--- a/typo3/sysext/extensionmanager/Classes/Command/ExtensionCommandController.php
+++ b/typo3/sysext/extensionmanager/Classes/Command/ExtensionCommandController.php
@@ -48,7 +48,6 @@ class ExtensionCommandController extends CommandController
      * recognised extension folder paths in TYPO3.
      *
      * @param string $extensionKey
-     * @return void
      * @cli
      */
     public function installCommand($extensionKey)
@@ -67,7 +66,6 @@ class ExtensionCommandController extends CommandController
      * recognised extension folder paths in TYPO3.
      *
      * @param string $extensionKey
-     * @return void
      * @cli
      */
     public function uninstallCommand($extensionKey)
@@ -83,7 +81,6 @@ class ExtensionCommandController extends CommandController
      * This command is only needed during development. The extension manager takes care
      * creating or updating this info properly during extension (de-)activation.
      *
-     * @return void
      * @cli
      */
     public function dumpClassLoadingInformationCommand()
diff --git a/typo3/sysext/extensionmanager/Classes/Controller/AbstractController.php b/typo3/sysext/extensionmanager/Classes/Controller/AbstractController.php
index 017ac8d9dcd33518fba2f585f3046b0f4313e9c4..59e57629ca3992d0b100bf86701db1c0b17dcf7a 100644
--- a/typo3/sysext/extensionmanager/Classes/Controller/AbstractController.php
+++ b/typo3/sysext/extensionmanager/Classes/Controller/AbstractController.php
@@ -47,8 +47,6 @@ class AbstractController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionControl
      * Handles trigger arguments, e.g. refreshing the module menu
      * widget if an extension with backend modules has been enabled
      * or disabled.
-     *
-     * @return void
      */
     protected function handleTriggerArguments()
     {
diff --git a/typo3/sysext/extensionmanager/Classes/Controller/AbstractModuleController.php b/typo3/sysext/extensionmanager/Classes/Controller/AbstractModuleController.php
index 327175fc7d19237982e7bbad12a664112471337c..9e4b4f5ee1539152e140cfecbb19cbb6005b6d0b 100644
--- a/typo3/sysext/extensionmanager/Classes/Controller/AbstractModuleController.php
+++ b/typo3/sysext/extensionmanager/Classes/Controller/AbstractModuleController.php
@@ -55,8 +55,6 @@ class AbstractModuleController extends AbstractController
 
     /**
      * Generates the action menu
-     *
-     * @return void
      */
     protected function generateMenu()
     {
diff --git a/typo3/sysext/extensionmanager/Classes/Controller/ActionController.php b/typo3/sysext/extensionmanager/Classes/Controller/ActionController.php
index fc0e8ca032aa0f6528e43981415c086ed28adfef..f3d717e16f44381f7a086685cd944b34c1078502 100644
--- a/typo3/sysext/extensionmanager/Classes/Controller/ActionController.php
+++ b/typo3/sysext/extensionmanager/Classes/Controller/ActionController.php
@@ -111,7 +111,6 @@ class ActionController extends AbstractController
      * Install an extension and omit dependency checking
      *
      * @param string $extensionKey
-     * @return void
      */
     public function installExtensionWithoutSystemDependencyCheckAction($extensionKey)
     {
diff --git a/typo3/sysext/extensionmanager/Classes/Controller/ConfigurationController.php b/typo3/sysext/extensionmanager/Classes/Controller/ConfigurationController.php
index 9e6394874d67134d31d3321a09f53f0e1bd002e3..c229f29d866430e3b55063a7c7ab22002be4de54 100644
--- a/typo3/sysext/extensionmanager/Classes/Controller/ConfigurationController.php
+++ b/typo3/sysext/extensionmanager/Classes/Controller/ConfigurationController.php
@@ -56,7 +56,6 @@ class ConfigurationController extends AbstractModuleController
      * Set up the doc header properly here
      *
      * @param ViewInterface $view
-     * @return void
      */
     protected function initializeView(ViewInterface $view)
     {
@@ -74,7 +73,6 @@ class ConfigurationController extends AbstractModuleController
      *
      * @param array $extension Extension information, must contain at least the key
      * @throws \TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException
-     * @return void
      */
     public function showConfigurationFormAction(array $extension)
     {
@@ -106,7 +104,6 @@ class ConfigurationController extends AbstractModuleController
      *
      * @param array $config The new extension configuration
      * @param string $extensionKey The extension key
-     * @return void
      */
     public function saveAction(array $config, $extensionKey)
     {
@@ -133,7 +130,6 @@ class ConfigurationController extends AbstractModuleController
      *
      * @param array $config
      * @param string $extensionKey
-     * @return void
      */
     public function saveAndCloseAction(array $config, $extensionKey)
     {
@@ -148,7 +144,6 @@ class ConfigurationController extends AbstractModuleController
      *
      * @param string $extensionKey
      * @param array $newConfiguration
-     * @return void
      */
     protected function emitAfterExtensionConfigurationWriteSignal($extensionKey, array $newConfiguration)
     {
@@ -160,7 +155,6 @@ class ConfigurationController extends AbstractModuleController
      *
      * @param array $config
      * @param $extensionKey
-     * @return void
      */
     protected function saveConfiguration(array $config, $extensionKey)
     {
@@ -178,7 +172,6 @@ class ConfigurationController extends AbstractModuleController
     /**
      * Registers the Icons into the docheader
      *
-     * @return void
      * @throws \InvalidArgumentException
      */
     protected function registerDocheaderButtons()
diff --git a/typo3/sysext/extensionmanager/Classes/Controller/DistributionController.php b/typo3/sysext/extensionmanager/Classes/Controller/DistributionController.php
index 4658597bc0a83f7fca414af28874be2cfe0311f4..7d4660df2ad63c44b1410a2f09b06a99a359cd85 100644
--- a/typo3/sysext/extensionmanager/Classes/Controller/DistributionController.php
+++ b/typo3/sysext/extensionmanager/Classes/Controller/DistributionController.php
@@ -40,7 +40,6 @@ class DistributionController extends AbstractModuleController
      * Set up the doc header properly here
      *
      * @param ViewInterface $view
-     * @return void
      */
     protected function initializeView(ViewInterface $view)
     {
@@ -83,7 +82,6 @@ class DistributionController extends AbstractModuleController
     /**
      * Registers the Icons into the docheader
      *
-     * @return void
      * @throws \InvalidArgumentException
      */
     protected function registerDocheaderButtons()
diff --git a/typo3/sysext/extensionmanager/Classes/Controller/DownloadController.php b/typo3/sysext/extensionmanager/Classes/Controller/DownloadController.php
index ae2ee81955fc12491cfd045b262e62c697ace782..35924b3190d5b2fb80d7c6154c1d21a9d5b5905c 100644
--- a/typo3/sysext/extensionmanager/Classes/Controller/DownloadController.php
+++ b/typo3/sysext/extensionmanager/Classes/Controller/DownloadController.php
@@ -232,7 +232,6 @@ class DownloadController extends AbstractController
      * redirects directly to configuration after installing
      *
      * @param \TYPO3\CMS\Extensionmanager\Domain\Model\Extension $extension
-     * @return void
      */
     public function installDistributionAction(\TYPO3\CMS\Extensionmanager\Domain\Model\Extension $extension)
     {
@@ -317,8 +316,6 @@ class DownloadController extends AbstractController
      * Show update comments for extensions that can be updated.
      * Fetches update comments for all versions between the current
      * installed and the highest version.
-     *
-     * @return void
      */
     protected function updateCommentForUpdatableVersionsAction()
     {
diff --git a/typo3/sysext/extensionmanager/Classes/Controller/ListController.php b/typo3/sysext/extensionmanager/Classes/Controller/ListController.php
index e1cd5896303f477817dfc17a98e7ac6675c69e71..7e4d6662cba344febee93d65117b60735c316b8c 100644
--- a/typo3/sysext/extensionmanager/Classes/Controller/ListController.php
+++ b/typo3/sysext/extensionmanager/Classes/Controller/ListController.php
@@ -111,7 +111,6 @@ class ListController extends AbstractModuleController
      * Set up the doc header properly here
      *
      * @param ViewInterface $view
-     * @return void
      */
     protected function initializeView(ViewInterface $view)
     {
@@ -145,8 +144,6 @@ class ListController extends AbstractModuleController
 
     /**
      * Shows list of extensions present in the system
-     *
-     * @return void
      */
     public function indexAction()
     {
@@ -162,7 +159,6 @@ class ListController extends AbstractModuleController
      *
      * @param string $extensionKey
      * @throws ExtensionManagerException
-     * @return void
      */
     public function unresolvedDependenciesAction($extensionKey)
     {
@@ -189,7 +185,6 @@ class ListController extends AbstractModuleController
      * Either all extensions or depending on a search param
      *
      * @param string $search
-     * @return void
      */
     public function terAction($search = '')
     {
@@ -210,7 +205,6 @@ class ListController extends AbstractModuleController
      * Action for listing all possible distributions
      *
      * @param bool $showUnsuitableDistributions
-     * @return void
      */
     public function distributionsAction($showUnsuitableDistributions = false)
     {
@@ -251,7 +245,6 @@ class ListController extends AbstractModuleController
      * Shows all versions of a specific extension
      *
      * @param string $extensionKey
-     * @return void
      */
     public function showAllVersionsAction($extensionKey)
     {
diff --git a/typo3/sysext/extensionmanager/Classes/Controller/UpdateFromTerController.php b/typo3/sysext/extensionmanager/Classes/Controller/UpdateFromTerController.php
index ca437c5f044fbe8aff25121c8b7e30ebd65b1ec8..751a323e89abd9f943a6cd4cb130c97f71b504e7 100644
--- a/typo3/sysext/extensionmanager/Classes/Controller/UpdateFromTerController.php
+++ b/typo3/sysext/extensionmanager/Classes/Controller/UpdateFromTerController.php
@@ -82,7 +82,6 @@ class UpdateFromTerController extends AbstractController
      * Update extension list from TER
      *
      * @param bool $forceUpdateCheck
-     * @return void
      */
     public function updateExtensionListFromTerAction($forceUpdateCheck = false)
     {
diff --git a/typo3/sysext/extensionmanager/Classes/Controller/UpdateScriptController.php b/typo3/sysext/extensionmanager/Classes/Controller/UpdateScriptController.php
index 1c88a8a0e4257372fa5177329ac353ddeafb01b3..992b40b7389a6b1408d63c4dddb06848be00f7f9 100644
--- a/typo3/sysext/extensionmanager/Classes/Controller/UpdateScriptController.php
+++ b/typo3/sysext/extensionmanager/Classes/Controller/UpdateScriptController.php
@@ -27,7 +27,6 @@ class UpdateScriptController extends AbstractModuleController
      * Set up the doc header properly here
      *
      * @param ViewInterface $view
-     * @return void
      */
     protected function initializeView(ViewInterface $view)
     {
@@ -43,7 +42,6 @@ class UpdateScriptController extends AbstractModuleController
      * Show the content of the update script (if any).
      *
      * @param string $extensionKey Extension key
-     * @return void
      * @throws \TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException
      */
     public function showAction($extensionKey)
@@ -61,7 +59,6 @@ class UpdateScriptController extends AbstractModuleController
     /**
      * Registers the Icons into the docheader
      *
-     * @return void
      * @throws \InvalidArgumentException
      */
     protected function registerDocheaderButtons()
diff --git a/typo3/sysext/extensionmanager/Classes/Controller/UploadExtensionFileController.php b/typo3/sysext/extensionmanager/Classes/Controller/UploadExtensionFileController.php
index cb53d8f584dcdd932aa0e4f35ee938bd465464cb..c225fa536f5e328fbabdc897b89874e564ea9662 100644
--- a/typo3/sysext/extensionmanager/Classes/Controller/UploadExtensionFileController.php
+++ b/typo3/sysext/extensionmanager/Classes/Controller/UploadExtensionFileController.php
@@ -111,8 +111,6 @@ class UploadExtensionFileController extends AbstractController
 
     /**
      * Render upload extension form
-     *
-     * @return void
      */
     public function formAction()
     {
@@ -129,7 +127,6 @@ class UploadExtensionFileController extends AbstractController
      *
      * @param bool $overwrite Overwrite existing extension if TRUE
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException
-     * @return void
      */
     public function extractAction($overwrite = false)
     {
@@ -189,7 +186,6 @@ class UploadExtensionFileController extends AbstractController
      * Validate the filename of an uploaded file
      *
      * @param string $fileName
-     * @return void
      * @throws \TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException
      */
     public function checkFileName($fileName)
@@ -322,7 +318,6 @@ class UploadExtensionFileController extends AbstractController
      *
      * @param string $extensionKey
      * @throws \TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException
-     * @return void
      */
     protected function copyExtensionFolderToTempFolder($extensionKey)
     {
@@ -339,7 +334,6 @@ class UploadExtensionFileController extends AbstractController
      *
      * @param string $fileName
      * @see UploadExtensionFileController::extractAction
-     * @return void
      */
     protected function removeExtensionAndRestoreFromBackup($fileName)
     {
@@ -355,7 +349,6 @@ class UploadExtensionFileController extends AbstractController
 
     /**
      * Removes the backup folder in typo3temp
-     * @return void
      */
     protected function removeBackupFolder()
     {
diff --git a/typo3/sysext/extensionmanager/Classes/Domain/Model/ConfigurationCategory.php b/typo3/sysext/extensionmanager/Classes/Domain/Model/ConfigurationCategory.php
index 0c123ecf9cdf40a4ad342305b6230cda6dc55670..ca20533b9f4a90f7c1afc3bd5278717a753ce40c 100644
--- a/typo3/sysext/extensionmanager/Classes/Domain/Model/ConfigurationCategory.php
+++ b/typo3/sysext/extensionmanager/Classes/Domain/Model/ConfigurationCategory.php
@@ -44,7 +44,6 @@ class ConfigurationCategory extends \TYPO3\CMS\Extbase\DomainObject\AbstractEnti
 
     /**
      * @param \TYPO3\CMS\Extbase\Persistence\ObjectStorage $subcategories
-     * @return void
      */
     public function setSubcategories($subcategories)
     {
@@ -63,7 +62,6 @@ class ConfigurationCategory extends \TYPO3\CMS\Extbase\DomainObject\AbstractEnti
      * Adds a subcategories
      *
      * @param \TYPO3\CMS\Extensionmanager\Domain\Model\ConfigurationSubcategory $subcategory
-     * @return void
      */
     public function addSubcategory(\TYPO3\CMS\Extensionmanager\Domain\Model\ConfigurationSubcategory $subcategory)
     {
@@ -72,7 +70,6 @@ class ConfigurationCategory extends \TYPO3\CMS\Extbase\DomainObject\AbstractEnti
 
     /**
      * @param string $name
-     * @return void
      */
     public function setName($name)
     {
@@ -89,7 +86,6 @@ class ConfigurationCategory extends \TYPO3\CMS\Extbase\DomainObject\AbstractEnti
 
     /**
      * @param string $highlightText
-     * @return void
      */
     public function setHighlightText($highlightText)
     {
diff --git a/typo3/sysext/extensionmanager/Classes/Domain/Model/ConfigurationItem.php b/typo3/sysext/extensionmanager/Classes/Domain/Model/ConfigurationItem.php
index d619430b7ddc8974004f7dd31eeeaef16abeb726..5c168f9711215f79d07a9387d8012885617ef705 100644
--- a/typo3/sysext/extensionmanager/Classes/Domain/Model/ConfigurationItem.php
+++ b/typo3/sysext/extensionmanager/Classes/Domain/Model/ConfigurationItem.php
@@ -66,7 +66,6 @@ class ConfigurationItem extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * @param string $category
-     * @return void
      */
     public function setCategory($category)
     {
@@ -83,7 +82,6 @@ class ConfigurationItem extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * @param string $labelHeadline
-     * @return void
      */
     public function setLabelHeadline($labelHeadline)
     {
@@ -100,7 +98,6 @@ class ConfigurationItem extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * @param string $labelText
-     * @return void
      */
     public function setLabelText($labelText)
     {
@@ -117,7 +114,6 @@ class ConfigurationItem extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * @param string $subCategory
-     * @return void
      */
     public function setSubCategory($subCategory)
     {
@@ -134,7 +130,6 @@ class ConfigurationItem extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * @param string $type
-     * @return void
      */
     public function setType($type)
     {
@@ -151,7 +146,6 @@ class ConfigurationItem extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * @param mixed $userFunc
-     * @return void
      */
     public function setGeneric($userFunc)
     {
@@ -168,7 +162,6 @@ class ConfigurationItem extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * @param string $name
-     * @return void
      */
     public function setName($name)
     {
@@ -185,7 +178,6 @@ class ConfigurationItem extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * @param string $value
-     * @return void
      */
     public function setValue($value)
     {
@@ -202,7 +194,6 @@ class ConfigurationItem extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * @param int $highlight
-     * @return void
      */
     public function setHighlight($highlight)
     {
diff --git a/typo3/sysext/extensionmanager/Classes/Domain/Model/ConfigurationSubcategory.php b/typo3/sysext/extensionmanager/Classes/Domain/Model/ConfigurationSubcategory.php
index ce8403392fc7ab131f6dfe7c441d38025bdd7a64..e02ad532be6f4de768191e188596f73a07c2bf4d 100644
--- a/typo3/sysext/extensionmanager/Classes/Domain/Model/ConfigurationSubcategory.php
+++ b/typo3/sysext/extensionmanager/Classes/Domain/Model/ConfigurationSubcategory.php
@@ -48,7 +48,6 @@ class ConfigurationSubcategory extends \TYPO3\CMS\Extbase\DomainObject\AbstractE
 
     /**
      * @param \TYPO3\CMS\Extbase\Persistence\ObjectStorage $items
-     * @return void
      */
     public function setItems($items)
     {
@@ -67,7 +66,6 @@ class ConfigurationSubcategory extends \TYPO3\CMS\Extbase\DomainObject\AbstractE
      * Adds a subcategory
      *
      * @param \TYPO3\CMS\Extensionmanager\Domain\Model\ConfigurationItem $item
-     * @return void
      */
     public function addItem(\TYPO3\CMS\Extensionmanager\Domain\Model\ConfigurationItem $item)
     {
@@ -76,7 +74,6 @@ class ConfigurationSubcategory extends \TYPO3\CMS\Extbase\DomainObject\AbstractE
 
     /**
      * @param string $name
-     * @return void
      */
     public function setName($name)
     {
@@ -95,7 +92,6 @@ class ConfigurationSubcategory extends \TYPO3\CMS\Extbase\DomainObject\AbstractE
      * Set sub category label
      *
      * @param string $label
-     * @return void
      */
     public function setLabel($label)
     {
diff --git a/typo3/sysext/extensionmanager/Classes/Domain/Model/Dependency.php b/typo3/sysext/extensionmanager/Classes/Domain/Model/Dependency.php
index 3b4e4308cfbd8ffda1542c5bb54e8681d1419f01..d29c88a5d0646fb231c1a05ed8215138ba2aa492 100644
--- a/typo3/sysext/extensionmanager/Classes/Domain/Model/Dependency.php
+++ b/typo3/sysext/extensionmanager/Classes/Domain/Model/Dependency.php
@@ -58,7 +58,6 @@ class Dependency extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * @param string $highestVersion
-     * @return void
      */
     public function setHighestVersion($highestVersion)
     {
@@ -75,7 +74,6 @@ class Dependency extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * @param string $identifier
-     * @return void
      */
     public function setIdentifier($identifier)
     {
@@ -92,7 +90,6 @@ class Dependency extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * @param string $lowestVersion
-     * @return void
      */
     public function setLowestVersion($lowestVersion)
     {
@@ -110,7 +107,6 @@ class Dependency extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
     /**
      * @param string $type
      * @throws \TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException if no valid dependency type was given
-     * @return void
      */
     public function setType($type)
     {
diff --git a/typo3/sysext/extensionmanager/Classes/Domain/Model/DownloadQueue.php b/typo3/sysext/extensionmanager/Classes/Domain/Model/DownloadQueue.php
index cb091247001d3bfdd5a33a88ec268df1e21f71ce..78cb08d5ef76e847801185683f3e3f36aa34fc59 100644
--- a/typo3/sysext/extensionmanager/Classes/Domain/Model/DownloadQueue.php
+++ b/typo3/sysext/extensionmanager/Classes/Domain/Model/DownloadQueue.php
@@ -63,7 +63,6 @@ class DownloadQueue implements \TYPO3\CMS\Core\SingletonInterface
      * @param \TYPO3\CMS\Extensionmanager\Domain\Model\Extension $extension
      * @param string $stack
      * @throws \TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException
-     * @return void
      */
     public function addExtensionToQueue(\TYPO3\CMS\Extensionmanager\Domain\Model\Extension $extension, $stack = 'download')
     {
@@ -99,7 +98,6 @@ class DownloadQueue implements \TYPO3\CMS\Core\SingletonInterface
      * @param \TYPO3\CMS\Extensionmanager\Domain\Model\Extension $extension
      * @param string $stack Stack to remove extension from (download, update or install)
      * @throws \TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException
-     * @return void
      */
     public function removeExtensionFromQueue(\TYPO3\CMS\Extensionmanager\Domain\Model\Extension $extension, $stack = 'download')
     {
@@ -117,7 +115,6 @@ class DownloadQueue implements \TYPO3\CMS\Core\SingletonInterface
      * Adds an extension to the install queue for later installation
      *
      * @param Extension $extension
-     * @return void
      */
     public function addExtensionToInstallQueue($extension)
     {
@@ -128,7 +125,6 @@ class DownloadQueue implements \TYPO3\CMS\Core\SingletonInterface
      * Removes an extension from the install queue
      *
      * @param string $extensionKey
-     * @return void
      */
     public function removeExtensionFromInstallQueue($extensionKey)
     {
@@ -142,7 +138,6 @@ class DownloadQueue implements \TYPO3\CMS\Core\SingletonInterface
      *
      * @param string $extensionKey
      * @param string $sourceFolder
-     * @return void
      */
     public function addExtensionToCopyQueue($extensionKey, $sourceFolder)
     {
@@ -153,7 +148,6 @@ class DownloadQueue implements \TYPO3\CMS\Core\SingletonInterface
      * Remove an extension from extension copy storage
      *
      * @param $extensionKey
-     * @return void
      */
     public function removeExtensionFromCopyQueue($extensionKey)
     {
diff --git a/typo3/sysext/extensionmanager/Classes/Domain/Model/Extension.php b/typo3/sysext/extensionmanager/Classes/Domain/Model/Extension.php
index 189a93e6d1e10e00bfa1c7eb3296b0c45ab946fb..0d8a595e3ff457c530d4989fbaa6f448cc15e6f6 100644
--- a/typo3/sysext/extensionmanager/Classes/Domain/Model/Extension.php
+++ b/typo3/sysext/extensionmanager/Classes/Domain/Model/Extension.php
@@ -165,7 +165,6 @@ class Extension extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * @param string $authorEmail
-     * @return void
      */
     public function setAuthorEmail($authorEmail)
     {
@@ -182,7 +181,6 @@ class Extension extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * @param string $authorName
-     * @return void
      */
     public function setAuthorName($authorName)
     {
@@ -199,7 +197,6 @@ class Extension extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * @param int $category
-     * @return void
      */
     public function setCategory($category)
     {
@@ -254,7 +251,6 @@ class Extension extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * @param string $description
-     * @return void
      */
     public function setDescription($description)
     {
@@ -271,7 +267,6 @@ class Extension extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * @param string $extensionKey
-     * @return void
      */
     public function setExtensionKey($extensionKey)
     {
@@ -288,7 +283,6 @@ class Extension extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * @param \DateTime $lastUpdated
-     * @return void
      */
     public function setLastUpdated(\DateTime $lastUpdated)
     {
@@ -305,7 +299,6 @@ class Extension extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * @param int $state
-     * @return void
      */
     public function setState($state)
     {
@@ -371,7 +364,6 @@ class Extension extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * @param string $title
-     * @return void
      */
     public function setTitle($title)
     {
@@ -388,7 +380,6 @@ class Extension extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * @param string $updateComment
-     * @return void
      */
     public function setUpdateComment($updateComment)
     {
@@ -405,7 +396,6 @@ class Extension extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * @param string $version
-     * @return void
      */
     public function setVersion($version)
     {
@@ -422,7 +412,6 @@ class Extension extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * @param bool $currentVersion
-     * @return void
      */
     public function setCurrentVersion($currentVersion)
     {
@@ -439,7 +428,6 @@ class Extension extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * @param string $md5hash
-     * @return void
      */
     public function setMd5hash($md5hash)
     {
@@ -505,7 +493,6 @@ class Extension extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * @param string $dependencies
-     * @return void
      */
     public function setSerializedDependencies($dependencies)
     {
@@ -522,7 +509,6 @@ class Extension extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * @param \SplObjectStorage $dependencies
-     * @return void
      */
     public function setDependencies($dependencies)
     {
@@ -544,7 +530,6 @@ class Extension extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * @param \TYPO3\CMS\Extensionmanager\Domain\Model\Dependency $dependency
-     * @return void
      */
     public function addDependency(\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency $dependency)
     {
@@ -553,7 +538,6 @@ class Extension extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * @param int $integerVersion
-     * @return void
      */
     public function setIntegerVersion($integerVersion)
     {
@@ -570,7 +554,6 @@ class Extension extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * @param int $reviewState
-     * @return void
      */
     public function setReviewState($reviewState)
     {
@@ -587,7 +570,6 @@ class Extension extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * @param int $position
-     * @return void
      */
     public function setPosition($position)
     {
diff --git a/typo3/sysext/extensionmanager/Classes/Domain/Model/Mirrors.php b/typo3/sysext/extensionmanager/Classes/Domain/Model/Mirrors.php
index cbdf7108e9cf4f6dfe80a5d53f2bfdf77eab0bf7..64286ecba0117f395b8dcf0e87acd2f184ebd09d 100644
--- a/typo3/sysext/extensionmanager/Classes/Domain/Model/Mirrors.php
+++ b/typo3/sysext/extensionmanager/Classes/Domain/Model/Mirrors.php
@@ -47,7 +47,6 @@ class Mirrors extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Method selects one specific mirror to be used.
      *
      * @param int $mirrorId number (>=1) of mirror or NULL for random selection
-     * @return void
      * @see $currentMirror
      */
     public function setSelect($mirrorId = null)
@@ -110,7 +109,6 @@ class Mirrors extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Method sets available mirrors.
      *
      * @param array $mirrors multidimensional array with mirrors and their properties
-     * @return void
      * @see $mirrors, getMirrors()
      */
     public function setMirrors(array $mirrors)
diff --git a/typo3/sysext/extensionmanager/Classes/Domain/Model/Repository.php b/typo3/sysext/extensionmanager/Classes/Domain/Model/Repository.php
index 0d85e0ba763aad133cf7161621bd3dc5bd27abdd..a6bdde7290ee18e023932f1b8c066327289c3774 100644
--- a/typo3/sysext/extensionmanager/Classes/Domain/Model/Repository.php
+++ b/typo3/sysext/extensionmanager/Classes/Domain/Model/Repository.php
@@ -85,7 +85,6 @@ class Repository extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      *
      * @access public
      * @param string $title title of repository to set
-     * @return void
      * @see $title, getTitle()
      */
     public function setTitle($title)
@@ -112,7 +111,6 @@ class Repository extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      *
      * @access public
      * @param string $description title of repository to set
-     * @return void
      */
     public function setDescription($description)
     {
@@ -140,7 +138,6 @@ class Repository extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      *
      * @access public
      * @param string $url URL of file that contains repository mirrors
-     * @return void
      * @see $mirrorListUrl, getMirrorListUrl()
      */
     public function setMirrorListUrl($url)
@@ -166,7 +163,6 @@ class Repository extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Method sets URL of repository WSDL.
      *
      * @param string $url URL of repository WSDL
-     * @return void
      * @see $wsdlUrl, getWsdlUrl()
      */
     public function setWsdlUrl($url)
@@ -192,7 +188,6 @@ class Repository extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      *
      * @access public
      * @param \DateTime $time URL of repository WSDL
-     * @return void
      */
     public function setLastUpdate(\DateTime $time)
     {
@@ -215,7 +210,6 @@ class Repository extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      *
      * @access public
      * @param string $count count of read extensions
-     * @return void
      */
     public function setExtensionCount($count)
     {
@@ -229,7 +223,6 @@ class Repository extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      *
      * @access public
      * @param \TYPO3\CMS\Extensionmanager\Domain\Model\Mirrors $mirrors mirror list
-     * @return void
      * @see $mirrors, getMirrors(), hasMirrors(), removeMirrors()
      */
     public function addMirrors(\TYPO3\CMS\Extensionmanager\Domain\Model\Mirrors $mirrors)
@@ -270,7 +263,6 @@ class Repository extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Method unregisters a repository mirrors object.
      *
      * @access public
-     * @return void
      * @see $mirrors, addMirrors(), getMirrors(), hasMirrors()
      */
     public function removeMirrors()
diff --git a/typo3/sysext/extensionmanager/Classes/Domain/Repository/ExtensionRepository.php b/typo3/sysext/extensionmanager/Classes/Domain/Repository/ExtensionRepository.php
index 126fbbedca3ccbd950fa2d46e9d296592c35c84b..abd7b7f22832f76d466b9c97d79c5df3efe38d0b 100644
--- a/typo3/sysext/extensionmanager/Classes/Domain/Repository/ExtensionRepository.php
+++ b/typo3/sysext/extensionmanager/Classes/Domain/Repository/ExtensionRepository.php
@@ -43,8 +43,6 @@ class ExtensionRepository extends \TYPO3\CMS\Extbase\Persistence\Repository
 
     /**
      * Do not include pid in queries
-     *
-     * @return void
      */
     public function initializeObject()
     {
@@ -337,7 +335,6 @@ class ExtensionRepository extends \TYPO3\CMS\Extbase\Persistence\Repository
      * For performance reasons, the "native" database connection is used here directly.
      *
      * @param int $repositoryUid
-     * @return void
      */
     protected function markExtensionWithMaximumVersionAsCurrent($repositoryUid)
     {
diff --git a/typo3/sysext/extensionmanager/Classes/Domain/Repository/RepositoryRepository.php b/typo3/sysext/extensionmanager/Classes/Domain/Repository/RepositoryRepository.php
index cc3e1f8d72f270f3371210b6f5edfbd5038d3cd1..f88dd468a2f7e547bfe78588df3acc473a87f14a 100644
--- a/typo3/sysext/extensionmanager/Classes/Domain/Repository/RepositoryRepository.php
+++ b/typo3/sysext/extensionmanager/Classes/Domain/Repository/RepositoryRepository.php
@@ -21,8 +21,6 @@ class RepositoryRepository extends \TYPO3\CMS\Extbase\Persistence\Repository
 {
     /**
      * Do not include pid in queries
-     *
-     * @return void
      */
     public function initializeObject()
     {
@@ -37,7 +35,6 @@ class RepositoryRepository extends \TYPO3\CMS\Extbase\Persistence\Repository
      *
      * @param int $extCount
      * @param int $uid
-     * @return void
      */
     public function updateRepositoryCount($extCount, $uid = 1)
     {
diff --git a/typo3/sysext/extensionmanager/Classes/Service/ExtensionManagementService.php b/typo3/sysext/extensionmanager/Classes/Service/ExtensionManagementService.php
index b3b6dcad4204fbf1df510ae9a83ca1a22b0789f1..11ade17c5c13c72cc69bdad4efc630637135571e 100644
--- a/typo3/sysext/extensionmanager/Classes/Service/ExtensionManagementService.php
+++ b/typo3/sysext/extensionmanager/Classes/Service/ExtensionManagementService.php
@@ -101,7 +101,6 @@ class ExtensionManagementService implements \TYPO3\CMS\Core\SingletonInterface
 
     /**
      * @param string $extensionKey
-     * @return void
      */
     public function markExtensionForInstallation($extensionKey)
     {
@@ -118,7 +117,6 @@ class ExtensionManagementService implements \TYPO3\CMS\Core\SingletonInterface
      *
      * @param string $extensionKey
      * @param string $sourceFolder
-     * @return void
      */
     public function markExtensionForCopy($extensionKey, $sourceFolder)
     {
@@ -129,7 +127,6 @@ class ExtensionManagementService implements \TYPO3\CMS\Core\SingletonInterface
      * Mark an extension for download
      *
      * @param Extension $extension
-     * @return void
      */
     public function markExtensionForDownload(Extension $extension)
     {
@@ -143,7 +140,6 @@ class ExtensionManagementService implements \TYPO3\CMS\Core\SingletonInterface
 
     /**
      * @param Extension $extension
-     * @return void
      */
     public function markExtensionForUpdate(Extension $extension)
     {
@@ -320,7 +316,6 @@ class ExtensionManagementService implements \TYPO3\CMS\Core\SingletonInterface
      * Copies locally provided extensions to typo3conf/ext
      *
      * @param array $copyQueue
-     * @return void
      */
     protected function copyDependencies(array $copyQueue)
     {
@@ -416,7 +411,6 @@ class ExtensionManagementService implements \TYPO3\CMS\Core\SingletonInterface
      * as an extension is able to provide it's own dependencies
      *
      * @param Extension $extension
-     * @return void
      */
     public function downloadMainExtension(Extension $extension)
     {
diff --git a/typo3/sysext/extensionmanager/Classes/Task/UpdateExtensionListTask.php b/typo3/sysext/extensionmanager/Classes/Task/UpdateExtensionListTask.php
index eb4fcaeaa56019154f52fea2d43f5553b4b687cf..494325b0677dc700c77f80506f07a207a4305468 100644
--- a/typo3/sysext/extensionmanager/Classes/Task/UpdateExtensionListTask.php
+++ b/typo3/sysext/extensionmanager/Classes/Task/UpdateExtensionListTask.php
@@ -36,7 +36,6 @@ class UpdateExtensionListTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask
      * Update extension list
      *
      * @TODO: Adapt to multiple repositories if the Helper can handle this
-     * @return void
      * @throws \TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException
      */
     protected function updateExtensionList()
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/ConfigurationUtility.php b/typo3/sysext/extensionmanager/Classes/Utility/ConfigurationUtility.php
index 5fb68e27b940b42df8e8fdb13a85ce83cfe032e3..19e43c17c85bd84636279c337f8933bfbf654181 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/ConfigurationUtility.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/ConfigurationUtility.php
@@ -41,7 +41,6 @@ class ConfigurationUtility implements \TYPO3\CMS\Core\SingletonInterface
      * Used by the InstallUtility to initialize local extension config.
      *
      * @param string $extensionKey Extension key
-     * @return void
      */
     public function saveDefaultConfiguration($extensionKey)
     {
@@ -61,7 +60,6 @@ class ConfigurationUtility implements \TYPO3\CMS\Core\SingletonInterface
      *
      * @param array $configuration Configuration to save
      * @param string $extensionKey Extension key
-     * @return void
      */
     public function writeConfiguration(array $configuration = [], $extensionKey)
     {
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/DependencyUtility.php b/typo3/sysext/extensionmanager/Classes/Utility/DependencyUtility.php
index 93b1138a58593376601b966f6e071eaac2475c05..265629fc69f6b9b4a0ac5e780aad4001426cd316 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/DependencyUtility.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/DependencyUtility.php
@@ -112,7 +112,6 @@ class DependencyUtility implements \TYPO3\CMS\Core\SingletonInterface
 
     /**
      * @param string $localExtensionStorage
-     * @return void
      */
     public function setLocalExtensionStorage($localExtensionStorage)
     {
@@ -122,8 +121,6 @@ class DependencyUtility implements \TYPO3\CMS\Core\SingletonInterface
     /**
      * Setter for available extensions
      * gets available extensions from list utility if not already done
-     *
-     * @return void
      */
     protected function setAvailableExtensions()
     {
@@ -132,7 +129,6 @@ class DependencyUtility implements \TYPO3\CMS\Core\SingletonInterface
 
     /**
      * @param bool $skipDependencyCheck
-     * @return void
      */
     public function setSkipDependencyCheck($skipDependencyCheck)
     {
@@ -143,7 +139,6 @@ class DependencyUtility implements \TYPO3\CMS\Core\SingletonInterface
      * Checks dependencies for special cases (currently typo3 and php)
      *
      * @param Extension $extension
-     * @return void
      */
     public function checkDependencies(Extension $extension)
     {
@@ -355,7 +350,6 @@ class DependencyUtility implements \TYPO3\CMS\Core\SingletonInterface
      *
      * @param string $extensionKey
      * @param Dependency $dependency
-     * @return void
      * @throws Exception\UnresolvedDependencyException
      */
     protected function getExtensionFromRepository($extensionKey, Dependency $dependency)
@@ -391,7 +385,6 @@ class DependencyUtility implements \TYPO3\CMS\Core\SingletonInterface
      * @param string $extensionKey
      * @param Dependency $dependency
      * @throws Exception\UnresolvedDependencyException
-     * @return void
      */
     protected function getExtensionFromTer($extensionKey, Dependency $dependency)
     {
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/DownloadUtility.php b/typo3/sysext/extensionmanager/Classes/Utility/DownloadUtility.php
index fc7303d66088e013590094bbc20021c8dc525bf1..423513492621b523944dd41de9fbe2af06fc7464 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/DownloadUtility.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/DownloadUtility.php
@@ -67,7 +67,6 @@ class DownloadUtility implements \TYPO3\CMS\Core\SingletonInterface
      * Download an extension
      *
      * @param \TYPO3\CMS\Extensionmanager\Domain\Model\Extension $extension
-     * @return void
      */
     public function download(\TYPO3\CMS\Extensionmanager\Domain\Model\Extension $extension)
     {
@@ -83,7 +82,6 @@ class DownloadUtility implements \TYPO3\CMS\Core\SingletonInterface
      *
      * @param string $downloadPath
      * @throws \TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException
-     * @return void
      */
     public function setDownloadPath($downloadPath)
     {
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/FileHandlingUtility.php b/typo3/sysext/extensionmanager/Classes/Utility/FileHandlingUtility.php
index fe0cd15e6713109ce89216e7f472ea70386f6e77..e0835cbede93eac3d9fbb7395d76a3d33658844c 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/FileHandlingUtility.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/FileHandlingUtility.php
@@ -65,8 +65,6 @@ class FileHandlingUtility implements \TYPO3\CMS\Core\SingletonInterface
 
     /**
      * Initialize method - loads language file
-     *
-     * @return void
      */
     public function initializeObject()
     {
@@ -79,7 +77,6 @@ class FileHandlingUtility implements \TYPO3\CMS\Core\SingletonInterface
      * @param array $extensionData
      * @param Extension $extension
      * @param string $pathType
-     * @return void
      */
     public function unpackExtensionFromExtensionDataArray(array $extensionData, Extension $extension = null, $pathType = 'Local')
     {
@@ -128,7 +125,6 @@ class FileHandlingUtility implements \TYPO3\CMS\Core\SingletonInterface
      *
      * @param array $directories
      * @param string $rootPath
-     * @return void
      */
     protected function createDirectoriesForExtensionFiles(array $directories, $rootPath)
     {
@@ -160,7 +156,6 @@ class FileHandlingUtility implements \TYPO3\CMS\Core\SingletonInterface
      *
      * @param array $files
      * @param string $rootPath
-     * @return void
      */
     protected function writeExtensionFiles(array $files, $rootPath)
     {
@@ -216,7 +211,6 @@ class FileHandlingUtility implements \TYPO3\CMS\Core\SingletonInterface
      *
      * @param string $extDirPath
      * @throws ExtensionManagerException
-     * @return void
      */
     protected function addDirectory($extDirPath)
     {
@@ -294,7 +288,6 @@ class FileHandlingUtility implements \TYPO3\CMS\Core\SingletonInterface
      *
      * @param string $extDirPath
      * @throws ExtensionManagerException
-     * @return void
      */
     public function removeDirectory($extDirPath)
     {
@@ -320,7 +313,6 @@ class FileHandlingUtility implements \TYPO3\CMS\Core\SingletonInterface
      * @param array $extensionData
      * @param string $rootPath
      * @param Extension $extension
-     * @return void
      */
     protected function writeEmConfToFile(array $extensionData, $rootPath, Extension $extension = null)
     {
@@ -474,7 +466,6 @@ class FileHandlingUtility implements \TYPO3\CMS\Core\SingletonInterface
      * @param string $fileName file name
      * @param string $pathType path type (Local, Global, System)
      * @throws ExtensionManagerException
-     * @return void
      */
     public function unzipExtensionFromFile($file, $fileName, $pathType = 'Local')
     {
@@ -509,7 +500,6 @@ class FileHandlingUtility implements \TYPO3\CMS\Core\SingletonInterface
      *
      * @param string $fileName
      * @param string $downloadName
-     * @return void
      */
     public function sendZipFileToBrowserAndDelete($fileName, $downloadName = '')
     {
@@ -529,7 +519,6 @@ class FileHandlingUtility implements \TYPO3\CMS\Core\SingletonInterface
      *
      * @param string $fileName
      * @param string $downloadName
-     * @return void
      */
     public function sendSqlDumpFileToBrowserAndDelete($fileName, $downloadName = '')
     {
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/Importer/ExtensionListUtility.php b/typo3/sysext/extensionmanager/Classes/Utility/Importer/ExtensionListUtility.php
index bf7a619457ef0437a87ab9e2e82678bacb825cbe..988fd916c59b63bbd5fce611da52233aff216866 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/Importer/ExtensionListUtility.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/Importer/ExtensionListUtility.php
@@ -161,7 +161,6 @@ class ExtensionListUtility implements \SplObserver
      * Method collects and stores extension version details into the database.
      *
      * @param \SplSubject|\TYPO3\CMS\Extensionmanager\Utility\Parser\AbstractExtensionXmlParser &$subject a subject notifying this observer
-     * @return void
      */
     protected function loadIntoDatabase(\SplSubject &$subject)
     {
@@ -208,7 +207,6 @@ class ExtensionListUtility implements \SplObserver
      * Method receives an update from a subject.
      *
      * @param \SplSubject $subject a subject notifying this observer
-     * @return void
      */
     public function update(\SplSubject $subject)
     {
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/Importer/MirrorListUtility.php b/typo3/sysext/extensionmanager/Classes/Utility/Importer/MirrorListUtility.php
index a6c76f972e08878b0bd99350726d0d38c32df35e..20a41388b7f0c2e437d26c7459500c121adff981 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/Importer/MirrorListUtility.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/Importer/MirrorListUtility.php
@@ -75,7 +75,6 @@ class MirrorListUtility implements \SplObserver
      * Method receives an update from a subject.
      *
      * @param \SplSubject $subject a subject notifying this observer
-     * @return void
      */
     public function update(\SplSubject $subject)
     {
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/InstallUtility.php b/typo3/sysext/extensionmanager/Classes/Utility/InstallUtility.php
index 6ab6a03cc68c92b78e976789977eb9cbf08758de..28c2fec5a2dac4071d7d54373fb033af1e03eeac 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/InstallUtility.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/InstallUtility.php
@@ -176,7 +176,6 @@ class InstallUtility implements \TYPO3\CMS\Core\SingletonInterface
      *
      * @param string $extensionKey
      * @throws ExtensionManagerException
-     * @return void
      */
     public function install($extensionKey)
     {
@@ -211,7 +210,6 @@ class InstallUtility implements \TYPO3\CMS\Core\SingletonInterface
      *
      * @param string $extensionKey
      * @throws ExtensionManagerException
-     * @return void
      */
     public function uninstall($extensionKey)
     {
@@ -253,7 +251,6 @@ class InstallUtility implements \TYPO3\CMS\Core\SingletonInterface
      * Wrapper function for loading extensions
      *
      * @param string $extensionKey
-     * @return void
      */
     protected function loadExtension($extensionKey)
     {
@@ -264,7 +261,6 @@ class InstallUtility implements \TYPO3\CMS\Core\SingletonInterface
      * Wrapper function for unloading extensions
      *
      * @param string $extensionKey
-     * @return void
      */
     protected function unloadExtension($extensionKey)
     {
@@ -445,8 +441,6 @@ class InstallUtility implements \TYPO3\CMS\Core\SingletonInterface
 
     /**
      * Reload Cache files and Typo3LoadedExtensions
-     *
-     * @return void
      */
     public function reloadCaches()
     {
@@ -469,7 +463,6 @@ class InstallUtility implements \TYPO3\CMS\Core\SingletonInterface
      * Save default configuration of an extension
      *
      * @param string $extensionKey
-     * @return void
      */
     protected function saveDefaultConfiguration($extensionKey)
     {
@@ -482,7 +475,6 @@ class InstallUtility implements \TYPO3\CMS\Core\SingletonInterface
      * Update database / process db updates from ext_tables
      *
      * @param string $rawDefinitions The raw SQL statements from ext_tables.sql
-     * @return void
      */
     public function updateDbWithExtTablesSql($rawDefinitions)
     {
@@ -498,7 +490,6 @@ class InstallUtility implements \TYPO3\CMS\Core\SingletonInterface
      * Import static SQL data (normally used for ext_tables_static+adt.sql)
      *
      * @param string $rawDefinitions
-     * @return void
      */
     public function importStaticSql($rawDefinitions)
     {
@@ -514,7 +505,6 @@ class InstallUtility implements \TYPO3\CMS\Core\SingletonInterface
      *
      * @param string $extension
      * @throws ExtensionManagerException
-     * @return void
      */
     public function removeExtension($extension)
     {
@@ -614,7 +604,6 @@ class InstallUtility implements \TYPO3\CMS\Core\SingletonInterface
      * Execution state is saved in the this->registry, so it only happens once
      *
      * @param string $extensionSiteRelPath
-     * @return void
      */
     protected function importT3DFile($extensionSiteRelPath)
     {
@@ -670,7 +659,6 @@ class InstallUtility implements \TYPO3\CMS\Core\SingletonInterface
      * Execution state is saved in the this->registry, so it only happens once
      *
      * @param string $extensionSiteRelPath
-     * @return void
      */
     protected function importStaticSqlFile($extensionSiteRelPath)
     {
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/Parser/AbstractExtensionXmlParser.php b/typo3/sysext/extensionmanager/Classes/Utility/Parser/AbstractExtensionXmlParser.php
index 0bf3745d3ba33d6b1715d86236e34cb44b95d162..b07ed858545a619cde9c2e8e7dd7412e61ccf7ad 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/Parser/AbstractExtensionXmlParser.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/Parser/AbstractExtensionXmlParser.php
@@ -381,7 +381,6 @@ abstract class AbstractExtensionXmlParser extends AbstractXmlParser
      * Method resets version class properties.
      *
      * @param bool $resetAll If TRUE, additionally extension properties are reset
-     * @return void
      * @see $extensionKey, $version, $extensionDLCounter, $versionDLCounter,
      */
     protected function resetProperties($resetAll = false)
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/Parser/AbstractMirrorXmlParser.php b/typo3/sysext/extensionmanager/Classes/Utility/Parser/AbstractMirrorXmlParser.php
index 2d11c1f98d5eb60d5e19872a850afa4c6a1674c6..f88a00129273bfcb10d52c7ffe7142ab52abfacc 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/Parser/AbstractMirrorXmlParser.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/Parser/AbstractMirrorXmlParser.php
@@ -179,7 +179,6 @@ abstract class AbstractMirrorXmlParser extends AbstractXmlParser
      * Method resets version class properties.
      *
      * @access protected
-     * @return void
      * @see $country, $host, $path, $sponsorlink, $sponsorlogo, $sponsorname, $title
      */
     protected function resetProperties()
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/Parser/AbstractXmlParser.php b/typo3/sysext/extensionmanager/Classes/Utility/Parser/AbstractXmlParser.php
index 05b0ac17263f944a26d0ccdb81ac8c310823e099..97a0d182b2f1eed66696e44894ef2c4d7d0111f5 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/Parser/AbstractXmlParser.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/Parser/AbstractXmlParser.php
@@ -45,7 +45,6 @@ abstract class AbstractXmlParser implements \SplSubject
      * Method attaches an observer.
      *
      * @param \SplObserver $observer an observer to attach
-     * @return void
      * @see $observers, detach(), notify()
      */
     public function attach(\SplObserver $observer)
@@ -57,7 +56,6 @@ abstract class AbstractXmlParser implements \SplSubject
      * Method detaches an attached observer
      *
      * @param \SplObserver $observer an observer to detach
-     * @return void
      * @see $observers, attach(), notify()
      */
     public function detach(\SplObserver $observer)
@@ -72,7 +70,6 @@ abstract class AbstractXmlParser implements \SplSubject
      * Method notifies attached observers.
      *
      * @access public
-     * @return void
      * @see $observers, attach(), detach()
      */
     public function notify()
@@ -112,8 +109,6 @@ abstract class AbstractXmlParser implements \SplSubject
 
     /**
      * Create required parser
-     *
-     * @return void
      */
     abstract protected function createParser();
 }
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/Parser/ExtensionXmlPullParser.php b/typo3/sysext/extensionmanager/Classes/Utility/Parser/ExtensionXmlPullParser.php
index 97c6c4c7c69c92b1fa4a39dc6cbeb637124370b8..ddddf74e1f27b25ccd51fcf4bc0b920573bade2d 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/Parser/ExtensionXmlPullParser.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/Parser/ExtensionXmlPullParser.php
@@ -32,8 +32,6 @@ class ExtensionXmlPullParser extends AbstractExtensionXmlParser
 
     /**
      * Create required parser
-     *
-     * @return void
      */
     protected function createParser()
     {
@@ -44,7 +42,6 @@ class ExtensionXmlPullParser extends AbstractExtensionXmlParser
      * Method parses an extensions.xml file.
      *
      * @param string $file GZIP stream resource
-     * @return void
      * @throws \TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException in case of parser error
      */
     public function parseXml($file)
@@ -77,7 +74,6 @@ class ExtensionXmlPullParser extends AbstractExtensionXmlParser
      * Method is invoked when parser accesses start tag of an element.
      *
      * @param string $elementName element name at parser's current position
-     * @return void
      */
     protected function startElement($elementName)
     {
@@ -143,7 +139,6 @@ class ExtensionXmlPullParser extends AbstractExtensionXmlParser
      * Method is invoked when parser accesses end tag of an element.
      *
      * @param string $elementName: element name at parser's current position
-     * @return void
      */
     protected function endElement($elementName)
     {
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/Parser/ExtensionXmlPushParser.php b/typo3/sysext/extensionmanager/Classes/Utility/Parser/ExtensionXmlPushParser.php
index 7782f831bf4eb4b6e29c56db57761347d529f64e..176491b92e7970dea98a74f5a6758cfebdeb2b4a 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/Parser/ExtensionXmlPushParser.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/Parser/ExtensionXmlPushParser.php
@@ -43,8 +43,6 @@ class ExtensionXmlPushParser extends AbstractExtensionXmlParser
 
     /**
      * Create required parser
-     *
-     * @return void
      */
     protected function createParser()
     {
@@ -56,7 +54,6 @@ class ExtensionXmlPushParser extends AbstractExtensionXmlParser
      * Method parses an extensions.xml file.
      *
      * @param string $file GZIP stream resource
-     * @return void
      * @throws \TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException in case of parse errors
      */
     public function parseXml($file)
@@ -91,7 +88,6 @@ class ExtensionXmlPushParser extends AbstractExtensionXmlParser
      * @param resource $parser parser resource
      * @param string $elementName element name at parser's current position
      * @param array $attrs array of an element's attributes if available
-     * @return void
      */
     protected function startElement($parser, $elementName, $attrs)
     {
@@ -112,7 +108,6 @@ class ExtensionXmlPushParser extends AbstractExtensionXmlParser
      *
      * @param resource $parser parser resource
      * @param string $elementName Element name at parser's current position
-     * @return void
      */
     protected function endElement($parser, $elementName)
     {
@@ -134,7 +129,6 @@ class ExtensionXmlPushParser extends AbstractExtensionXmlParser
      *
      * @param resource $parser parser resource
      * @param string $data An element's value
-     * @return void
      */
     protected function characterData($parser, $data)
     {
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/Parser/MirrorXmlPullParser.php b/typo3/sysext/extensionmanager/Classes/Utility/Parser/MirrorXmlPullParser.php
index 27785832e78c482c8a43211b76d46fb39cd43b24..a308fb7e5a3ab2f38c32da86002c82a6b7f9a806 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/Parser/MirrorXmlPullParser.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/Parser/MirrorXmlPullParser.php
@@ -34,8 +34,6 @@ class MirrorXmlPullParser extends AbstractMirrorXmlParser
 
     /**
      * Create required parser
-     *
-     * @return void
      */
     protected function createParser()
     {
@@ -46,7 +44,6 @@ class MirrorXmlPullParser extends AbstractMirrorXmlParser
      * Method parses an extensions.xml file.
      *
      * @param string $file file resource, typically a stream
-     * @return void
      * @throws \TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException in case of XML parser errors
      */
     public function parseXml($file)
@@ -76,7 +73,6 @@ class MirrorXmlPullParser extends AbstractMirrorXmlParser
      * Method is invoked when parser accesses start tag of an element.
      *
      * @param string $elementName element name at parser's current position
-     * @return void
      * @see endElement()
      */
     protected function startElement($elementName)
@@ -112,7 +108,6 @@ class MirrorXmlPullParser extends AbstractMirrorXmlParser
      * Method is invoked when parser accesses end tag of an element.
      *
      * @param string $elementName element name at parser's current position
-     * @return void
      * @see startElement()
      */
     protected function endElement($elementName)
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/Parser/MirrorXmlPushParser.php b/typo3/sysext/extensionmanager/Classes/Utility/Parser/MirrorXmlPushParser.php
index 6e6611f648c2e4614c61e5e4bc3634afb1f5813d..0f8f13b09021658e7d96662b468dd0e19d16127a 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/Parser/MirrorXmlPushParser.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/Parser/MirrorXmlPushParser.php
@@ -41,8 +41,6 @@ class MirrorXmlPushParser extends AbstractMirrorXmlParser
 
     /**
      * Create required parser
-     *
-     * @return void
      */
     protected function createParser()
     {
@@ -54,7 +52,6 @@ class MirrorXmlPushParser extends AbstractMirrorXmlParser
      * Method parses a mirror.xml file.
      *
      * @param string $file GZIP stream resource
-     * @return void
      * @throws \TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException in case of XML parser errors
      */
     public function parseXml($file)
@@ -89,7 +86,6 @@ class MirrorXmlPushParser extends AbstractMirrorXmlParser
      * @param resource $parser parser resource
      * @param string $elementName element name at parser's current position
      * @param array $attrs array of an element's attributes if available
-     * @return void
      */
     protected function startElement($parser, $elementName, $attrs)
     {
@@ -107,7 +103,6 @@ class MirrorXmlPushParser extends AbstractMirrorXmlParser
      * @see xml_set_element_handler
      * @param resource $parser parser resource
      * @param string $elementName element name at parser's current position
-     * @return void
      */
     protected function endElement($parser, $elementName)
     {
@@ -129,7 +124,6 @@ class MirrorXmlPushParser extends AbstractMirrorXmlParser
      * @see xml_set_character_data_handler
      * @param resource $parser parser resource
      * @param string $data an element's value
-     * @return void
      */
     protected function characterData($parser, $data)
     {
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/Repository/Helper.php b/typo3/sysext/extensionmanager/Classes/Utility/Repository/Helper.php
index ab384409f78a7c8139c5c2a5240aeb78a07aa885..9209789f40df8d4f8f7638d6a5f5c20adfe33a97 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/Repository/Helper.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/Repository/Helper.php
@@ -96,7 +96,6 @@ class Helper implements \TYPO3\CMS\Core\SingletonInterface
      *
      * @access public
      * @param \TYPO3\CMS\Extensionmanager\Domain\Model\Repository $repository
-     * @return void
      * @see $repository
      */
     public function setRepository(\TYPO3\CMS\Extensionmanager\Domain\Model\Repository $repository)
@@ -110,7 +109,6 @@ class Helper implements \TYPO3\CMS\Core\SingletonInterface
      * Delegates to {@link fetchFile()}.
      *
      * @access public
-     * @return void
      * @throws ExtensionManagerException
      * @see fetchFile()
      */
@@ -125,7 +123,6 @@ class Helper implements \TYPO3\CMS\Core\SingletonInterface
      * Delegates to {@link fetchFile()}.
      *
      * @access public
-     * @return void
      * @throws ExtensionManagerException
      * @see fetchFile()
      */
@@ -140,7 +137,6 @@ class Helper implements \TYPO3\CMS\Core\SingletonInterface
      *
      * @param string $remoteResource remote resource to read contents from
      * @param string $localResource local resource (absolute file path) to store retrieved contents to (must be within typo3temp/)
-     * @return void
      * @see \TYPO3\CMS\Core\Utility\GeneralUtility::getUrl(), \TYPO3\CMS\Core\Utility\GeneralUtility::writeFile()
      * @throws ExtensionManagerException
      */
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Controller/DownloadControllerTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Controller/DownloadControllerTest.php
index 298b194349b5b9657c0ea256fa93c0f12faae10c..bca9c25cc210ddea99ca33671637ba98fd47b2d5 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Controller/DownloadControllerTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Controller/DownloadControllerTest.php
@@ -16,14 +16,11 @@ namespace TYPO3\CMS\Extensionmanager\Tests\Unit\Controller;
 
 /**
  * Download from TER controller test
- *
  */
 class DownloadControllerTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
-     *
-     * @return void
      */
     public function installFromTerReturnsArrayWithBooleanResultAndErrorArrayWhenExtensionManagerExceptionIsThrown()
     {
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Controller/UpdateFromTerControllerTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Controller/UpdateFromTerControllerTest.php
index 6768244f60af7a93e8b95779d52261aecb6d4eb1..2095e887592f4b8cfe5bb8041fa65e42c6334faa 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Controller/UpdateFromTerControllerTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Controller/UpdateFromTerControllerTest.php
@@ -19,7 +19,6 @@ use TYPO3\TestingFramework\Core\AccessibleObjectInterface;
 
 /**
  * Update from TER controller test
- *
  */
 class UpdateFromTerControllerTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 {
@@ -64,7 +63,6 @@ class UpdateFromTerControllerTest extends \TYPO3\TestingFramework\Core\Unit\Unit
 
     /**
      * @test
-     * @return void
      */
     public function updateExtensionListFromTerCallsUpdateExtListIfExtensionListIsEmpty()
     {
@@ -90,7 +88,6 @@ class UpdateFromTerControllerTest extends \TYPO3\TestingFramework\Core\Unit\Unit
 
     /**
      * @test
-     * @return void
      */
     public function updateExtensionListFromTerDoesNotCallsUpdateExtListIfExtensionListIsNotEmpty()
     {
@@ -116,7 +113,6 @@ class UpdateFromTerControllerTest extends \TYPO3\TestingFramework\Core\Unit\Unit
 
     /**
      * @test
-     * @return void
      */
     public function updateExtensionListFromTerCallsUpdateExtListIfForceUpdateCheckIsSet()
     {
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Controller/UploadExtensionFileControllerTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Controller/UploadExtensionFileControllerTest.php
index ae0bb7bc3e45f72f895e04b2c1007120eea2ca38..eb3174f38dfe234b2b43e11cf4cbf3cc55923c3f 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Controller/UploadExtensionFileControllerTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Controller/UploadExtensionFileControllerTest.php
@@ -16,7 +16,6 @@ namespace TYPO3\CMS\Extensionmanager\Tests\Unit\Controller;
 
 /**
  * Update from TER controller test
- *
  */
 class UploadExtensionFileControllerTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 {
@@ -61,7 +60,6 @@ class UploadExtensionFileControllerTest extends \TYPO3\TestingFramework\Core\Uni
      * @dataProvider getExtensionFromZipFileExtractsExtensionKeyDataProvider
      * @param string $filename The file name to test
      * @param string $expectedKey The expected extension key
-     * @return void
      */
     public function getExtensionFromZipFileExtractsExtensionKey($filename, $expectedKey)
     {
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Domain/Model/DownloadQueueTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Domain/Model/DownloadQueueTest.php
index c8d2f877999b4eeb7efa84f8da1dca06be77a257..3036bcadad075e2c41bfa705a18913a40233f85c 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Domain/Model/DownloadQueueTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Domain/Model/DownloadQueueTest.php
@@ -17,7 +17,6 @@ use TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException;
 
 /**
  * Download queue test
- *
  */
 class DownloadQueueTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 {
@@ -32,7 +31,6 @@ class DownloadQueueTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
     protected $extensionMock;
 
     /**
-     * @return void
      */
     protected function setUp()
     {
@@ -46,7 +44,6 @@ class DownloadQueueTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 
     /**
      * @test
-     * @return void
      */
     public function addExtensionToQueueAddsExtensionToDownloadStorageArray()
     {
@@ -58,7 +55,6 @@ class DownloadQueueTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 
     /**
      * @test
-     * @return void
      */
     public function addExtensionToQueueAddsExtensionToUpdateStorageArray()
     {
@@ -80,7 +76,6 @@ class DownloadQueueTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 
     /**
      * @test
-     * @return void
      */
     public function addExtensionToQueueThrowsExceptionIfExtensionWithSameKeyAndDifferentValuesAlreadyExists()
     {
@@ -99,7 +94,6 @@ class DownloadQueueTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 
     /**
      * @test
-     * @return void
      */
     public function removeExtensionFromQueueRemovesExtension()
     {
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Domain/Model/ExtensionTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Domain/Model/ExtensionTest.php
index 83d74a3f32a9e4b001935e24a5acba072ab4a56c..b336b497c1186d0316dc670ca6027c12cea30a53 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Domain/Model/ExtensionTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Domain/Model/ExtensionTest.php
@@ -79,7 +79,6 @@ class ExtensionTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
      * @dataProvider getCategoryIndexFromStringOrNumberReturnsIndexDataProvider
      * @param string|int $input Given input
      * @param int $expected Expected result
-     * @return void
      */
     public function getCategoryIndexFromStringOrNumberReturnsIndex($input, $expected)
     {
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Domain/Repository/ConfigurationItemRepositoryTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Domain/Repository/ConfigurationItemRepositoryTest.php
index 3e100393830156ae9d5148746cd0c8eb2b852015..481cef12b9ada6a07149b29565971e46ff8e61d6 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Domain/Repository/ConfigurationItemRepositoryTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Domain/Repository/ConfigurationItemRepositoryTest.php
@@ -16,7 +16,6 @@ namespace TYPO3\CMS\Extensionmanager\Tests\Unit\Domain\Repository;
 
 /**
  * Tests for ConfigurationItemRepository
- *
  */
 class ConfigurationItemRepositoryTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 {
@@ -32,8 +31,6 @@ class ConfigurationItemRepositoryTest extends \TYPO3\TestingFramework\Core\Unit\
 
     /**
      * Set up
-     *
-     * @return void
      */
     protected function setUp()
     {
@@ -177,7 +174,6 @@ class ConfigurationItemRepositoryTest extends \TYPO3\TestingFramework\Core\Unit\
 
     /**
      * @test
-     * @return void
      */
     public function addMetaInformationUnsetsOriginalConfigurationMetaKey()
     {
@@ -191,7 +187,6 @@ class ConfigurationItemRepositoryTest extends \TYPO3\TestingFramework\Core\Unit\
 
     /**
      * @test
-     * @return void
      */
     public function addMetaInformationReturnsMetaInformation()
     {
@@ -255,7 +250,6 @@ class ConfigurationItemRepositoryTest extends \TYPO3\TestingFramework\Core\Unit\
      * @test
      * @dataProvider extractInformationForConfigFieldsOfTypeUserAddsGenericAndTypeInformationDataProvider
      * @param $configurationOption
-     * @return void
      */
     public function extractInformationForConfigFieldsOfTypeUserAddsGenericAndTypeInformation($configurationOption)
     {
@@ -266,7 +260,6 @@ class ConfigurationItemRepositoryTest extends \TYPO3\TestingFramework\Core\Unit\
 
     /**
      * @test
-     * @return void
      */
     public function extractInformationForConfigFieldsOfTypeOptionsAddsGenericTypeAndLabelInformation()
     {
@@ -296,7 +289,6 @@ class ConfigurationItemRepositoryTest extends \TYPO3\TestingFramework\Core\Unit\
 
     /**
      * @test
-     * @return void
      */
     public function extractInformationForConfigFieldsOfTypeOptionsWithLabelsAndValuesAddsGenericTypeAndLabelInformation()
     {
@@ -326,7 +318,6 @@ class ConfigurationItemRepositoryTest extends \TYPO3\TestingFramework\Core\Unit\
 
     /**
      * @test
-     * @return void
      */
     public function mergeDefaultConfigurationCatchesExceptionOfConfigurationManagerIfNoLocalConfigurationExists()
     {
@@ -350,7 +341,6 @@ class ConfigurationItemRepositoryTest extends \TYPO3\TestingFramework\Core\Unit\
 
     /**
      * @test
-     * @return void
      */
     public function mergeDefaultConfigurationWithNoCurrentValuesReturnsTheDefaultConfiguration()
     {
@@ -377,7 +367,6 @@ class ConfigurationItemRepositoryTest extends \TYPO3\TestingFramework\Core\Unit\
 
     /**
      * @test
-     * @return void
      */
     public function mergeWithExistingConfigurationOverwritesDefaultKeysWithCurrent()
     {
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Domain/Repository/RepositoryRepositoryTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Domain/Repository/RepositoryRepositoryTest.php
index 2e2fec5228f644b1e860afa808a4d610e82b0acf..171c6306aa07a06f56dbbe1562121e798f2a7f34 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Domain/Repository/RepositoryRepositoryTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Domain/Repository/RepositoryRepositoryTest.php
@@ -16,7 +16,6 @@ namespace TYPO3\CMS\Extensionmanager\Tests\Unit\Domain\Repository;
 
 /**
  * Test case
- *
  */
 class RepositoryRepositoryTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 {
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Service/ExtensionManagementServiceTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Service/ExtensionManagementServiceTest.php
index a8a820706b9cfc7cd3c24886c3d76c7c9380407e..29dd3729afe83bd947bcbfd11b9ac5a094eab5da 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Service/ExtensionManagementServiceTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Service/ExtensionManagementServiceTest.php
@@ -16,13 +16,11 @@ namespace TYPO3\CMS\Extensionmanager\Tests\Unit\Service;
 
 /**
  * Testcase
- *
  */
 class ExtensionManagementServiceTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
-     * @return void
      */
     public function resolveDependenciesCallsDownloadDependenciesIfDownloadKeyExistsInQueue()
     {
@@ -55,7 +53,6 @@ class ExtensionManagementServiceTest extends \TYPO3\TestingFramework\Core\Unit\U
 
     /**
      * @test
-     * @return void
      */
     public function resolveDependenciesCallsUpdateAndDownloadDependenciesIfUpdateKeyExistsInQueue()
     {
@@ -89,7 +86,6 @@ class ExtensionManagementServiceTest extends \TYPO3\TestingFramework\Core\Unit\U
 
     /**
      * @test
-     * @return void
      */
     public function downloadDependenciesCallsDownloadUtilityDownloadMethod()
     {
@@ -124,7 +120,6 @@ class ExtensionManagementServiceTest extends \TYPO3\TestingFramework\Core\Unit\U
 
     /**
      * @test
-     * @return void
      */
     public function downloadDependenciesCallsRemoveExtensionFromQueue()
     {
@@ -162,7 +157,6 @@ class ExtensionManagementServiceTest extends \TYPO3\TestingFramework\Core\Unit\U
 
     /**
      * @test
-     * @return void
      */
     public function downloadDependenciesReturnsResolvedDependencies()
     {
@@ -198,7 +192,6 @@ class ExtensionManagementServiceTest extends \TYPO3\TestingFramework\Core\Unit\U
 
     /**
      * @test
-     * @return void
      */
     public function uninstallDependenciesToBeUpdatedCallsUninstall()
     {
@@ -220,7 +213,6 @@ class ExtensionManagementServiceTest extends \TYPO3\TestingFramework\Core\Unit\U
 
     /**
      * @test
-     * @return void
      */
     public function uninstallDependenciesToBeUpdatedReturnsResolvedDependencies()
     {
@@ -242,7 +234,6 @@ class ExtensionManagementServiceTest extends \TYPO3\TestingFramework\Core\Unit\U
 
     /**
      * @test
-     * @return void
      */
     public function installDependenciesCallsInstall()
     {
@@ -266,7 +257,6 @@ class ExtensionManagementServiceTest extends \TYPO3\TestingFramework\Core\Unit\U
 
     /**
      * @test
-     * @return void
      */
     public function installDependenciesReturnsResolvedDependencies()
     {
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Task/UpdateExtensionListTaskTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Task/UpdateExtensionListTaskTest.php
index 64d061e6e5f41ff9c4b4a1e89c813fe15ff18d2c..4ce4e56b2f8fddec8706b63261f5055e1064896f 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Task/UpdateExtensionListTaskTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Task/UpdateExtensionListTaskTest.php
@@ -16,7 +16,6 @@ namespace TYPO3\CMS\Extensionmanager\Tests\Unit\Task;
 
 /**
  * Test case
- *
  */
 class UpdateExtensionListTaskTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 {
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Utility/ConfigurationUtilityTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Utility/ConfigurationUtilityTest.php
index ffebb73946a67166b52008b765343fbf18b2fd3c..8989deb8c99b4de57eef1974dbc49c89eb0d555a 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Utility/ConfigurationUtilityTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Utility/ConfigurationUtilityTest.php
@@ -16,7 +16,6 @@ namespace TYPO3\CMS\Extensionmanager\Tests\Unit\Utility;
 
 /**
  * Configuration utility test
- *
  */
 class ConfigurationUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 {
@@ -241,7 +240,6 @@ class ConfigurationUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTes
      *
      * @param array $configuration
      * @param array $expected
-     * @return void
      */
     public function convertValuedToNestedConfiguration(array $configuration, array $expected)
     {
@@ -309,7 +307,6 @@ class ConfigurationUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTes
      *
      * @param array $configuration
      * @param array $expected
-     * @return void
      */
     public function convertNestedToValuedConfiguration(array $configuration, array $expected)
     {
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Utility/DependencyUtilityTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Utility/DependencyUtilityTest.php
index 9927f5aacdf9f583c8e452f46d8ced51cd3a47b2..f03d5401f9b00182684e26e212bdbadc3333c696 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Utility/DependencyUtilityTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Utility/DependencyUtilityTest.php
@@ -18,7 +18,6 @@ use TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException;
 
 /**
  * Test for DependencyUtility
- *
  */
 class DependencyUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 {
@@ -28,7 +27,6 @@ class DependencyUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCa
     protected $objectManagerMock;
 
     /**
-     * @return void
      */
     protected function setUp()
     {
@@ -37,7 +35,6 @@ class DependencyUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCa
 
     /**
      * @test
-     * @return void
      */
     public function checkTypo3DependencyThrowsExceptionIfVersionNumberIsTooLow()
     {
@@ -56,7 +53,6 @@ class DependencyUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCa
 
     /**
      * @test
-     * @return void
      */
     public function checkTypo3DependencyThrowsExceptionIfVersionNumberIsTooHigh()
     {
@@ -76,7 +72,6 @@ class DependencyUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCa
 
     /**
      * @test
-     * @return void
      */
     public function checkTypo3DependencyThrowsExceptionIfIdentifierIsNotTypo3()
     {
@@ -94,7 +89,6 @@ class DependencyUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCa
 
     /**
      * @test
-     * @return void
      */
     public function checkTypo3DependencyReturnsTrueIfVersionNumberIsInRange()
     {
@@ -112,7 +106,6 @@ class DependencyUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCa
 
     /**
      * @test
-     * @return void
      */
     public function checkTypo3DependencyCanHandleEmptyVersionHighestVersion()
     {
@@ -130,7 +123,6 @@ class DependencyUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCa
 
     /**
      * @test
-     * @return void
      */
     public function checkTypo3DependencyCanHandleEmptyVersionLowestVersion()
     {
@@ -148,7 +140,6 @@ class DependencyUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCa
 
     /**
      * @test
-     * @return void
      */
     public function checkPhpDependencyThrowsExceptionIfVersionNumberIsTooLow()
     {
@@ -167,7 +158,6 @@ class DependencyUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCa
 
     /**
      * @test
-     * @return void
      */
     public function checkPhpDependencyThrowsExceptionIfVersionNumberIsTooHigh()
     {
@@ -187,7 +177,6 @@ class DependencyUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCa
 
     /**
      * @test
-     * @return void
      */
     public function checkPhpDependencyThrowsExceptionIfIdentifierIsNotTypo3()
     {
@@ -205,7 +194,6 @@ class DependencyUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCa
 
     /**
      * @test
-     * @return void
      */
     public function checkPhpDependencyReturnsTrueIfVersionNumberIsInRange()
     {
@@ -223,7 +211,6 @@ class DependencyUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCa
 
     /**
      * @test
-     * @return void
      */
     public function checkPhpDependencyCanHandleEmptyVersionHighestVersion()
     {
@@ -241,7 +228,6 @@ class DependencyUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCa
 
     /**
      * @test
-     * @return void
      */
     public function checkPhpDependencyCanHandleEmptyVersionLowestVersion()
     {
@@ -259,7 +245,6 @@ class DependencyUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCa
 
     /**
      * @test
-     * @return void
      */
     public function checkDependenciesCallsMethodToCheckPhpDependencies()
     {
@@ -285,7 +270,6 @@ class DependencyUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCa
 
     /**
      * @test
-     * @return void
      */
     public function checkDependenciesCallsMethodToCheckTypo3Dependencies()
     {
@@ -312,7 +296,6 @@ class DependencyUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCa
 
     /**
      * @test
-     * @return void
      */
     public function isVersionCompatibleReturnsTrueForCompatibleVersion()
     {
@@ -330,7 +313,6 @@ class DependencyUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCa
 
     /**
      * @test
-     * @return void
      */
     public function isVersionCompatibleReturnsFalseForIncompatibleVersion()
     {
@@ -348,7 +330,6 @@ class DependencyUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCa
 
     /**
      * @test
-     * @return void
      */
     public function isDependentExtensionAvailableReturnsTrueIfExtensionIsAvailable()
     {
@@ -369,7 +350,6 @@ class DependencyUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCa
 
     /**
      * @test
-     * @return void
      */
     public function isDependentExtensionAvailableReturnsFalseIfExtensionIsNotAvailable()
     {
@@ -390,7 +370,6 @@ class DependencyUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCa
 
     /**
      * @test
-     * @return void
      */
     public function isAvailableVersionCompatibleCallsIsVersionCompatibleWithExtensionVersion()
     {
@@ -419,7 +398,6 @@ class DependencyUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCa
 
     /**
      * @test
-     * @return void
      */
     public function isExtensionDownloadableFromTerReturnsTrueIfOneVersionExists()
     {
@@ -437,7 +415,6 @@ class DependencyUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCa
 
     /**
      * @test
-     * @return void
      */
     public function isExtensionDownloadableFromTerReturnsFalseIfNoVersionExists()
     {
@@ -455,7 +432,6 @@ class DependencyUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCa
 
     /**
      * @test
-     * @return void
      */
     public function isDownloadableVersionCompatibleReturnsTrueIfCompatibleVersionExists()
     {
@@ -479,7 +455,6 @@ class DependencyUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCa
 
     /**
      * @test
-     * @return void
      */
     public function isDownloadableVersionCompatibleReturnsFalseIfIncompatibleVersionExists()
     {
@@ -505,7 +480,6 @@ class DependencyUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCa
 
     /**
      * @test
-     * @return void
      */
     public function getLowestAndHighestIntegerVersionsReturnsArrayWithVersions()
     {
@@ -527,7 +501,6 @@ class DependencyUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCa
 
     /**
      * @test
-     * @return void
      */
     public function getLatestCompatibleExtensionByIntegerVersionDependencyWillReturnExtensionModelOfLatestExtension()
     {
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Utility/ExtensionModelUtilityTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Utility/ExtensionModelUtilityTest.php
index 6229f38582e71daf841532fab755c7790f31c50b..0a801b33289bde83b8659e6cd8c954668cd44003 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Utility/ExtensionModelUtilityTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Utility/ExtensionModelUtilityTest.php
@@ -21,7 +21,6 @@ class ExtensionModelUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
 {
     /**
      * @test
-     * @return void
      */
     public function convertDependenciesToObjectsCreatesObjectStorage()
     {
@@ -44,7 +43,6 @@ class ExtensionModelUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
 
     /**
      * @test
-     * @return void
      */
     public function convertDependenciesToObjectsSetsIdentifier()
     {
@@ -125,7 +123,6 @@ class ExtensionModelUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * @dataProvider convertDependenciesToObjectSetsVersionDataProvider
      * @param array $dependencies
      * @param array $returnValue
-     * @return void
      */
     public function convertDependenciesToObjectSetsVersion(array $dependencies, array $returnValue)
     {
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Utility/FileHandlingUtilityTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Utility/FileHandlingUtilityTest.php
index 40e2610bc1831b47fb6e50490415911f5b3e9c06..fc755589273b9f0aba6e9f85a526cd7872d797c7 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Utility/FileHandlingUtilityTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Utility/FileHandlingUtilityTest.php
@@ -17,7 +17,6 @@ use TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException;
 
 /**
  * Testcase
- *
  */
 class FileHandlingUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 {
@@ -52,7 +51,6 @@ class FileHandlingUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTest
 
     /**
      * @test
-     * @return void
      */
     public function makeAndClearExtensionDirRemovesExtensionDirIfAlreadyExists()
     {
@@ -118,7 +116,6 @@ class FileHandlingUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTest
 
     /**
      * @test
-     * @return void
      */
     public function makeAndClearExtensionDirAddsDir()
     {
@@ -135,7 +132,6 @@ class FileHandlingUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTest
 
     /**
      * @test
-     * @return void
      */
     public function makeAndClearExtensionDirThrowsExceptionOnInvalidPath()
     {
@@ -149,7 +145,6 @@ class FileHandlingUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTest
 
     /**
      * @test
-     * @return void
      */
     public function addDirectoryAddsDirectory()
     {
@@ -162,7 +157,6 @@ class FileHandlingUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTest
 
     /**
      * @test
-     * @return void
      */
     public function removeDirectoryRemovesDirectory()
     {
@@ -175,7 +169,6 @@ class FileHandlingUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTest
 
     /**
      * @test
-     * @return void
      */
     public function removeDirectoryRemovesSymlink()
     {
@@ -191,7 +184,6 @@ class FileHandlingUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTest
 
     /**
      * @test
-     * @return void
      */
     public function removeDirectoryDoesNotRemoveContentOfSymlinkedTargetDirectory()
     {
@@ -214,7 +206,6 @@ class FileHandlingUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTest
 
     /**
      * @test
-     * @return void
      */
     public function unpackExtensionFromExtensionDataArrayCreatesTheExtensionDirectory()
     {
@@ -238,7 +229,6 @@ class FileHandlingUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTest
 
     /**
      * @test
-     * @return void
      */
     public function unpackExtensionFromExtensionDataArrayStripsDirectoriesFromFilesArray()
     {
@@ -308,7 +298,6 @@ class FileHandlingUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTest
 
     /**
      * @test
-     * @return void
      */
     public function extractFilesArrayFromExtensionDataReturnsFileArray()
     {
@@ -327,7 +316,6 @@ class FileHandlingUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTest
 
     /**
      * @test
-     * @return void
      */
     public function writeExtensionFilesWritesFiles()
     {
@@ -355,7 +343,6 @@ class FileHandlingUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTest
 
     /**
      * @test
-     * @return void
      */
     public function extractDirectoriesFromExtensionDataExtractsDirectories()
     {
@@ -407,7 +394,6 @@ class FileHandlingUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTest
 
     /**
      * @test
-     * @return void
      */
     public function createDirectoriesForExtensionFilesCreatesDirectories()
     {
@@ -426,7 +412,6 @@ class FileHandlingUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTest
 
     /**
      * @test
-     * @return void
      */
     public function writeEmConfWritesEmConfFile()
     {
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Utility/InstallUtilityTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Utility/InstallUtilityTest.php
index a36cc0504bde71e33cc7eef6e5e856839d63b49e..3d64c7c17e9a822a3f878d006847184408f1f9d0 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Utility/InstallUtilityTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Utility/InstallUtilityTest.php
@@ -40,7 +40,6 @@ class InstallUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
     protected $installMock;
 
     /**
-     * @return void
      */
     protected function setUp()
     {
@@ -90,7 +89,6 @@ class InstallUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
     }
 
     /**
-     * @return void
      */
     protected function tearDown()
     {
@@ -327,7 +325,6 @@ class InstallUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
     }
 
     /**
-     *
      * @param string $fileName
      * @param string $registryNameReturnsFalse
      * @param string $registryNameReturnsTrue
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Utility/ListUtilityTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Utility/ListUtilityTest.php
index ed2ca95bd9f9e64b553e7ab122da2db9912fefc0..8316e0022209e277a5add953836d7b36eb05cd26 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Utility/ListUtilityTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Utility/ListUtilityTest.php
@@ -16,7 +16,6 @@ namespace TYPO3\CMS\Extensionmanager\Tests\Unit\Utility;
 
 /**
  * List utility test
- *
  */
 class ListUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 {
@@ -26,7 +25,6 @@ class ListUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
     protected $subject;
 
     /**
-     * @return void
      */
     protected function setUp()
     {
@@ -122,7 +120,6 @@ class ListUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
      * @dataProvider getAvailableAndInstalledExtensionsDataProvider
      * @param $availableExtensions
      * @param $expectedResult
-     * @return void
      */
     public function getAvailableAndInstalledExtensionsTest($availableExtensions, $expectedResult)
     {
@@ -161,7 +158,6 @@ class ListUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
      * @param $extensions
      * @param $emConf
      * @param $expectedResult
-     * @return void
      */
     public function enrichExtensionsWithEmConfInformation($extensions, $emConf, $expectedResult)
     {
diff --git a/typo3/sysext/feedit/Classes/FrontendEditAssetLoader.php b/typo3/sysext/feedit/Classes/FrontendEditAssetLoader.php
index 1d4a88967ece213f9ae3b70ac22b418709e2484b..e88c11ef5c3ce6145c2af979c0f37da40412dd60 100644
--- a/typo3/sysext/feedit/Classes/FrontendEditAssetLoader.php
+++ b/typo3/sysext/feedit/Classes/FrontendEditAssetLoader.php
@@ -25,7 +25,6 @@ class FrontendEditAssetLoader
 {
     /**
      * @param EditDocumentController $controller
-     * @return void
      */
     public function attachAssets(EditDocumentController $controller)
     {
diff --git a/typo3/sysext/felogin/Classes/Controller/FrontendLoginController.php b/typo3/sysext/felogin/Classes/Controller/FrontendLoginController.php
index 9295ee091905af983d2d1ca7a6e96d8ebb6cf3f2..9a8bdaecb9b21c2f8e00d248ba4b0de0d48cea82 100644
--- a/typo3/sysext/felogin/Classes/Controller/FrontendLoginController.php
+++ b/typo3/sysext/felogin/Classes/Controller/FrontendLoginController.php
@@ -841,8 +841,6 @@ class FrontendLoginController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin
 
     /**
      * Reads flexform configuration and merge it with $this->conf
-     *
-     * @return void
      */
     protected function mergeflexFormValuesIntoConf()
     {
diff --git a/typo3/sysext/felogin/Classes/Hooks/CmsLayout.php b/typo3/sysext/felogin/Classes/Hooks/CmsLayout.php
index 14ae42d119fd32065cf57c64766f0e2e355d3cfc..7e690cd7cf016e4402a301916e59d5d306a1a62c 100644
--- a/typo3/sysext/felogin/Classes/Hooks/CmsLayout.php
+++ b/typo3/sysext/felogin/Classes/Hooks/CmsLayout.php
@@ -16,7 +16,6 @@ namespace TYPO3\CMS\Felogin\Hooks;
 
 /**
  * Hook to display verbose information about the felogin plugin
- *
  */
 class CmsLayout implements \TYPO3\CMS\Backend\View\PageLayoutViewDrawItemHookInterface
 {
@@ -28,7 +27,6 @@ class CmsLayout implements \TYPO3\CMS\Backend\View\PageLayoutViewDrawItemHookInt
      * @param string $headerContent Header content
      * @param string $itemContent Item content
      * @param array $row Record row of tt_content
-     * @return void
      */
     public function preProcess(\TYPO3\CMS\Backend\View\PageLayoutView &$parentObject, &$drawItem, &$headerContent, &$itemContent, array &$row)
     {
diff --git a/typo3/sysext/felogin/Tests/Unit/Controller/FrontendLoginControllerTest.php b/typo3/sysext/felogin/Tests/Unit/Controller/FrontendLoginControllerTest.php
index 0c7ef29a07d0a30d914d80d3b328377e40e46086..8dade80127b8a707408c5a7553ff91d0441f1e12 100644
--- a/typo3/sysext/felogin/Tests/Unit/Controller/FrontendLoginControllerTest.php
+++ b/typo3/sysext/felogin/Tests/Unit/Controller/FrontendLoginControllerTest.php
@@ -413,7 +413,6 @@ class FrontendLoginControllerTest extends \TYPO3\TestingFramework\Core\Unit\Unit
      * @param array $getArray
      * @param string $preserveVars
      * @param string $expected
-     * @return void
      */
     public function getPreserveGetVarsReturnsCorrectResult(array $getArray, $preserveVars, $expected)
     {
diff --git a/typo3/sysext/filelist/Classes/ContextMenu/ItemProviders/FileDragProvider.php b/typo3/sysext/filelist/Classes/ContextMenu/ItemProviders/FileDragProvider.php
index 7844f7a444776fcf053dafb8e8ec3b43e7ebe046..f96c904f7419ef3f3cea20883dedcaec58651b93 100644
--- a/typo3/sysext/filelist/Classes/ContextMenu/ItemProviders/FileDragProvider.php
+++ b/typo3/sysext/filelist/Classes/ContextMenu/ItemProviders/FileDragProvider.php
@@ -19,7 +19,6 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 /**
  * Drag drop menu provider for legacy tree (used in filelist folder tree)
- *
  */
 class FileDragProvider extends \TYPO3\CMS\Backend\ContextMenu\ItemProviders\AbstractProvider
 {
diff --git a/typo3/sysext/filelist/Classes/ContextMenu/ItemProviders/FileStorageProvider.php b/typo3/sysext/filelist/Classes/ContextMenu/ItemProviders/FileStorageProvider.php
index 06f8f8805ed526f66a8dabbf026c9627ec5d1585..3b19360d34a5ea421ad83e35b7bc0b38bb5b1c0f 100644
--- a/typo3/sysext/filelist/Classes/ContextMenu/ItemProviders/FileStorageProvider.php
+++ b/typo3/sysext/filelist/Classes/ContextMenu/ItemProviders/FileStorageProvider.php
@@ -19,7 +19,6 @@ use TYPO3\CMS\Core\Resource\File;
 
 /**
  * Provides click menu items for file_storage
- *
  */
 class FileStorageProvider extends FileProvider
 {
diff --git a/typo3/sysext/filelist/Classes/ContextMenu/ItemProviders/FilemountsProvider.php b/typo3/sysext/filelist/Classes/ContextMenu/ItemProviders/FilemountsProvider.php
index cae48eb68a0e101a80a5d9e3200b9bdd3834a7be..4eca58f9fe85b0b9beb221dca799a9f56a706de5 100644
--- a/typo3/sysext/filelist/Classes/ContextMenu/ItemProviders/FilemountsProvider.php
+++ b/typo3/sysext/filelist/Classes/ContextMenu/ItemProviders/FilemountsProvider.php
@@ -19,7 +19,6 @@ use TYPO3\CMS\Core\Resource\File;
 
 /**
  * Provides click menu items for filemounts
- *
  */
 class FilemountsProvider extends FileProvider
 {
diff --git a/typo3/sysext/filelist/Classes/Controller/FileListController.php b/typo3/sysext/filelist/Classes/Controller/FileListController.php
index 8fc5238604587791f5e593d6f9d825f5b8b88f61..9eb0ce41709c3341017a167b053702cb88870ddd 100644
--- a/typo3/sysext/filelist/Classes/Controller/FileListController.php
+++ b/typo3/sysext/filelist/Classes/Controller/FileListController.php
@@ -151,7 +151,6 @@ class FileListController extends ActionController
      * Initialize variables, file object
      * Incoming GET vars include id, pointer, table, imagemode
      *
-     * @return void
      * @throws \RuntimeException
      * @throws Exception\InsufficientFolderAccessPermissionsException
      */
@@ -254,8 +253,6 @@ class FileListController extends ActionController
 
     /**
      * Setting the menu/session variables
-     *
-     * @return void
      */
     public function menuConfig()
     {
@@ -282,7 +279,6 @@ class FileListController extends ActionController
      * Initialize the view
      *
      * @param ViewInterface $view The view
-     * @return void
      */
     public function initializeView(ViewInterface $view)
     {
@@ -296,7 +292,6 @@ class FileListController extends ActionController
     }
 
     /**
-     * @return void
      */
     public function initializeIndexAction()
     {
@@ -332,7 +327,6 @@ class FileListController extends ActionController
     }
 
     /**
-     * @return void
      */
     public function indexAction()
     {
@@ -452,7 +446,6 @@ class FileListController extends ActionController
     }
 
     /**
-     * @return void
      */
     public function missingFolderAction()
     {
@@ -526,7 +519,6 @@ class FileListController extends ActionController
     /**
      * Registers the Icons into the docheader
      *
-     * @return void
      * @throws \InvalidArgumentException
      */
     protected function registerDocHeaderButtons()
diff --git a/typo3/sysext/filelist/Classes/FileList.php b/typo3/sysext/filelist/Classes/FileList.php
index 1484bedc8a3107013dd8bf282b08c66cb61019b1..d68835a29f0ed5bbb7d76f8c6191fc534028a196 100644
--- a/typo3/sysext/filelist/Classes/FileList.php
+++ b/typo3/sysext/filelist/Classes/FileList.php
@@ -204,7 +204,6 @@ class FileList extends AbstractRecordList
      * @param bool $sortRev Sorting direction
      * @param bool $clipBoard
      * @param bool $bigControlPanel Show clipboard flag
-     * @return void
      */
     public function start(Folder $folderObject, $pointer, $sort, $sortRev, $clipBoard = false, $bigControlPanel = false)
     {
@@ -227,8 +226,6 @@ class FileList extends AbstractRecordList
 
     /**
      * Reading files and directories, counting elements and generating the list in ->HTMLcode
-     *
-     * @return void
      */
     public function generateList()
     {
diff --git a/typo3/sysext/filelist/Classes/FileListEditIconHookInterface.php b/typo3/sysext/filelist/Classes/FileListEditIconHookInterface.php
index b291fb506f1f2444a6538d878dc842ea5a93484f..b39b4d40c80c30e88e26589eeb400f9a5e40bc94 100644
--- a/typo3/sysext/filelist/Classes/FileListEditIconHookInterface.php
+++ b/typo3/sysext/filelist/Classes/FileListEditIconHookInterface.php
@@ -24,7 +24,6 @@ interface FileListEditIconHookInterface
      *
      * @param array $cells Array of edit icons
      * @param \TYPO3\CMS\Filelist\FileList $parentObject Parent object
-     * @return void
      */
     public function manipulateEditIcons(&$cells, &$parentObject);
 }
diff --git a/typo3/sysext/filelist/Classes/Hook/BackendControllerHook.php b/typo3/sysext/filelist/Classes/Hook/BackendControllerHook.php
index 487cd0af5490e4a344e97a2390b99c67d6e57a10..5c3edbbcde780ccd5c11b71f7990da809a5f8528 100644
--- a/typo3/sysext/filelist/Classes/Hook/BackendControllerHook.php
+++ b/typo3/sysext/filelist/Classes/Hook/BackendControllerHook.php
@@ -29,7 +29,6 @@ class BackendControllerHook
      *
      * @param array $configuration
      * @param BackendController $backendController
-     * @return void
      */
     public function addJavaScript(array $configuration, BackendController $backendController)
     {
diff --git a/typo3/sysext/filelist/Classes/ViewHelpers/Link/ClickMenuOnIconViewHelper.php b/typo3/sysext/filelist/Classes/ViewHelpers/Link/ClickMenuOnIconViewHelper.php
index a71ba87c842df0faea0f9a4e71ec69034e95da11..e35797c6be6b3b42fe039c6c3c68059bf9eb7885 100644
--- a/typo3/sysext/filelist/Classes/ViewHelpers/Link/ClickMenuOnIconViewHelper.php
+++ b/typo3/sysext/filelist/Classes/ViewHelpers/Link/ClickMenuOnIconViewHelper.php
@@ -26,7 +26,6 @@ class ClickMenuOnIconViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\Abstrac
 
     /**
      * Defines additional arguments that are allowed for this view helper.
-     * @return void
      */
     public function initializeArguments()
     {
diff --git a/typo3/sysext/fluid/Classes/Core/Cache/FluidTemplateCache.php b/typo3/sysext/fluid/Classes/Core/Cache/FluidTemplateCache.php
index 6f4586d33eb28800a6de767bb7d848dd156eaad7..0aa47f63e2a2f81315152654d14a6597081473d7 100644
--- a/typo3/sysext/fluid/Classes/Core/Cache/FluidTemplateCache.php
+++ b/typo3/sysext/fluid/Classes/Core/Cache/FluidTemplateCache.php
@@ -30,7 +30,6 @@ class FluidTemplateCache extends PhpFrontend implements FluidCacheInterface
 {
     /**
      * @param null $name
-     * @return void
      */
     public function flush($name = null)
     {
diff --git a/typo3/sysext/fluid/Classes/Core/Rendering/RenderingContext.php b/typo3/sysext/fluid/Classes/Core/Rendering/RenderingContext.php
index e390f8199dff9f30df43aa3000a482d7c28ec603..e7d58325d1775d1e42d37d69c4474472bb58e174 100644
--- a/typo3/sysext/fluid/Classes/Core/Rendering/RenderingContext.php
+++ b/typo3/sysext/fluid/Classes/Core/Rendering/RenderingContext.php
@@ -152,7 +152,6 @@ class RenderingContext extends \TYPO3Fluid\Fluid\Core\Rendering\RenderingContext
      *
      * @deprecated since TYPO3 v8, will be removed in TYPO3 v9
      * @param bool $legacyMode
-     * @return void
      */
     public function setLegacyMode($legacyMode)
     {
@@ -199,7 +198,6 @@ class RenderingContext extends \TYPO3Fluid\Fluid\Core\Rendering\RenderingContext
 
     /**
      * @param string $action
-     * @return void
      */
     public function setControllerAction($action)
     {
diff --git a/typo3/sysext/fluid/Classes/Core/ViewHelper/AbstractConditionViewHelper.php b/typo3/sysext/fluid/Classes/Core/ViewHelper/AbstractConditionViewHelper.php
index e3eb376138f564c0f3bb905b08d9944767a159e1..07c243e1f70f910b5d0b30f65a0cd9e7a13406a4 100644
--- a/typo3/sysext/fluid/Classes/Core/ViewHelper/AbstractConditionViewHelper.php
+++ b/typo3/sysext/fluid/Classes/Core/ViewHelper/AbstractConditionViewHelper.php
@@ -45,7 +45,6 @@ abstract class AbstractConditionViewHelper extends \TYPO3Fluid\Fluid\Core\ViewHe
 
     /**
      * @param \TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface $renderingContext
-     * @return void
      */
     public function setRenderingContext(\TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface $renderingContext)
     {
diff --git a/typo3/sysext/fluid/Classes/Core/ViewHelper/AbstractTagBasedViewHelper.php b/typo3/sysext/fluid/Classes/Core/ViewHelper/AbstractTagBasedViewHelper.php
index f89200e92c7e47417effa9754f4b7b527a026b70..e222e3757869bf4d04179986041b101ee478de59 100644
--- a/typo3/sysext/fluid/Classes/Core/ViewHelper/AbstractTagBasedViewHelper.php
+++ b/typo3/sysext/fluid/Classes/Core/ViewHelper/AbstractTagBasedViewHelper.php
@@ -75,7 +75,6 @@ abstract class AbstractTagBasedViewHelper extends AbstractViewHelper
      *
      * Will be invoked just before the render method.
      *
-     * @return void
      * @api
      */
     public function initialize()
@@ -110,7 +109,6 @@ abstract class AbstractTagBasedViewHelper extends AbstractViewHelper
      * @param string $description Description of tag attribute
      * @param bool $required set to TRUE if tag attribute is required. Defaults to FALSE.
      * @param string $default Default value
-     * @return void
      * @api
      */
     protected function registerTagAttribute($name, $type, $description, $required = false, $default = null)
@@ -123,7 +121,6 @@ abstract class AbstractTagBasedViewHelper extends AbstractViewHelper
      * Registers all standard HTML universal attributes.
      * Should be used inside registerArguments();
      *
-     * @return void
      * @api
      */
     protected function registerUniversalTagAttributes()
diff --git a/typo3/sysext/fluid/Classes/Core/ViewHelper/AbstractViewHelper.php b/typo3/sysext/fluid/Classes/Core/ViewHelper/AbstractViewHelper.php
index 98f02fcc583aca2d1e5ba87ef18d66e77c2e8d9a..c524f8299b6bf734771268e0708eec932be088b7 100644
--- a/typo3/sysext/fluid/Classes/Core/ViewHelper/AbstractViewHelper.php
+++ b/typo3/sysext/fluid/Classes/Core/ViewHelper/AbstractViewHelper.php
@@ -47,7 +47,6 @@ abstract class AbstractViewHelper extends \TYPO3Fluid\Fluid\Core\ViewHelper\Abst
 
     /**
      * @param \TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface $renderingContext
-     * @return void
      */
     public function setRenderingContext(\TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface $renderingContext)
     {
@@ -113,7 +112,6 @@ abstract class AbstractViewHelper extends \TYPO3Fluid\Fluid\Core\ViewHelper\Abst
     /**
      * Register method arguments for "render" by analysing the doc comment above.
      *
-     * @return void
      * @throws \TYPO3Fluid\Fluid\Core\Parser\Exception
      */
     protected function registerRenderMethodArguments()
diff --git a/typo3/sysext/fluid/Classes/Core/Widget/AbstractWidgetController.php b/typo3/sysext/fluid/Classes/Core/Widget/AbstractWidgetController.php
index accf6c23b0aaf6cf4a82b5be28c9879f71148223..89cc9d8e9bf7ace4fd20b5cac5d33e8493ef0d3e 100644
--- a/typo3/sysext/fluid/Classes/Core/Widget/AbstractWidgetController.php
+++ b/typo3/sysext/fluid/Classes/Core/Widget/AbstractWidgetController.php
@@ -43,7 +43,6 @@ abstract class AbstractWidgetController extends \TYPO3\CMS\Extbase\Mvc\Controlle
      *
      * @param \TYPO3\CMS\Extbase\Mvc\RequestInterface $request The request object
      * @param \TYPO3\CMS\Extbase\Mvc\ResponseInterface $response The response, modified by this handler
-     * @return void
      * @api
      */
     public function processRequest(\TYPO3\CMS\Extbase\Mvc\RequestInterface $request, \TYPO3\CMS\Extbase\Mvc\ResponseInterface $response)
@@ -57,7 +56,6 @@ abstract class AbstractWidgetController extends \TYPO3\CMS\Extbase\Mvc\Controlle
      * e.g. plugin.tx_extension.view.widget.<WidgetViewHelperClassName>.templateRootPath
      *
      * @param \TYPO3\CMS\Extbase\Mvc\View\ViewInterface $view
-     * @return void
      */
     protected function setViewConfiguration(\TYPO3\CMS\Extbase\Mvc\View\ViewInterface $view)
     {
diff --git a/typo3/sysext/fluid/Classes/Core/Widget/AbstractWidgetViewHelper.php b/typo3/sysext/fluid/Classes/Core/Widget/AbstractWidgetViewHelper.php
index 492ac1901f05f7b8e82efb7626d58cf3f2edee03..f0b9a60bd5e30641678bb30e659dcd0f25c7136d 100644
--- a/typo3/sysext/fluid/Classes/Core/Widget/AbstractWidgetViewHelper.php
+++ b/typo3/sysext/fluid/Classes/Core/Widget/AbstractWidgetViewHelper.php
@@ -66,7 +66,6 @@ abstract class AbstractWidgetViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper
 
     /**
      * @param \TYPO3\CMS\Fluid\Core\Widget\AjaxWidgetContextHolder $ajaxWidgetContextHolder
-     * @return void
      */
     public function injectAjaxWidgetContextHolder(\TYPO3\CMS\Fluid\Core\Widget\AjaxWidgetContextHolder $ajaxWidgetContextHolder)
     {
@@ -75,7 +74,6 @@ abstract class AbstractWidgetViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper
 
     /**
      * @param \TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager
-     * @return void
      */
     public function injectObjectManager(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager)
     {
@@ -115,8 +113,6 @@ abstract class AbstractWidgetViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper
 
     /**
      * Initialize the Widget Context, before the Render method is called.
-     *
-     * @return void
      */
     private function initializeWidgetContext()
     {
@@ -140,7 +136,6 @@ abstract class AbstractWidgetViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper
      * rendered with <f:widget.renderChildren> lateron.
      *
      * @param array $childNodes The SyntaxTree Child nodes of this ViewHelper.
-     * @return void
      */
     public function setChildNodes(array $childNodes)
     {
@@ -191,7 +186,6 @@ abstract class AbstractWidgetViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper
      * Pass the arguments of the widget to the subrequest.
      *
      * @param \TYPO3\CMS\Fluid\Core\Widget\WidgetRequest $subRequest
-     * @return void
      */
     private function passArgumentsToSubRequest(\TYPO3\CMS\Fluid\Core\Widget\WidgetRequest $subRequest)
     {
@@ -211,7 +205,6 @@ abstract class AbstractWidgetViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper
      * in the URI as a namespace for the widget's arguments.
      *
      * @return string the widget identifier for this widget
-     * @return void
      * @todo clean up, and make it somehow more routing compatible.
      */
     private function initializeWidgetIdentifier()
diff --git a/typo3/sysext/fluid/Classes/Core/Widget/AjaxWidgetContextHolder.php b/typo3/sysext/fluid/Classes/Core/Widget/AjaxWidgetContextHolder.php
index 03a90a80cfe630a9b4d4a26ed3255de62e58f8e9..5fbf1ca2231905e841d8d4cfb3612f42d7c6f62e 100644
--- a/typo3/sysext/fluid/Classes/Core/Widget/AjaxWidgetContextHolder.php
+++ b/typo3/sysext/fluid/Classes/Core/Widget/AjaxWidgetContextHolder.php
@@ -46,8 +46,6 @@ class AjaxWidgetContextHolder implements \TYPO3\CMS\Core\SingletonInterface
 
     /**
      * Loads the windget contexts from the TYPO3 user session
-     *
-     * @return void
      */
     protected function loadWidgetContexts()
     {
@@ -78,7 +76,6 @@ class AjaxWidgetContextHolder implements \TYPO3\CMS\Core\SingletonInterface
      * AjaxWidgetIdentifier inside the Widget Context correctly.
      *
      * @param \TYPO3\CMS\Fluid\Core\Widget\WidgetContext $widgetContext
-     * @return void
      */
     public function store(\TYPO3\CMS\Fluid\Core\Widget\WidgetContext $widgetContext)
     {
@@ -90,8 +87,6 @@ class AjaxWidgetContextHolder implements \TYPO3\CMS\Core\SingletonInterface
 
     /**
      * Persists the widget contexts in the TYPO3 user session
-     *
-     * @return void
      */
     protected function storeWidgetContexts()
     {
diff --git a/typo3/sysext/fluid/Classes/Core/Widget/Bootstrap.php b/typo3/sysext/fluid/Classes/Core/Widget/Bootstrap.php
index 501f7207d03e5b75c40ef12d47971a4da322294d..14d8c67536123adf6fcb4c990d54cb3a1506e15c 100644
--- a/typo3/sysext/fluid/Classes/Core/Widget/Bootstrap.php
+++ b/typo3/sysext/fluid/Classes/Core/Widget/Bootstrap.php
@@ -61,7 +61,6 @@ class Bootstrap
      * Initializes the Object framework.
      *
      * @param array $configuration
-     * @return void
      * @see initialize()
      */
     public function initializeConfiguration($configuration)
@@ -77,7 +76,6 @@ class Bootstrap
      * Configures the object manager object configuration from
      * config.tx_extbase.objects
      *
-     * @return void
      * @see initialize()
      * @todo this is duplicated code (see \TYPO3\CMS\Extbase\Core\Bootstrap::configureObjectManager())
      */
diff --git a/typo3/sysext/fluid/Classes/Core/Widget/WidgetContext.php b/typo3/sysext/fluid/Classes/Core/Widget/WidgetContext.php
index c6fcff2e9c8cd0862405ad8d71840844c5d9ece6..a0cdb2cfa4799ceeed38a4ccb85da8ecf0ca2732 100644
--- a/typo3/sysext/fluid/Classes/Core/Widget/WidgetContext.php
+++ b/typo3/sysext/fluid/Classes/Core/Widget/WidgetContext.php
@@ -105,7 +105,6 @@ class WidgetContext
 
     /**
      * @param string $widgetIdentifier
-     * @return void
      */
     public function setWidgetIdentifier($widgetIdentifier)
     {
@@ -122,7 +121,6 @@ class WidgetContext
 
     /**
      * @param string $ajaxWidgetIdentifier
-     * @return void
      */
     public function setAjaxWidgetIdentifier($ajaxWidgetIdentifier)
     {
@@ -133,7 +131,6 @@ class WidgetContext
      * Sets the URI namespace of the plugin that contains the widget
      *
      * @param string $parentPluginNamespace
-     * @return void
      */
     public function setParentPluginNamespace($parentPluginNamespace)
     {
@@ -154,7 +151,6 @@ class WidgetContext
      * Sets the Extension name of the plugin that contains the widget
      *
      * @param string $parentExtensionName
-     * @return void
      */
     public function setParentExtensionName($parentExtensionName)
     {
@@ -175,7 +171,6 @@ class WidgetContext
      * Sets the name of the plugin that contains the widget
      *
      * @param string $parentPluginName
-     * @return void
      */
     public function setParentPluginName($parentPluginName)
     {
@@ -196,7 +191,6 @@ class WidgetContext
      * Sets the fully qualified class name of the view helper this context belongs to
      *
      * @param string $widgetViewHelperClassName
-     * @return void
      */
     public function setWidgetViewHelperClassName($widgetViewHelperClassName)
     {
@@ -223,7 +217,6 @@ class WidgetContext
 
     /**
      * @param array $widgetConfiguration
-     * @return void
      */
     public function setWidgetConfiguration($widgetConfiguration)
     {
@@ -240,7 +233,6 @@ class WidgetContext
 
     /**
      * @param string $controllerObjectName
-     * @return void
      */
     public function setControllerObjectName($controllerObjectName)
     {
@@ -250,7 +242,6 @@ class WidgetContext
     /**
      * @param \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\RootNode $viewHelperChildNodes
      * @param \TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface $viewHelperChildNodeRenderingContext
-     * @return void
      */
     public function setViewHelperChildNodes(\TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\RootNode $viewHelperChildNodes, \TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface $viewHelperChildNodeRenderingContext)
     {
diff --git a/typo3/sysext/fluid/Classes/Core/Widget/WidgetRequest.php b/typo3/sysext/fluid/Classes/Core/Widget/WidgetRequest.php
index a57767c749a1f676b8c1337e450bcb8c6d3b204a..635d609a68aa38f94070af4afca09f8b9ef49b82 100644
--- a/typo3/sysext/fluid/Classes/Core/Widget/WidgetRequest.php
+++ b/typo3/sysext/fluid/Classes/Core/Widget/WidgetRequest.php
@@ -34,7 +34,6 @@ class WidgetRequest extends \TYPO3\CMS\Extbase\Mvc\Web\Request
 
     /**
      * @param \TYPO3\CMS\Fluid\Core\Widget\WidgetContext $widgetContext
-     * @return void
      */
     public function setWidgetContext(\TYPO3\CMS\Fluid\Core\Widget\WidgetContext $widgetContext)
     {
diff --git a/typo3/sysext/fluid/Classes/Core/Widget/WidgetRequestBuilder.php b/typo3/sysext/fluid/Classes/Core/Widget/WidgetRequestBuilder.php
index 58af3921f00fdcd08933d69b3b1749b2e1525d38..05bb6e286f7091a191e6bec2830976cd8ac844c9 100644
--- a/typo3/sysext/fluid/Classes/Core/Widget/WidgetRequestBuilder.php
+++ b/typo3/sysext/fluid/Classes/Core/Widget/WidgetRequestBuilder.php
@@ -28,7 +28,6 @@ class WidgetRequestBuilder extends \TYPO3\CMS\Extbase\Mvc\Web\RequestBuilder
 
     /**
      * @param \TYPO3\CMS\Fluid\Core\Widget\AjaxWidgetContextHolder $ajaxWidgetContextHolder
-     * @return void
      */
     public function injectAjaxWidgetContextHolder(\TYPO3\CMS\Fluid\Core\Widget\AjaxWidgetContextHolder $ajaxWidgetContextHolder)
     {
diff --git a/typo3/sysext/fluid/Classes/View/AbstractTemplateView.php b/typo3/sysext/fluid/Classes/View/AbstractTemplateView.php
index 1e427a64195b2df92015b4a2e78a2e4a8ac302d9..009c057f5f8d4b59caf6aebaeed1353e7adb0149 100644
--- a/typo3/sysext/fluid/Classes/View/AbstractTemplateView.php
+++ b/typo3/sysext/fluid/Classes/View/AbstractTemplateView.php
@@ -35,7 +35,6 @@ abstract class AbstractTemplateView extends TemplateView implements \TYPO3\CMS\E
     /**
      * Initializes this view.
      *
-     * @return void
      * @api
      */
     public function initializeView()
@@ -72,7 +71,6 @@ abstract class AbstractTemplateView extends TemplateView implements \TYPO3\CMS\E
      * Sets the current controller context
      *
      * @param \TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext $controllerContext
-     * @return void
      */
     public function setControllerContext(\TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext $controllerContext)
     {
diff --git a/typo3/sysext/fluid/Classes/View/StandaloneView.php b/typo3/sysext/fluid/Classes/View/StandaloneView.php
index 24dad285e2d9ef9b201a599a004cd8180fa76bfa..cd4891ccdcad934a2d16a41d175b4c154abe46de 100644
--- a/typo3/sysext/fluid/Classes/View/StandaloneView.php
+++ b/typo3/sysext/fluid/Classes/View/StandaloneView.php
@@ -84,7 +84,6 @@ class StandaloneView extends AbstractTemplateView
      * Sets the format of the current request (default format is "html")
      *
      * @param string $format
-     * @return void
      * @throws \RuntimeException
      * @api
      */
@@ -130,7 +129,6 @@ class StandaloneView extends AbstractTemplateView
      * Sets the absolute path to a Fluid template file
      *
      * @param string $templatePathAndFilename Fluid template path
-     * @return void
      * @api
      */
     public function setTemplatePathAndFilename($templatePathAndFilename)
@@ -159,7 +157,6 @@ class StandaloneView extends AbstractTemplateView
      * You can use setTemplatePathAndFilename() alternatively if you only want to specify the template path
      *
      * @param string $templateSource Fluid template source code
-     * @return void
      * @api
      */
     public function setTemplateSource($templateSource)
@@ -171,7 +168,6 @@ class StandaloneView extends AbstractTemplateView
      * Set the root path(s) to the templates.
      *
      * @param string[] $templateRootPaths Root paths to the templates.
-     * @return void
      * @api
      */
     public function setTemplateRootPaths(array $templateRootPaths)
@@ -183,7 +179,6 @@ class StandaloneView extends AbstractTemplateView
      * Set the root path(s) to the layouts.
      *
      * @param string[] $layoutRootPaths Root path to the layouts
-     * @return void
      * @api
      */
     public function setLayoutRootPaths(array $layoutRootPaths)
@@ -208,7 +203,6 @@ class StandaloneView extends AbstractTemplateView
      * If set, overrides the one determined from $this->partialRootPathPattern
      *
      * @param string[] $partialRootPaths Root paths to the partials. If set, overrides the one determined from $this->partialRootPathPattern
-     * @return void
      * @api
      */
     public function setPartialRootPaths(array $partialRootPaths)
diff --git a/typo3/sysext/fluid/Classes/View/TemplatePaths.php b/typo3/sysext/fluid/Classes/View/TemplatePaths.php
index 3e7dc6a38258be88d278a9db05309464aeba5cb3..ebd8d46fb2eeac5d8fb5fcf6a0ed07df3891ef0d 100644
--- a/typo3/sysext/fluid/Classes/View/TemplatePaths.php
+++ b/typo3/sysext/fluid/Classes/View/TemplatePaths.php
@@ -168,7 +168,6 @@ class TemplatePaths extends \TYPO3Fluid\Fluid\View\TemplatePaths
      * if not defined, uses fallback paths by convention.
      *
      * @param string $packageName
-     * @return void
      */
     public function fillDefaultsByPackageName($packageName)
     {
@@ -179,7 +178,6 @@ class TemplatePaths extends \TYPO3Fluid\Fluid\View\TemplatePaths
      * Overridden setter with enforced sorting behavior
      *
      * @param array $templateRootPaths
-     * @return void
      */
     public function setTemplateRootPaths(array $templateRootPaths)
     {
@@ -192,7 +190,6 @@ class TemplatePaths extends \TYPO3Fluid\Fluid\View\TemplatePaths
      * Overridden setter with enforced sorting behavior
      *
      * @param array $layoutRootPaths
-     * @return void
      */
     public function setLayoutRootPaths(array $layoutRootPaths)
     {
@@ -205,7 +202,6 @@ class TemplatePaths extends \TYPO3Fluid\Fluid\View\TemplatePaths
      * Overridden setter with enforced sorting behavior
      *
      * @param array $partialRootPaths
-     * @return void
      */
     public function setPartialRootPaths(array $partialRootPaths)
     {
diff --git a/typo3/sysext/fluid/Classes/View/TemplateView.php b/typo3/sysext/fluid/Classes/View/TemplateView.php
index 4ba2e902973f5af3dbaaae7379303907a05fba98..187c01b40240dd730f808d70be7ed336b81d02f8 100644
--- a/typo3/sysext/fluid/Classes/View/TemplateView.php
+++ b/typo3/sysext/fluid/Classes/View/TemplateView.php
@@ -45,7 +45,6 @@ class TemplateView extends AbstractTemplateView
      * dynamic resolving of a template file.
      *
      * @param string $templatePathAndFilename Template file path
-     * @return void
      * @api
      */
     public function setTemplatePathAndFilename($templatePathAndFilename)
@@ -57,7 +56,6 @@ class TemplateView extends AbstractTemplateView
      * Sets the path and name of the layout file. Overrides the dynamic resolving of the layout file.
      *
      * @param string $layoutPathAndFilename Path and filename of the layout file
-     * @return void
      * @api
      */
     public function setLayoutPathAndFilename($layoutPathAndFilename)
@@ -80,7 +78,6 @@ class TemplateView extends AbstractTemplateView
      * If set, overrides the one determined from $this->templateRootPathPattern
      *
      * @param array $templateRootPaths Root path(s) to the templates. If set, overrides the one determined from $this->templateRootPathPattern
-     * @return void
      * @api
      */
     public function setTemplateRootPaths(array $templateRootPaths)
@@ -93,7 +90,6 @@ class TemplateView extends AbstractTemplateView
      * If set, overrides the one determined from $this->partialRootPathPattern
      *
      * @param array $partialRootPaths Root paths to the partials. If set, overrides the one determined from $this->partialRootPathPattern
-     * @return void
      * @api
      */
     public function setPartialRootPaths(array $partialRootPaths)
@@ -106,7 +102,6 @@ class TemplateView extends AbstractTemplateView
      * If set, overrides the one determined from $this->layoutRootPathPattern
      *
      * @param array $layoutRootPaths Root path to the layouts. If set, overrides the one determined from $this->layoutRootPathPattern
-     * @return void
      * @api
      */
     public function setLayoutRootPaths(array $layoutRootPaths)
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Be/Menus/ActionMenuItemGroupViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Be/Menus/ActionMenuItemGroupViewHelper.php
index e1da663241f80d44d5278cca11fc7386a23d7a6f..0b50f8f3e3d093a4f1b9242deb049e01bfe4d0c1 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Be/Menus/ActionMenuItemGroupViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Be/Menus/ActionMenuItemGroupViewHelper.php
@@ -34,7 +34,6 @@ use TYPO3Fluid\Fluid\Core\Parser\SyntaxTree\ViewHelperNode;
  *			<f:be.menus.actionMenuItem label="XClasses" controller="Information" action="xclass" />
  *		</f:be.menus.actionMenuItemGroup>
  *	</f:be.menus.actionMenu>
- *
  */
 class ActionMenuItemGroupViewHelper extends ActionMenuViewHelper
 {
@@ -79,7 +78,6 @@ class ActionMenuItemGroupViewHelper extends ActionMenuViewHelper
      * @param string $initializationPhpCode
      * @param ViewHelperNode $node
      * @param TemplateCompiler $compiler
-     * @return null
      */
     public function compile($argumentsName, $closureName, &$initializationPhpCode, ViewHelperNode $node, TemplateCompiler $compiler)
     {
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Be/Menus/ActionMenuViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Be/Menus/ActionMenuViewHelper.php
index 86b1977956e78feba638dbfadeb21fd4a9d379f3..8d95575113f432b604b7f36255a617619def31d5 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Be/Menus/ActionMenuViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Be/Menus/ActionMenuViewHelper.php
@@ -63,7 +63,6 @@ class ActionMenuViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractTagB
      * Setter for ChildNodes - as defined in ChildNodeAccessInterface
      *
      * @param array $childNodes Child nodes of this syntax tree node
-     * @return void
      * @api
      */
     public function setChildNodes(array $childNodes)
@@ -107,7 +106,6 @@ class ActionMenuViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractTagB
      * @param string $initializationPhpCode
      * @param ViewHelperNode $node
      * @param TemplateCompiler $compiler
-     * @return null
      */
     public function compile($argumentsName, $closureName, &$initializationPhpCode, ViewHelperNode $node, TemplateCompiler $compiler)
     {
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Be/Security/IfHasRoleViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Be/Security/IfHasRoleViewHelper.php
index 0e1c291da7b2c83095456036e82716b8ed81f2df..580a4468264edc903cd708601d5b7d9299293c01 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Be/Security/IfHasRoleViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Be/Security/IfHasRoleViewHelper.php
@@ -60,8 +60,6 @@ class IfHasRoleViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractCondi
      * Initializes the "role" argument.
      * Renders <f:then> child if the current logged in BE user belongs to the specified role (aka usergroup)
      * otherwise renders <f:else> child.
-     *
-     * @return void
      */
     public function initializeArguments()
     {
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Be/Widget/Controller/PaginateController.php b/typo3/sysext/fluid/Classes/ViewHelpers/Be/Widget/Controller/PaginateController.php
index 24c14fbe02dc7fbedbf6d6c4df90eb63da7190cc..374f3592723a90a8b59113d7c684a01fed1731f4 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Be/Widget/Controller/PaginateController.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Be/Widget/Controller/PaginateController.php
@@ -56,8 +56,6 @@ class PaginateController extends \TYPO3\CMS\Fluid\Core\Widget\AbstractWidgetCont
 
     /**
      * Initializes necessary variables for all actions.
-     *
-     * @return void
      */
     public function initializeAction()
     {
@@ -70,7 +68,6 @@ class PaginateController extends \TYPO3\CMS\Fluid\Core\Widget\AbstractWidgetCont
 
     /**
      * @param int $currentPage
-     * @return void
      */
     public function indexAction($currentPage = 1)
     {
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/CObjectViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/CObjectViewHelper.php
index b7ddbe3ab654d08a0f954d0657a4e85bc89e01ae..dc26420c20c582863035aab1ea602d94d4cff423 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/CObjectViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/CObjectViewHelper.php
@@ -82,7 +82,6 @@ class CObjectViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHel
 
     /**
      * @param \TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface $configurationManager
-     * @return void
      */
     public function injectConfigurationManager(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface $configurationManager)
     {
@@ -162,8 +161,6 @@ class CObjectViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHel
     /**
      * Sets the $TSFE->cObjectDepthCounter in Backend mode
      * This somewhat hacky work around is currently needed because the cObjGetSingle() function of \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer relies on this setting
-     *
-     * @return void
      */
     protected function simulateFrontendEnvironment()
     {
@@ -175,7 +172,6 @@ class CObjectViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHel
     /**
      * Resets $GLOBALS['TSFE'] if it was previously changed by simulateFrontendEnvironment()
      *
-     * @return void
      * @see simulateFrontendEnvironment()
      */
     protected function resetFrontendEnvironment()
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/CaseViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/CaseViewHelper.php
index 6b92a9410a9687f236854b972789d31344862e3d..867b35757cad03c2831372ff7d05852519ccd1be 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/CaseViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/CaseViewHelper.php
@@ -32,8 +32,6 @@ class CaseViewHelper extends AbstractViewHelper
 
     /**
      * Initialize ViewHelper arguments
-     *
-     * @return void
      */
     public function initializeArguments()
     {
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Debug/RenderViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Debug/RenderViewHelper.php
index 4cbd2c089c105ee7df89d561cf97d23f30ea2e47..1624283bfd18faca01ce4c11cfd2e2d1dc3c378c 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Debug/RenderViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Debug/RenderViewHelper.php
@@ -39,7 +39,6 @@ class RenderViewHelper extends AbstractViewHelper
 
     /**
      * Initializes additional arguments available for this view helper.
-     * @return void
      */
     public function initializeArguments()
     {
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/FlashMessagesViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/FlashMessagesViewHelper.php
index 9832d2833f88251892ab559fa68d70363ebf14a8..4280c08f19426ac2b435d58f30efb2752ebacff3 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/FlashMessagesViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/FlashMessagesViewHelper.php
@@ -89,7 +89,6 @@ class FlashMessagesViewHelper extends AbstractViewHelper
     /**
      * Initialize arguments
      *
-     * @return void
      * @api
      */
     public function initializeArguments()
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Form/AbstractFormFieldViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Form/AbstractFormFieldViewHelper.php
index 17f0a6f5d80662f2aee162c2334806895fb664ae..38b05af9cd060d4e30562d9b6a22dc06492969f6 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Form/AbstractFormFieldViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Form/AbstractFormFieldViewHelper.php
@@ -47,7 +47,6 @@ abstract class AbstractFormFieldViewHelper extends AbstractFormViewHelper
     /**
      * Initialize arguments.
      *
-     * @return void
      * @api
      */
     public function initializeArguments()
@@ -75,7 +74,6 @@ abstract class AbstractFormFieldViewHelper extends AbstractFormViewHelper
      * Define respectSubmittedDataValue to enable or disable the usage of the submitted values in the viewhelper.
      *
      * @param bool $respectSubmittedDataValue
-     * @return void
      */
     public function setRespectSubmittedDataValue($respectSubmittedDataValue)
     {
@@ -240,8 +238,6 @@ abstract class AbstractFormFieldViewHelper extends AbstractFormViewHelper
     /**
      * Add additional identity properties in case the current property is hierarchical (of the form "bla.blubb").
      * Then, [bla][__identity] has to be generated as well.
-     *
-     * @return void
      */
     protected function addAdditionalIdentityPropertiesIfNeeded()
     {
@@ -316,8 +312,6 @@ abstract class AbstractFormFieldViewHelper extends AbstractFormViewHelper
 
     /**
      * Add an CSS class if this view helper has errors
-     *
-     * @return void
      */
     protected function setErrorClassAttribute()
     {
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Form/AbstractFormViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Form/AbstractFormViewHelper.php
index 7081f9f20911fe32f470c08a061c958e15c6381a..63b1404b4d5428ddab54c8f17a28b1d9cec1d56f 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Form/AbstractFormViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Form/AbstractFormViewHelper.php
@@ -95,7 +95,6 @@ abstract class AbstractFormViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\A
      * Register a field name for inclusion in the HMAC / Form Token generation
      *
      * @param string $fieldName name of the field to register
-     * @return void
      */
     protected function registerFieldNameForFormTokenGeneration($fieldName)
     {
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Form/ButtonViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Form/ButtonViewHelper.php
index 4ebe9ebf757b6aa4a411a17589fa65d9272e9f9e..98380eda8e07032cd24a8ffcdc6c239b33e5a1c9 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Form/ButtonViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Form/ButtonViewHelper.php
@@ -45,7 +45,6 @@ class ButtonViewHelper extends AbstractFormFieldViewHelper
     /**
      * Initialize the arguments.
      *
-     * @return void
      * @throws \TYPO3Fluid\Fluid\Core\ViewHelper\Exception
      * @api
      */
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Form/CheckboxViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Form/CheckboxViewHelper.php
index 47e6c2a85df618c7988c55b9d7e6af904c737a23..8981f6e6a7f9857b7ead0a5de0fbcfc08f2d7299 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Form/CheckboxViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Form/CheckboxViewHelper.php
@@ -54,7 +54,6 @@ class CheckboxViewHelper extends AbstractFormFieldViewHelper
     /**
      * Initialize the arguments.
      *
-     * @return void
      * @api
      */
     public function initializeArguments()
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Form/HiddenViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Form/HiddenViewHelper.php
index ce8c4e46646ce6c7167777c5bc0c688db924b18e..3a20b8f00b7a6163d3ef6a993b8d86b40cf4e965 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Form/HiddenViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Form/HiddenViewHelper.php
@@ -41,7 +41,6 @@ class HiddenViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Form\AbstractFormFie
     /**
      * Initialize the arguments.
      *
-     * @return void
      * @api
      */
     public function initializeArguments()
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Form/PasswordViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Form/PasswordViewHelper.php
index 06117e5814c09dc70ffc33e7a3f37397dbdc2930..ae87e9f56ef8d2e420f177f954967f79d27dcc4a 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Form/PasswordViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Form/PasswordViewHelper.php
@@ -38,7 +38,6 @@ class PasswordViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Form\AbstractFormF
     /**
      * Initialize the arguments.
      *
-     * @return void
      * @api
      */
     public function initializeArguments()
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Form/RadioViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Form/RadioViewHelper.php
index 9d73293c599c9bfc947cd835971267175110ab31..c5374afd0d5c265f5c53df698ab6712ec8e122e7 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Form/RadioViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Form/RadioViewHelper.php
@@ -56,7 +56,6 @@ class RadioViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Form\AbstractFormFiel
     /**
      * Initialize the arguments.
      *
-     * @return void
      * @api
      */
     public function initializeArguments()
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Form/Select/OptgroupViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Form/Select/OptgroupViewHelper.php
index e6f6938dc78828ca47b05aed1f488a2ee7ce1fc7..76880f3debde47c56701edb7ca5d6d845ec284ff 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Form/Select/OptgroupViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Form/Select/OptgroupViewHelper.php
@@ -29,7 +29,6 @@ class OptgroupViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Form\AbstractFormF
 
     /**
      * Initialize additional arguments available for this tag view helper.
-     * @return void
      */
     public function initializeArguments()
     {
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Form/Select/OptionViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Form/Select/OptionViewHelper.php
index 37ac254a7689ebd149e73f4b2d03f2e04b26d5e9..8884f46dabb15077f4f9eb2ff46fe0b94066f0ed 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Form/Select/OptionViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Form/Select/OptionViewHelper.php
@@ -29,7 +29,6 @@ class OptionViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Form\AbstractFormFie
 
     /**
      * Initialize additional arguments available for this tag view helper.
-     * @return void
      */
     public function initializeArguments()
     {
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Form/SelectViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Form/SelectViewHelper.php
index 3d35fa4e74f050b927a8e156d7098fa7b4122c7e..a172eb2bb3ad8847aa3590c796c9d23b09a3acd9 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Form/SelectViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Form/SelectViewHelper.php
@@ -90,7 +90,6 @@ class SelectViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Form\AbstractFormFie
     /**
      * Initialize arguments.
      *
-     * @return void
      * @api
      */
     public function initializeArguments()
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Form/SubmitViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Form/SubmitViewHelper.php
index 3371688838c6f74bce73feb0d0b4b7f1c809cbc8..19e67570a5996f1117c2d255d6e8154e434bf860 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Form/SubmitViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Form/SubmitViewHelper.php
@@ -45,7 +45,6 @@ class SubmitViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Form\AbstractFormFie
     /**
      * Initialize the arguments.
      *
-     * @return void
      * @api
      */
     public function initializeArguments()
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Form/TextareaViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Form/TextareaViewHelper.php
index cb5dd2025be3f36fc15f8331432dce32ba1be334..83b1513c87d9ad5464c2e528b65d9f1e6937b14a 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Form/TextareaViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Form/TextareaViewHelper.php
@@ -39,7 +39,6 @@ class TextareaViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Form\AbstractFormF
     /**
      * Initialize the arguments.
      *
-     * @return void
      * @api
      */
     public function initializeArguments()
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Form/TextfieldViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Form/TextfieldViewHelper.php
index 95b8e23abf24ed80ada7671dbcc4c1052b85b35a..6bf35c23ee168d331f8afb72f567a1354f09388b 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Form/TextfieldViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Form/TextfieldViewHelper.php
@@ -38,7 +38,6 @@ class TextfieldViewHelper extends AbstractFormFieldViewHelper
     /**
      * Initialize the arguments.
      *
-     * @return void
      * @throws \TYPO3Fluid\Fluid\Core\ViewHelper\Exception
      * @api
      */
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Form/UploadViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Form/UploadViewHelper.php
index aae034e8edb4ba25097ee185c7b2ae5920bf35a7..7516bd3a4882109fb2634ae08c9d051f7d573a81 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Form/UploadViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Form/UploadViewHelper.php
@@ -39,7 +39,6 @@ class UploadViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Form\AbstractFormFie
     /**
      * Initialize the arguments.
      *
-     * @return void
      * @api
      */
     public function initializeArguments()
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Form/ValidationResultsViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Form/ValidationResultsViewHelper.php
index f2c8e00052247136b5c2d28f21eb22e5a4f2139f..dda72daa070cdc9523553a3f9a5f5c19446dd6cc 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Form/ValidationResultsViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Form/ValidationResultsViewHelper.php
@@ -73,7 +73,6 @@ class ValidationResultsViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\Abstr
     /**
      * Initialize arguments
      *
-     * @return void
      * @api
      */
     public function initializeArguments()
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Format/BytesViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Format/BytesViewHelper.php
index 2fff265792fa46cd63e25708f6b73b0e553a7bd7..f76c184617ecf2817e9114a30ebf2530722a9734 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Format/BytesViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Format/BytesViewHelper.php
@@ -65,8 +65,6 @@ class BytesViewHelper extends AbstractViewHelper
 
     /**
      * Initialize ViewHelper arguments
-     *
-     * @return void
      */
     public function initializeArguments()
     {
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Format/CaseViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Format/CaseViewHelper.php
index a803e1a4b94cc6432b9109f3a7afc1aa255341f2..7fdecc9c793d3d23743de996235042f7ff5c29d1 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Format/CaseViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Format/CaseViewHelper.php
@@ -100,8 +100,6 @@ class CaseViewHelper extends AbstractViewHelper
 
     /**
      * Initialize ViewHelper arguments
-     *
-     * @return void
      */
     public function initializeArguments()
     {
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Format/HtmlentitiesViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Format/HtmlentitiesViewHelper.php
index ca74cc3132e0f799cc5aae817ac2fbff02176fa0..bb5188d43fd1490c06affdc1dddc46f2330dc4c5 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Format/HtmlentitiesViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Format/HtmlentitiesViewHelper.php
@@ -56,8 +56,6 @@ class HtmlentitiesViewHelper extends AbstractEncodingViewHelper implements Singl
 
     /**
      * Initialize ViewHelper arguments
-     *
-     * @return void
      */
     public function initializeArguments()
     {
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Format/StripTagsViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Format/StripTagsViewHelper.php
index 66556c0997b456bdd9a4b12cbb0c7bb649bf2f47..e6b52e568ca3cf811c172a00937b6a96108f270e 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Format/StripTagsViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Format/StripTagsViewHelper.php
@@ -52,7 +52,6 @@ class StripTagsViewHelper extends AbstractViewHelper
     /**
      * Initialize ViewHelper arguments
      *
-     * @return void
      * @throws \TYPO3Fluid\Fluid\Core\ViewHelper\Exception
      */
     public function initializeArguments()
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Format/UrlencodeViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Format/UrlencodeViewHelper.php
index 868bf51d1692ae048e8d39beeaea3c3c3c20646e..f3579dd58318f7dd594a445be5c7417e181bca17 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Format/UrlencodeViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Format/UrlencodeViewHelper.php
@@ -39,7 +39,6 @@ use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderS
  * <output>
  * Url encoded text (rawurlencode() applied)
  * </output>
- *
  */
 class UrlencodeViewHelper extends AbstractViewHelper
 {
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/ImageViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/ImageViewHelper.php
index 54ecf2def711a6f89166b6a0e412a72c69e17ff3..375a61c184af594b1da682b56eb8db4dfcb4cda4 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/ImageViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/ImageViewHelper.php
@@ -83,8 +83,6 @@ class ImageViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractTagBasedV
 
     /**
      * Initialize arguments.
-     *
-     * @return void
      */
     public function initializeArguments()
     {
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Link/ActionViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Link/ActionViewHelper.php
index 37d6a26e58552b46dc089934caea106b8ac297b3..2b1cbd52d4a759e0ab849f45f35a62c78aeadc67 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Link/ActionViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Link/ActionViewHelper.php
@@ -36,8 +36,6 @@ class ActionViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractTagBased
 
     /**
      * Arguments initialization
-     *
-     * @return void
      */
     public function initializeArguments()
     {
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Link/EmailViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Link/EmailViewHelper.php
index 25f6733e087ef44eb95ade195748c0f43d7bf31d..80263fa108e8c248118331028dddd3c45774b33a 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Link/EmailViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Link/EmailViewHelper.php
@@ -44,8 +44,6 @@ class EmailViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractTagBasedV
 
     /**
      * Arguments initialization
-     *
-     * @return void
      */
     public function initializeArguments()
     {
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Link/ExternalViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Link/ExternalViewHelper.php
index be7c991deb99856e3139220ba7a7b0a589e0276c..79845374fe92f2fde2ba3f680b997e140efd07a4 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Link/ExternalViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Link/ExternalViewHelper.php
@@ -45,7 +45,6 @@ class ExternalViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractTagBas
     /**
      * Initialize arguments
      *
-     * @return void
      * @api
      */
     public function initializeArguments()
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Link/PageViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Link/PageViewHelper.php
index a5b0f7d0c7fa91f6901a24d9e72cac8c4b80beb4..3edd96418895c792f2ba77a911630549ae10e594 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Link/PageViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Link/PageViewHelper.php
@@ -52,8 +52,6 @@ class PageViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractTagBasedVi
 
     /**
      * Arguments initialization
-     *
-     * @return void
      */
     public function initializeArguments()
     {
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Link/TypolinkViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Link/TypolinkViewHelper.php
index 6ef31fbba6cf87f3861d639d32b45d037b4f126a..ac02693f27ed172eaa42b87f03a168883f08ebf9 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Link/TypolinkViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Link/TypolinkViewHelper.php
@@ -49,7 +49,6 @@ use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
  * Linktext
  * </a>
  * </output>
- *
  */
 class TypolinkViewHelper extends AbstractViewHelper
 {
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/MediaViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/MediaViewHelper.php
index 0e8f6e73222258e01029f0a55a2610d6ced482db..81a1b27dec09a2234f53cc2ffd56920989280833 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/MediaViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/MediaViewHelper.php
@@ -60,8 +60,6 @@ class MediaViewHelper extends AbstractTagBasedViewHelper
 
     /**
      * Initialize arguments.
-     *
-     * @return void
      */
     public function initializeArguments()
     {
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/RenderChildrenViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/RenderChildrenViewHelper.php
index e4edb26f7fea4f019a268f72ceeac5520d1ff49e..333b6a7be45ef67ee324f17fec503bb6b0379688 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/RenderChildrenViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/RenderChildrenViewHelper.php
@@ -86,7 +86,6 @@ class RenderChildrenViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\Abstract
      * Add the given arguments to the TemplateVariableContainer of the widget.
      *
      * @param array $arguments
-     * @return void
      */
     protected function addArgumentsToTemplateVariableContainer(array $arguments)
     {
@@ -100,7 +99,6 @@ class RenderChildrenViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\Abstract
      * Remove the given arguments from the TemplateVariableContainer of the widget.
      *
      * @param array $arguments
-     * @return void
      */
     protected function removeArgumentsFromTemplateVariableContainer(array $arguments)
     {
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Security/IfHasRoleViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Security/IfHasRoleViewHelper.php
index 365bccd1e8ed14fa7f1b37c703249b57fb49add3..5ebebebd0878ea9bb79aeb6da486b6614875fc5b 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Security/IfHasRoleViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Security/IfHasRoleViewHelper.php
@@ -60,8 +60,6 @@ class IfHasRoleViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractCondi
      * Initializes the "role" argument.
      * Renders <f:then> child if the current logged in FE user belongs to the specified role (aka usergroup)
      * otherwise renders <f:else> child.
-     *
-     * @return void
      */
     public function initializeArguments()
     {
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Uri/ActionViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Uri/ActionViewHelper.php
index 409e030d19097439f57fe6d31b9bf8c3fefcaafa..85101d4aa53db1225bbde91bdc570643d87446ae 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Uri/ActionViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Uri/ActionViewHelper.php
@@ -32,7 +32,6 @@ class ActionViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelp
     /**
      * Initialize arguments
      *
-     * @return void
      * @api
      */
     public function initializeArguments()
@@ -58,7 +57,6 @@ class ActionViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelp
     }
 
     /**
-     *
      * @return string Rendered link
      */
     public function render()
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Uri/EmailViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Uri/EmailViewHelper.php
index b0fa6c142758bcdbd873bde0c201d9d629a12bd2..42ae3f9856253272c11c5785fbeb366c79ab2e2e 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Uri/EmailViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Uri/EmailViewHelper.php
@@ -38,7 +38,6 @@ class EmailViewHelper extends AbstractViewHelper
     /**
      * Initialize arguments
      *
-     * @return void
      * @api
      */
     public function initializeArguments()
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Uri/ResourceViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Uri/ResourceViewHelper.php
index 047f07c52981045b1ed09d102b184fe7aca4debd..ad18723ac25e80de6c32be1ea6acc6789485755d 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Uri/ResourceViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Uri/ResourceViewHelper.php
@@ -37,7 +37,6 @@ class ResourceViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHe
     /**
      * Initialize arguments
      *
-     * @return void
      * @api
      */
     public function initializeArguments()
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Uri/TypolinkViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Uri/TypolinkViewHelper.php
index 5cb6947e5f27097e1fdc67f447b28581c43cfc57..43dfe3534a22ba9ee299d6d0100cbc30fb1e7057 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Uri/TypolinkViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Uri/TypolinkViewHelper.php
@@ -43,7 +43,6 @@ use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
  * <output>
  * index.php?id=19&X=y&u=b
  * </output>
- *
  */
 class TypolinkViewHelper extends AbstractViewHelper
 {
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Widget/Controller/AutocompleteController.php b/typo3/sysext/fluid/Classes/ViewHelpers/Widget/Controller/AutocompleteController.php
index a8c558389c34dda92b625fbca56190210a420aee..b324133b0a95f43ee57c142a292a84fc41d29353 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Widget/Controller/AutocompleteController.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Widget/Controller/AutocompleteController.php
@@ -21,8 +21,6 @@ class AutocompleteController extends \TYPO3\CMS\Fluid\Core\Widget\AbstractWidget
 {
     /**
      * Simply assigns the ID of the widget.
-     *
-     * @return void
      */
     public function indexAction()
     {
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Widget/Controller/PaginateController.php b/typo3/sysext/fluid/Classes/ViewHelpers/Widget/Controller/PaginateController.php
index 26f558a8e980a4ad1129c092baae64123256842c..59e51c6a4bd7191db1091360a077ade563f5a707 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Widget/Controller/PaginateController.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Widget/Controller/PaginateController.php
@@ -67,7 +67,6 @@ class PaginateController extends AbstractWidgetController
 
     /**
      * Initializes the current information on which page the visitor is.
-     * @return void
      */
     public function initializeAction()
     {
@@ -80,7 +79,6 @@ class PaginateController extends AbstractWidgetController
 
     /**
      * @param int $currentPage
-     * @return void
      */
     public function indexAction($currentPage = 1)
     {
@@ -111,8 +109,6 @@ class PaginateController extends AbstractWidgetController
     /**
      * If a certain number of links should be displayed, adjust before and after
      * amounts accordingly.
-     *
-     * @return void
      */
     protected function calculateDisplayRange()
     {
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Widget/LinkViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Widget/LinkViewHelper.php
index b5b47514090807cf2a19c9ea0b8d4a3e1a64021b..8bb3848071a4a581fee720230ba06200554aae58 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Widget/LinkViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Widget/LinkViewHelper.php
@@ -39,7 +39,6 @@ class LinkViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractTagBasedVi
     /**
      * Initialize arguments
      *
-     * @return void
      * @api
      */
     public function initializeArguments()
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Widget/UriViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Widget/UriViewHelper.php
index cb19ca86199b10f4c47acd68bc0e077836a4fc4b..fe7b110a1afcf6a7b9fe89cafc725c6d46b006c5 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Widget/UriViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Widget/UriViewHelper.php
@@ -34,7 +34,6 @@ class UriViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper
     /**
      * Initialize arguments
      *
-     * @return void
      * @api
      */
     public function initializeArguments()
diff --git a/typo3/sysext/fluid/Tests/Unit/Core/Widget/AbstractWidgetViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/Core/Widget/AbstractWidgetViewHelperTest.php
index c76a2af19b07487da5f26ba9344d5a355a785cfa..fe1683e8b173064cea4fab305fcd2c05c832af8a 100644
--- a/typo3/sysext/fluid/Tests/Unit/Core/Widget/AbstractWidgetViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/Core/Widget/AbstractWidgetViewHelperTest.php
@@ -103,8 +103,6 @@ class AbstractWidgetViewHelperTest extends \TYPO3\TestingFramework\Core\Unit\Uni
 
     /**
      * Calls the ViewHelper, and emulates a rendering.
-     *
-     * @return void
      */
     public function callViewHelper()
     {
diff --git a/typo3/sysext/fluid/Tests/Unit/View/AbstractTemplateViewTest.php b/typo3/sysext/fluid/Tests/Unit/View/AbstractTemplateViewTest.php
index 4b0ebe305b83544ace3c521744d4ae5a8e1f6f8c..7af107de3191d5cefbe4af3fd0a6b0528b7430f2 100644
--- a/typo3/sysext/fluid/Tests/Unit/View/AbstractTemplateViewTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/View/AbstractTemplateViewTest.php
@@ -40,8 +40,6 @@ class AbstractTemplateViewTest extends \TYPO3\TestingFramework\Core\Unit\UnitTes
 
     /**
      * Sets up this test case
-     *
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/fluid/Tests/Unit/View/StandaloneViewTest.php b/typo3/sysext/fluid/Tests/Unit/View/StandaloneViewTest.php
index c9e164ed27584003bd24f4b771b270f220ba4fc0..1b6f97c1adaf0b02177ac91b7282d8bbaf366531 100644
--- a/typo3/sysext/fluid/Tests/Unit/View/StandaloneViewTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/View/StandaloneViewTest.php
@@ -100,8 +100,6 @@ class StandaloneViewTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 
     /**
      * Sets up this test case
-     *
-     * @return void
      */
     protected function setUp()
     {
@@ -139,7 +137,6 @@ class StandaloneViewTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
     }
 
     /**
-     * @return void
      */
     protected function tearDown()
     {
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/FlashMessagesViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/FlashMessagesViewHelperTest.php
index e2e1cb8b08fefc99468f33c210eb53ab2c1e4662..08713dba34a98144461377574fd1ff4fc364bdab 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/FlashMessagesViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/FlashMessagesViewHelperTest.php
@@ -36,8 +36,6 @@ class FlashMessagesViewHelperTest extends ViewHelperBaseTestcase
 
     /**
      * Sets up this test case
-     *
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/AbstractFormFieldViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/AbstractFormFieldViewHelperTest.php
index 915fe487ce6c6f5344ca711ed891da601e6eb07d..77e725bc459961067aa716a8ef7f5ce207a15c43 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/AbstractFormFieldViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/AbstractFormFieldViewHelperTest.php
@@ -257,7 +257,6 @@ class AbstractFormFieldViewHelperTest extends FormFieldViewHelperBaseTestcase
 
     /**
      * @test
-     *
      */
     public function addAdditionalIdentityPropertiesIfNeededCallsRenderIdentityFieldWithTheRightParameters()
     {
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/FormFieldViewHelperBaseTestcase.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/FormFieldViewHelperBaseTestcase.php
index 54eb82a4dc9e542c4eb9180117b31fb39fb23718..6004174a89ea1fa9147a4be4a43363fd5afbe29b 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/FormFieldViewHelperBaseTestcase.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/FormFieldViewHelperBaseTestcase.php
@@ -28,7 +28,6 @@ abstract class FormFieldViewHelperBaseTestcase extends ViewHelperBaseTestcase
     protected $mockConfigurationManager;
 
     /**
-     * @return void
      */
     protected function setUp()
     {
@@ -38,7 +37,6 @@ abstract class FormFieldViewHelperBaseTestcase extends ViewHelperBaseTestcase
 
     /**
      * @param ViewHelperInterface $viewHelper
-     * @return void
      */
     protected function injectDependenciesIntoViewHelper(ViewHelperInterface $viewHelper)
     {
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/FormViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/FormViewHelperTest.php
index ea7cd1bf3538dbc2c4e02a7561f0d9a65948cd79..7bdebe88dc458827e734a75dce7cf3db8e640810 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/FormViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/FormViewHelperTest.php
@@ -76,7 +76,6 @@ class FormViewHelperTest extends ViewHelperBaseTestcase
 
     /**
      * @param ViewHelperInterface $viewHelper
-     * @return void
      */
     protected function injectDependenciesIntoViewHelper(ViewHelperInterface $viewHelper)
     {
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Widget/Controller/PaginateControllerTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Widget/Controller/PaginateControllerTest.php
index 48b041595454eac11565f392f60b16a912d1b9e3..6e96808037bbe3e7c0795f6136aebf53e58bd1ed 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Widget/Controller/PaginateControllerTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Widget/Controller/PaginateControllerTest.php
@@ -52,8 +52,6 @@ class PaginateControllerTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestC
 
     /**
      * Sets up this test case
-     *
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/fluid_styled_content/Classes/ViewHelpers/Link/ClickEnlargeViewHelper.php b/typo3/sysext/fluid_styled_content/Classes/ViewHelpers/Link/ClickEnlargeViewHelper.php
index 345e366380ff80adf94ac6cfd8115bf76c6da511..cf9a06a71244b863d34d6fb7c3735179a9aafc03 100644
--- a/typo3/sysext/fluid_styled_content/Classes/ViewHelpers/Link/ClickEnlargeViewHelper.php
+++ b/typo3/sysext/fluid_styled_content/Classes/ViewHelpers/Link/ClickEnlargeViewHelper.php
@@ -44,8 +44,6 @@ class ClickEnlargeViewHelper extends AbstractViewHelper
 
     /**
      * Initialize ViewHelper arguments
-     *
-     * @return void
      */
     public function initializeArguments()
     {
diff --git a/typo3/sysext/form/Classes/Controller/AbstractBackendController.php b/typo3/sysext/form/Classes/Controller/AbstractBackendController.php
index 0f028e4982f70080295e4f900dee480996b930ca..8ac0902a26d19305478bbce6b9374b1cf8cd914f 100644
--- a/typo3/sysext/form/Classes/Controller/AbstractBackendController.php
+++ b/typo3/sysext/form/Classes/Controller/AbstractBackendController.php
@@ -40,7 +40,6 @@ abstract class AbstractBackendController extends ActionController
 
     /**
      * @param \TYPO3\CMS\Form\Mvc\Persistence\FormPersistenceManagerInterface $formPersistenceManager
-     * @return void
      * @internal
      */
     public function injectFormPersistenceManager(\TYPO3\CMS\Form\Mvc\Persistence\FormPersistenceManagerInterface $formPersistenceManager)
diff --git a/typo3/sysext/form/Classes/Controller/FormEditorController.php b/typo3/sysext/form/Classes/Controller/FormEditorController.php
index de2af3e7f271fc335abbaa2f2b6468c352361bd5..3a15aa862d92c02b9d09e381f0bcc9dbc99362cd 100644
--- a/typo3/sysext/form/Classes/Controller/FormEditorController.php
+++ b/typo3/sysext/form/Classes/Controller/FormEditorController.php
@@ -55,7 +55,6 @@ class FormEditorController extends AbstractBackendController
      *
      * @param string $formPersistenceIdentifier
      * @param string $prototypeName
-     * @return void
      * @throws PersistenceManagerException
      * @internal
      */
diff --git a/typo3/sysext/form/Classes/Controller/FormFrontendController.php b/typo3/sysext/form/Classes/Controller/FormFrontendController.php
index d69e2c2558034350714fb5a540d866f7267fc935..3d27737e23210aac2515e2a7cfed00775b73cbe7 100644
--- a/typo3/sysext/form/Classes/Controller/FormFrontendController.php
+++ b/typo3/sysext/form/Classes/Controller/FormFrontendController.php
@@ -35,7 +35,6 @@ class FormFrontendController extends ActionController
 
     /**
      * @param \TYPO3\CMS\Form\Mvc\Persistence\FormPersistenceManagerInterface $formPersistenceManager
-     * @return void
      * @internal
      */
     public function injectFormPersistenceManager(\TYPO3\CMS\Form\Mvc\Persistence\FormPersistenceManagerInterface $formPersistenceManager)
@@ -50,7 +49,6 @@ class FormFrontendController extends ActionController
      * This method is used directly to display the first page from the
      * formDefinition because its cached.
      *
-     * @return void
      * @internal
      */
     public function renderAction()
@@ -69,7 +67,6 @@ class FormFrontendController extends ActionController
      * This method is used to display all pages / finishers except the
      * first page because its non cached.
      *
-     * @return void
      * @internal
      */
     public function performAction()
diff --git a/typo3/sysext/form/Classes/Controller/FormManagerController.php b/typo3/sysext/form/Classes/Controller/FormManagerController.php
index a6a5c53e9d528275fb4ee9a873e02b46304c0dd1..46cb2fb2c57a9ee3986dbdb5f97dd9070a088f28 100644
--- a/typo3/sysext/form/Classes/Controller/FormManagerController.php
+++ b/typo3/sysext/form/Classes/Controller/FormManagerController.php
@@ -51,7 +51,6 @@ class FormManagerController extends AbstractBackendController
      * Initialize the references action.
      * This action use the Fluid JsonView::class as view.
      *
-     * @return void
      * @internal
      */
     public function initializeReferencesAction()
@@ -62,7 +61,6 @@ class FormManagerController extends AbstractBackendController
     /**
      * Displays the Form Manager
      *
-     * @return void
      * @internal
      */
     public function indexAction()
@@ -169,7 +167,6 @@ class FormManagerController extends AbstractBackendController
      * Show references to this persistence identifier
      *
      * @param string $formPersistenceIdentifier persistence identifier of the form to duplicate
-     * @return void
      * @internal
      */
     public function referencesAction(string $formPersistenceIdentifier)
@@ -188,7 +185,6 @@ class FormManagerController extends AbstractBackendController
      * Delete a formDefinition identified by the $formPersistenceIdentifier.
      *
      * @param string $formPersistenceIdentifier persistence identifier to delete
-     * @return void
      * @internal
      */
     public function deleteAction(string $formPersistenceIdentifier)
diff --git a/typo3/sysext/form/Classes/Domain/Factory/AbstractFormFactory.php b/typo3/sysext/form/Classes/Domain/Factory/AbstractFormFactory.php
index 23b0e4259986d63776515d4e2d509f0df85cd9ab..b719520475458e0604ae97206470ce9049f0cb1c 100644
--- a/typo3/sysext/form/Classes/Domain/Factory/AbstractFormFactory.php
+++ b/typo3/sysext/form/Classes/Domain/Factory/AbstractFormFactory.php
@@ -57,7 +57,6 @@ abstract class AbstractFormFactory implements FormFactoryInterface
      * hook on all form elements.
      *
      * @param FormDefinition $form
-     * @return void
      * @api
      */
     protected function triggerFormBuildingFinished(FormDefinition $form)
diff --git a/typo3/sysext/form/Classes/Domain/Finishers/AbstractFinisher.php b/typo3/sysext/form/Classes/Domain/Finishers/AbstractFinisher.php
index 79b818c0ff14aad3c23f9b82d655d18b5e58575b..1b560fb972d8a19176ff8d874f8af5dca25e0284 100644
--- a/typo3/sysext/form/Classes/Domain/Finishers/AbstractFinisher.php
+++ b/typo3/sysext/form/Classes/Domain/Finishers/AbstractFinisher.php
@@ -79,7 +79,6 @@ abstract class AbstractFinisher implements FinisherInterface
 
     /**
      * @param array $options configuration options in the format ['option1' => 'value1', 'option2' => 'value2', ...]
-     * @return void
      * @api
      */
     public function setOptions(array $options)
@@ -92,7 +91,6 @@ abstract class AbstractFinisher implements FinisherInterface
      *
      * @param string $optionName name of the option to be set
      * @param mixed $optionValue value of the option
-     * @return void
      * @api
      */
     public function setOption(string $optionName, $optionValue)
@@ -104,7 +102,6 @@ abstract class AbstractFinisher implements FinisherInterface
      * Executes the finisher
      *
      * @param FinisherContext $finisherContext The Finisher context that contains the current Form Runtime and Response
-     * @return void
      * @api
      */
     final public function execute(FinisherContext $finisherContext)
@@ -120,7 +117,6 @@ abstract class AbstractFinisher implements FinisherInterface
      *
      * Override and fill with your own implementation!
      *
-     * @return void
      * @api
      */
     abstract protected function executeInternal();
diff --git a/typo3/sysext/form/Classes/Domain/Finishers/ClosureFinisher.php b/typo3/sysext/form/Classes/Domain/Finishers/ClosureFinisher.php
index ab08262540479574e4c3136d70d99a2608a4d11d..eba195d37ca426e517fe67db153e54db0cdcea81 100644
--- a/typo3/sysext/form/Classes/Domain/Finishers/ClosureFinisher.php
+++ b/typo3/sysext/form/Classes/Domain/Finishers/ClosureFinisher.php
@@ -48,7 +48,6 @@ class ClosureFinisher extends AbstractFinisher
      * Executes this finisher
      * @see AbstractFinisher::execute()
      *
-     * @return void
      * @throws FinisherException
      */
     protected function executeInternal()
diff --git a/typo3/sysext/form/Classes/Domain/Finishers/ConfirmationFinisher.php b/typo3/sysext/form/Classes/Domain/Finishers/ConfirmationFinisher.php
index 1d609a186a79e4df73cc42033232d3291636eedd..07188b0d69120a1d680472a998d6bf7077043659 100644
--- a/typo3/sysext/form/Classes/Domain/Finishers/ConfirmationFinisher.php
+++ b/typo3/sysext/form/Classes/Domain/Finishers/ConfirmationFinisher.php
@@ -53,7 +53,6 @@ class ConfirmationFinisher extends AbstractFinisher
      * Executes this finisher
      * @see AbstractFinisher::execute()
      *
-     * @return void
      * @throws FinisherException
      */
     protected function executeInternal()
diff --git a/typo3/sysext/form/Classes/Domain/Finishers/DeleteUploadsFinisher.php b/typo3/sysext/form/Classes/Domain/Finishers/DeleteUploadsFinisher.php
index 46af398567064162f1171396df82ac09c97c1736..8df9f5a51f8baafd0546925369bd631daa03a789 100644
--- a/typo3/sysext/form/Classes/Domain/Finishers/DeleteUploadsFinisher.php
+++ b/typo3/sysext/form/Classes/Domain/Finishers/DeleteUploadsFinisher.php
@@ -31,8 +31,6 @@ class DeleteUploadsFinisher extends AbstractFinisher
     /**
      * Executes this finisher
      * @see AbstractFinisher::execute()
-     *
-     * @return void
      */
     protected function executeInternal()
     {
diff --git a/typo3/sysext/form/Classes/Domain/Finishers/EmailFinisher.php b/typo3/sysext/form/Classes/Domain/Finishers/EmailFinisher.php
index e3aeef79e8d7cc8e37b0792a84e7f497ab4c40c8..cd6958eb21d9215d440d6c193940bd52005c0670 100644
--- a/typo3/sysext/form/Classes/Domain/Finishers/EmailFinisher.php
+++ b/typo3/sysext/form/Classes/Domain/Finishers/EmailFinisher.php
@@ -69,7 +69,6 @@ class EmailFinisher extends AbstractFinisher
      * Executes this finisher
      * @see AbstractFinisher::execute()
      *
-     * @return void
      * @throws FinisherException
      */
     protected function executeInternal()
diff --git a/typo3/sysext/form/Classes/Domain/Finishers/FinisherContext.php b/typo3/sysext/form/Classes/Domain/Finishers/FinisherContext.php
index 54ca2a8b14539041e67b52e50e206b034254d3e1..d6b78532be1d3ce58ac9ed67e6b40a4fe4e211a9 100644
--- a/typo3/sysext/form/Classes/Domain/Finishers/FinisherContext.php
+++ b/typo3/sysext/form/Classes/Domain/Finishers/FinisherContext.php
@@ -84,7 +84,6 @@ class FinisherContext
     /**
      * Cancels the finisher invocation after the current finisher
      *
-     * @return void
      * @api
      */
     public function cancel()
diff --git a/typo3/sysext/form/Classes/Domain/Finishers/FinisherInterface.php b/typo3/sysext/form/Classes/Domain/Finishers/FinisherInterface.php
index 6d882995275b3f6432625c520fdb1616dd12d34e..b6330a2a00be2c124046f00b6e38964ad9cbd18f 100644
--- a/typo3/sysext/form/Classes/Domain/Finishers/FinisherInterface.php
+++ b/typo3/sysext/form/Classes/Domain/Finishers/FinisherInterface.php
@@ -30,14 +30,12 @@ interface FinisherInterface
      * Executes the finisher
      *
      * @param FinisherContext $finisherContext The Finisher context that contains the current Form Runtime and Response
-     * @return void
      * @api
      */
     public function execute(FinisherContext $finisherContext);
 
     /**
      * @param array $options configuration options in the format ['option1' => 'value1', 'option2' => 'value2', ...]
-     * @return void
      * @api
      */
     public function setOptions(array $options);
@@ -47,7 +45,6 @@ interface FinisherInterface
      *
      * @param string $optionName name of the option to be set
      * @param mixed $optionValue value of the option
-     * @return void
      * @api
      */
     public function setOption(string $optionName, $optionValue);
diff --git a/typo3/sysext/form/Classes/Domain/Finishers/FinisherVariableProvider.php b/typo3/sysext/form/Classes/Domain/Finishers/FinisherVariableProvider.php
index c5fabeae01305c98f8f335039cccb119a44d539e..1cee140e1c1a21f5eb66c1c44420554134fbc451 100644
--- a/typo3/sysext/form/Classes/Domain/Finishers/FinisherVariableProvider.php
+++ b/typo3/sysext/form/Classes/Domain/Finishers/FinisherVariableProvider.php
@@ -41,7 +41,6 @@ final class FinisherVariableProvider implements \ArrayAccess
      * @param string $finisherIdentifier
      * @param string $key
      * @param mixed $value
-     * @return void
      * @api
      */
     public function add(string $finisherIdentifier, string $key, $value)
@@ -56,7 +55,6 @@ final class FinisherVariableProvider implements \ArrayAccess
      * @param string $finisherIdentifier
      * @param string $key
      * @param mixed $value
-     * @return void
      */
     public function addOrUpdate(string $finisherIdentifier, string $key, $value)
     {
@@ -111,7 +109,6 @@ final class FinisherVariableProvider implements \ArrayAccess
      *
      * @param string $finisherIdentifier
      * @param string $key
-     * @return void
      * @api
      */
     public function remove(string $finisherIdentifier, string $key)
@@ -165,7 +162,6 @@ final class FinisherVariableProvider implements \ArrayAccess
      * @link http://php.net/manual/en/arrayaccess.offsetset.php
      * @param mixed $offset The offset to assign the value to.
      * @param mixed $value The value to set.
-     * @return void
      */
     public function offsetSet($offset, $value)
     {
@@ -177,7 +173,6 @@ final class FinisherVariableProvider implements \ArrayAccess
      *
      * @link http://php.net/manual/en/arrayaccess.offsetunset.php
      * @param mixed $offset The offset to unset.
-     * @return void
      */
     public function offsetUnset($offset)
     {
diff --git a/typo3/sysext/form/Classes/Domain/Finishers/FlashMessageFinisher.php b/typo3/sysext/form/Classes/Domain/Finishers/FlashMessageFinisher.php
index 810c468d4ddcb23e5491f850cc193c164cd39545..62cde2daf62a4800beeeb1051f24cdd29332246f 100644
--- a/typo3/sysext/form/Classes/Domain/Finishers/FlashMessageFinisher.php
+++ b/typo3/sysext/form/Classes/Domain/Finishers/FlashMessageFinisher.php
@@ -62,7 +62,6 @@ class FlashMessageFinisher extends AbstractFinisher
      * Executes this finisher
      * @see AbstractFinisher::execute()
      *
-     * @return void
      * @throws FinisherException
      */
     protected function executeInternal()
diff --git a/typo3/sysext/form/Classes/Domain/Finishers/RedirectFinisher.php b/typo3/sysext/form/Classes/Domain/Finishers/RedirectFinisher.php
index 0d20268f11b5b1890172b9d1c319c5f4bb17f0d8..e5e77e8cfed1d4848f3daa873acbc44655ac8fc6 100644
--- a/typo3/sysext/form/Classes/Domain/Finishers/RedirectFinisher.php
+++ b/typo3/sysext/form/Classes/Domain/Finishers/RedirectFinisher.php
@@ -58,8 +58,6 @@ class RedirectFinisher extends AbstractFinisher
     /**
      * Executes this finisher
      * @see AbstractFinisher::execute()
-     *
-     * @return void
      */
     protected function executeInternal()
     {
@@ -91,7 +89,6 @@ class RedirectFinisher extends AbstractFinisher
      * @param string $additionalParameters
      * @param int $delay (optional) The delay in seconds. Default is no delay.
      * @param int $statusCode (optional) The HTTP status code for the redirect. Default is "303 See Other
-     * @return void
      * @throws UnsupportedRequestTypeException If the request is not a web request
      * @see forward()
      */
diff --git a/typo3/sysext/form/Classes/Domain/Finishers/SaveToDatabaseFinisher.php b/typo3/sysext/form/Classes/Domain/Finishers/SaveToDatabaseFinisher.php
index 1402251b10492691fe5414a7a6e1d011bc78a563..ef6ddb38ce886fdeaaec7a6f0dcaaf6ed3e55419 100644
--- a/typo3/sysext/form/Classes/Domain/Finishers/SaveToDatabaseFinisher.php
+++ b/typo3/sysext/form/Classes/Domain/Finishers/SaveToDatabaseFinisher.php
@@ -192,7 +192,6 @@ class SaveToDatabaseFinisher extends AbstractFinisher
      * Executes this finisher
      * @see AbstractFinisher::execute()
      *
-     * @return void
      * @throws FinisherException
      */
     protected function executeInternal()
@@ -213,7 +212,6 @@ class SaveToDatabaseFinisher extends AbstractFinisher
      * Perform the current database operation
      *
      * @param int $iterationCount
-     * @return void
      */
     protected function process(int $iterationCount)
     {
@@ -283,7 +281,6 @@ class SaveToDatabaseFinisher extends AbstractFinisher
      * @param [] $databaseData
      * @param string $table
      * @param int $iterationCount
-     * @return void
      */
     protected function saveToDatabase(array $databaseData, string $table, int $iterationCount)
     {
@@ -314,7 +311,6 @@ class SaveToDatabaseFinisher extends AbstractFinisher
      * Throws an exception if some inconsistent configuration
      * are detected.
      *
-     * @return void
      * @throws FinisherException
      */
     protected function throwExceptionOnInconsistentConfiguration()
diff --git a/typo3/sysext/form/Classes/Domain/Model/FormDefinition.php b/typo3/sysext/form/Classes/Domain/Model/FormDefinition.php
index ff6cdd5e4372fb66135f19a883c8346a6aba96c9..2bee2f5a1d2c678f0a54aeea15119929326b9bb3 100644
--- a/typo3/sysext/form/Classes/Domain/Model/FormDefinition.php
+++ b/typo3/sysext/form/Classes/Domain/Model/FormDefinition.php
@@ -324,7 +324,6 @@ class FormDefinition extends AbstractCompositeRenderable
     /**
      * Initialize the form defaults of the current type
      *
-     * @return void
      * @throws TypeDefinitionNotFoundException
      * @internal
      */
@@ -343,7 +342,6 @@ class FormDefinition extends AbstractCompositeRenderable
      * the passed $options array.
      *
      * @param array $options
-     * @return void
      * @internal
      */
     public function setOptions(array $options)
@@ -427,7 +425,6 @@ class FormDefinition extends AbstractCompositeRenderable
      * Instead of this method, you should often use {@link createPage} instead.
      *
      * @param Page $page
-     * @return void
      * @throws FormDefinitionConsistencyException if Page is already added to a FormDefinition
      * @see createPage
      * @api
@@ -482,7 +479,6 @@ class FormDefinition extends AbstractCompositeRenderable
      * Adds the specified finisher to this form
      *
      * @param FinisherInterface $finisher
-     * @return void
      * @api
      */
     public function addFinisher(FinisherInterface $finisher)
@@ -528,7 +524,6 @@ class FormDefinition extends AbstractCompositeRenderable
      * Add an element to the ElementsByIdentifier Cache.
      *
      * @param RenderableInterface $renderable
-     * @return void
      * @throws DuplicateFormElementException
      * @internal
      */
@@ -546,7 +541,6 @@ class FormDefinition extends AbstractCompositeRenderable
      * Remove an element from the ElementsByIdentifier cache
      *
      * @param RenderableInterface $renderable
-     * @return void
      * @internal
      */
     public function unregisterRenderable(RenderableInterface $renderable)
@@ -575,7 +569,6 @@ class FormDefinition extends AbstractCompositeRenderable
      *
      * @param string $elementIdentifier identifier of the form element. This supports property paths!
      * @param mixed $defaultValue
-     * @return void
      * @internal
      */
     public function addElementDefaultValue(string $elementIdentifier, $defaultValue)
@@ -606,7 +599,6 @@ class FormDefinition extends AbstractCompositeRenderable
      *
      * @param Page $pageToMove
      * @param Page $referencePage
-     * @return void
      * @api
      */
     public function movePageBefore(Page $pageToMove, Page $referencePage)
@@ -619,7 +611,6 @@ class FormDefinition extends AbstractCompositeRenderable
      *
      * @param Page $pageToMove
      * @param Page $referencePage
-     * @return void
      * @api
      */
     public function movePageAfter(Page $pageToMove, Page $referencePage)
@@ -631,7 +622,6 @@ class FormDefinition extends AbstractCompositeRenderable
      * Remove $pageToRemove from form
      *
      * @param Page $pageToRemove
-     * @return void
      * @api
      */
     public function removePage(Page $pageToRemove)
@@ -710,7 +700,6 @@ class FormDefinition extends AbstractCompositeRenderable
      * Set the renderer class name
      *
      * @param string $rendererClassName
-     * @return void
      * @api
      */
     public function setRendererClassName(string $rendererClassName)
diff --git a/typo3/sysext/form/Classes/Domain/Model/FormElements/AbstractFormElement.php b/typo3/sysext/form/Classes/Domain/Model/FormElements/AbstractFormElement.php
index 43cc590905e25f26b098c670f70e2f694066e75a..737f0e83c3ba63cffb94d31e2f801c845d12cb3c 100644
--- a/typo3/sysext/form/Classes/Domain/Model/FormElements/AbstractFormElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/FormElements/AbstractFormElement.php
@@ -70,7 +70,6 @@ abstract class AbstractFormElement extends AbstractRenderable implements FormEle
     /**
      * Override this method in your custom FormElements if needed
      *
-     * @return void
      * @api
      */
     public function initializeFormElement()
@@ -120,7 +119,6 @@ abstract class AbstractFormElement extends AbstractRenderable implements FormEle
      * Set the default value of the element
      *
      * @param mixed $defaultValue
-     * @return void
      * @api
      */
     public function setDefaultValue($defaultValue)
@@ -150,7 +148,6 @@ abstract class AbstractFormElement extends AbstractRenderable implements FormEle
      *
      * @param string $key
      * @param mixed $value
-     * @return void
      * @api
      */
     public function setProperty(string $key, $value)
@@ -175,7 +172,6 @@ abstract class AbstractFormElement extends AbstractRenderable implements FormEle
      * @param FormRuntime $formRuntime
      * @param mixed $elementValue
      * @param array $requestArguments submitted raw request values
-     * @return void
      * @api
      * @deprecated since TYPO3 v8, will be removed in TYPO3 v9
      */
diff --git a/typo3/sysext/form/Classes/Domain/Model/FormElements/AbstractSection.php b/typo3/sysext/form/Classes/Domain/Model/FormElements/AbstractSection.php
index 312f582279ed02a5e7d79e92bae07fa728d32f89..3ccf1b05f62edcee35cedf810dd64ae0fffda0dc 100644
--- a/typo3/sysext/form/Classes/Domain/Model/FormElements/AbstractSection.php
+++ b/typo3/sysext/form/Classes/Domain/Model/FormElements/AbstractSection.php
@@ -84,7 +84,6 @@ abstract class AbstractSection extends AbstractCompositeRenderable
      * Add a new form element at the end of the section
      *
      * @param FormElementInterface $formElement The form element to add
-     * @return void
      * @throws FormDefinitionConsistencyException if FormElement is already added to a section
      * @api
      */
@@ -155,7 +154,6 @@ abstract class AbstractSection extends AbstractCompositeRenderable
      *
      * @param FormElementInterface $elementToMove
      * @param FormElementInterface $referenceElement
-     * @return void
      * @api
      */
     public function moveElementBefore(FormElementInterface $elementToMove, FormElementInterface $referenceElement)
@@ -170,7 +168,6 @@ abstract class AbstractSection extends AbstractCompositeRenderable
      *
      * @param FormElementInterface $elementToMove
      * @param FormElementInterface $referenceElement
-     * @return void
      * @api
      */
     public function moveElementAfter(FormElementInterface $elementToMove, FormElementInterface $referenceElement)
@@ -182,7 +179,6 @@ abstract class AbstractSection extends AbstractCompositeRenderable
      * Remove $elementToRemove from this Section/Page
      *
      * @param FormElementInterface $elementToRemove
-     * @return void
      * @api
      */
     public function removeElement(FormElementInterface $elementToRemove)
@@ -198,7 +194,6 @@ abstract class AbstractSection extends AbstractCompositeRenderable
      * @param FormRuntime $formRuntime
      * @param mixed $elementValue submitted value of the element *before post processing*
      * @param array $requestArguments submitted raw request values
-     * @return void
      * @api
      * @deprecated since TYPO3 v8, will be removed in TYPO3 v9
      */
diff --git a/typo3/sysext/form/Classes/Domain/Model/FormElements/AdvancedPassword.php b/typo3/sysext/form/Classes/Domain/Model/FormElements/AdvancedPassword.php
index fb94c6e8fcf9a682ae004a68195e046f79473a23..67bb855ad696c3a98d2917ec042c9100715ae650 100644
--- a/typo3/sysext/form/Classes/Domain/Model/FormElements/AdvancedPassword.php
+++ b/typo3/sysext/form/Classes/Domain/Model/FormElements/AdvancedPassword.php
@@ -36,7 +36,6 @@ class AdvancedPassword extends AbstractFormElement
      * @param FormRuntime $formRuntime
      * @param mixed $elementValue submitted value of the element *before post processing*
      * @param array $requestArguments submitted raw request values
-     * @return void
      * @see FormRuntime::mapAndValidate()
      * @internal
      * @deprecated since TYPO3 v8, will be removed in TYPO3 v9
diff --git a/typo3/sysext/form/Classes/Domain/Model/FormElements/DatePicker.php b/typo3/sysext/form/Classes/Domain/Model/FormElements/DatePicker.php
index ebf32ae1079728681e7bf07a6b34ce49ab24ba77..430831dd61183b48a642169501adebdddc872859 100644
--- a/typo3/sysext/form/Classes/Domain/Model/FormElements/DatePicker.php
+++ b/typo3/sysext/form/Classes/Domain/Model/FormElements/DatePicker.php
@@ -27,7 +27,6 @@ class DatePicker extends AbstractFormElement
 
     /**
      * Initializes the Form Element by setting the data type to "DateTime"
-     * @return void
      * @internal
      */
     public function initializeFormElement()
diff --git a/typo3/sysext/form/Classes/Domain/Model/FormElements/FileUpload.php b/typo3/sysext/form/Classes/Domain/Model/FormElements/FileUpload.php
index 480118fc177aea69c6ebe0ce417c9c540eb5b5b9..7d4f00398be9533cdb1f63cf5be5380e93974edc 100644
--- a/typo3/sysext/form/Classes/Domain/Model/FormElements/FileUpload.php
+++ b/typo3/sysext/form/Classes/Domain/Model/FormElements/FileUpload.php
@@ -27,7 +27,6 @@ class FileUpload extends AbstractFormElement
 
     /**
      * Initializes the Form Element by setting the data type to a Extbase File Reference
-     * @return void
      * @internal
      */
     public function initializeFormElement()
@@ -37,7 +36,6 @@ class FileUpload extends AbstractFormElement
     }
 
     /**
-     * @return void
      * @internal
      * @deprecated since TYPO3 v8, will be removed in TYPO3 v9
      */
diff --git a/typo3/sysext/form/Classes/Domain/Model/FormElements/FormElementInterface.php b/typo3/sysext/form/Classes/Domain/Model/FormElements/FormElementInterface.php
index 80b43e6165707b08634b3b850702b9386b6fc31d..b5b0e6688ef5b762cc4392817ca3521e3aa09f39 100644
--- a/typo3/sysext/form/Classes/Domain/Model/FormElements/FormElementInterface.php
+++ b/typo3/sysext/form/Classes/Domain/Model/FormElements/FormElementInterface.php
@@ -40,7 +40,6 @@ interface FormElementInterface extends RenderableInterface
      * Will be called as soon as the element is (tried to be) added to a form
      * @see registerInFormIfPossible()
      *
-     * @return void
      * @internal
      */
     public function initializeFormElement();
@@ -78,7 +77,6 @@ interface FormElementInterface extends RenderableInterface
      *
      * @param string $key
      * @param mixed $value
-     * @return void
      * @api
      */
     public function setProperty(string $key, $value);
@@ -112,7 +110,6 @@ interface FormElementInterface extends RenderableInterface
      * Registers a validator for this element
      *
      * @param ValidatorInterface $validator
-     * @return void
      * @api
      */
     public function addValidator(ValidatorInterface $validator);
@@ -121,7 +118,6 @@ interface FormElementInterface extends RenderableInterface
      * Set the target data type for this element
      *
      * @param string $dataType the target data type
-     * @return void
      * @api
      */
     public function setDataType(string $dataType);
@@ -141,7 +137,6 @@ interface FormElementInterface extends RenderableInterface
      * @param FormRuntime $formRuntime
      * @param mixed $elementValue submitted value of the element *before post processing*
      * @param array $requestArguments submitted raw request values
-     * @return void
      * @see FormRuntime::mapAndValidate()
      * @api
      * @deprecated since TYPO3 v8, will be removed in TYPO3 v9
diff --git a/typo3/sysext/form/Classes/Domain/Model/FormElements/GridContainer.php b/typo3/sysext/form/Classes/Domain/Model/FormElements/GridContainer.php
index 84a1a125b92f3a6dbdd3f15fb0b33361a3042fc4..909ff16586094a1ac9619794b25e079bb35de353 100644
--- a/typo3/sysext/form/Classes/Domain/Model/FormElements/GridContainer.php
+++ b/typo3/sysext/form/Classes/Domain/Model/FormElements/GridContainer.php
@@ -31,7 +31,6 @@ class GridContainer extends Section implements GridContainerInterface
     /**
      * Register this element at the parent form, if there is a connection to the parent form.
      *
-     * @return void
      * @throws TypeDefinitionNotValidException
      * @internal
      */
@@ -52,7 +51,6 @@ class GridContainer extends Section implements GridContainerInterface
      * Add a new row element at the end of the grid container
      *
      * @param FormElementInterface $formElement The form element to add
-     * @return void
      * @api
      */
     public function addElement(FormElementInterface $formElement)
diff --git a/typo3/sysext/form/Classes/Domain/Model/FormElements/GridRow.php b/typo3/sysext/form/Classes/Domain/Model/FormElements/GridRow.php
index 5be61bd435c1731b1c9bcc49f250c967dc581eef..739b33683b33bf338725fa91ec3b433da6b5a556 100644
--- a/typo3/sysext/form/Classes/Domain/Model/FormElements/GridRow.php
+++ b/typo3/sysext/form/Classes/Domain/Model/FormElements/GridRow.php
@@ -34,7 +34,6 @@ class GridRow extends Section implements GridRowInterface
      * Add a new form element at the end of the grid row
      *
      * @param FormElementInterface $formElement The form element to add
-     * @return void
      * @throws TypeDefinitionNotValidException if FormElement is already added to a section
      * @api
      */
diff --git a/typo3/sysext/form/Classes/Domain/Model/FormElements/Page.php b/typo3/sysext/form/Classes/Domain/Model/FormElements/Page.php
index 20fcdb7c2876042ee40f81775ed982d55b96bc65..ae507e49c4a644eefd15c89d7a0a1dd37bf118c3 100644
--- a/typo3/sysext/form/Classes/Domain/Model/FormElements/Page.php
+++ b/typo3/sysext/form/Classes/Domain/Model/FormElements/Page.php
@@ -56,7 +56,6 @@ class Page extends AbstractSection
      * Set the parent renderable
      *
      * @param CompositeRenderableInterface $parentRenderable
-     * @return void
      * @throws FormException
      * @api
      */
diff --git a/typo3/sysext/form/Classes/Domain/Model/FormElements/Section.php b/typo3/sysext/form/Classes/Domain/Model/FormElements/Section.php
index 3522334ecd8b80b929f0152ab29e1b486b2f5847..b36a8ae109f6bf954e3a4b3aad62cef0bb4c59e6 100644
--- a/typo3/sysext/form/Classes/Domain/Model/FormElements/Section.php
+++ b/typo3/sysext/form/Classes/Domain/Model/FormElements/Section.php
@@ -43,7 +43,6 @@ class Section extends AbstractSection implements FormElementInterface
      * Will be called as soon as the element is (tried to be) added to a form
      * @see registerInFormIfPossible()
      *
-     * @return void
      * @internal
      */
     public function initializeFormElement()
@@ -118,7 +117,6 @@ class Section extends AbstractSection implements FormElementInterface
      *
      * @param string $key
      * @param mixed $value
-     * @return void
      * @api
      */
     public function setProperty(string $key, $value)
@@ -155,7 +153,6 @@ class Section extends AbstractSection implements FormElementInterface
      * Add a validator to the element
      *
      * @param ValidatorInterface $validator
-     * @return void
      * @api
      */
     public function addValidator(ValidatorInterface $validator)
diff --git a/typo3/sysext/form/Classes/Domain/Model/FormElements/UnknownFormElement.php b/typo3/sysext/form/Classes/Domain/Model/FormElements/UnknownFormElement.php
index 465e4f2990cdfdafb9c3699e9ddf37bc3619dd18..8a8cd79e1f0c1123127c8fa0ffe4b27b5019fdcc 100644
--- a/typo3/sysext/form/Classes/Domain/Model/FormElements/UnknownFormElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/FormElements/UnknownFormElement.php
@@ -48,7 +48,6 @@ class UnknownFormElement extends AbstractRenderable implements FormElementInterf
     }
 
     /**
-     * @return void
      * @api
      */
     public function initializeFormElement()
@@ -119,7 +118,6 @@ class UnknownFormElement extends AbstractRenderable implements FormElementInterf
      *
      * @param string $key
      * @param mixed $value
-     * @return void
      * @internal
      */
     public function setProperty(string $key, $value)
@@ -150,7 +148,6 @@ class UnknownFormElement extends AbstractRenderable implements FormElementInterf
      * @param FormRuntime $formRuntime
      * @param mixed $elementValue submitted value of the element *before post processing*
      * @param array $requestArguments submitted raw request values
-     * @return void
      * @see FormRuntime::mapAndValidate()
      * @internal
      * @deprecated since TYPO3 v8, will be removed in TYPO3 v9
diff --git a/typo3/sysext/form/Classes/Domain/Model/Renderable/AbstractCompositeRenderable.php b/typo3/sysext/form/Classes/Domain/Model/Renderable/AbstractCompositeRenderable.php
index bfeaaa1dd994bbb98ee0472fb38cdb1b8decae0d..5274f85b820331771b271e7765fb26dd3fd8c5b0 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Renderable/AbstractCompositeRenderable.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Renderable/AbstractCompositeRenderable.php
@@ -43,7 +43,6 @@ abstract class AbstractCompositeRenderable extends AbstractRenderable implements
      * or "addElement" method with the correct type hint.
      *
      * @param RenderableInterface $renderable
-     * @return void
      * @throws FormDefinitionConsistencyException
      * @internal
      */
@@ -65,7 +64,6 @@ abstract class AbstractCompositeRenderable extends AbstractRenderable implements
      *
      * @param RenderableInterface $renderableToMove
      * @param RenderableInterface $referenceRenderable
-     * @return void
      * @throws FormDefinitionConsistencyException
      * @internal
      */
@@ -102,7 +100,6 @@ abstract class AbstractCompositeRenderable extends AbstractRenderable implements
      *
      * @param RenderableInterface $renderableToMove
      * @param RenderableInterface $referenceRenderable
-     * @return void
      * @throws FormDefinitionConsistencyException
      * @internal
      */
@@ -157,7 +154,6 @@ abstract class AbstractCompositeRenderable extends AbstractRenderable implements
      * or "removeElement" method with the correct type hint.
      *
      * @param RenderableInterface $renderableToRemove
-     * @return void
      * @throws FormDefinitionConsistencyException
      * @internal
      */
@@ -183,7 +179,6 @@ abstract class AbstractCompositeRenderable extends AbstractRenderable implements
     /**
      * Register this element at the parent form, if there is a connection to the parent form.
      *
-     * @return void
      * @internal
      */
     public function registerInFormIfPossible()
@@ -199,7 +194,6 @@ abstract class AbstractCompositeRenderable extends AbstractRenderable implements
      * renderable.
      * This just passes the event down to all child renderables of this composite renderable.
      *
-     * @return void
      * @internal
      */
     public function onRemoveFromParentRenderable()
diff --git a/typo3/sysext/form/Classes/Domain/Model/Renderable/AbstractRenderable.php b/typo3/sysext/form/Classes/Domain/Model/Renderable/AbstractRenderable.php
index 9a1569725ab2b75a0e9fb2380d73447c3315d781..668ca265ae247df7dd50c97269012482887634c8 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Renderable/AbstractRenderable.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Renderable/AbstractRenderable.php
@@ -114,7 +114,6 @@ abstract class AbstractRenderable implements RenderableInterface
      * Set the identifier of the element
      *
      * @param string $identifier
-     * @return void
      * @api
      */
     public function setIdentifier(string $identifier)
@@ -128,7 +127,6 @@ abstract class AbstractRenderable implements RenderableInterface
      * the passed $options array.
      *
      * @param array $options
-     * @return void
      * @api
      */
     public function setOptions(array $options)
@@ -208,7 +206,6 @@ abstract class AbstractRenderable implements RenderableInterface
      * Add a validator to the element
      *
      * @param ValidatorInterface $validator
-     * @return void
      * @api
      */
     public function addValidator(ValidatorInterface $validator)
@@ -233,7 +230,6 @@ abstract class AbstractRenderable implements RenderableInterface
      * Set the datatype
      *
      * @param string $dataType
-     * @return void
      * @api
      */
     public function setDataType(string $dataType)
@@ -281,7 +277,6 @@ abstract class AbstractRenderable implements RenderableInterface
      * Get the parent renderable
      *
      * @return null|CompositeRenderableInterface
-     * @return void
      * @api
      */
     public function getParentRenderable()
@@ -293,7 +288,6 @@ abstract class AbstractRenderable implements RenderableInterface
      * Set the parent renderable
      *
      * @param CompositeRenderableInterface $parentRenderable
-     * @return void
      * @api
      */
     public function setParentRenderable(CompositeRenderableInterface $parentRenderable)
@@ -325,7 +319,6 @@ abstract class AbstractRenderable implements RenderableInterface
     /**
      * Register this element at the parent form, if there is a connection to the parent form.
      *
-     * @return void
      * @internal
      */
     public function registerInFormIfPossible()
@@ -340,7 +333,6 @@ abstract class AbstractRenderable implements RenderableInterface
     /**
      * Triggered when the renderable is removed from it's parent
      *
-     * @return void
      * @internal
      */
     public function onRemoveFromParentRenderable()
@@ -382,7 +374,6 @@ abstract class AbstractRenderable implements RenderableInterface
      * Set the index of the renderable
      *
      * @param int $index
-     * @return void
      * @internal
      */
     public function setIndex(int $index)
@@ -405,7 +396,6 @@ abstract class AbstractRenderable implements RenderableInterface
      * Set the label which shall be displayed next to the form element
      *
      * @param string $label
-     * @return void
      * @api
      */
     public function setLabel(string $label)
@@ -430,7 +420,6 @@ abstract class AbstractRenderable implements RenderableInterface
      * Override this method in your custom Renderable if needed
      *
      * @param FormRuntime $formRuntime
-     * @return void
      * @api
      * @deprecated since TYPO3 v8, will be removed in TYPO3 v9
      */
@@ -445,7 +434,6 @@ abstract class AbstractRenderable implements RenderableInterface
      *
      * Override this method in your custom Renderable if needed.
      *
-     * @return void
      * @api
      * @deprecated since TYPO3 v8, will be removed in TYPO3 v9
      */
diff --git a/typo3/sysext/form/Classes/Domain/Model/Renderable/RenderableInterface.php b/typo3/sysext/form/Classes/Domain/Model/Renderable/RenderableInterface.php
index 7b185c797f509e9f0ea563735b1dfc55ca9803c3..ddbc66ba257f1aafcd0d41c0fb2060675b07756f 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Renderable/RenderableInterface.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Renderable/RenderableInterface.php
@@ -42,7 +42,6 @@ interface RenderableInterface extends RootRenderableInterface
      * This method should also register itself at the parent form, if possible.
      *
      * @param CompositeRenderableInterface $renderable
-     * @return void
      * @internal
      */
     public function setParentRenderable(CompositeRenderableInterface $renderable);
@@ -51,7 +50,6 @@ interface RenderableInterface extends RootRenderableInterface
      * Set the index of this renderable inside the parent renderable
      *
      * @param int $index
-     * @return void
      * @internal
      */
     public function setIndex(int $index);
@@ -70,7 +68,6 @@ interface RenderableInterface extends RootRenderableInterface
      * like reseting $this->parentRenderable or deregistering the renderable
      * at the form.
      *
-     * @return void
      * @internal
      */
     public function onRemoveFromParentRenderable();
@@ -79,7 +76,6 @@ interface RenderableInterface extends RootRenderableInterface
      * This is a callback that is invoked by the Form Factory after the whole form has been built.
      * It can be used to add new form elements as children for complex form elements.
      *
-     * @return void
      * @api
      * @deprecated since TYPO3 v8, will be removed in TYPO3 v9
      */
@@ -88,7 +84,6 @@ interface RenderableInterface extends RootRenderableInterface
     /**
      * Register this element at the parent form, if there is a connection to the parent form.
      *
-     * @return void
      * @internal
      */
     public function registerInFormIfPossible();
diff --git a/typo3/sysext/form/Classes/Domain/Model/Renderable/RootRenderableInterface.php b/typo3/sysext/form/Classes/Domain/Model/Renderable/RootRenderableInterface.php
index cf75cf35917906fc7953b3169943af2f0609f9bf..c142ca020ee3692278d6f780dbe3ca8cfcfceb79 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Renderable/RootRenderableInterface.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Renderable/RootRenderableInterface.php
@@ -60,7 +60,6 @@ interface RootRenderableInterface
      * is outputted to the browser.
      *
      * @param FormRuntime $formRuntime
-     * @return void
      * @api
      * @deprecated since TYPO3 v8, will be removed in TYPO3 v9
      */
diff --git a/typo3/sysext/form/Classes/Domain/Renderer/AbstractElementRenderer.php b/typo3/sysext/form/Classes/Domain/Renderer/AbstractElementRenderer.php
index 88526134603c356f4a714f6ef8ea238ed585d1cb..350b8e6ed568bce142be617f8f14242c66fcdd0e 100644
--- a/typo3/sysext/form/Classes/Domain/Renderer/AbstractElementRenderer.php
+++ b/typo3/sysext/form/Classes/Domain/Renderer/AbstractElementRenderer.php
@@ -56,7 +56,6 @@ abstract class AbstractElementRenderer implements RendererInterface
 
     /**
      * @param FormRuntime $formRuntime
-     * @return void
      * @api
      */
     public function setFormRuntime(FormRuntime $formRuntime)
diff --git a/typo3/sysext/form/Classes/Domain/Renderer/RendererInterface.php b/typo3/sysext/form/Classes/Domain/Renderer/RendererInterface.php
index 50840c34bd7d322688bf6fb65de516106d8e5374..8ad7af001483db3b7fc356fa6f26bcbd6739e84c 100644
--- a/typo3/sysext/form/Classes/Domain/Renderer/RendererInterface.php
+++ b/typo3/sysext/form/Classes/Domain/Renderer/RendererInterface.php
@@ -49,7 +49,6 @@ interface RendererInterface
 
     /**
      * @param FormRuntime $formRuntime
-     * @return void
      * @api
      */
     public function setFormRuntime(FormRuntime $formRuntime);
diff --git a/typo3/sysext/form/Classes/Domain/Runtime/FormRuntime.php b/typo3/sysext/form/Classes/Domain/Runtime/FormRuntime.php
index 501d5474315bf151b13202c7f6faf9120d7361dc..9988dfbb88fa06715ab48dd64b6d0382fb82ad46 100644
--- a/typo3/sysext/form/Classes/Domain/Runtime/FormRuntime.php
+++ b/typo3/sysext/form/Classes/Domain/Runtime/FormRuntime.php
@@ -133,7 +133,6 @@ class FormRuntime implements RootRenderableInterface, \ArrayAccess
 
     /**
      * @param \TYPO3\CMS\Extbase\Security\Cryptography\HashService $hashService
-     * @return void
      * @internal
      */
     public function injectHashService(\TYPO3\CMS\Extbase\Security\Cryptography\HashService $hashService)
@@ -170,7 +169,6 @@ class FormRuntime implements RootRenderableInterface, \ArrayAccess
     }
 
     /**
-     * @return void
      * @internal
      */
     public function initializeObject()
@@ -188,7 +186,6 @@ class FormRuntime implements RootRenderableInterface, \ArrayAccess
 
     /**
      * Initializes the current state of the form, based on the request
-     * @return void
      */
     protected function initializeFormStateFromRequest()
     {
@@ -203,7 +200,6 @@ class FormRuntime implements RootRenderableInterface, \ArrayAccess
 
     /**
      * Initializes the current page data based on the current request, also modifiable by a hook
-     * @return void
      */
     protected function initializeCurrentPageFromRequest()
     {
@@ -264,8 +260,6 @@ class FormRuntime implements RootRenderableInterface, \ArrayAccess
 
     /**
      * Checks if the honey pot is active, and adds a validator if so.
-     *
-     * @return void
      */
     protected function initializeHoneypotFromRequest()
     {
@@ -293,8 +287,6 @@ class FormRuntime implements RootRenderableInterface, \ArrayAccess
 
     /**
      * Renders a hidden field if the honey pot is active.
-     *
-     * @return void
      */
     protected function renderHoneypot()
     {
@@ -362,7 +354,6 @@ class FormRuntime implements RootRenderableInterface, \ArrayAccess
     /**
      * @param Page $page
      * @param string $honeypotName
-     * @return void
      */
     protected function setHoneypotNameInSession(Page $page, string $honeypotName)
     {
@@ -403,7 +394,6 @@ class FormRuntime implements RootRenderableInterface, \ArrayAccess
 
     /**
      * Runs throuh all validations
-     * @return void
      */
     protected function processSubmittedFormValues()
     {
@@ -533,7 +523,6 @@ class FormRuntime implements RootRenderableInterface, \ArrayAccess
      * some kind of "preview" of the form.
      *
      * @param int $pageIndex
-     * @return void
      * @api
      */
     public function overrideCurrentPage(int $pageIndex)
@@ -575,8 +564,6 @@ class FormRuntime implements RootRenderableInterface, \ArrayAccess
 
     /**
      * Executes all finishers of this form
-     *
-     * @return void
      */
     protected function invokeFinishers()
     {
@@ -746,7 +733,6 @@ class FormRuntime implements RootRenderableInterface, \ArrayAccess
     /**
      * @param string $identifier
      * @param mixed $value
-     * @return void
      * @internal
      */
     public function offsetSet($identifier, $value)
@@ -756,7 +742,6 @@ class FormRuntime implements RootRenderableInterface, \ArrayAccess
 
     /**
      * @param string $identifier
-     * @return void
      * @internal
      */
     public function offsetUnset($identifier)
@@ -860,7 +845,6 @@ class FormRuntime implements RootRenderableInterface, \ArrayAccess
      * is outputted to the browser.
      *
      * @param FormRuntime $formRuntime
-     * @return void
      * @api
      * @deprecated since TYPO3 v8, will be removed in TYPO3 v9
      */
diff --git a/typo3/sysext/form/Classes/Domain/Runtime/FormState.php b/typo3/sysext/form/Classes/Domain/Runtime/FormState.php
index e07bcf23a42ff11a7a0c6ef5496ccde8cbe5ab09..0aacc83f8a63ef6733ba0321eb0ae3eb631aae24 100644
--- a/typo3/sysext/form/Classes/Domain/Runtime/FormState.php
+++ b/typo3/sysext/form/Classes/Domain/Runtime/FormState.php
@@ -66,7 +66,6 @@ class FormState
 
     /**
      * @param int $lastDisplayedPageIndex
-     * @return void
      */
     public function setLastDisplayedPageIndex(int $lastDisplayedPageIndex)
     {
@@ -84,7 +83,6 @@ class FormState
     /**
      * @param string $propertyPath
      * @param mixed $value
-     * @return void
      */
     public function setFormValue(string $propertyPath, $value)
     {
diff --git a/typo3/sysext/form/Classes/Hooks/FormElementsOnSubmitHooks.php b/typo3/sysext/form/Classes/Hooks/FormElementsOnSubmitHooks.php
index 9e1e104c3a6ab5ef8127c4c14804466e5fb2f68c..4df3b1ad9e6f014887fc504d1929d7aa5127e2dd 100644
--- a/typo3/sysext/form/Classes/Hooks/FormElementsOnSubmitHooks.php
+++ b/typo3/sysext/form/Classes/Hooks/FormElementsOnSubmitHooks.php
@@ -35,7 +35,6 @@ class FormElementsOnSubmitHooks
      * @param RenderableInterface $renderable
      * @param mixed $elementValue submitted value of the element *before post processing*
      * @param array $requestArguments submitted raw request values
-     * @return void
      * @see FormRuntime::mapAndValidate()
      * @internal
      */
diff --git a/typo3/sysext/form/Classes/Hooks/FormPagePreviewRenderer.php b/typo3/sysext/form/Classes/Hooks/FormPagePreviewRenderer.php
index 4da54f3d27493e6a89aecf3e03855d95e7a50b22..565e8a605506ddc7f0eb1348092989ae0a44c6f0 100644
--- a/typo3/sysext/form/Classes/Hooks/FormPagePreviewRenderer.php
+++ b/typo3/sysext/form/Classes/Hooks/FormPagePreviewRenderer.php
@@ -37,7 +37,6 @@ class FormPagePreviewRenderer implements PageLayoutViewDrawItemHookInterface
      * @param string $headerContent Header content
      * @param string $itemContent Item content
      * @param array $row Record row of tt_content
-     * @return void
      */
     public function preProcess(
         \TYPO3\CMS\Backend\View\PageLayoutView &$parentObject,
diff --git a/typo3/sysext/form/Classes/Mvc/Configuration/InheritancesResolverService.php b/typo3/sysext/form/Classes/Mvc/Configuration/InheritancesResolverService.php
index b4b0823b53ac8b14529b3993cd17fd9dce5a96c0..66619b150a5b3c0522569a90d94ac02b25d19c99 100644
--- a/typo3/sysext/form/Classes/Mvc/Configuration/InheritancesResolverService.php
+++ b/typo3/sysext/form/Classes/Mvc/Configuration/InheritancesResolverService.php
@@ -252,7 +252,6 @@ class InheritancesResolverService
      * @toDo: More description
      * @param string $path
      * @param string $pathToCheck
-     * @return void
      * @throws CycleInheritancesException
      */
     protected function throwExceptionIfCycleInheritances(string $path, string $pathToCheck)
diff --git a/typo3/sysext/form/Classes/Mvc/Configuration/YamlSource.php b/typo3/sysext/form/Classes/Mvc/Configuration/YamlSource.php
index e8defe72e5479be56614b10ad74c1a6456c32405..31afdd3a4afce5cb06d902c1493475e7b5dec9dc 100644
--- a/typo3/sysext/form/Classes/Mvc/Configuration/YamlSource.php
+++ b/typo3/sysext/form/Classes/Mvc/Configuration/YamlSource.php
@@ -116,7 +116,6 @@ class YamlSource
      *
      * @param File|string $fileToSave The file to write to.
      * @param array $configuration The configuration to save
-     * @return void
      * @internal
      */
     public function save($fileToSave, array $configuration)
diff --git a/typo3/sysext/form/Classes/Mvc/Persistence/FormPersistenceManager.php b/typo3/sysext/form/Classes/Mvc/Persistence/FormPersistenceManager.php
index 6516b85f5966a90b4e8be3855d45709d52eb260b..da132935decc29fcabef026747ddef6b8e1c1fd4 100644
--- a/typo3/sysext/form/Classes/Mvc/Persistence/FormPersistenceManager.php
+++ b/typo3/sysext/form/Classes/Mvc/Persistence/FormPersistenceManager.php
@@ -118,7 +118,6 @@ class FormPersistenceManager implements FormPersistenceManagerInterface
      *
      * @param string $persistenceIdentifier
      * @param array $formDefinition
-     * @return void
      * @throws PersistenceManagerException
      * @internal
      */
@@ -148,7 +147,6 @@ class FormPersistenceManager implements FormPersistenceManagerInterface
      * Only files with the extension .yaml are removed.
      *
      * @param string $persistenceIdentifier
-     * @return void
      * @throws PersistenceManagerException
      * @internal
      */
diff --git a/typo3/sysext/form/Classes/Mvc/Persistence/FormPersistenceManagerInterface.php b/typo3/sysext/form/Classes/Mvc/Persistence/FormPersistenceManagerInterface.php
index a8f00942b5cc356ed581b7ba83a5d3fc21e99990..859b87a24e8c2a28d6ac8e98dade8f10a0b8d762 100644
--- a/typo3/sysext/form/Classes/Mvc/Persistence/FormPersistenceManagerInterface.php
+++ b/typo3/sysext/form/Classes/Mvc/Persistence/FormPersistenceManagerInterface.php
@@ -58,7 +58,6 @@ interface FormPersistenceManagerInterface
      * Delete the form representation identified by $persistenceIdentifier
      *
      * @param string $persistenceIdentifier
-     * @return void
      * @api
      */
     public function delete(string $persistenceIdentifier);
diff --git a/typo3/sysext/form/Classes/Mvc/ProcessingRule.php b/typo3/sysext/form/Classes/Mvc/ProcessingRule.php
index 6b8949a420b5bd2e65122cd354171616987181dc..aac4fa8c88b9231c5df9252069e97efc92ca90b8 100644
--- a/typo3/sysext/form/Classes/Mvc/ProcessingRule.php
+++ b/typo3/sysext/form/Classes/Mvc/ProcessingRule.php
@@ -62,7 +62,6 @@ class ProcessingRule
 
     /**
      * @param \TYPO3\CMS\Extbase\Property\PropertyMappingConfiguration $propertyMappingConfiguration
-     * @return void
      * @internal
      */
     public function injectPropertyMappingConfiguration(\TYPO3\CMS\Extbase\Property\PropertyMappingConfiguration $propertyMappingConfiguration)
@@ -72,7 +71,6 @@ class ProcessingRule
 
     /**
      * @param \TYPO3\CMS\Extbase\Validation\Validator\ConjunctionValidator $validator
-     * @return void
      * @internal
      */
     public function injectConjunctionValidator(\TYPO3\CMS\Extbase\Validation\Validator\ConjunctionValidator $validator)
@@ -82,7 +80,6 @@ class ProcessingRule
 
     /**
      * @param \TYPO3\CMS\Extbase\Property\PropertyMapper $propertyMapper
-     * @return void
      * @internal
      */
     public function injectPropertyMapper(\TYPO3\CMS\Extbase\Property\PropertyMapper $propertyMapper)
@@ -140,7 +137,6 @@ class ProcessingRule
 
     /**
      * @param ValidatorInterface $validator
-     * @return void
      * @internal
      */
     public function addValidator(ValidatorInterface $validator)
diff --git a/typo3/sysext/form/Classes/Mvc/Property/PropertyMappingConfiguration.php b/typo3/sysext/form/Classes/Mvc/Property/PropertyMappingConfiguration.php
index 0be67089305d4cbbc613e096f7fcb0a2b2e032e1..bde3904d820e0d3506b7ef9753f976c5ef5603c1 100644
--- a/typo3/sysext/form/Classes/Mvc/Property/PropertyMappingConfiguration.php
+++ b/typo3/sysext/form/Classes/Mvc/Property/PropertyMappingConfiguration.php
@@ -44,7 +44,6 @@ class PropertyMappingConfiguration
      *   persistence identifier exist the default storage "1:/user_upload/" will be used.
      *
      * @param RenderableInterface $renderable
-     * @return void
      * @internal
      * @todo: could we find a not so ugly solution for that?
      */
diff --git a/typo3/sysext/form/Classes/Mvc/Property/TypeConverter/UploadedFileReferenceConverter.php b/typo3/sysext/form/Classes/Mvc/Property/TypeConverter/UploadedFileReferenceConverter.php
index 1b6211067a854055ce97f07ab60d4c93010e26d6..0a257e99a57e3e0558553a8f63339e5bb32fe97a 100644
--- a/typo3/sysext/form/Classes/Mvc/Property/TypeConverter/UploadedFileReferenceConverter.php
+++ b/typo3/sysext/form/Classes/Mvc/Property/TypeConverter/UploadedFileReferenceConverter.php
@@ -101,7 +101,6 @@ class UploadedFileReferenceConverter extends AbstractTypeConverter
 
     /**
      * @param \TYPO3\CMS\Core\Resource\ResourceFactory $resourceFactory
-     * @return void
      * @internal
      */
     public function injectResourceFactory(\TYPO3\CMS\Core\Resource\ResourceFactory $resourceFactory)
@@ -111,7 +110,6 @@ class UploadedFileReferenceConverter extends AbstractTypeConverter
 
     /**
      * @param \TYPO3\CMS\Extbase\Security\Cryptography\HashService $hashService
-     * @return void
      * @internal
      */
     public function injectHashService(\TYPO3\CMS\Extbase\Security\Cryptography\HashService $hashService)
@@ -121,7 +119,6 @@ class UploadedFileReferenceConverter extends AbstractTypeConverter
 
     /**
      * @param \TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface $persistenceManager
-     * @return void
      * @internal
      */
     public function injectPersistenceManager(\TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface $persistenceManager)
diff --git a/typo3/sysext/form/Classes/Mvc/Validation/CountValidator.php b/typo3/sysext/form/Classes/Mvc/Validation/CountValidator.php
index b9508ea453449764d5b6a39aad7a65ac5a393c68..e336cdd58122b6096742b8cae67baae3b8ad8594 100644
--- a/typo3/sysext/form/Classes/Mvc/Validation/CountValidator.php
+++ b/typo3/sysext/form/Classes/Mvc/Validation/CountValidator.php
@@ -39,7 +39,6 @@ class CountValidator extends AbstractValidator
      * The given value is valid if it is an array or \Countable that contains the specified amount of elements.
      *
      * @param mixed $value
-     * @return void
      * @api
      */
     public function isValid($value)
diff --git a/typo3/sysext/form/Classes/Mvc/Validation/EmptyValidator.php b/typo3/sysext/form/Classes/Mvc/Validation/EmptyValidator.php
index 5e1204a5520e2b9c3c2c9bbb29dcfdd0ec16460d..2d8fb3e3a708db9700e20db5ac4b92a4d951a7b1 100644
--- a/typo3/sysext/form/Classes/Mvc/Validation/EmptyValidator.php
+++ b/typo3/sysext/form/Classes/Mvc/Validation/EmptyValidator.php
@@ -37,7 +37,6 @@ class EmptyValidator extends AbstractValidator
      * Checks if the given property ($propertyValue) is empty (NULL, empty string, empty array or empty object).
      *
      * @param mixed $value The value that should be validated
-     * @return void
      * @api
      */
     public function isValid($value)
diff --git a/typo3/sysext/form/Classes/Mvc/Validation/MimeTypeValidator.php b/typo3/sysext/form/Classes/Mvc/Validation/MimeTypeValidator.php
index 4cf7b93a030e1eedc3bdcf6965c1b3b9f86f847c..7f3781874ec654a2c8a947ece8b959e72de44786 100644
--- a/typo3/sysext/form/Classes/Mvc/Validation/MimeTypeValidator.php
+++ b/typo3/sysext/form/Classes/Mvc/Validation/MimeTypeValidator.php
@@ -42,7 +42,6 @@ class MimeTypeValidator extends AbstractValidator
      * Note: a value of NULL or empty string ('') is considered valid
      *
      * @param FileReference|File $resource The resource that should be validated
-     * @return void
      * @api
      */
     public function isValid($resource)
@@ -78,7 +77,6 @@ class MimeTypeValidator extends AbstractValidator
     /**
      * Checks if this validator is correctly configured
      *
-     * @return void
      * @throws InvalidValidationOptionsException if the configured validation options are incorrect
      */
     protected function validateOptions()
diff --git a/typo3/sysext/form/Classes/Service/TranslationService.php b/typo3/sysext/form/Classes/Service/TranslationService.php
index 397313cae2ecd4b5adac35d8d209a9ed9ff2385f..d1e5e71bf6464afe98286d99eeffd32b9448176a 100644
--- a/typo3/sysext/form/Classes/Service/TranslationService.php
+++ b/typo3/sysext/form/Classes/Service/TranslationService.php
@@ -476,7 +476,6 @@ class TranslationService implements SingletonInterface
 
     /**
      * @param string $locallangPathAndFilename
-     * @return void
      */
     protected function initializeLocalization(string $locallangPathAndFilename)
     {
@@ -502,8 +501,6 @@ class TranslationService implements SingletonInterface
     /**
      * Sets the currently active language/language_alt keys.
      * Default values are "default" for language key and "" for language_alt key.
-     *
-     * @return void
      */
     protected function setLanguageKeys()
     {
@@ -536,8 +533,6 @@ class TranslationService implements SingletonInterface
      * Overwrites labels that are set via TypoScript.
      * TS locallang labels have to be configured like:
      * plugin.tx_form._LOCAL_LANG.languageKey.key = value
-     *
-     * @return void
      */
     protected function loadTypoScriptLabels()
     {
diff --git a/typo3/sysext/form/Classes/ViewHelpers/Be/RenderContentElementPreviewViewHelper.php b/typo3/sysext/form/Classes/ViewHelpers/Be/RenderContentElementPreviewViewHelper.php
index 6b481f78e3cfa8aeda0104d680ac5c677a6e1ad3..aeb0dff53b0fc226c826b5e90cef6468235c0d02 100644
--- a/typo3/sysext/form/Classes/ViewHelpers/Be/RenderContentElementPreviewViewHelper.php
+++ b/typo3/sysext/form/Classes/ViewHelpers/Be/RenderContentElementPreviewViewHelper.php
@@ -43,7 +43,6 @@ class RenderContentElementPreviewViewHelper extends AbstractViewHelper
     /**
      * Initialize arguments.
      *
-     * @return void
      * @internal
      */
     public function initializeArguments()
diff --git a/typo3/sysext/form/Classes/ViewHelpers/Form/DatePickerViewHelper.php b/typo3/sysext/form/Classes/ViewHelpers/Form/DatePickerViewHelper.php
index 3d81be8582a0d5435369f445660a544f2ac0316d..45d79bdb4a4d677d4f7d5ebe06c39bf2f4efc7b7 100644
--- a/typo3/sysext/form/Classes/ViewHelpers/Form/DatePickerViewHelper.php
+++ b/typo3/sysext/form/Classes/ViewHelpers/Form/DatePickerViewHelper.php
@@ -46,7 +46,6 @@ class DatePickerViewHelper extends AbstractFormFieldViewHelper
 
     /**
      * @param \TYPO3\CMS\Extbase\Property\PropertyMapper $propertyMapper
-     * @return void
      * @internal
      */
     public function injectPropertyMapper(\TYPO3\CMS\Extbase\Property\PropertyMapper $propertyMapper)
@@ -57,7 +56,6 @@ class DatePickerViewHelper extends AbstractFormFieldViewHelper
     /**
      * Initialize the arguments.
      *
-     * @return void
      * @api
      */
     public function initializeArguments()
@@ -178,7 +176,6 @@ class DatePickerViewHelper extends AbstractFormFieldViewHelper
     /**
      * @param string $uniqueIdentifier
      * @param string $datePickerDateFormat
-     * @return void
      */
     protected function renderInlineJavascript(string $uniqueIdentifier, string $datePickerDateFormat)
     {
diff --git a/typo3/sysext/form/Classes/ViewHelpers/Form/TimePickerViewHelper.php b/typo3/sysext/form/Classes/ViewHelpers/Form/TimePickerViewHelper.php
index 4c5003faa5ac3f2efd2d181fd6593e3ed6c1d5b0..79b38aac6117e6a2cb791f879c7254ab92ae067a 100644
--- a/typo3/sysext/form/Classes/ViewHelpers/Form/TimePickerViewHelper.php
+++ b/typo3/sysext/form/Classes/ViewHelpers/Form/TimePickerViewHelper.php
@@ -42,7 +42,6 @@ class TimePickerViewHelper extends AbstractFormFieldViewHelper
 
     /**
      * @param \TYPO3\CMS\Extbase\Property\PropertyMapper $propertyMapper
-     * @return void
      * @internal
      */
     public function injectPropertyMapper(\TYPO3\CMS\Extbase\Property\PropertyMapper $propertyMapper)
@@ -53,7 +52,6 @@ class TimePickerViewHelper extends AbstractFormFieldViewHelper
     /**
      * Initialize the arguments.
      *
-     * @return void
      * @internal
      */
     public function initializeArguments()
diff --git a/typo3/sysext/form/Classes/ViewHelpers/Form/UploadedResourceViewHelper.php b/typo3/sysext/form/Classes/ViewHelpers/Form/UploadedResourceViewHelper.php
index 988c3114d13173b6158cb7a1f6ce2b6dc3413d51..ea8f319d071ece96040ea8bb2f52915ce215fb1e 100644
--- a/typo3/sysext/form/Classes/ViewHelpers/Form/UploadedResourceViewHelper.php
+++ b/typo3/sysext/form/Classes/ViewHelpers/Form/UploadedResourceViewHelper.php
@@ -44,7 +44,6 @@ class UploadedResourceViewHelper extends UploadViewHelper
 
     /**
      * @param HashService $hashService
-     * @return void
      * @internal
      */
     public function injectHashService(\TYPO3\CMS\Extbase\Security\Cryptography\HashService $hashService)
@@ -54,7 +53,6 @@ class UploadedResourceViewHelper extends UploadViewHelper
 
     /**
      * @param \TYPO3\CMS\Extbase\Property\PropertyMapper $propertyMapper
-     * @return void
      * @internal
      */
     public function injectPropertyMapper(\TYPO3\CMS\Extbase\Property\PropertyMapper $propertyMapper)
@@ -65,7 +63,6 @@ class UploadedResourceViewHelper extends UploadViewHelper
     /**
      * Initialize the arguments.
      *
-     * @return void
      * @internal
      */
     public function initializeArguments()
diff --git a/typo3/sysext/form/Classes/ViewHelpers/GridColumnClassAutoConfigurationViewHelper.php b/typo3/sysext/form/Classes/ViewHelpers/GridColumnClassAutoConfigurationViewHelper.php
index 93bf6e28afaea52098999ace7dcb34d9f19d8d7b..f1140f52c162f127b93266c14ae4ec8b51d320cf 100644
--- a/typo3/sysext/form/Classes/ViewHelpers/GridColumnClassAutoConfigurationViewHelper.php
+++ b/typo3/sysext/form/Classes/ViewHelpers/GridColumnClassAutoConfigurationViewHelper.php
@@ -37,7 +37,6 @@ class GridColumnClassAutoConfigurationViewHelper extends AbstractViewHelper
     /**
      * Initialize the arguments.
      *
-     * @return void
      * @internal
      */
     public function initializeArguments()
diff --git a/typo3/sysext/form/Classes/ViewHelpers/PlainTextMailViewHelper.php b/typo3/sysext/form/Classes/ViewHelpers/PlainTextMailViewHelper.php
index d63e7c697de9a4b0abd7a0e03da37bcdc2135672..fbc404678bf079ab14bed6d18c5a00cd7d0007e8 100644
--- a/typo3/sysext/form/Classes/ViewHelpers/PlainTextMailViewHelper.php
+++ b/typo3/sysext/form/Classes/ViewHelpers/PlainTextMailViewHelper.php
@@ -32,7 +32,6 @@ class PlainTextMailViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractV
     /**
      * Initialize the arguments.
      *
-     * @return void
      * @internal
      */
     public function initializeArguments()
diff --git a/typo3/sysext/form/Classes/ViewHelpers/RenderAllFormValuesViewHelper.php b/typo3/sysext/form/Classes/ViewHelpers/RenderAllFormValuesViewHelper.php
index a11e44fcd77d2df0b43453eaa38b178ecf466839..86b25bc705e27551273d2a4412869e316faf29cb 100644
--- a/typo3/sysext/form/Classes/ViewHelpers/RenderAllFormValuesViewHelper.php
+++ b/typo3/sysext/form/Classes/ViewHelpers/RenderAllFormValuesViewHelper.php
@@ -45,7 +45,6 @@ class RenderAllFormValuesViewHelper extends AbstractViewHelper
     /**
      * Initialize the arguments.
      *
-     * @return void
      * @internal
      */
     public function initializeArguments()
diff --git a/typo3/sysext/form/Classes/ViewHelpers/RenderRenderableViewHelper.php b/typo3/sysext/form/Classes/ViewHelpers/RenderRenderableViewHelper.php
index c72a9097c6a951fd5731b41397d4fe706ac8be43..75933d1f5cc7151753616460026d7b55e170f86f 100644
--- a/typo3/sysext/form/Classes/ViewHelpers/RenderRenderableViewHelper.php
+++ b/typo3/sysext/form/Classes/ViewHelpers/RenderRenderableViewHelper.php
@@ -46,7 +46,6 @@ class RenderRenderableViewHelper extends AbstractViewHelper
     /**
      * Initialize the arguments.
      *
-     * @return void
      * @internal
      */
     public function initializeArguments()
diff --git a/typo3/sysext/form/Classes/ViewHelpers/RenderViewHelper.php b/typo3/sysext/form/Classes/ViewHelpers/RenderViewHelper.php
index fd4f8989f21b41fdaf361f15d87b637d72cb44bd..7882ba6ae60d90f9f7b0fb75dd68cdb395bb4324 100644
--- a/typo3/sysext/form/Classes/ViewHelpers/RenderViewHelper.php
+++ b/typo3/sysext/form/Classes/ViewHelpers/RenderViewHelper.php
@@ -53,7 +53,6 @@ class RenderViewHelper extends AbstractViewHelper
     /**
      * Initialize the arguments.
      *
-     * @return void
      * @internal
      */
     public function initializeArguments()
diff --git a/typo3/sysext/form/Classes/ViewHelpers/TranslateElementErrorViewHelper.php b/typo3/sysext/form/Classes/ViewHelpers/TranslateElementErrorViewHelper.php
index 2c8a8858686ee5483e2664993d78a283d7a162e3..9d839f88aea17c411de6ba3abe6aa85abe90604c 100644
--- a/typo3/sysext/form/Classes/ViewHelpers/TranslateElementErrorViewHelper.php
+++ b/typo3/sysext/form/Classes/ViewHelpers/TranslateElementErrorViewHelper.php
@@ -35,7 +35,6 @@ class TranslateElementErrorViewHelper extends AbstractViewHelper
     /**
      * Initialize arguments.
      *
-     * @return void
      * @internal
      */
     public function initializeArguments()
diff --git a/typo3/sysext/form/Classes/ViewHelpers/TranslateElementPropertyViewHelper.php b/typo3/sysext/form/Classes/ViewHelpers/TranslateElementPropertyViewHelper.php
index 5932920a7932dc57c2caa415250c64fff075736e..3e401d111ef65afe86d489648dde3afce251afb7 100644
--- a/typo3/sysext/form/Classes/ViewHelpers/TranslateElementPropertyViewHelper.php
+++ b/typo3/sysext/form/Classes/ViewHelpers/TranslateElementPropertyViewHelper.php
@@ -35,7 +35,6 @@ class TranslateElementPropertyViewHelper extends AbstractViewHelper
     /**
      * Initialize arguments.
      *
-     * @return void
      * @internal
      */
     public function initializeArguments()
diff --git a/typo3/sysext/form/Tests/Unit/Mvc/Validation/Fixtures/TestValidator.php b/typo3/sysext/form/Tests/Unit/Mvc/Validation/Fixtures/TestValidator.php
index 1ddc62cea40fc88b2a47ea90a6d05a0a7d8f5dac..f01ede7c08f09a70ef8bf26dea4ea60b73af3bdb 100644
--- a/typo3/sysext/form/Tests/Unit/Mvc/Validation/Fixtures/TestValidator.php
+++ b/typo3/sysext/form/Tests/Unit/Mvc/Validation/Fixtures/TestValidator.php
@@ -25,7 +25,6 @@ class TestValidator extends AbstractValidator
 {
     /**
      * @param mixed $value
-     * @return void
      */
     public function isValid($value)
     {
diff --git a/typo3/sysext/form/Tests/Unit/ViewHelpers/Form/DatePickerViewHelperTest.php b/typo3/sysext/form/Tests/Unit/ViewHelpers/Form/DatePickerViewHelperTest.php
index c464481bbe872f80e8db5e84550a22b8e408de08..c86c0f7279107ec22e8da64b57cedb8b0e058874 100644
--- a/typo3/sysext/form/Tests/Unit/ViewHelpers/Form/DatePickerViewHelperTest.php
+++ b/typo3/sysext/form/Tests/Unit/ViewHelpers/Form/DatePickerViewHelperTest.php
@@ -30,8 +30,6 @@ class DatePickerViewHelperTest extends \TYPO3\TestingFramework\Core\Unit\UnitTes
 
     /**
      * Set up
-     *
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/frontend/Classes/Aspect/FileMetadataOverlayAspect.php b/typo3/sysext/frontend/Classes/Aspect/FileMetadataOverlayAspect.php
index 9e1dd3c097f62ca21d20c954b2d25fdeb9abb016..d9614fdfb72077af7d1a2df1c371f7b27ae602cb 100644
--- a/typo3/sysext/frontend/Classes/Aspect/FileMetadataOverlayAspect.php
+++ b/typo3/sysext/frontend/Classes/Aspect/FileMetadataOverlayAspect.php
@@ -30,7 +30,6 @@ class FileMetadataOverlayAspect
      * Do translation and workspace overlay
      *
      * @param \ArrayObject $data
-     * @return void
      */
     public function languageAndWorkspaceOverlay(\ArrayObject $data)
     {
diff --git a/typo3/sysext/frontend/Classes/Authentication/FrontendUserAuthentication.php b/typo3/sysext/frontend/Classes/Authentication/FrontendUserAuthentication.php
index 11715757925b43332f9c60473e8658dc6dedc9ee..5b8aa80f4f265ff3915cd44a33280d207a5f2124 100644
--- a/typo3/sysext/frontend/Classes/Authentication/FrontendUserAuthentication.php
+++ b/typo3/sysext/frontend/Classes/Authentication/FrontendUserAuthentication.php
@@ -156,7 +156,6 @@ class FrontendUserAuthentication extends AbstractUserAuthentication
     /**
      * Starts a user session
      *
-     * @return void
      * @see AbstractUserAuthentication::start()
      */
     public function start()
@@ -379,7 +378,6 @@ class FrontendUserAuthentication extends AbstractUserAuthentication
      * If the flag $this->userData_change has been set, the function ->writeUC is called (which will save persistent user session data)
      * If the flag $this->sesData_change has been set, the current session record is updated with the content of $this->sessionData
      *
-     * @return void
      * @see getKey(), setKey()
      */
     public function storeSessionData()
@@ -418,8 +416,6 @@ class FrontendUserAuthentication extends AbstractUserAuthentication
 
     /**
      * Removes data of the current session.
-     *
-     * @return void
      */
     public function removeSessionData()
     {
@@ -446,8 +442,6 @@ class FrontendUserAuthentication extends AbstractUserAuthentication
      * Additionally the cookie is removed, but only if there is no session data.
      * If session data exists, only the user information is removed and the session
      * gets converted into an anonymous session.
-     *
-     * @return void
      */
     protected function performLogoff()
     {
@@ -531,7 +525,6 @@ class FrontendUserAuthentication extends AbstractUserAuthentication
      * @param string $type Session data type; Either "user" (persistent, bound to fe_users profile) or "ses" (temporary, bound to current session cookie)
      * @param string $key Key from the data array to store incoming data in; The session data (in either case) is an array ($this->uc / $this->sessionData) and this value determines in which key the $data value will be stored.
      * @param mixed $data The data value to store in $key
-     * @return void
      * @see setKey(), storeSessionData(), record_registration()
      */
     public function setKey($type, $key, $data)
@@ -562,7 +555,6 @@ class FrontendUserAuthentication extends AbstractUserAuthentication
      *
      * @param string $key A non empty string to store the data under
      * @param mixed $data Data store store in session
-     * @return void
      */
     public function setSessionData($key, $data)
     {
@@ -579,7 +571,6 @@ class FrontendUserAuthentication extends AbstractUserAuthentication
      *
      * @param string $key
      * @param mixed $data
-     * @return void
      */
     public function setAndSaveSessionData($key, $data)
     {
@@ -594,7 +585,6 @@ class FrontendUserAuthentication extends AbstractUserAuthentication
      *
      * @param array $recs The data array to merge into/override the current recs values. The $recs array is constructed as [table]][uid] = scalar-value (eg. string/integer).
      * @param int $maxSizeOfSessionData The maximum size of stored session data. If zero, no limit is applied and even confirmation of cookie session is discarded.
-     * @return void
      * @deprecated since TYPO3 v8, will be removed in TYPO3 v9. Automatically feeding a "basket" by magic GET/POST keyword "recs" has been deprecated.
      */
     public function record_registration($recs, $maxSizeOfSessionData = 0)
@@ -628,7 +618,6 @@ class FrontendUserAuthentication extends AbstractUserAuthentication
     /**
      * Garbage collector, removing old expired sessions.
      *
-     * @return void
      * @internal
      */
     public function gc()
@@ -641,8 +630,6 @@ class FrontendUserAuthentication extends AbstractUserAuthentication
      *
      * This is used by the fe_login_mode feature for pages.
      * A current login is unset, but we remember that there has been one.
-     *
-     * @return void
      */
     public function hideActiveLogin()
     {
diff --git a/typo3/sysext/frontend/Classes/Configuration/TypoScript/ConditionMatching/ConditionMatcher.php b/typo3/sysext/frontend/Classes/Configuration/TypoScript/ConditionMatching/ConditionMatcher.php
index 23a76a0bd687f9fb2b4c5f38b1e013b493b7b5a6..e161508021c504cb6677bed5b066d701d79cc9e2 100644
--- a/typo3/sysext/frontend/Classes/Configuration/TypoScript/ConditionMatching/ConditionMatcher.php
+++ b/typo3/sysext/frontend/Classes/Configuration/TypoScript/ConditionMatching/ConditionMatcher.php
@@ -178,7 +178,6 @@ class ConditionMatcher extends AbstractConditionMatcher
      * Set/write a log message.
      *
      * @param string $message The log message to set/write
-     * @return void
      */
     protected function log($message)
     {
diff --git a/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php b/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php
index 2f1e4f50d30acf3b3fa5877efcf300311e5943dd..625ca50f5d6ac6a1606fffc8d33df56057f621d6 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php
@@ -553,7 +553,6 @@ class ContentObjectRenderer
      *
      * @param array $data The record data that is rendered.
      * @param string $table The table that the data record is from.
-     * @return void
      */
     public function start($data, $table = '')
     {
@@ -626,7 +625,6 @@ class ContentObjectRenderer
      *
      * @param array $data The record array
      * @param string $currentRecord This is set to the [table]:[uid] of the record delivered in the $data-array, if the cObjects CONTENT or RECORD is in operation. Note that $GLOBALS['TSFE']->currentRecord is set to an equal value but always indicating the latest record rendered.
-     * @return void
      * @access private
      */
     public function setParent($data, $currentRecord)
@@ -659,7 +657,6 @@ class ContentObjectRenderer
      * Sets the "current" value.
      *
      * @param mixed $value The variable that you want to set as "current
-     * @return void
      * @see getCurrentVal()
      */
     public function setCurrentVal($value)
@@ -943,7 +940,6 @@ class ContentObjectRenderer
      * Sets the user object type
      *
      * @param mixed $userObjectType
-     * @return void
      */
     public function setUserObjectType($userObjectType)
     {
@@ -952,8 +948,6 @@ class ContentObjectRenderer
 
     /**
      * Requests the current USER object to be converted to USER_INT.
-     *
-     * @return void
      */
     public function convertToUserIntObject()
     {
@@ -975,7 +969,6 @@ class ContentObjectRenderer
      * @param string|array $flexData Flexform data
      * @param array $conf Array to write the data into, by reference
      * @param bool $recursive Is set if called recursive. Don't call function with this parameter, it's used inside the function only
-     * @return void
      */
     public function readFlexformIntoConf($flexData, &$conf, $recursive = false)
     {
@@ -1408,7 +1401,6 @@ class ContentObjectRenderer
      * Therefore you should call this function with the last-changed timestamp of any element you display.
      *
      * @param int $tstamp Unix timestamp (number of seconds since 1970)
-     * @return void
      * @see TypoScriptFrontendController::setSysLastChanged()
      */
     public function lastChanged($tstamp)
diff --git a/typo3/sysext/frontend/Classes/ContentObject/FluidTemplateContentObject.php b/typo3/sysext/frontend/Classes/ContentObject/FluidTemplateContentObject.php
index 4d63e7171ec3cc8307fd2d2caa8d47495ca443c1..3368d0d0373cdfff1e091e02875ceced3ce56789 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/FluidTemplateContentObject.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/FluidTemplateContentObject.php
@@ -134,8 +134,6 @@ class FluidTemplateContentObject extends AbstractContentObject
      * are not always re-created by the content object rendered for every
      * usage, but can be re-used. Thus, we need a fresh instance of
      * StandaloneView every time render() is called.
-     *
-     * @return void
      */
     protected function initializeStandaloneViewInstance()
     {
@@ -146,7 +144,6 @@ class FluidTemplateContentObject extends AbstractContentObject
      * Set template
      *
      * @param array $conf With possibly set file resource
-     * @return void
      * @throws \InvalidArgumentException
      */
     protected function setTemplate(array $conf)
@@ -180,7 +177,6 @@ class FluidTemplateContentObject extends AbstractContentObject
      * Set layout root path if given in configuration
      *
      * @param array $conf Configuration array
-     * @return void
      */
     protected function setLayoutRootPath(array $conf)
     {
@@ -204,7 +200,6 @@ class FluidTemplateContentObject extends AbstractContentObject
      * Set partial root path if given in configuration
      *
      * @param array $conf Configuration array
-     * @return void
      */
     protected function setPartialRootPath(array $conf)
     {
@@ -227,7 +222,6 @@ class FluidTemplateContentObject extends AbstractContentObject
      * Set different format if given in configuration
      *
      * @param array $conf Configuration array
-     * @return void
      */
     protected function setFormat(array $conf)
     {
@@ -241,7 +235,6 @@ class FluidTemplateContentObject extends AbstractContentObject
      * Set some extbase variables if given
      *
      * @param array $conf Configuration array
-     * @return void
      */
     protected function setExtbaseVariables(array $conf)
     {
@@ -326,7 +319,6 @@ class FluidTemplateContentObject extends AbstractContentObject
      * default MVC action controller in extbase.
      *
      * @param array $conf Configuration
-     * @return void
      */
     protected function assignSettings(array $conf)
     {
diff --git a/typo3/sysext/frontend/Classes/ContentObject/Menu/AbstractMenuContentObject.php b/typo3/sysext/frontend/Classes/ContentObject/Menu/AbstractMenuContentObject.php
index 5f8934bdf66f26197a40a896c5b275f3e3bec2ff..156af2b18e76f04d28cff417dfacbe4a0cb26d78 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/Menu/AbstractMenuContentObject.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/Menu/AbstractMenuContentObject.php
@@ -420,8 +420,6 @@ abstract class AbstractMenuContentObject
      * Basically this will read the page records needed and fill in the internal $this->menuArr
      * Based on a hash of this array and some other variables the $this->result variable will be
      * loaded either from cache OR by calling the generate() method of the class to create the menu for real.
-     *
-     * @return void
      */
     public function makeMenu()
     {
@@ -519,8 +517,6 @@ abstract class AbstractMenuContentObject
      * Generates the the menu data.
      *
      * Subclasses should overwrite this method.
-     *
-     * @return void
      */
     public function generate()
     {
@@ -1216,7 +1212,6 @@ abstract class AbstractMenuContentObject
      * Analyzes the parameters to find if the link needs a cHash parameter.
      *
      * @param string $queryString
-     * @return void
      */
     protected function analyzeCacheHashRequirements($queryString)
     {
@@ -1762,7 +1757,6 @@ abstract class AbstractMenuContentObject
      * @param array $page Page array
      * @param string $mainTarget Main target value
      * @param string $typeOverride Type number override if any
-     * @return void ($LD passed by reference might be changed.)
      */
     public function changeLinksForAccessRestrictedPages(&$LD, $page, $mainTarget, $typeOverride)
     {
@@ -2050,7 +2044,6 @@ abstract class AbstractMenuContentObject
     /**
      * Creates the <A> tag parts for the current item (in $this->I, [A1] and [A2]) based on other information in this array (like $this->I['linkHREF'])
      *
-     * @return void
      * @internal
      */
     public function setATagParts()
diff --git a/typo3/sysext/frontend/Classes/ContentObject/Menu/GraphicalMenuContentObject.php b/typo3/sysext/frontend/Classes/ContentObject/Menu/GraphicalMenuContentObject.php
index 237af07877871105e14efd53cc70093c888dfa3a..5048d67bb2b1244d9b6e2922ea5fb27e4ca00039 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/Menu/GraphicalMenuContentObject.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/Menu/GraphicalMenuContentObject.php
@@ -27,7 +27,6 @@ class GraphicalMenuContentObject extends AbstractMenuContentObject
      * Calls procesItemStates() so that the common configuration for the menu items are resolved into individual configuration per item.
      * Calls makeGifs() for all "normal" items and if configured for, also the "rollover" items.
      *
-     * @return void
      * @see AbstractMenuContentObject::procesItemStates(), makeGifs()
      */
     public function generate()
@@ -71,7 +70,6 @@ class GraphicalMenuContentObject extends AbstractMenuContentObject
      *
      * @param array $conf Array with configuration for each item.
      * @param string $resKey Type of images: normal ("NO") or rollover ("RO"). Valid values are "NO" and "RO
-     * @return void
      * @internal
      * @see generate()
      */
@@ -474,7 +472,6 @@ class GraphicalMenuContentObject extends AbstractMenuContentObject
      * Called right before the traversing of $this->result begins.
      * Can be used for various initialization
      *
-     * @return void
      * @internal
      * @see writeMenu()
      */
@@ -486,7 +483,6 @@ class GraphicalMenuContentObject extends AbstractMenuContentObject
      * Called after all processing for RollOver of an element has been done.
      *
      * @param int $key Pointer to $this->menuArr[$key] where the current menu element record is found OR $this->result['RO'][$key] where the configuration for that elements RO version is found!
-     * @return void
      * @internal
      * @see writeMenu()
      */
@@ -498,7 +494,6 @@ class GraphicalMenuContentObject extends AbstractMenuContentObject
      * Called right before the creation of the link for the menu item
      *
      * @param int $key Pointer to $this->menuArr[$key] where the current menu element record is found
-     * @return void
      * @internal
      * @see writeMenu()
      */
@@ -513,7 +508,6 @@ class GraphicalMenuContentObject extends AbstractMenuContentObject
      * Further this calls the subMenu function in the parent class to create any submenu there might be.
      *
      * @param int $key Pointer to $this->menuArr[$key] where the current menu element record is found
-     * @return void
      * @internal
      * @see writeMenu(), AbstractMenuContentObject::subMenu()
      */
diff --git a/typo3/sysext/frontend/Classes/ContentObject/Menu/ImageMenuContentObject.php b/typo3/sysext/frontend/Classes/ContentObject/Menu/ImageMenuContentObject.php
index 14cd6ca66682670904623e498e325fde4dd13f86..396a94b51dd4f42147edd4339aad146a049306f3 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/Menu/ImageMenuContentObject.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/Menu/ImageMenuContentObject.php
@@ -28,7 +28,6 @@ class ImageMenuContentObject extends AbstractMenuContentObject
      * Calls procesItemStates() so that the common configuration for the menu items are resolved into individual configuration per item.
      * Calls makeImageMap() to generate the image map image-file
      *
-     * @return void
      * @see AbstractMenuContentObject::procesItemStates(), makeImageMap()
      */
     public function generate()
@@ -50,7 +49,6 @@ class ImageMenuContentObject extends AbstractMenuContentObject
      * The data of the files are stored in $this->result
      *
      * @param array $conf Array with configuration for each item.
-     * @return void
      * @access private
      * @see generate()
      */
diff --git a/typo3/sysext/frontend/Classes/ContentObject/Menu/TextMenuContentObject.php b/typo3/sysext/frontend/Classes/ContentObject/Menu/TextMenuContentObject.php
index 312250f109276318e5955160497774d00d709ca4..0d4ea4e64d057cec4851bdd9bcd410ec5a395a9f 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/Menu/TextMenuContentObject.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/Menu/TextMenuContentObject.php
@@ -23,7 +23,6 @@ class TextMenuContentObject extends AbstractMenuContentObject
      * Calls procesItemStates() so that the common configuration for the menu items are resolved into individual configuration per item.
      * Sets the result for the new "normal state" in $this->result
      *
-     * @return void
      * @see AbstractMenuContentObject::procesItemStates()
      */
     public function generate()
@@ -202,7 +201,6 @@ class TextMenuContentObject extends AbstractMenuContentObject
      * Called right before the traversing of $this->result begins.
      * Can be used for various initialization
      *
-     * @return void
      * @access private
      * @see writeMenu()
      */
@@ -214,7 +212,6 @@ class TextMenuContentObject extends AbstractMenuContentObject
      * Called right before the creation of the link for the menu item
      *
      * @param int $key Pointer to $this->menuArr[$key] where the current menu element record is found
-     * @return void
      * @access private
      * @see writeMenu()
      */
@@ -227,7 +224,6 @@ class TextMenuContentObject extends AbstractMenuContentObject
      * This function MUST set $this->WMresult.=[HTML for menu item] to add the generated menu item to the internal accumulation of items.
      *
      * @param int $key Pointer to $this->menuArr[$key] where the current menu element record is found
-     * @return void
      * @access private
      * @see writeMenu()
      */
diff --git a/typo3/sysext/frontend/Classes/ContentObject/RecordsContentObject.php b/typo3/sysext/frontend/Classes/ContentObject/RecordsContentObject.php
index 1e9ec67d3e913d962186f9608adf62efcbd85cd9..6140213aebd3a7623179df45505a22f510b899ee 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/RecordsContentObject.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/RecordsContentObject.php
@@ -144,7 +144,6 @@ class RecordsContentObject extends AbstractContentObject
      *
      * @param string $source Source of records
      * @param array $tables List of tables
-     * @return void
      */
     protected function collectRecordsFromSource($source, array $tables)
     {
@@ -168,7 +167,6 @@ class RecordsContentObject extends AbstractContentObject
      * @param string $selectedCategories Comma-separated list of categories
      * @param array $tables List of tables
      * @param string $relationField Name of the field containing the categories relation
-     * @return void
      */
     protected function collectRecordsFromCategories($selectedCategories, array $tables, $relationField)
     {
diff --git a/typo3/sysext/frontend/Classes/Controller/ShowImageController.php b/typo3/sysext/frontend/Classes/Controller/ShowImageController.php
index b7b47d24b7d58a2bd618edd23b22501f30b6cdcf..62748b0d80aa2e23694ddf716bc416cd3a52febd 100644
--- a/typo3/sysext/frontend/Classes/Controller/ShowImageController.php
+++ b/typo3/sysext/frontend/Classes/Controller/ShowImageController.php
@@ -100,7 +100,6 @@ EOF;
     /**
      * Init function, setting the input vars in the global space.
      *
-     * @return void
      * @throws \InvalidArgumentException
      * @throws \TYPO3\CMS\Core\Resource\Exception\FileDoesNotExistException
      */
@@ -141,8 +140,6 @@ EOF;
     /**
      * Main function which creates the image if needed and outputs the HTML code for the page displaying the image.
      * Accumulates the content in $this->content
-     *
-     * @return void
      */
     public function main()
     {
diff --git a/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php b/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php
index 3d969597343cd951e583ea8afe62b86b4814fdae..8a25201cbe3acedd1c9fab2d3dce4dafc24f54c6 100644
--- a/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php
+++ b/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php
@@ -912,7 +912,6 @@ class TypoScriptFrontendController
      *
      * @throws \RuntimeException
      * @throws ServiceUnavailableException
-     * @return void
      */
     public function connectToDB()
     {
@@ -943,8 +942,6 @@ class TypoScriptFrontendController
      * found to be associated with a redirect URL then the redirection
      * is carried out with a 'Location:' header
      * May exit after sending a location-header.
-     *
-     * @return void
      */
     public function sendRedirect()
     {
@@ -979,8 +976,6 @@ class TypoScriptFrontendController
      ********************************************/
     /**
      * Initializes the caching system.
-     *
-     * @return void
      */
     protected function initCaches()
     {
@@ -989,8 +984,6 @@ class TypoScriptFrontendController
 
     /**
      * Initializes the front-end login user.
-     *
-     * @return void
      */
     public function initFEuser()
     {
@@ -1052,8 +1045,6 @@ class TypoScriptFrontendController
     /**
      * Initializes the front-end user groups.
      * Sets ->loginUser and ->gr_list based on front-end user status.
-     *
-     * @return void
      */
     public function initUserGroups()
     {
@@ -1108,8 +1099,6 @@ class TypoScriptFrontendController
      * Two options:
      * 1) Use PATH_INFO (also Apache) to extract id and type from that var. Does not require any special modules compiled with apache. (less typical)
      * 2) Using hook which enables features like those provided from "realurl" extension (AKA "Speaking URLs")
-     *
-     * @return void
      */
     public function checkAlternativeIdMethods()
     {
@@ -1127,8 +1116,6 @@ class TypoScriptFrontendController
      * Clears the preview-flags, sets sim_exec_time to current time.
      * Hidden pages must be hidden as default, $GLOBALS['SIM_EXEC_TIME'] is set to $GLOBALS['EXEC_TIME']
      * in bootstrap initializeGlobalTimeVariables(). Alter it by adding or subtracting seconds.
-     *
-     * @return void
      */
     public function clear_preview()
     {
@@ -1206,8 +1193,6 @@ class TypoScriptFrontendController
      * Basically this function is about determining whether a backend user is logged in,
      * if he has read access to the page and if he's previewing the page.
      * That all determines which id to show and how to initialize the id.
-     *
-     * @return void
      */
     public function determineId()
     {
@@ -1391,7 +1376,6 @@ class TypoScriptFrontendController
      * Sets variables such as $this->sys_page, $this->loginUser, $this->gr_list, $this->id, $this->type, $this->domainStartPage
      *
      * @throws ServiceUnavailableException
-     * @return void
      * @access private
      */
     public function fetch_the_id()
@@ -1489,7 +1473,6 @@ class TypoScriptFrontendController
      *
      * @throws ServiceUnavailableException
      * @throws PageNotFoundException
-     * @return void
      * @access private
      */
     public function getPageAndRootline()
@@ -1862,7 +1845,6 @@ class TypoScriptFrontendController
      * If not inside domain, then default to first page in domain.
      *
      * @param int $domainStartPage Page uid of the page where the found domain record is (pid of the domain record)
-     * @return void
      * @access private
      */
     public function getPageAndRootlineWithDomain($domainStartPage)
@@ -1890,7 +1872,6 @@ class TypoScriptFrontendController
     /**
      * Sets sys_page where-clause
      *
-     * @return void
      * @access private
      */
     public function setSysPageWhereClause()
@@ -1936,7 +1917,6 @@ class TypoScriptFrontendController
      *
      * @param string $reason Reason text
      * @param string $header HTTP header to send
-     * @return void Function exits.
      */
     public function pageUnavailableAndExit($reason = '', $header = '')
     {
@@ -1950,7 +1930,6 @@ class TypoScriptFrontendController
      *
      * @param string $reason Reason text
      * @param string $header HTTP header to send
-     * @return void Function exits.
      */
     public function pageNotFoundAndExit($reason = '', $header = '')
     {
@@ -1987,7 +1966,6 @@ class TypoScriptFrontendController
      * @param mixed $code Which type of handling; If a true PHP-boolean or TRUE then a \TYPO3\CMS\Core\Messaging\ErrorpageMessage is outputted. If integer an error message with that number is shown. Otherwise the $code value is expected to be a "Location:" header value.
      * @param string $header If set, this is passed directly to the PHP function, header()
      * @param string $reason If set, error messages will also mention this as the reason for the page-not-found.
-     * @return void (The function exits!)
      */
     public function pageUnavailableHandler($code, $header, $reason)
     {
@@ -2000,7 +1978,6 @@ class TypoScriptFrontendController
      * @param mixed $code Which type of handling; If a true PHP-boolean or TRUE then a \TYPO3\CMS\Core\Messaging\ErrorpageMessage is outputted. If integer an error message with that number is shown. Otherwise the $code value is expected to be a "Location:" header value.
      * @param string $header If set, this is passed directly to the PHP function, header()
      * @param string $reason If set, error messages will also mention this as the reason for the page-not-found.
-     * @return void (The function exits!)
      */
     public function pageNotFoundHandler($code, $header = '', $reason = '')
     {
@@ -2015,7 +1992,6 @@ class TypoScriptFrontendController
      * @param string $header If set, this is passed directly to the PHP function, header()
      * @param string $reason If set, error messages will also mention this as the reason for the page-not-found.
      * @throws \RuntimeException
-     * @return void (The function exits!)
      */
     public function pageErrorHandler($code, $header = '', $reason = '')
     {
@@ -2148,7 +2124,6 @@ class TypoScriptFrontendController
      * Fetches the integer page id for a page alias.
      * Looks if ->id is not an integer and if so it will search for a page alias and if found the page uid of that page is stored in $this->id
      *
-     * @return void
      * @access private
      */
     public function checkAndSetAlias()
@@ -2167,7 +2142,6 @@ class TypoScriptFrontendController
      * Merging values into the global $_GET
      *
      * @param array $GET_VARS Array of key/value pairs that will be merged into the current GET-vars. (Non-escaped values)
-     * @return void
      */
     public function mergingWithGetVars($GET_VARS)
     {
@@ -2208,7 +2182,6 @@ class TypoScriptFrontendController
      * Calculated hash is stored in $this->cHash_array.
      * This is used to cache pages with more parameters than just id and type.
      *
-     * @return void
      * @see reqCHash()
      */
     public function makeCacheHash()
@@ -2243,7 +2216,6 @@ class TypoScriptFrontendController
      * Will disable caching if the cHash value was not set.
      * This function should be called to check the _existence_ of "&cHash" whenever a plugin generating cacheable output is using extra GET variables. If there _is_ a cHash value the validation of it automatically takes place in makeCacheHash() (see above)
      *
-     * @return void
      * @see makeCacheHash(), \TYPO3\CMS\Frontend\Plugin\AbstractPlugin::pi_cHashCheck()
      */
     public function reqCHash()
@@ -2263,8 +2235,6 @@ class TypoScriptFrontendController
 
     /**
      * Initialize the TypoScript template parser
-     *
-     * @return void
      */
     public function initTemplate()
     {
@@ -2507,7 +2477,6 @@ class TypoScriptFrontendController
      * Checks if config-array exists already but if not, gets it
      *
      * @throws ServiceUnavailableException
-     * @return void
      */
     public function getConfigArray()
     {
@@ -2617,7 +2586,6 @@ class TypoScriptFrontendController
      * Setting the language key that will be used by the current page.
      * In this function it should be checked, 1) that this language exists, 2) that a page_overlay_record exists, .. and if not the default language, 0 (zero), should be set.
      *
-     * @return void
      * @access private
      */
     public function settingLanguage()
@@ -2734,8 +2702,6 @@ class TypoScriptFrontendController
 
     /**
      * Setting locale for frontend rendering
-     *
-     * @return void
      */
     public function settingLocale()
     {
@@ -2766,8 +2732,6 @@ class TypoScriptFrontendController
      * target than the original language page.
      * If that is the case, things get corrected to follow that alternative
      * shortcut
-     *
-     * @return void
      */
     protected function checkTranslatedShortcut()
     {
@@ -2789,8 +2753,6 @@ class TypoScriptFrontendController
     /**
      * Handle data submission
      * This is done at this point, because we need the config values
-     *
-     * @return void
      */
     public function handleDataSubmission()
     {
@@ -2861,7 +2823,6 @@ class TypoScriptFrontendController
      * Sets the URL_ID_TOKEN in the internal var, $this->getMethodUrlIdToken
      * This feature allows sessions to use a GET-parameter instead of a cookie.
      *
-     * @return void
      * @access private
      */
     public function setUrlIdToken()
@@ -2876,8 +2837,6 @@ class TypoScriptFrontendController
     /**
      * Calculates and sets the internal linkVars based upon the current
      * $_GET parameters and the setting "config.linkVars".
-     *
-     * @return void
      */
     public function calculateLinkVars()
     {
@@ -2919,8 +2878,6 @@ class TypoScriptFrontendController
      *
      * If the current page is of type mountpoint and should be overlaid with the contents of the mountpoint page
      * and is accessed directly, the user will be redirected to the mountpoint context.
-     *
-     * @return void
      */
     public function checkPageForMountpointRedirect()
     {
@@ -2934,8 +2891,6 @@ class TypoScriptFrontendController
      *
      * If the current page is of type shortcut and accessed directly via its URL, this function redirects to the
      * Shortcut target using a Location header.
-     *
-     * @return void If page is not a Shortcut, redirects and exits otherwise
      */
     public function checkPageForShortcutRedirect()
     {
@@ -2947,8 +2902,6 @@ class TypoScriptFrontendController
     /**
      * Builds a typolink to the current page, appends the type paremeter if required
      * and redirects the user to the generated URL using a Location header.
-     *
-     * @return void
      */
     protected function redirectToCurrentPage()
     {
@@ -2990,8 +2943,6 @@ class TypoScriptFrontendController
     /**
      * Temp cache content
      * The temporary cache will expire after a few seconds (typ. 30) or will be cleared by the rendered page, which will also clear and rewrite the cache.
-     *
-     * @return void
      */
     public function tempPageCacheContent()
     {
@@ -3046,8 +2997,6 @@ class TypoScriptFrontendController
 
     /**
      * Set cache content to $this->content
-     *
-     * @return void
      */
     public function realPageCacheContent()
     {
@@ -3084,7 +3033,6 @@ class TypoScriptFrontendController
      * @param string $content The content to store in the HTML field of the cache table
      * @param mixed $data The additional cache_data array, fx. $this->config
      * @param int $expirationTstamp Expiration timestamp
-     * @return void
      * @see realPageCacheContent(), tempPageCacheContent()
      */
     public function setPageCacheContent($content, $data, $expirationTstamp)
@@ -3119,8 +3067,6 @@ class TypoScriptFrontendController
 
     /**
      * Clears cache content (for $this->newHash)
-     *
-     * @return void
      */
     public function clearPageCacheContent()
     {
@@ -3131,7 +3077,6 @@ class TypoScriptFrontendController
      * Clears cache content for a list of page ids
      *
      * @param string $pidList A list of INTEGER numbers which points to page uids for which to clear entries in the cache_pages cache (page content cache)
-     * @return void
      */
     public function clearPageCacheContent_pidList($pidList)
     {
@@ -3145,7 +3090,6 @@ class TypoScriptFrontendController
      * Sets sys last changed
      * Setting the SYS_LASTCHANGED value in the pagerecord: This value will thus be set to the highest tstamp of records rendered on the page. This includes all records with no regard to hidden records, userprotection and so on.
      *
-     * @return void
      * @see ContentObjectRenderer::lastChanged()
      */
     public function setSysLastChanged()
@@ -3170,7 +3114,6 @@ class TypoScriptFrontendController
      * Release pending locks
      *
      * @internal
-     * @return void
      */
     public function releaseLocks()
     {
@@ -3183,7 +3126,6 @@ class TypoScriptFrontendController
      * entries by tag
      *
      * @param array $tags An array of tag
-     * @return void
      */
     public function addCacheTags(array $tags)
     {
@@ -3197,8 +3139,6 @@ class TypoScriptFrontendController
      *******************************************/
     /**
      * Does some processing BEFORE the pagegen script is included.
-     *
-     * @return void
      */
     public function generatePage_preProcessing()
     {
@@ -3400,8 +3340,6 @@ class TypoScriptFrontendController
     /**
      * Does some processing AFTER the pagegen script is included.
      * This includes caching the page, indexing the page (if configured) and setting sysLastChanged
-     *
-     * @return void
      */
     public function generatePage_postProcessing()
     {
@@ -3453,8 +3391,6 @@ class TypoScriptFrontendController
 
     /**
      * Generate the page title again as TSFE->altPageTitle might have been modified by an inc script
-     *
-     * @return void
      */
     protected function regeneratePageTitle()
     {
@@ -3463,8 +3399,6 @@ class TypoScriptFrontendController
 
     /**
      * Processes the INTinclude-scripts
-     *
-     * @return void
      */
     public function INTincScript()
     {
@@ -3528,7 +3462,6 @@ class TypoScriptFrontendController
      * Processes the INTinclude-scripts and substitue in content.
      *
      * @param array $INTiS_config $GLOBALS['TSFE']->config['INTincScript'] or part of it
-     * @return void
      * @see INTincScript()
      */
     protected function INTincScript_process($INTiS_config)
@@ -3576,8 +3509,6 @@ class TypoScriptFrontendController
 
     /**
      * Loads the JavaScript code for INTincScript
-     *
-     * @return void
      */
     public function INTincScript_loadJSCode()
     {
@@ -3650,8 +3581,6 @@ class TypoScriptFrontendController
      * This includes substituting the "username" comment, sending additional headers
      * (as defined in the TypoScript "config.additionalheaders" object), XHTML cleaning content (if configured)
      * Works on $this->content.
-     *
-     * @return void
      */
     public function processOutput()
     {
@@ -3713,7 +3642,6 @@ class TypoScriptFrontendController
      * Send cache headers good for client/reverse proxy caching
      * This function should not be called if the page content is temporary (like for "Page is being generated..." message, but in that case it is ok because the config-variables are not yet available and so will not allow to send cache headers)
      *
-     * @return void
      * @co-author Ole Tange, Forbrugernes Hus, Denmark
      */
     public function sendCacheHeaders()
@@ -3776,8 +3704,6 @@ class TypoScriptFrontendController
 
     /**
      * Substitute various tokens in content. This should happen only if the content is not cached by proxies or client browsers.
-     *
-     * @return void
      */
     public function contentStrReplace()
     {
@@ -3821,8 +3747,6 @@ class TypoScriptFrontendController
 
     /**
      * Stores session data for the front end user
-     *
-     * @return void
      */
     public function storeSessionData()
     {
@@ -3832,7 +3756,6 @@ class TypoScriptFrontendController
     /**
      * Sets the parsetime of the page.
      *
-     * @return void
      * @access private
      * @deprecated since TYPO3 v8, will be removed in TYPO3 v9, as the Request Handler is taking care of that now
      */
@@ -3850,8 +3773,6 @@ class TypoScriptFrontendController
 
     /**
      * Outputs preview info.
-     *
-     * @return void
      */
     public function previewInfo()
     {
@@ -3869,8 +3790,6 @@ class TypoScriptFrontendController
 
     /**
      * End-Of-Frontend hook
-     *
-     * @return void
      */
     public function hook_eofe()
     {
@@ -3910,8 +3829,6 @@ class TypoScriptFrontendController
 
     /**
      * Sends HTTP headers for temporary content. These headers prevent search engines from caching temporary content and asks them to revisit this page again.
-     *
-     * @return void
      */
     public function addTempContentHttpHeaders()
     {
@@ -3995,7 +3912,6 @@ class TypoScriptFrontendController
      * Creates an instance of ContentObjectRenderer in $this->cObj
      * This instance is used to start the rendering of the TypoScript template structure
      *
-     * @return void
      * @see pagegen.php
      */
     public function newCObj()
@@ -4007,7 +3923,6 @@ class TypoScriptFrontendController
     /**
      * Converts relative paths in the HTML source to absolute paths for fileadmin/, typo3conf/ext/ and media/ folders.
      *
-     * @return void
      * @access private
      * @see pagegen.php, INTincScript()
      */
@@ -4076,7 +3991,6 @@ class TypoScriptFrontendController
      *
      * @param string $typoScriptProperty Deprecated object or property
      * @param string $explanation Message or additional information
-     * @return void
      */
     public function logDeprecatedTyposcript($typoScriptProperty, $explanation = '')
     {
@@ -4089,7 +4003,6 @@ class TypoScriptFrontendController
      * Updates the tstamp field of a cache_md5params record to the current time.
      *
      * @param string $hash The hash string identifying the cache_md5params record for which to update the "tstamp" field to the current time.
-     * @return void
      * @access private
      */
     public function updateMD5paramsRecord($hash)
@@ -4167,7 +4080,6 @@ class TypoScriptFrontendController
      * Includes a comma-separated list of library files by PHP function include_once.
      *
      * @param array $libraries The libraries to be included.
-     * @return void
      * @deprecated since TYPO3 v8, will be removed in TYPO3 v9, use proper class loading instead.
      */
     public function includeLibraries(array $libraries)
@@ -4230,7 +4142,6 @@ class TypoScriptFrontendController
      *
      * @param string $key is the key in the array, for num-key let the value be empty. Note reserved keys 'openPic' and 'mouseOver'
      * @param string $content is the content if you want any
-     * @return void
      * @see \TYPO3\CMS\Frontend\ContentObject\Menu\GraphicalMenuContentObject::writeMenu(), ContentObjectRenderer::imageLinkWrap()
      */
     public function setJS($key, $content = '')
@@ -4268,7 +4179,6 @@ class TypoScriptFrontendController
      *
      * @param string $key Is the key in the array, for num-key let the value be empty
      * @param string $content Is the content if you want any
-     * @return void
      * @see setJS()
      */
     public function setCSS($key, $content)
@@ -4295,7 +4205,6 @@ class TypoScriptFrontendController
      *
      * @param string $reason An optional reason to be written to the syslog.
      * @param bool $internal Whether the call is done from core itself (should only be used by core).
-     * @return void
      */
     public function set_no_cache($reason = '', $internal = false)
     {
@@ -4334,7 +4243,6 @@ class TypoScriptFrontendController
     /**
      * Disables caching of the current page.
      *
-     * @return void
      * @internal
      */
     protected function disableCache()
@@ -4346,7 +4254,6 @@ class TypoScriptFrontendController
      * Sets the cache-timeout in seconds
      *
      * @param int $seconds Cache-timeout in seconds
-     * @return void
      */
     public function set_cache_timeout_default($seconds)
     {
@@ -4514,8 +4421,6 @@ class TypoScriptFrontendController
 
     /**
      * Initializing the getLL variables needed.
-     *
-     * @return void
      */
     public function initLLvars()
     {
@@ -4590,8 +4495,6 @@ class TypoScriptFrontendController
 
     /**
      * Converts the $_POST array from metaCharset (page HTML charset from input form) to utf-8 (internal processing) IF the two charsets are different.
-     *
-     * @return void
      */
     public function convPOSTCharset()
     {
diff --git a/typo3/sysext/frontend/Classes/DataProcessing/GalleryProcessor.php b/typo3/sysext/frontend/Classes/DataProcessing/GalleryProcessor.php
index 24a99883330653487eb648b965b34b9872571f91..3d351fd5bb4f349faf3b4eab53345465d0010a76 100644
--- a/typo3/sysext/frontend/Classes/DataProcessing/GalleryProcessor.php
+++ b/typo3/sysext/frontend/Classes/DataProcessing/GalleryProcessor.php
@@ -91,7 +91,6 @@ use TYPO3\CMS\Frontend\ContentObject\Exception\ContentRenderingException;
  *     padding = 0
  *   }
  * }
- *
  */
 class GalleryProcessor implements DataProcessorInterface
 {
@@ -314,8 +313,6 @@ class GalleryProcessor implements DataProcessorInterface
      *
      * Gallery has a horizontal and a vertical position towards the text
      * and a possible wrapping of the text around the gallery.
-     *
-     * @return void
      */
     protected function determineGalleryPosition()
     {
@@ -334,8 +331,6 @@ class GalleryProcessor implements DataProcessorInterface
 
     /**
      * Get the gallery width based on vertical position
-     *
-     * @return void
      */
     protected function determineMaximumGalleryWidth()
     {
@@ -348,8 +343,6 @@ class GalleryProcessor implements DataProcessorInterface
 
     /**
      * Calculate the amount of rows and columns
-     *
-     * @return void
      */
     protected function calculateRowsAndColumns()
     {
@@ -380,8 +373,6 @@ class GalleryProcessor implements DataProcessorInterface
      * the use of a border, defined by user, where the border width and padding are taken into account
      *
      * File objects MUST already be filtered. They need a height and width to be shown in the gallery
-     *
-     * @return void
      */
     protected function calculateMediaWidthsAndHeights()
     {
@@ -495,8 +486,6 @@ class GalleryProcessor implements DataProcessorInterface
      * Prepare the gallery data
      *
      * Make an array for rows, columns and configuration
-     *
-     * @return void
      */
     protected function prepareGalleryData()
     {
diff --git a/typo3/sysext/frontend/Classes/DataProcessing/MenuProcessor.php b/typo3/sysext/frontend/Classes/DataProcessing/MenuProcessor.php
index d95596a04b650047ccc09cd0d36f6d45d6104a77..0888d56311985dd0a11da476f2de6d61c80f45d8 100644
--- a/typo3/sysext/frontend/Classes/DataProcessing/MenuProcessor.php
+++ b/typo3/sysext/frontend/Classes/DataProcessing/MenuProcessor.php
@@ -54,7 +54,6 @@ use TYPO3\CMS\Frontend\ContentObject\DataProcessorInterface;
  *     }
  *   }
  * }
- *
  */
 class MenuProcessor implements DataProcessorInterface
 {
@@ -293,7 +292,6 @@ class MenuProcessor implements DataProcessorInterface
 
     /**
      * Prepare configuration for a certain menu level in the hierarchy
-     * @return void
      */
     public function prepareLevelConfiguration()
     {
@@ -309,7 +307,6 @@ class MenuProcessor implements DataProcessorInterface
 
     /**
      * Prepare the configuration when rendering a language menu
-     * @return void
      */
     public function prepareLevelLanguageConfiguration()
     {
@@ -341,8 +338,6 @@ class MenuProcessor implements DataProcessorInterface
 
     /**
      * Build the menu configuration so it can be treated by HMENU cObject
-     *
-     * @return void
      */
     public function buildConfiguration()
     {
@@ -492,7 +487,6 @@ class MenuProcessor implements DataProcessorInterface
      *
      * @param array $menuItem
      * @param array $conf
-     * @return void
      */
     public function replacePlaceholderInRenderedMenuItem($menuItem, $conf)
     {
diff --git a/typo3/sysext/frontend/Classes/Hooks/MediaItemHooks.php b/typo3/sysext/frontend/Classes/Hooks/MediaItemHooks.php
index 7677d7ad8cf0e5eb4dae0ccfa5272eec7b16b151..85a8b91c380ee7a92788bff526971aacdd42c00a 100644
--- a/typo3/sysext/frontend/Classes/Hooks/MediaItemHooks.php
+++ b/typo3/sysext/frontend/Classes/Hooks/MediaItemHooks.php
@@ -26,7 +26,6 @@ class MediaItemHooks implements \TYPO3\CMS\Core\SingletonInterface
      *
      * @param array $params Existing types by reference
      * @param array $conf Config array
-     * @return void
      */
     public function customMediaRenderTypes(&$params, $conf)
     {
@@ -43,7 +42,6 @@ class MediaItemHooks implements \TYPO3\CMS\Core\SingletonInterface
      *
      * @param array $params Existing types by reference
      * @param array $conf Config array
-     * @return void
      */
     public function customMediaParams(&$params, $conf)
     {
diff --git a/typo3/sysext/frontend/Classes/Hooks/PageLayoutView/ImagePreviewRenderer.php b/typo3/sysext/frontend/Classes/Hooks/PageLayoutView/ImagePreviewRenderer.php
index 10b5c079d80ce7a07b12a0753317608350fdff51..bb2312f70999c3085734ac8f7c53005670eb70a2 100644
--- a/typo3/sysext/frontend/Classes/Hooks/PageLayoutView/ImagePreviewRenderer.php
+++ b/typo3/sysext/frontend/Classes/Hooks/PageLayoutView/ImagePreviewRenderer.php
@@ -27,7 +27,6 @@ class ImagePreviewRenderer implements \TYPO3\CMS\Backend\View\PageLayoutViewDraw
      * @param string $headerContent Header content
      * @param string $itemContent Item content
      * @param array $row Record row of tt_content
-     * @return void
      */
     public function preProcess(
         \TYPO3\CMS\Backend\View\PageLayoutView &$parentObject,
diff --git a/typo3/sysext/frontend/Classes/Hooks/PageLayoutView/TextPreviewRenderer.php b/typo3/sysext/frontend/Classes/Hooks/PageLayoutView/TextPreviewRenderer.php
index a1f2ffa101ac2a4f7d9fa1a4a0ae799d6d672f5c..20df23924eed11159296f5a8be5c0695d42c7c51 100644
--- a/typo3/sysext/frontend/Classes/Hooks/PageLayoutView/TextPreviewRenderer.php
+++ b/typo3/sysext/frontend/Classes/Hooks/PageLayoutView/TextPreviewRenderer.php
@@ -27,7 +27,6 @@ class TextPreviewRenderer implements \TYPO3\CMS\Backend\View\PageLayoutViewDrawI
      * @param string $headerContent Header content
      * @param string $itemContent Item content
      * @param array $row Record row of tt_content
-     * @return void
      */
     public function preProcess(
         \TYPO3\CMS\Backend\View\PageLayoutView &$parentObject,
diff --git a/typo3/sysext/frontend/Classes/Hooks/PageLayoutView/TextmediaPreviewRenderer.php b/typo3/sysext/frontend/Classes/Hooks/PageLayoutView/TextmediaPreviewRenderer.php
index 9010f2339b06459e1dcffd4216761cf9bf8572ea..c4736da79f2ad941a55017f4dc5c37f752c4341f 100644
--- a/typo3/sysext/frontend/Classes/Hooks/PageLayoutView/TextmediaPreviewRenderer.php
+++ b/typo3/sysext/frontend/Classes/Hooks/PageLayoutView/TextmediaPreviewRenderer.php
@@ -31,8 +31,6 @@ class TextmediaPreviewRenderer implements PageLayoutViewDrawItemHookInterface
      * @param string $headerContent Header content
      * @param string $itemContent Item content
      * @param array $row Record row of tt_content
-     *
-     * @return void
      */
     public function preProcess(
         PageLayoutView &$parentObject,
diff --git a/typo3/sysext/frontend/Classes/Hooks/PageLayoutView/TextpicPreviewRenderer.php b/typo3/sysext/frontend/Classes/Hooks/PageLayoutView/TextpicPreviewRenderer.php
index 5639e5478862c2195eb37ae7d8b3a02fe02cc395..e6e37e05d07ecb613711036e10c176ac4a764c7f 100644
--- a/typo3/sysext/frontend/Classes/Hooks/PageLayoutView/TextpicPreviewRenderer.php
+++ b/typo3/sysext/frontend/Classes/Hooks/PageLayoutView/TextpicPreviewRenderer.php
@@ -27,7 +27,6 @@ class TextpicPreviewRenderer implements \TYPO3\CMS\Backend\View\PageLayoutViewDr
      * @param string $headerContent Header content
      * @param string $itemContent Item content
      * @param array $row Record row of tt_content
-     * @return void
      */
     public function preProcess(
         \TYPO3\CMS\Backend\View\PageLayoutView &$parentObject,
diff --git a/typo3/sysext/frontend/Classes/Hooks/TreelistCacheUpdateHooks.php b/typo3/sysext/frontend/Classes/Hooks/TreelistCacheUpdateHooks.php
index 0bf670aaadb77221b79c51fd689b67d2e8525a4d..34a8560dd7328382141b9d2d970749d92a2402a6 100644
--- a/typo3/sysext/frontend/Classes/Hooks/TreelistCacheUpdateHooks.php
+++ b/typo3/sysext/frontend/Classes/Hooks/TreelistCacheUpdateHooks.php
@@ -67,7 +67,6 @@ class TreelistCacheUpdateHooks
      * @param mixed $recordId The record's uid for update records, a string to look the record's uid up after it has been created
      * @param array $updatedFields Array of changed fields and their new values
      * @param DataHandler $dataHandler DataHandler parent object
-     * @return void
      */
     public function processDatamap_afterDatabaseOperations($status, $table, $recordId, array $updatedFields, DataHandler $dataHandler)
     {
@@ -101,7 +100,6 @@ class TreelistCacheUpdateHooks
      * @param int $recordId The record's uid
      * @param array $commandValue The commands value, typically an array with more detailed command information
      * @param DataHandler $dataHandler The DataHandler parent object
-     * @return void
      */
     public function processCmdmap_postProcess($command, $table, $recordId, $commandValue, DataHandler $dataHandler)
     {
@@ -138,7 +136,6 @@ class TreelistCacheUpdateHooks
      * @param array $movedRecord The record that moved
      * @param array $updatedFields Array of changed fields
      * @param DataHandler $dataHandler DataHandler parent object
-     * @return void
      */
     public function moveRecord_firstElementPostProcess($table, $recordId, $destinationPid, array $movedRecord, array $updatedFields, DataHandler $dataHandler)
     {
@@ -165,7 +162,6 @@ class TreelistCacheUpdateHooks
      * @param array $movedRecord The record that moved
      * @param array $updatedFields Array of changed fields
      * @param DataHandler $dataHandler DataHandler parent object
-     * @return void
      */
     public function moveRecord_afterAnotherElementPostProcess($table, $recordId, $destinationPid, $originalDestinationPid, array $movedRecord, array $updatedFields, DataHandler $dataHandler)
     {
@@ -207,7 +203,6 @@ class TreelistCacheUpdateHooks
      * @param int $affectedParentPage parent uid of the affected page
      * @param array $updatedFields Array of updated fields and their new values
      * @param array $actions Array of actions to carry out
-     * @return void
      */
     protected function processClearCacheActions($affectedPage, $affectedParentPage, $updatedFields, array $actions)
     {
@@ -240,7 +235,6 @@ class TreelistCacheUpdateHooks
      * gets called after creating a new page and after moving a page
      *
      * @param int $affectedParentPage Parent page id of the changed page, the page to start clearing from
-     * @return void
      */
     protected function clearCacheForAllParents($affectedParentPage)
     {
@@ -271,7 +265,6 @@ class TreelistCacheUpdateHooks
      * in the treelist
      *
      * @param int $affectedPage ID of the changed page
-     * @return void
      */
     protected function clearCacheWhereUidInTreelist($affectedPage)
     {
@@ -291,7 +284,6 @@ class TreelistCacheUpdateHooks
      *
      * @param int $affectedPage Uid of the changed page
      * @param int $expirationTime
-     * @return void
      */
     protected function setCacheExpiration($affectedPage, $expirationTime)
     {
@@ -308,8 +300,6 @@ class TreelistCacheUpdateHooks
 
     /**
      * Removes all expired treelist cache entries
-     *
-     * @return void
      */
     protected function removeExpiredCacheEntries()
     {
diff --git a/typo3/sysext/frontend/Classes/Http/Application.php b/typo3/sysext/frontend/Classes/Http/Application.php
index a3015ea26c9957abc30bdebcdb6edc38134abab8..d9b33fadd83785b71f1479e1e116204bb044becc 100644
--- a/typo3/sysext/frontend/Classes/Http/Application.php
+++ b/typo3/sysext/frontend/Classes/Http/Application.php
@@ -73,7 +73,6 @@ class Application implements ApplicationInterface
      * Starting point
      *
      * @param callable $execute
-     * @return void
      */
     public function run(callable $execute = null)
     {
diff --git a/typo3/sysext/frontend/Classes/Http/RequestHandler.php b/typo3/sysext/frontend/Classes/Http/RequestHandler.php
index 59a53c52e2705c232de39aba07d36f52e3cbecce..ecc129ed79d88e2aa37aba68d608dbc03140c52c 100644
--- a/typo3/sysext/frontend/Classes/Http/RequestHandler.php
+++ b/typo3/sysext/frontend/Classes/Http/RequestHandler.php
@@ -315,8 +315,6 @@ class RequestHandler implements RequestHandlerInterface
 
     /**
      * Timetracking started depending if a Backend User is logged in
-     *
-     * @return void
      */
     protected function initializeTimeTracker()
     {
@@ -329,8 +327,6 @@ class RequestHandler implements RequestHandlerInterface
 
     /**
      * Creates an instance of TSFE and sets it as a global variable
-     *
-     * @return void
      */
     protected function initializeController()
     {
diff --git a/typo3/sysext/frontend/Classes/Http/UrlHandlerInterface.php b/typo3/sysext/frontend/Classes/Http/UrlHandlerInterface.php
index f3870164e452609f4bc83c4bcb06d2e485130eda..248b2ec7f651a915948878b8a52e968ded6e48d8 100644
--- a/typo3/sysext/frontend/Classes/Http/UrlHandlerInterface.php
+++ b/typo3/sysext/frontend/Classes/Http/UrlHandlerInterface.php
@@ -40,7 +40,6 @@ interface UrlHandlerInterface
      * This hook will be called BEFORE the user is redirected to an external URL configured in the page properties.
      *
      * @see \TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController::redirectToExternalUrl()
-     * @return void
      */
     public function handle();
 }
diff --git a/typo3/sysext/frontend/Classes/Imaging/GifBuilder.php b/typo3/sysext/frontend/Classes/Imaging/GifBuilder.php
index 08645599d67dfb910c6c884f414275136cded447..77b1ca1552c82715f45ce334c8ea2af27762c72c 100644
--- a/typo3/sysext/frontend/Classes/Imaging/GifBuilder.php
+++ b/typo3/sysext/frontend/Classes/Imaging/GifBuilder.php
@@ -107,7 +107,6 @@ class GifBuilder extends GraphicalFunctions
      *
      * @param array $conf TypoScript properties for the GIFBUILDER session. Stored internally in the variable ->setup
      * @param array $data The current data record from \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer. Stored internally in the variable ->data
-     * @return void
      * @see ContentObjectRenderer::getImgResource(), \TYPO3\CMS\Frontend\ContentObject\Menu\GraphicalMenuContentObject::makeGifs(), \TYPO3\CMS\Frontend\ContentObject\Menu\GraphicalMenuContentObject::findLargestDims()
      */
     public function start($conf, $data)
@@ -365,7 +364,6 @@ class GifBuilder extends GraphicalFunctions
      * Creates a GDlib resource in $this->im and works on that
      * Called by gifBuild()
      *
-     * @return void
      * @access private
      * @see gifBuild()
      */
diff --git a/typo3/sysext/frontend/Classes/Page/ExternalPageUrlHandler.php b/typo3/sysext/frontend/Classes/Page/ExternalPageUrlHandler.php
index efbbf86cfcca9e42ccf6872308448229ba3d0e5e..1448930f8c24b0eb945c327d1ffe2c60ab420923 100644
--- a/typo3/sysext/frontend/Classes/Page/ExternalPageUrlHandler.php
+++ b/typo3/sysext/frontend/Classes/Page/ExternalPageUrlHandler.php
@@ -49,8 +49,6 @@ class ExternalPageUrlHandler implements \TYPO3\CMS\Frontend\Http\UrlHandlerInter
 
     /**
      * Redirects the user to the detected external URL.
-     *
-     * @return void
      */
     public function handle()
     {
diff --git a/typo3/sysext/frontend/Classes/Page/PageGenerator.php b/typo3/sysext/frontend/Classes/Page/PageGenerator.php
index 22ebcfa2024d7c0288291fb073323c119a7043b8..311ca3a6b81fdf560d204025b2efe4156e815a0a 100644
--- a/typo3/sysext/frontend/Classes/Page/PageGenerator.php
+++ b/typo3/sysext/frontend/Classes/Page/PageGenerator.php
@@ -42,7 +42,6 @@ class PageGenerator
      * Setting some vars in TSFE, primarily based on TypoScript config settings.
      *
      * @deprecated since TYPO3 v8, will be removed in TYPO3 v9
-     * @return void
      */
     public static function pagegenInit()
     {
@@ -172,8 +171,6 @@ class PageGenerator
 
     /**
      * Rendering the page content
-     *
-     * @return void
      */
     public static function renderContent()
     {
@@ -208,7 +205,6 @@ class PageGenerator
      * Rendering normal HTML-page with header by wrapping the generated content ($pageContent) in body-tags and setting the header accordingly.
      *
      * @param string $pageContent The page content which TypoScript objects has generated
-     * @return void
      */
     public static function renderContentWithHeader($pageContent)
     {
@@ -1025,8 +1021,6 @@ class PageGenerator
      * Takes the settings [config][noPageTitle], [config][pageTitleFirst], [config][titleTagFunction]
      * [config][pageTitleSeparator] and [config][noPageTitle] into account.
      * Furthermore $GLOBALS[TSFE]->altPageTitle is observed.
-     *
-     * @return void
      */
     public static function generatePageTitle()
     {
diff --git a/typo3/sysext/frontend/Classes/Page/PageRepository.php b/typo3/sysext/frontend/Classes/Page/PageRepository.php
index e89557e686f90c81dad967a9d3f1f40344a35b28..dad992888d04222d878029e66a826882915c1cb3 100644
--- a/typo3/sysext/frontend/Classes/Page/PageRepository.php
+++ b/typo3/sysext/frontend/Classes/Page/PageRepository.php
@@ -175,7 +175,6 @@ class PageRepository
      * into account
      *
      * @param bool $show_hidden If $show_hidden is TRUE, the hidden-field is ignored!! Normally this should be FALSE. Is used for previewing.
-     * @return void
      * @see \TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController::fetch_the_id(), \TYPO3\CMS\Tstemplate\Controller\TemplateAnalyzerModuleFunctionController::initialize_editor()
      */
     public function init($show_hidden)
@@ -1283,7 +1282,6 @@ class PageRepository
      * @param mixed $data The data to store
      * @param string $ident Is just a textual identification in order to inform about the content!
      * @param int $lifetime The lifetime for the cache entry in seconds
-     * @return void
      * @see tslib_TStemplate::start(), getHash()
      */
     public static function storeHash($hash, $data, $ident, $lifetime = 0)
@@ -1469,7 +1467,6 @@ class PageRepository
      *
      * @param string $table Table name
      * @param array $rr Record array passed by reference. As minimum, "pid" and "uid" fields must exist! "t3ver_oid" and "t3ver_wsid" is nice and will save you a DB query.
-     * @return void (Passed by ref).
      * @see BackendUtility::fixVersioningPid(), versionOL(), getRootLine()
      */
     public function fixVersioningPid($table, &$rr)
@@ -1529,7 +1526,6 @@ class PageRepository
      * @param array $row Record array passed by reference. As minimum, the "uid", "pid" and "t3ver_state" fields must exist! The record MAY be set to FALSE in which case the calling function should act as if the record is forbidden to access!
      * @param bool $unsetMovePointers If set, the $row is cleared in case it is a move-pointer. This is only for preview of moved records (to remove the record from the original location so it appears only in the new location)
      * @param bool $bypassEnableFieldsCheck Unless this option is TRUE, the $row is unset if enablefields for BOTH the version AND the online record deselects it. This is because when versionOL() is called it is assumed that the online record is already selected with no regards to it's enablefields. However, after looking for a new version the online record enablefields must ALSO be evaluated of course. This is done all by this function!
-     * @return void (Passed by ref).
      * @see fixVersioningPid(), BackendUtility::workspaceOL()
      */
     public function versionOL($table, &$row, $unsetMovePointers = false, $bypassEnableFieldsCheck = false)
diff --git a/typo3/sysext/frontend/Classes/Page/PageRepositoryGetPageHookInterface.php b/typo3/sysext/frontend/Classes/Page/PageRepositoryGetPageHookInterface.php
index 3660ce2aae146388ce4b27bc13f285cb8be6bb47..67af1df1fee3d87c8c0c4d2cf8abe7962a3f13ac 100644
--- a/typo3/sysext/frontend/Classes/Page/PageRepositoryGetPageHookInterface.php
+++ b/typo3/sysext/frontend/Classes/Page/PageRepositoryGetPageHookInterface.php
@@ -25,7 +25,6 @@ interface PageRepositoryGetPageHookInterface
      * @param int $uid The page ID
      * @param bool $disableGroupAccessCheck If set, the check for group access is disabled. VERY rarely used
      * @param \TYPO3\CMS\Frontend\Page\PageRepository $parentObject Parent object
-     * @return void
      */
     public function getPage_preProcess(&$uid, &$disableGroupAccessCheck, PageRepository $parentObject);
 }
diff --git a/typo3/sysext/frontend/Classes/Page/PageRepositoryGetPageOverlayHookInterface.php b/typo3/sysext/frontend/Classes/Page/PageRepositoryGetPageOverlayHookInterface.php
index 27ce7e839e312c49b36598d362febcf666ec30f0..ef901d79ae039f2e993d3c962bf7f8737c20aa99 100644
--- a/typo3/sysext/frontend/Classes/Page/PageRepositoryGetPageOverlayHookInterface.php
+++ b/typo3/sysext/frontend/Classes/Page/PageRepositoryGetPageOverlayHookInterface.php
@@ -25,7 +25,6 @@ interface PageRepositoryGetPageOverlayHookInterface
      * @param array $pageInput The page record
      * @param int $lUid The overlay language
      * @param \TYPO3\CMS\Frontend\Page\PageRepository $parent The calling parent object
-     * @return void
      */
     public function getPageOverlay_preProcess(&$pageInput, &$lUid, PageRepository $parent);
 }
diff --git a/typo3/sysext/frontend/Classes/Page/PageRepositoryInitHookInterface.php b/typo3/sysext/frontend/Classes/Page/PageRepositoryInitHookInterface.php
index 2b5ddceb844f6dfb2b8c58eea93837026b035f6c..8f3f08fd657c850e7a18c193a95b6e9c44969430 100644
--- a/typo3/sysext/frontend/Classes/Page/PageRepositoryInitHookInterface.php
+++ b/typo3/sysext/frontend/Classes/Page/PageRepositoryInitHookInterface.php
@@ -16,7 +16,6 @@ namespace TYPO3\CMS\Frontend\Page;
 
 /**
  * Interface for classes which hook into pageSelect and do additional getPage processing
- *
  */
 interface PageRepositoryInitHookInterface
 {
@@ -24,7 +23,6 @@ interface PageRepositoryInitHookInterface
      * Modifies the DB params
      *
      * @param \TYPO3\CMS\Frontend\Page\PageRepository $parentObject Parent object
-     * @return void
      */
     public function init_postProcess(PageRepository $parentObject);
 }
diff --git a/typo3/sysext/frontend/Classes/Plugin/AbstractPlugin.php b/typo3/sysext/frontend/Classes/Plugin/AbstractPlugin.php
index 72b120750e6679599e28eccf79fdd0b089d898d1..53661a0074c697ee77d10a1c6f49694f4b1c14b4 100644
--- a/typo3/sysext/frontend/Classes/Plugin/AbstractPlugin.php
+++ b/typo3/sysext/frontend/Classes/Plugin/AbstractPlugin.php
@@ -317,8 +317,6 @@ class AbstractPlugin
 
     /**
      * If internal TypoScript property "_DEFAULT_PI_VARS." is set then it will merge the current $this->piVars array onto these default values.
-     *
-     * @return void
      */
     public function pi_setPiVarDefaults()
     {
@@ -989,7 +987,6 @@ class AbstractPlugin
      * Supported file extensions xlf, xml
      *
      * @param string $languageFilePath path to the plugin language file in format EXT:....
-     * @return void
      */
     public function pi_loadLL($languageFilePath = '')
     {
@@ -1362,7 +1359,6 @@ class AbstractPlugin
      * Converts $this->cObj->data['pi_flexform'] from XML string to flexForm array.
      *
      * @param string $field Field name to convert
-     * @return void
      */
     public function pi_initPIflexForm($field = 'pi_flexform')
     {
diff --git a/typo3/sysext/frontend/Classes/Resource/FileCollector.php b/typo3/sysext/frontend/Classes/Resource/FileCollector.php
index dbfc5536c5232b412a7bfb91df22c6d0a2c7fdc8..b2fe32fe12a727edc1cba41463f555ba6c454374 100644
--- a/typo3/sysext/frontend/Classes/Resource/FileCollector.php
+++ b/typo3/sysext/frontend/Classes/Resource/FileCollector.php
@@ -89,7 +89,6 @@ class FileCollector implements \Countable
      * @param string $relationTable The table of the relation (e.g. tt_content or pages)
      * @param string $relationField The field which holds the files (e.g. media or images)
      * @param array $referenceRecord the record which is referencing the files
-     * @return void
      */
     public function addFilesFromRelation($relationTable, $relationField, array $referenceRecord)
     {
@@ -108,7 +107,6 @@ class FileCollector implements \Countable
      * Add files from UIDs of a reference
      *
      * @param array $fileReferenceUids
-     * @return void
      */
     public function addFileReferences(array $fileReferenceUids = [])
     {
@@ -122,7 +120,6 @@ class FileCollector implements \Countable
      * Add files to the collection from multiple file collections
      *
      * @param array $fileCollectionUids The file collections uids
-     * @return void
      */
     public function addFilesFromFileCollections(array $fileCollectionUids = [])
     {
@@ -135,7 +132,6 @@ class FileCollector implements \Countable
      * Add files to the collection from one single file collection
      *
      * @param int $fileCollectionUid The file collections uid
-     * @return void
      */
     public function addFilesFromFileCollection($fileCollectionUid = null)
     {
@@ -164,7 +160,6 @@ class FileCollector implements \Countable
      *
      * @param array $folderIdentifiers The folder identifiers
      * @param bool $recursive Add files recursive from given folders
-     * @return void
      */
     public function addFilesFromFolders(array $folderIdentifiers = [], $recursive = false)
     {
@@ -203,7 +198,6 @@ class FileCollector implements \Countable
      *
      * @param string $sortingProperty The sorting property
      * @param string $sortingOrder can be ascending or descending or "random"
-     * @return void
      */
     public function sort($sortingProperty = '', $sortingOrder = 'ascending')
     {
@@ -239,7 +233,6 @@ class FileCollector implements \Countable
      * Add a file object to the collection
      *
      * @param FileInterface $file The file object
-     * @return void
      */
     public function addFileObject(FileInterface $file)
     {
@@ -250,7 +243,6 @@ class FileCollector implements \Countable
      * Add multiple file objects to the collection
      *
      * @param FileInterface[] $files The file objects
-     * @return void
      */
     public function addFileObjects($files)
     {
diff --git a/typo3/sysext/frontend/Classes/Utility/EidUtility.php b/typo3/sysext/frontend/Classes/Utility/EidUtility.php
index 92cc6c66e46e0afd32aae2ab8caca2a5f145d8fc..07345a9ec7cb6ea8ced52c2c94a0bb5650d02aaa 100644
--- a/typo3/sysext/frontend/Classes/Utility/EidUtility.php
+++ b/typo3/sysext/frontend/Classes/Utility/EidUtility.php
@@ -53,7 +53,6 @@ class EidUtility
      * Initializes $GLOBALS['LANG'] for use in eID scripts.
      *
      * @param string $language TYPO3 language code
-     * @return void
      */
     public static function initLanguage($language = 'default')
     {
@@ -65,8 +64,6 @@ class EidUtility
 
     /**
      * Makes TCA available inside eID
-     *
-     * @return void
      */
     public static function initTCA()
     {
@@ -84,7 +81,6 @@ class EidUtility
      * you need not to include the whole $GLOBALS['TCA'].
      *
      * @param string $extensionKey Extension key
-     * @return void
      */
     public static function initExtensionTCA($extensionKey)
     {
diff --git a/typo3/sysext/frontend/Classes/View/AdminPanelView.php b/typo3/sysext/frontend/Classes/View/AdminPanelView.php
index e2da71f68b08d0dd51531ab9c945afd0ee057e53..b6491395b64ad12140c7905390c3610413a31a24 100644
--- a/typo3/sysext/frontend/Classes/View/AdminPanelView.php
+++ b/typo3/sysext/frontend/Classes/View/AdminPanelView.php
@@ -72,8 +72,6 @@ class AdminPanelView
 
     /**
      * Initializes settings for the admin panel.
-     *
-     * @return void
      */
     public function initialize()
     {
@@ -145,8 +143,6 @@ class AdminPanelView
     /**
      * Saves any change in settings made in the Admin Panel.
      * Called from \TYPO3\CMS\Frontend\Http\RequestHandler right after access check for the Admin Panel
-     *
-     * @return void
      */
     public function saveConfigOptions()
     {
@@ -222,8 +218,6 @@ class AdminPanelView
 
     /**
      * Enables the force preview option.
-     *
-     * @return void
      */
     public function forcePreview()
     {
diff --git a/typo3/sysext/frontend/Tests/Unit/Authentication/FrontendUserAuthenticationTest.php b/typo3/sysext/frontend/Tests/Unit/Authentication/FrontendUserAuthenticationTest.php
index f72d749c5bc85c837ce58284c01d982b52819b45..a4bf7310cefae417612a34b2b37d8946981d0a15 100644
--- a/typo3/sysext/frontend/Tests/Unit/Authentication/FrontendUserAuthenticationTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/Authentication/FrontendUserAuthenticationTest.php
@@ -505,7 +505,6 @@ class FrontendUserAuthenticationTest extends UnitTestCase
      * @test
      *
      * If a user has an anonymous session, and its data is set to null, then the record is removed
-     *
      */
     public function destroysAnonymousSessionIfDataIsNull()
     {
@@ -559,7 +558,6 @@ class FrontendUserAuthenticationTest extends UnitTestCase
     /**
      * @test
      * Any session data set when logged in should be preserved when logging out
-     *
      */
     public function sessionDataShouldBePreservedOnLogout()
     {
diff --git a/typo3/sysext/frontend/Tests/Unit/ContentObject/ContentObjectRendererTest.php b/typo3/sysext/frontend/Tests/Unit/ContentObject/ContentObjectRendererTest.php
index bda41dfca1c6cc7bf1e0fe1fd3db9aeec27d347d..fe7c9636d88256a2b28f458cd15eb34b9765ed33 100644
--- a/typo3/sysext/frontend/Tests/Unit/ContentObject/ContentObjectRendererTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/ContentObject/ContentObjectRendererTest.php
@@ -753,7 +753,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * @param string $expect The expected cropped output.
      * @param string $content The given input.
      * @param string $conf The given configuration.
-     * @return void
      */
     public function cropHTML($expect, $content, $conf)
     {
@@ -823,7 +822,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * @param float $expect The expected output.
      * @param mixed $content The given content.
      * @param array $conf The given configuration of 'round.'.
-     * @return void
      * @dataProvider roundDataProvider
      * @test
      */
@@ -991,7 +989,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * @param string $content The given input.
      * @param string $expects The expected result.
      * @param array $conf The given configuration.
-     * @return void
      */
     public function replacement($expects, $content, $conf)
     {
@@ -1045,7 +1042,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * @param int $expect
      * @param int $timestamp
      * @param string $labels
-     * @return void
      */
     public function calcAge($expect, $timestamp, $labels)
     {
@@ -1115,7 +1111,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * @param string $expect The expected output.
      * @param string $content The given input.
      * @param array $conf The given configutation.
-     * @return void
      */
     public function substring($expect, $content, $conf)
     {
@@ -3393,7 +3388,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * @param int $times Times called mocked method.
      * @param array $with Parameter passed to mocked method.
      * @param string $will Return value of mocked method.
-     * @return void
      */
     public function calculateCacheKey($expect, $conf, $times, $with, $withWrap, $will)
     {
@@ -3440,7 +3434,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * @param string $cacheKey Return from calculateCacheKey mock.
      * @param int $times Times the cache is expected to be called (0 or 1).
      * @param string $cached Return from cacheFrontend mock.
-     * @return void
      */
     public function getFromCache($expect, $conf, $cacheKey, $times, $cached)
     {
@@ -3539,7 +3532,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * @dataProvider getFieldValDataProvider
      * @param string $expect The expected string.
      * @param string $fields Field names divides by //.
-     * @return void
      */
     public function getFieldVal($expect, $fields)
     {
@@ -3653,7 +3645,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
       * @param string $case The given type of conversion.
       * @param array $with Consecutive args expected by caseshift.
       * @param array $will Consecutive return values of caseshfit.
-      * @return void
       */
     public function HTMLcaseshift($expect, $content, $case, $with, $will)
     {
@@ -3682,7 +3673,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * - Their amount is 91.
      *
      * @test
-     * @return void
      */
     public function allStdWrapProcessorsAreCallable()
     {
@@ -3722,7 +3712,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      *  that it is an issue.
      *
      * @test
-     * @return void
      */
     public function notAllStdWrapProcessorsAreCallableWithEmptyConfiguration()
     {
@@ -3797,7 +3786,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * @dataProvider fourTypesOfStdWrapHookObjectProcessorsDataProvider
      * @param string $stdWrapMethod: The method to cover.
      * @param string $hookObjectCall: The expected hook object call.
-     * @return void
      */
     public function fourTypesOfStdWrapHookObjectProcessors(
         $stdWrapMethod, $hookObjectCall)
@@ -3870,7 +3858,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * @param array $conf The given configuration.
      * @param int $times Times HTMLparser_TSbridge is called (0 or 1).
      * @param string $will Return of HTMLparser_TSbridge.
-     * @return void.
      */
     public function stdWrap_HTMLparser(
         $expect, $content, $conf, $times, $will)
@@ -3933,7 +3920,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      *  @param mixed $conf The the given configuration.
      *  @param int $times Times TCAlookup is called.
      *  @param string $will Return value of TCAlookup.
-     *  @return void.
      */
     public function stdWrap_TCAselectItem(
         $expect, $content, $conf, $times, $will)
@@ -3996,7 +3982,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      *  - Returns the return value.
      *
      *  @test
-     *  @return void.
      */
     public function stdWrap_addParams()
     {
@@ -4028,7 +4013,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * - Returns the return value.
      *
      * @test
-     * @return void
      */
     public function stdWrap_age()
     {
@@ -4060,7 +4044,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * - Returns the return value appended to $content.
      *
      * @test
-     * @return void
      */
     public function stdWrap_append()
     {
@@ -4119,7 +4102,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * @param string $expected The expected value.
      * @param string $input The input value.
      * @param string $xhtmlDoctype Xhtml document type.
-     * @return void
      * @test
      * @dataProvider stdWrapBrDataProvider
      */
@@ -4223,7 +4205,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * @param string $expect The expected output.
      * @param string $content The given input.
      * @param array $conf The given configuration for 'bytes.'.
-     * @return void
      */
     public function stdWrap_bytes($expect, $content, $conf)
     {
@@ -4250,7 +4231,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * - Returns the return value.
      *
      * @test
-     * @return void
      */
     public function stdWrap_cObject()
     {
@@ -4321,7 +4301,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * @param array $firstConf Parameter 2 expected by first call to stdWrap.
      * @param array $secondConf Parameter 2 expected by second call to stdWrap.
      * @param array $conf The given configuration.
-     * @return void
      */
     public function stdWrap_orderedStdWrap($firstConf, $secondConf, $conf)
     {
@@ -4384,7 +4363,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * @param int $times Times called mocked method.
      * @param array $with Parameter passed to mocked method.
      * @param string|false $will Return value of mocked method.
-     * @return void
      */
     public function stdWrap_cacheRead(
         $expect, $input, $conf, $times, $with, $will)
@@ -4442,7 +4420,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * @param int $timesCCK Times calculateCacheKey is called.
      * @param string  $key The return value of calculateCacheKey.
      * @param int $times Times the other methods are called.
-     * @return void
      */
     public function stdWrap_cacheStore(
         $confCache, $timesCCK, $key, $times)
@@ -4507,7 +4484,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * - Returns the return value.
      *
      * @test
-     * @return void
      */
     public function stdWrap_case()
     {
@@ -4532,7 +4508,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * Check if stdWrap_char works properly.
      *
      * @test
-     * @return void
      */
     public function stdWrap_char()
     {
@@ -4552,7 +4527,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * - Returns the return value.
      *
      * @test
-     * @return void
      */
     public function stdWrap_crop()
     {
@@ -4584,7 +4558,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * - Returns the return value.
      *
      * @test
-     * @return void
      */
     public function stdWrap_cropHTML()
     {
@@ -4654,7 +4627,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * @param string $expected The expected value.
      * @param string $value The input value.
      * @param array $conf Property: csConv
-     * @return void
      */
     public function stdWrap_csConv($expected, $input, $conf)
     {
@@ -4672,7 +4644,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * - the key defaults to 'currentValue_kidjls9dksoje'
      *
      * @test
-     * @return void
      */
     public function stdWrap_current()
     {
@@ -4727,7 +4698,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * @param mixed $expect Expect either $data or $alternativeData.
      * @param array $data The data.
      * @param mixed $alt The alternativeData.
-     * @return void
      */
     public function stdWrap_data($expect, $data, $alt)
     {
@@ -4757,7 +4727,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      *  - Returns the return value.
      *
      *  @test
-     *  @return void.
      */
     public function stdWrap_dataWrap()
     {
@@ -4827,7 +4796,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * @param mixed $content The given input.
      * @param array $conf The given configuration.
      * @param int $now Fictive execution time.
-     * @return void
      */
     public function stdWrap_date($expected, $content, $conf, $now)
     {
@@ -4840,7 +4808,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * Check if stdWrap_debug works properly.
      *
      * @test
-     * @return void
      */
     public function stdWrap_debug()
     {
@@ -4875,7 +4842,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      *   implementation at all. It can't even indirectly be tested.
      *
      * @test
-     * @return void
      */
     public function stdWrap_debugData()
     {
@@ -4937,7 +4903,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * @dataProvider stdWrap_debugFuncDataProvider
      * @param bool $expectArray If cast to array is expected.
      * @param mixed $confDebugFunc The configuration for $conf['debugFunc'].
-     * @return void
      */
     public function stdWrap_debugFunc($expectArray, $confDebugFunc)
     {
@@ -5025,7 +4990,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * @param string $expected The expected value.
      * @param string $input The input value.
      * @param array $config The property 'doubleBrTag'.
-     * @return void
      */
     public function stdWrap_doubleBrTag($expected, $input, $config)
     {
@@ -5102,7 +5066,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * @param int $times Times editIcons is called (0 or 1).
      * @param array $param3 The expected third parameter.
      * @param string $will Return value of editIcons.
-     * @return void
      */
     public function stdWrap_editIcons(
         $expect, $content, $conf, $login, $times, $param3, $will)
@@ -5130,7 +5093,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * - Returns the return value.
      *
      * @test
-     * @return void
      */
      public function stdWrap_encapsLines()
      {
@@ -5190,7 +5152,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * @param bool $login Simulate backend user login.
      * @param int $times Times editPanel is called (0 or 1).
      * @param string $will Return value of editPanel.
-     * @return void
      */
     public function stdWrap_editPanel(
         $expect, $content, $login, $times, $will)
@@ -5247,7 +5208,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * @dataProvider stdWrap_encodeForJavaScriptValueDataProvider
      * @param string $expect The expected output.
      * @param string $content The given input.
-     * @return void
      */
     public function stdWrap_encodeForJavaScriptValue($expect, $content)
     {
@@ -5281,7 +5241,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * @dataProvider stdWrap_expandListDataProvider
      * @param string $expected The expected output.
      * @param string $content The given content.
-     * @return void
      */
     public function stdWrap_expandList($expected, $content)
     {
@@ -5298,7 +5257,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * - passes conf['field'] as parameter
      *
      * @test
-     * @return void
      */
     public function stdWrap_field()
     {
@@ -5378,7 +5336,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * @param bool $stop Expect stop further rendering.
      * @param mixed $content The given input.
      * @param array $conf The given configuration.
-     * @return void
      */
     public function stdWrap_fieldRequired($expect, $stop, $content, $conf)
     {
@@ -5414,7 +5371,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * - Returns the return value.
      *
      * @test
-     * @return void
      */
     public function stdWrap_filelink()
     {
@@ -5441,7 +5397,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * - Returns the return value.
      *
      * @test
-     * @return void
      */
     public function stdWrap_filelist()
     {
@@ -5505,7 +5460,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * @param string $expect The expected output.
      * @param string $content The given content.
      * @param array $conf The given configuration.
-     * @return void
      */
     public function stdWrap_hash($expect, $content, $conf)
     {
@@ -5552,7 +5506,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * @param string $expected The expected value.
      * @param string $input The input value.
      * @param array $conf htmlSpecialChars.preserveEntities
-     * @return void
      */
     public function stdWrap_htmlSpecialChars($expected, $input, $conf)
     {
@@ -5618,7 +5571,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * @param mixed $config The given configuration.
      * @param int $times Times checkIf is called (0 or 1).
      * @param bool|null $will Return of checkIf (null if not called).
-     * @return void
      */
     public function stdWrap_if($expect, $stop, $content, $conf, $times, $will)
     {
@@ -5674,7 +5626,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * @param mixed $expected The expected output.
      * @param mixed $content The given input.
      * @param array $conf The given configuration.
-     * @return void
      */
     public function stdWrap_ifBlank($expect, $content, $conf)
     {
@@ -5727,7 +5678,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * @param mixed $expect The expected output.
      * @param mixed $content The given content.
      * @param array $conf The given configuration.
-     * @return void
      */
     public function stdWrap_ifEmpty($expect, $content, $conf)
     {
@@ -5770,7 +5720,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * @param mixed $expected The expected output.
      * @param mixed $content The given input.
      * @param array $conf The given configuration.
-     * @return void
      */
     public function stdWrap_ifNull($expect, $content, $conf)
     {
@@ -5823,7 +5772,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * @param string $expected The expected value.
      * @param string $input The input value.
      * @param array $conf Property: innerWrap
-     * @return void
      * @test
      * @dataProvider stdWrap_innerWrapDataProvider
      */
@@ -5878,7 +5826,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * @param string $expected The expected value.
      * @param string $input The input value.
      * @param array $conf Property: innerWrap2
-     * @return void
      * @test
      * @dataProvider stdWrap_innerWrap2DataProvider
      */
@@ -5898,7 +5845,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      *  - Returns the return value.
      *
      *  @test
-     *  @return void
      */
     public function stdWrap_insertData()
     {
@@ -5961,7 +5907,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * @dataProvider stdWrap_intvalDataProvider
      * @param int $expect The expected output.
      * @param string $content The given input.
-     * @return void
      */
     public function stdWrap_intval($expect, $content)
     {
@@ -6018,7 +5963,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      *
      * @param string $expected The expected value.
      * @param string $input The input value.
-     * @return void
      * @test
      * @dataProvider stdWrapKeywordsDataProvider
      */
@@ -6095,7 +6039,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * @param string $input The input value.
      * @param array $conf Properties: lang.xy.
      * @param string $language For $TSFE->config[config][language].
-     * @return void
      * @test
      * @dataProvider stdWrap_langDataProvider
      */
@@ -6121,7 +6064,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * - Returns the return value.
      *
      * @test
-     * @return void
      */
     public function stdWrap_listNum()
     {
@@ -6225,7 +6167,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * @param string $expect The expected output.
      * @param string $content The given input.
      * @param array $conf The given configuration.
-     * @return void
      */
     public function stdWrap_noTrimWrap($expect, $content, $conf)
     {
@@ -6243,7 +6184,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * - Returns the return value.
      *
      * @test
-     * @return void
      */
     public function stdWrap_numRows()
     {
@@ -6270,7 +6210,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * - Returns the return value.
      *
      * @test
-     * @return void
      */
     public function stdWrap_numberFormat()
     {
@@ -6336,7 +6275,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * @param string $expected The expected value.
      * @param string $input The input value.
      * @param array $conf Property: outerWrap
-     * @return void
      * @test
      * @dataProvider stdWrap_outerWrapDataProvider
      */
@@ -6400,7 +6338,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * @dataProvider stdWrap_overrideDataProvider
      * @param string $input The input value.
      * @param array $conf Property: setCurrent
-     * @return void
      */
     public function stdWrap_override($expect, $content, $conf)
     {
@@ -6420,7 +6357,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * - Returns the return.
      *
      * @test
-     * @return void
      */
     public function stdWrap_parseFunc()
     {
@@ -6453,7 +6389,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * - Returns the return value appended by $content.
      *
      * @test
-     * @return void
      */
     public function stdWrap_postCObject()
     {
@@ -6485,7 +6420,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      *  - Returns the return value.
      *
      *  @test
-     *  @return void.
      */
     public function stdWrap_postUserFunc()
     {
@@ -6523,7 +6457,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * - Returns "<!-- $substKey -->".
      *
      * @test
-     * @return void
      */
     public function stdWrap_postUserFuncInt()
     {
@@ -6568,7 +6501,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * - Returns the return value appended by $content.
      *
      * @test
-     * @return void
      */
     public function stdWrap_preCObject()
     {
@@ -6602,7 +6534,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * - Returns the return value.
      *
      * @test
-     * @return void
      */
     public function stdWrap_preIfEmptyListNum()
     {
@@ -6666,7 +6597,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      *
      *  @test
      *  @dataProvider stdWrap_prefixCommentDataProvider
-     *  @return void
      */
     public function stdWrap_prefixComment(
         $expect, $content, $conf, $disable, $times, $will)
@@ -6696,7 +6626,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * - Returns the return value prepended to $content.
      *
      * @test
-     * @return void
      */
     public function stdWrap_prepend()
     {
@@ -6753,7 +6682,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * @param mixed $expect The expected output.
      * @param string $content The given content.
      * @param array $conf The given configuration.
-     * @return void
      */
     public function stdWrap_prioriCalc($expect, $content, $conf)
     {
@@ -6773,7 +6701,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * - Returns the return value.
      *
      * @test
-     * @return void
      */
     public function stdWrap_preUserFunc()
     {
@@ -6817,7 +6744,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * @dataProvider stdWrap_rawUrlEncodeDataProvider
      * @param string $expect The expected output.
      * @param string $content The given input.
-     * @return void
      */
     public function stdWrap_rawUrlEncode($expect, $content)
     {
@@ -6836,7 +6762,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * - Returns the return value.
      *
      * @test
-     * @return void
      */
     public function stdWrap_replacement()
     {
@@ -6895,7 +6820,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * @param mixed $expect The expected output.
      * @param bool $stop Expect stop further rendering.
      * @param mixed $content The given input.
-     * @return void
      */
     public function stdWrap_required($expect, $stop, $content)
     {
@@ -6917,7 +6841,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * - Returns the return value.
      *
      * @test
-     * @return void
      */
     public function stdWrap_round()
     {
@@ -6941,7 +6864,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * Check if stdWrap_setContentToCurrent works properly.
      *
      * @test
-     * @return void
      */
     public function stdWrap_setContentToCurrent()
     {
@@ -6998,7 +6920,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * @dataProvider stdWrap_setCurrentDataProvider
      * @param string $input The input value.
      * @param array $conf Property: setCurrent
-     * @return void
      */
     public function stdWrap_setCurrent($input, $conf)
     {
@@ -7024,7 +6945,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      *  - Returns the return value.
      *
      *  @test
-     *  @return void.
      */
     public function stdWrap_space()
     {
@@ -7059,7 +6979,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      *  - Returns the return value.
      *
      *  @test
-     *  @return void.
      */
     public function stdWrap_spaceAfter()
     {
@@ -7095,7 +7014,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      *  - Returns the return value.
      *
      *  @test
-     *  @return void.
      */
     public function stdWrap_spaceBefore()
     {
@@ -7128,7 +7046,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * - Returns the return value.
      *
      * @test
-     * @return void
      */
      public function stdWrap_split()
      {
@@ -7159,7 +7076,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      *  - Returns the return value.
      *
      *  @test
-     *  @return void.
      */
     public function stdWrap_stdWrap()
     {
@@ -7346,7 +7262,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * @param string $expect The expected output.
      * @param string $content The given input.
      * @param array $conf The configuration of 'strPad.'.
-     * @return void
      */
     public function stdWrap_strPad($expect, $content, $conf)
     {
@@ -7395,7 +7310,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * @param mixed $content The given input.
      * @param array $conf The given configuration.
      * @param int $now Fictive execution time.
-     * @return void
      */
     public function stdWrap_strftime($expect, $content, $conf, $now)
     {
@@ -7468,7 +7382,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * @param int $expect The expected output.
      * @param mixed $content The given input.
      * @param array $conf The given configuration.
-     * @return void
      */
     public function stdWrap_strtotime($expect, $content, $conf)
     {
@@ -7498,7 +7411,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * - Returns the return value.
      *
      * @test
-     * @return void
      */
     public function stdWrap_substring()
     {
@@ -7576,7 +7488,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * @dataProvider stdWrap_trimDataProvider
      * @param string $expected The expected output.
      * @param mixed $content The given content.
-     * @return void
      */
     public function stdWrap_trim($expect, $content)
     {
@@ -7594,7 +7505,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      *  - Returns the return value.
      *
      *  @test
-     *  @return void.
      */
     public function stdWrap_typolink()
     {
@@ -7669,7 +7579,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * @param string $expected The expected value.
      * @param string $input The input value.
      * @param array $conf Properties: wrap, wrap.splitChar
-     * @return void
      * @test
      * @dataProvider stdWrap_wrapDataProvider
      */
@@ -7734,7 +7643,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * @param string $expected The expected value.
      * @param string $input The input value.
      * @param array $conf Properties: wrap2, wrap2.splitChar
-     * @return void
      * @test
      * @dataProvider stdWrap_wrap2DataProvider
      */
@@ -7798,7 +7706,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * @param string $expected The expected value.
      * @param string $input The input value.
      * @param array $conf Properties: wrap3, wrap3.splitChar
-     * @return void
      * @test
      * @dataProvider stdWrap_wrap3DataProvider
      */
@@ -7841,7 +7748,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
      * @param string $expect The expected output.
      * @param string $content The given content.
      * @param mixed $wrapAlignConf The given input.
-     * @return void
      */
     public function stdWrap_wrapAlign($expect, $content, $wrapAlignConf)
     {
diff --git a/typo3/sysext/frontend/Tests/Unit/ContentObject/Fixtures/GeneralUtilityFixture.php b/typo3/sysext/frontend/Tests/Unit/ContentObject/Fixtures/GeneralUtilityFixture.php
index e566fc407fc7ea65cd9c2cef7bd8ba6b5234277b..d3c4db815c75d3241657094637522f4b9b829c8b 100644
--- a/typo3/sysext/frontend/Tests/Unit/ContentObject/Fixtures/GeneralUtilityFixture.php
+++ b/typo3/sysext/frontend/Tests/Unit/ContentObject/Fixtures/GeneralUtilityFixture.php
@@ -21,7 +21,6 @@ class GeneralUtilityFixture extends \TYPO3\CMS\Core\Utility\GeneralUtility
 {
     /**
      * @param \TYPO3\CMS\Core\Core\ApplicationContext $applicationContext
-     * @return void
      */
     public static function setApplicationContext($applicationContext)
     {
diff --git a/typo3/sysext/frontend/Tests/Unit/ContentObject/Menu/AbstractMenuContentObjectTest.php b/typo3/sysext/frontend/Tests/Unit/ContentObject/Menu/AbstractMenuContentObjectTest.php
index 70c53d1b1852a6b8990a431e1d6b288f29ed6ab4..96ff6a21f78124036e645160ef6bab1ce61eff0f 100644
--- a/typo3/sysext/frontend/Tests/Unit/ContentObject/Menu/AbstractMenuContentObjectTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/ContentObject/Menu/AbstractMenuContentObjectTest.php
@@ -19,7 +19,6 @@ use TYPO3\CMS\Frontend\ContentObject\Menu\AbstractMenuContentObject;
 
 /**
  * Test case
- *
  */
 class AbstractMenuContentObjectTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 {
@@ -47,8 +46,6 @@ class AbstractMenuContentObjectTest extends \TYPO3\TestingFramework\Core\Unit\Un
     ////////////////////////////////
     /**
      * Prepares a test for the method sectionIndex
-     *
-     * @return void
      */
     protected function prepareSectionIndexTest()
     {
diff --git a/typo3/sysext/func/Classes/Controller/PageFunctionsController.php b/typo3/sysext/func/Classes/Controller/PageFunctionsController.php
index d8f1bb1a65d53907716e94ed96e537495783925c..9e61358d19a0441a06d0934778c175da362eabc8 100644
--- a/typo3/sysext/func/Classes/Controller/PageFunctionsController.php
+++ b/typo3/sysext/func/Classes/Controller/PageFunctionsController.php
@@ -108,8 +108,6 @@ class PageFunctionsController extends \TYPO3\CMS\Backend\Module\BaseScriptClass
 
     /**
      * Initialize module header etc and call extObjContent function
-     *
-     * @return void
      */
     public function main()
     {
diff --git a/typo3/sysext/impexp/Classes/Command/ImportCommand.php b/typo3/sysext/impexp/Classes/Command/ImportCommand.php
index cf82dca83f54fa59b5ba92494fc9f51227132e1c..1e3868820a50b9edaddf6d4e351f9aecbe000ad2 100644
--- a/typo3/sysext/impexp/Classes/Command/ImportCommand.php
+++ b/typo3/sysext/impexp/Classes/Command/ImportCommand.php
@@ -68,7 +68,6 @@ class ImportCommand extends Command
      *
      * @param InputInterface $input
      * @param OutputInterface $output
-     * @return void
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
diff --git a/typo3/sysext/impexp/Classes/Controller/ImportExportController.php b/typo3/sysext/impexp/Classes/Controller/ImportExportController.php
index b3f8e675ff3a7510f26272f2189c534cb15e01ae..1b4d49cd1ab729c143a036ab1f74c2478a610aa8 100644
--- a/typo3/sysext/impexp/Classes/Controller/ImportExportController.php
+++ b/typo3/sysext/impexp/Classes/Controller/ImportExportController.php
@@ -157,8 +157,6 @@ class ImportExportController extends BaseScriptClass
 
     /**
      * Initializes the module and defining necessary variables for this module to run.
-     *
-     * @return void
      */
     public function init()
     {
@@ -174,7 +172,6 @@ class ImportExportController extends BaseScriptClass
      * @throws \BadFunctionCallException
      * @throws \InvalidArgumentException
      * @throws \RuntimeException
-     * @return void
      */
     public function main()
     {
@@ -348,7 +345,6 @@ class ImportExportController extends BaseScriptClass
      * @throws \InvalidArgumentException
      * @throws \RuntimeException
      * @throws \TYPO3\CMS\Core\Resource\Exception\ExistingTargetFileNameException
-     * @return void
      */
     public function exportData($inData)
     {
@@ -591,7 +587,6 @@ class ImportExportController extends BaseScriptClass
      * @param int $k Page id for which to select records to add
      * @param array $tables Array of table names to select from
      * @param int $maxNumber Max amount of records to select
-     * @return void
      */
     public function addRecordsForPid($k, $tables, $maxNumber)
     {
@@ -673,7 +668,6 @@ class ImportExportController extends BaseScriptClass
      * Create configuration form
      *
      * @param array $inData Form configuration data
-     * @return void
      */
     public function makeConfigurationForm($inData)
     {
@@ -754,7 +748,6 @@ class ImportExportController extends BaseScriptClass
      * Sets content in $this->content
      *
      * @param array $inData Form configurat data
-     * @return void
      */
     public function makeAdvancedOptionsForm($inData)
     {
@@ -768,7 +761,6 @@ class ImportExportController extends BaseScriptClass
      * Create configuration form
      *
      * @param array $inData Form configuration data
-     * @return void
      */
     public function makeSaveForm($inData)
     {
@@ -810,7 +802,6 @@ class ImportExportController extends BaseScriptClass
      * @throws \BadFunctionCallException
      * @throws \InvalidArgumentException
      * @throws \RuntimeException
-     * @return void Setting content in $this->content
      */
     public function importData($inData)
     {
@@ -946,7 +937,6 @@ class ImportExportController extends BaseScriptClass
      *
      * @throws \InvalidArgumentException
      * @throws \UnexpectedValueException
-     * @return void
      */
     public function checkUpload()
     {
diff --git a/typo3/sysext/impexp/Classes/Domain/Repository/PresetRepository.php b/typo3/sysext/impexp/Classes/Domain/Repository/PresetRepository.php
index a5ff945ab01aaf9b4ec23f097afba9f33cb9657e..334bca1ffe956fdd8c35144a0c3f3c68b25a9afc 100644
--- a/typo3/sysext/impexp/Classes/Domain/Repository/PresetRepository.php
+++ b/typo3/sysext/impexp/Classes/Domain/Repository/PresetRepository.php
@@ -102,7 +102,6 @@ class PresetRepository
      * Manipulate presets
      *
      * @param array $inData In data array, passed by reference!
-     * @return void
      */
     public function processPresets(&$inData)
     {
diff --git a/typo3/sysext/impexp/Classes/Export.php b/typo3/sysext/impexp/Classes/Export.php
index ec89b2c0b220260d812987e35eee0e7e2f8cf8c2..cdbf8ee301bce3a9c220c30af96afbeeb207726b 100644
--- a/typo3/sysext/impexp/Classes/Export.php
+++ b/typo3/sysext/impexp/Classes/Export.php
@@ -133,7 +133,6 @@ class Export extends ImportExport
      * Init the object
      *
      * @param bool $dontCompress If set, compression of t3d files is disabled
-     * @return void
      */
     public function init($dontCompress = false)
     {
@@ -148,8 +147,6 @@ class Export extends ImportExport
 
     /**
      * Set header basics
-     *
-     * @return void
      */
     public function setHeaderBasics()
     {
@@ -181,7 +178,6 @@ class Export extends ImportExport
      * Set charset
      *
      * @param string $charset Charset for the content in the export. During import the character set will be converted if the target system uses another charset.
-     * @return void
      */
     public function setCharset($charset)
     {
@@ -197,7 +193,6 @@ class Export extends ImportExport
      * @param string $packager_username Backend Username of the packager (the guy making the export)
      * @param string $packager_name Real name of the packager
      * @param string $packager_email Email of the packager
-     * @return void
      */
     public function setMetaData($title, $description, $notes, $packager_username, $packager_name, $packager_email)
     {
@@ -272,7 +267,6 @@ class Export extends ImportExport
      *
      * @param array $recordTypesIncludeFields Keys are [recordname], values are an array of fields to be included in the export
      * @throws Exception if an array value is not type of array
-     * @return void
      */
     public function setRecordTypesIncludeFields(array $recordTypesIncludeFields)
     {
@@ -289,7 +283,6 @@ class Export extends ImportExport
      *
      * @param string $table The record type
      * @param array $fields The fields to be included
-     * @return void
      */
     public function setRecordTypeIncludeFields($table, array $fields)
     {
@@ -303,7 +296,6 @@ class Export extends ImportExport
      * @param string $table Table name
      * @param array $row Record row.
      * @param int $relationLevel (Internal) if the record is added as a relation, this is set to the "level" it was on.
-     * @return void
      */
     public function export_addRecord($table, $row, $relationLevel = 0)
     {
@@ -538,7 +530,6 @@ class Export extends ImportExport
      * @param array $fI Array with table/id keys to add
      * @param array $addR Add array, passed by reference to be modified
      * @param string $tokenID Softref Token ID, if applicable.
-     * @return void
      * @see export_addDBRelations()
      */
     public function export_addDBRelations_registerRelation($fI, &$addR, $tokenID = '')
@@ -559,7 +550,6 @@ class Export extends ImportExport
      * This adds all files in relations.
      * Call this method AFTER adding all records including relations.
      *
-     * @return void
      * @see export_addDBRelations()
      */
     public function export_addFilesFromRelations()
@@ -650,8 +640,6 @@ class Export extends ImportExport
 
     /**
      * This adds all files from sys_file records
-     *
-     * @return void
      */
     public function export_addFilesFromSysFilesRecords()
     {
@@ -669,7 +657,6 @@ class Export extends ImportExport
      * Adds a files content from a sys file record to the export memory
      *
      * @param File $file
-     * @return void
      */
     public function export_addSysFile(File $file)
     {
@@ -729,7 +716,6 @@ class Export extends ImportExport
      * @param array $fI File information with three keys: "filename" = filename without path, "ID_absFile" = absolute filepath to the file (including the filename), "ID" = md5 hash of "ID_absFile". "relFileName" is optional for files attached to records, but mandatory for soft referenced files (since the relFileName determines where such a file should be stored!)
      * @param string $recordRef If the file is related to a record, this is the id on the form [table]:[id]. Information purposes only.
      * @param string $fieldname If the file is related to a record, this is the field name it was related to. Information purposes only.
-     * @return void
      */
     public function export_addFile($fI, $recordRef = '', $fieldname = '')
     {
diff --git a/typo3/sysext/impexp/Classes/Hook/BackendControllerHook.php b/typo3/sysext/impexp/Classes/Hook/BackendControllerHook.php
index 1982fb8691c545ffe1f740925bcb5606cd6a1456..376f253c3cc3baa7cbcb1105f629af3c3a066c81 100644
--- a/typo3/sysext/impexp/Classes/Hook/BackendControllerHook.php
+++ b/typo3/sysext/impexp/Classes/Hook/BackendControllerHook.php
@@ -29,7 +29,6 @@ class BackendControllerHook
      *
      * @param array $configuration
      * @param BackendController $backendController
-     * @return void
      */
     public function addJavaScript(array $configuration, BackendController $backendController)
     {
diff --git a/typo3/sysext/impexp/Classes/Import.php b/typo3/sysext/impexp/Classes/Import.php
index 5c9428ad792e7863ebb05dec811a17831f5e2d6c..83ef4315f591cd8693740fc357d122564e080e14 100644
--- a/typo3/sysext/impexp/Classes/Import.php
+++ b/typo3/sysext/impexp/Classes/Import.php
@@ -112,8 +112,6 @@ class Import extends ImportExport
 
     /**
      * Init the object
-     *
-     * @return void
      */
     public function init()
     {
@@ -127,8 +125,6 @@ class Import extends ImportExport
 
     /**
      * Initialize all settings for the import
-     *
-     * @return void
      */
     protected function initializeImport()
     {
@@ -149,8 +145,6 @@ class Import extends ImportExport
 
     /**
      * Initialize the all present storage objects
-     *
-     * @return void
      */
     protected function initializeStorageObjects()
     {
@@ -163,7 +157,6 @@ class Import extends ImportExport
      * Imports the internal data array to $pid.
      *
      * @param int $pid Page ID in which to import the content
-     * @return void
      */
     public function importData($pid)
     {
@@ -190,8 +183,6 @@ class Import extends ImportExport
 
     /**
      * Imports the sys_file_storage records from internal data array.
-     *
-     * @return void
      */
     protected function writeSysFileStorageRecords()
     {
@@ -341,8 +332,6 @@ class Import extends ImportExport
 
     /**
      * Imports the sys_file records and the binary files data from internal data array.
-     *
-     * @return void
      */
     protected function writeSysFileRecords()
     {
@@ -468,8 +457,6 @@ class Import extends ImportExport
     /**
      * Removes all sys_file_reference records from the import data array that are pointing to sys_file records which
      * are missing not in the import data to prevent exceptions on checking the related file started by the Datahandler.
-     *
-     * @return void
      */
     protected function removeSysFileReferenceRecordsFromImportDataWithRelationToMissingFile()
     {
@@ -515,7 +502,6 @@ class Import extends ImportExport
      *
      * @param int $oldFileUid
      * @param int $newFileUid
-     * @return void
     */
     protected function fixUidLocalInSysFileReferenceRecords($oldFileUid, $newFileUid)
     {
@@ -587,7 +573,6 @@ class Import extends ImportExport
      * Writing pagetree/pages to database:
      *
      * @param int $pid PID in which to import. If the operation is an update operation, the root of the page tree inside will be moved to this PID unless it is the same as the root page from the import
-     * @return void
      * @see writeRecords_records()
      */
     public function writeRecords_pages($pid)
@@ -642,7 +627,6 @@ class Import extends ImportExport
      * Organize all updated pages in page tree so they are related like in the import file
      * Only used for updates and when $this->dat['header']['pagetree'] is an array.
      *
-     * @return void
      * @access private
      * @see writeRecords_pages(), writeRecords_records_order()
      */
@@ -706,7 +690,6 @@ class Import extends ImportExport
      * Write all database records except pages (writtein in writeRecords_pages())
      *
      * @param int $pid Page id in which to import
-     * @return void
      * @see writeRecords_pages()
      */
     public function writeRecords_records($pid)
@@ -767,7 +750,6 @@ class Import extends ImportExport
      * Only used for updates
      *
      * @param int $mainPid Main PID into which we import.
-     * @return void
      * @access private
      * @see writeRecords_records(), writeRecords_pages_order()
      */
@@ -822,7 +804,6 @@ class Import extends ImportExport
      * @param string $table Table name (from import memory)
      * @param int $uid Record UID (from import memory)
      * @param int $pid Page id
-     * @return void
      * @see writeRecords()
      */
     public function addSingle($table, $uid, $pid)
@@ -934,7 +915,6 @@ class Import extends ImportExport
      * Registers the substNEWids in memory.
      *
      * @param array $substNEWwithIDs From DataHandler to be merged into internal mapping variable in this object
-     * @return void
      * @see writeRecords()
      */
     public function addToMapId($substNEWwithIDs)
@@ -975,8 +955,6 @@ class Import extends ImportExport
 
     /**
      * Cleaning up all the temporary files stored in typo3temp/ folder
-     *
-     * @return void
      */
     public function unlinkTempFiles()
     {
@@ -1003,7 +981,6 @@ class Import extends ImportExport
      * to imported records are all re-created so imported records are correctly related again)
      * Relations in flexform fields are processed in setFlexFormRelations() after this function
      *
-     * @return void
      * @see setFlexFormRelations()
      */
     public function setRelations()
@@ -1155,7 +1132,6 @@ class Import extends ImportExport
      * After all DB relations has been set in the end of the import (see setRelations()) then it is time to correct all relations inside of FlexForm fields.
      * The reason for doing this after is that the setting of relations may affect (quite often!) which data structure is used for the flexforms field!
      *
-     * @return void
      * @see setRelations()
      */
     public function setFlexFormRelations()
@@ -1275,8 +1251,6 @@ class Import extends ImportExport
 
     /**
      * Processing of soft references
-     *
-     * @return void
      */
     public function processSoftReferences()
     {
@@ -1796,7 +1770,6 @@ class Import extends ImportExport
      * (This function can be used to test the output strings from ->compileMemoryToFileContent())
      *
      * @param string $filecontent File content
-     * @return void
      */
     public function loadContent($filecontent)
     {
@@ -1846,8 +1819,6 @@ class Import extends ImportExport
 
     /**
      * Setting up the object based on the recently loaded ->dat array
-     *
-     * @return void
      */
     public function loadInit()
     {
diff --git a/typo3/sysext/impexp/Classes/ImportExport.php b/typo3/sysext/impexp/Classes/ImportExport.php
index 588cbb3b98212d193a4441d49d57030861256ced..7388b25a42123cd9f99494325ef4e93530366353 100644
--- a/typo3/sysext/impexp/Classes/ImportExport.php
+++ b/typo3/sysext/impexp/Classes/ImportExport.php
@@ -275,8 +275,6 @@ abstract class ImportExport
 
     /**
      * Init the object, both import and export
-     *
-     * @return void
      */
     public function init()
     {
@@ -357,7 +355,6 @@ abstract class ImportExport
      * @param array $pT Page tree array with uid/subrow (from ->dat[header][pagetree]
      * @param array $lines Output lines array (is passed by reference and modified)
      * @param string $preCode Pre-HTML code
-     * @return void
      */
     public function traversePageTree($pT, &$lines, $preCode = '')
     {
@@ -408,7 +405,6 @@ abstract class ImportExport
      *
      * @param int $pageUid Uid of the page to exclude
      * @param array $pageTree Page tree array with uid/subrow (from ->dat[header][pagetree]
-     * @return void
      */
     protected function excludePageAndRecords($pageUid, $pageTree)
     {
@@ -439,7 +435,6 @@ abstract class ImportExport
      *
      * @param array $pT Page tree array with uid/subrow (from ->dat[header][pagetree]
      * @param array $lines Output lines array (is passed by reference and modified)
-     * @return void
      */
     public function traversePageRecords($pT, &$lines)
     {
@@ -464,7 +459,6 @@ abstract class ImportExport
      *
      * @param array $pT Page tree array with uid/subrow (from ->dat[header][pagetree]
      * @param array $lines Output lines array (is passed by reference and modified)
-     * @return void
      */
     public function traverseAllRecords($pT, &$lines)
     {
@@ -483,7 +477,6 @@ abstract class ImportExport
      * Log general error message for a given table
      *
      * @param string $table database table name
-     * @return void
      */
     protected function addGeneralErrorsByTable($table)
     {
@@ -503,7 +496,6 @@ abstract class ImportExport
      * @param array $lines Output lines array (is passed by reference and modified)
      * @param string $preCode Pre-HTML code
      * @param bool $checkImportInPidRecord If you want import validation, you can set this so it checks if the import can take place on the specified page.
-     * @return void
      */
     public function singleRecordLines($table, $uid, &$lines, $preCode, $checkImportInPidRecord = false)
     {
@@ -670,7 +662,6 @@ abstract class ImportExport
      * @param string $preCode Pre-HTML code
      * @param array $recurCheck Recursivity check stack
      * @param string $htmlColorClass Alternative HTML color class to use.
-     * @return void
      * @access private
      * @see singleRecordLines()
      */
@@ -735,7 +726,6 @@ abstract class ImportExport
      * @param string $preCode Pre-HTML code
      * @param string $htmlColorClass Alternative HTML color class to use.
      * @param string $tokenID Token ID if this is a softreference (in which case it only makes sense with a single element in the $rels array!)
-     * @return void
      * @access private
      * @see singleRecordLines()
      */
@@ -966,7 +956,6 @@ abstract class ImportExport
      *****************************/
 
     /**
-     *
      * @return string
      */
     protected function getTemporaryFolderName()
@@ -1224,7 +1213,6 @@ abstract class ImportExport
      *
      * @param string $name Name of the hook
      * @param array $params Array with params
-     * @return void
      */
     public function callHook($name, $params)
     {
@@ -1256,7 +1244,6 @@ abstract class ImportExport
      * Sets error message in the internal error log
      *
      * @param string $msg Error message
-     * @return void
      */
     public function error($msg)
     {
diff --git a/typo3/sysext/impexp/Classes/Utility/ImportExportUtility.php b/typo3/sysext/impexp/Classes/Utility/ImportExportUtility.php
index 390ee77157e19cf791a0400c97840f930347ad98..43cdea20c6444e45ea928806ea34bd160762591e 100644
--- a/typo3/sysext/impexp/Classes/Utility/ImportExportUtility.php
+++ b/typo3/sysext/impexp/Classes/Utility/ImportExportUtility.php
@@ -22,7 +22,6 @@ use TYPO3\CMS\Impexp\Import;
 /**
  * Utility for import / export
  * Can be used for API access for simple importing of files
- *
  */
 class ImportExportUtility
 {
diff --git a/typo3/sysext/impexp/Tests/Functional/Export/AbstractExportTestCase.php b/typo3/sysext/impexp/Tests/Functional/Export/AbstractExportTestCase.php
index ae5e92bcb85e302cb055e55cc3a158557deeab89..ba13baef898de53df3e35bc74f2c87b0733a086a 100644
--- a/typo3/sysext/impexp/Tests/Functional/Export/AbstractExportTestCase.php
+++ b/typo3/sysext/impexp/Tests/Functional/Export/AbstractExportTestCase.php
@@ -48,8 +48,6 @@ abstract class AbstractExportTestCase extends \TYPO3\TestingFramework\Core\Funct
     /**
      * Set up for set up the backend user, initialize the language object
      * and creating the Export instance
-     *
-     * @return void
      */
     protected function setUp()
     {
@@ -69,7 +67,6 @@ abstract class AbstractExportTestCase extends \TYPO3\TestingFramework\Core\Funct
      *
      * @param int $pidToStart
      * @param int $depth
-     * @return void
      */
     protected function setPageTree($pidToStart, $depth = 1)
     {
@@ -97,7 +94,6 @@ abstract class AbstractExportTestCase extends \TYPO3\TestingFramework\Core\Funct
      *
      * @param int $pid Page id for which to select records to add
      * @param array $tables Array of table names to select from
-     * @return void
      */
     protected function addRecordsForPid($pid, array $tables)
     {
diff --git a/typo3/sysext/impexp/Tests/Functional/Import/AbstractImportTestCase.php b/typo3/sysext/impexp/Tests/Functional/Import/AbstractImportTestCase.php
index 234a66fcb4253979b8818cd7b38ffd0a4d892864..eec6d7911242e9bd5bc94a3f4511bc1c96904355 100644
--- a/typo3/sysext/impexp/Tests/Functional/Import/AbstractImportTestCase.php
+++ b/typo3/sysext/impexp/Tests/Functional/Import/AbstractImportTestCase.php
@@ -47,8 +47,6 @@ abstract class AbstractImportTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
 
     /**
      * Set up for initialization of the Import instance
-     *
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/indexed_search/Classes/Controller/AdministrationController.php b/typo3/sysext/indexed_search/Classes/Controller/AdministrationController.php
index 603db6989c36d2c73ff20a89fa237aebdf24c7a2..1904900ae4cf40efb9b9d7c27f1c83cd7d9adf18 100644
--- a/typo3/sysext/indexed_search/Classes/Controller/AdministrationController.php
+++ b/typo3/sysext/indexed_search/Classes/Controller/AdministrationController.php
@@ -146,8 +146,6 @@ class AdministrationController extends ActionController
 
     /**
      * Function will be called before every other action
-     *
-     * @return void
      */
     public function initializeAction()
     {
@@ -200,7 +198,6 @@ class AdministrationController extends ActionController
 
     /**
      * @param \TYPO3\CMS\IndexedSearch\Domain\Repository\AdministrationRepository $administrationRepository
-     * @return void
      */
     public function injectAdministrationRepository(AdministrationRepository $administrationRepository)
     {
@@ -209,8 +206,6 @@ class AdministrationController extends ActionController
 
     /**
      * Index action contains the most important statistics
-     *
-     * @return void
      */
     public function indexAction()
     {
@@ -238,8 +233,6 @@ class AdministrationController extends ActionController
 
     /**
      * Statistics for pages
-     *
-     * @return void
      */
     public function pagesAction()
     {
@@ -248,8 +241,6 @@ class AdministrationController extends ActionController
 
     /**
      * Statistics for external documents
-     *
-     * @return void
      */
     public function externalDocumentsAction()
     {
@@ -260,7 +251,6 @@ class AdministrationController extends ActionController
      * Statistics for a given page hash
      *
      * @param int $pageHash
-     * @return void
      */
     public function statisticDetailsAction($pageHash = 0)
     {
@@ -441,7 +431,6 @@ class AdministrationController extends ActionController
      * @param int $pageId
      * @param array $stopwords
      * @param array $keywords
-     * @return void
      */
     public function saveStopwordsKeywordsAction($pageHash, $pageId, $stopwords = [], $keywords = [])
     {
@@ -462,7 +451,6 @@ class AdministrationController extends ActionController
      *
      * @param int $id
      * @param int $pageHash
-     * @return void
      */
     public function wordDetailAction($id = 0, $pageHash = 0)
     {
@@ -501,7 +489,6 @@ class AdministrationController extends ActionController
      *
      * @param int $depth
      * @param string $mode
-     * @return void
      */
     public function statisticAction($depth = 1, $mode = 'overview')
     {
@@ -533,7 +520,6 @@ class AdministrationController extends ActionController
      * @param string $id
      * @param int $depth
      * @param string $mode
-     * @return void
      */
     public function deleteIndexedItemAction($id, $depth = 1, $mode = 'overview')
     {
diff --git a/typo3/sysext/indexed_search/Classes/Controller/SearchController.php b/typo3/sysext/indexed_search/Classes/Controller/SearchController.php
index 454ca48dd935a71d9562647b2c0f9ae6de680029..8e92952ea2ac46c2c825e7e71546a4d7bce12b23 100644
--- a/typo3/sysext/indexed_search/Classes/Controller/SearchController.php
+++ b/typo3/sysext/indexed_search/Classes/Controller/SearchController.php
@@ -243,7 +243,6 @@ class SearchController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionControlle
      * Performs the search, the display and writing stats
      *
      * @param array $search the search parameters, an associative array
-     * @return void
      * @ignorevalidation $search
      */
     public function searchAction($search = [])
@@ -799,7 +798,6 @@ class SearchController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionControlle
      * @param array $searchWords Search Word array
      * @param int $count Number of hits
      * @param int $pt Milliseconds the search took
-     * @return void
      */
     protected function writeSearchStat($searchParams, $searchWords, $count, $pt)
     {
@@ -934,7 +932,6 @@ class SearchController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionControlle
      * Sort options about the search form
      *
      * @param array $search The search data / params
-     * @return void
      * @ignorevalidation $search
      */
     public function formAction($search = [])
@@ -1452,8 +1449,6 @@ class SearchController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionControlle
     /**
      * simple function to initialize possible external parsers
      * feeds the $this->externalParsers array
-     *
-     * @return void
      */
     protected function initializeExternalParsers()
     {
diff --git a/typo3/sysext/indexed_search/Classes/Domain/Repository/AdministrationRepository.php b/typo3/sysext/indexed_search/Classes/Domain/Repository/AdministrationRepository.php
index 29f73c9645cf8f3e28de62f3138122c7656c4a4a..0986685337b98149d175cedd08901f5dc4f5bc14 100644
--- a/typo3/sysext/indexed_search/Classes/Domain/Repository/AdministrationRepository.php
+++ b/typo3/sysext/indexed_search/Classes/Domain/Repository/AdministrationRepository.php
@@ -434,7 +434,6 @@ class AdministrationRepository
      * Add additional information to the result row
      *
      * @param array $row
-     * @return void
      */
     protected function addAdditionalInformation(array &$row)
     {
@@ -666,7 +665,6 @@ class AdministrationRepository
      * @param string $phashList
      * @param int $pageId
      * @param int $depth
-     * @return void
      */
     public function removeIndexedPhashRow($phashList, $pageId, $depth = 4)
     {
@@ -728,7 +726,6 @@ class AdministrationRepository
      * Save stop words
      *
      * @param array $words stop words
-     * @return void
      */
     public function saveStopWords(array $words)
     {
@@ -752,7 +749,6 @@ class AdministrationRepository
      *
      * @param array $words keywords
      * @param int $pageId page id
-     * @return void
      */
     public function saveKeywords(array $words, $pageId)
     {
diff --git a/typo3/sysext/indexed_search/Classes/Domain/Repository/IndexSearchRepository.php b/typo3/sysext/indexed_search/Classes/Domain/Repository/IndexSearchRepository.php
index 5ea0f5e3126f358279f7daa4e6122bf927f8d5ab..d28289a6fb12625bc39832637834d1277811712d 100644
--- a/typo3/sysext/indexed_search/Classes/Domain/Repository/IndexSearchRepository.php
+++ b/typo3/sysext/indexed_search/Classes/Domain/Repository/IndexSearchRepository.php
@@ -169,7 +169,6 @@ class IndexSearchRepository
      * @param array $searchData the search data
      * @param array $externalParsers
      * @param string $searchRootPageIdList
-     * @return void
      */
     public function initialize($settings, $searchData, $externalParsers, $searchRootPageIdList)
     {
diff --git a/typo3/sysext/indexed_search/Classes/Example/CrawlerHook.php b/typo3/sysext/indexed_search/Classes/Example/CrawlerHook.php
index 1c73a5f1bc71beb543646884a23ca3d71c456be8..58203f572fd2b17eabb24805bccacb71b9ac2ad4 100644
--- a/typo3/sysext/indexed_search/Classes/Example/CrawlerHook.php
+++ b/typo3/sysext/indexed_search/Classes/Example/CrawlerHook.php
@@ -41,7 +41,6 @@ class CrawlerHook
      * @param array $session_data Session data variable. Passed by reference. Changed content is saved and passed back upon next instance in the session.
      * @param array $params Params array from the queue entry.
      * @param \TYPO3\CMS\IndexedSearch\Hook\CrawlerHook $pObj Parent Object (from "indexed_search" extension)
-     * @return void
      */
     public function indexOperation($cfgRec, &$session_data, $params, &$pObj)
     {
diff --git a/typo3/sysext/indexed_search/Classes/Example/PluginHook.php b/typo3/sysext/indexed_search/Classes/Example/PluginHook.php
index 72ff3fdb126433952548183854ba0dd9b4d56abd..926b1fdd97be63f5ae965550d1dabb792bae2579 100644
--- a/typo3/sysext/indexed_search/Classes/Example/PluginHook.php
+++ b/typo3/sysext/indexed_search/Classes/Example/PluginHook.php
@@ -37,8 +37,6 @@ class PluginHook
      *
      * This hook is activated by this key / value pair in ext_localconf.php
      * 'initialize_postProc' => \TYPO3\CMS\IndexedSearch\Example\PluginHook::class,
-     *
-     * @return void
      */
     public function initialize_postProc()
     {
diff --git a/typo3/sysext/indexed_search/Classes/FileContentParser.php b/typo3/sysext/indexed_search/Classes/FileContentParser.php
index 5a222a92866f457ef3597a70445b941d2728d199..d5b0e9fc8655c1c93eb21986cfff9a70971c4cde 100644
--- a/typo3/sysext/indexed_search/Classes/FileContentParser.php
+++ b/typo3/sysext/indexed_search/Classes/FileContentParser.php
@@ -707,7 +707,6 @@ class FileContentParser
      *
      * @staticvar string $lastLocale Stores the locale used before it is overridden by this method.
      * @param bool $resetLocale TRUE resets the locale to $lastLocale.
-     * @return void
      * @throws \RuntimeException
      */
     protected function setLocaleForServerFileSystem($resetLocale = false)
diff --git a/typo3/sysext/indexed_search/Classes/Hook/CrawlerHook.php b/typo3/sysext/indexed_search/Classes/Hook/CrawlerHook.php
index fd493a1910519e1c62faf73ac3b57d32fb1fb975..05bc79674321d382abae642d9352b706ba7030df 100644
--- a/typo3/sysext/indexed_search/Classes/Hook/CrawlerHook.php
+++ b/typo3/sysext/indexed_search/Classes/Hook/CrawlerHook.php
@@ -64,7 +64,6 @@ class CrawlerHook
      * In reality we select indexing configurations and evaluate if any of them needs to run.
      *
      * @param object $pObj Parent object (tx_crawler lib)
-     * @return void
      */
     public function crawler_init(&$pObj)
     {
@@ -262,7 +261,6 @@ class CrawlerHook
      * @param array $session_data Session data for the indexing session spread over multiple instances of the script. Passed by reference so changes hereto will be saved for the next call!
      * @param array $params Parameters from the log queue.
      * @param object $pObj Parent object (from "crawler" extension!)
-     * @return void
      */
     public function crawler_execute_type1($cfgRec, &$session_data, $params, &$pObj)
     {
@@ -328,7 +326,6 @@ class CrawlerHook
      * @param array $session_data Session data for the indexing session spread over multiple instances of the script. Passed by reference so changes hereto will be saved for the next call!
      * @param array $params Parameters from the log queue.
      * @param object $pObj Parent object (from "crawler" extension!)
-     * @return void
      */
     public function crawler_execute_type2($cfgRec, &$session_data, $params, &$pObj)
     {
@@ -390,7 +387,6 @@ class CrawlerHook
      * @param array $session_data Session data for the indexing session spread over multiple instances of the script. Passed by reference so changes hereto will be saved for the next call!
      * @param array $params Parameters from the log queue.
      * @param object $pObj Parent object (from "crawler" extension!)
-     * @return void
      */
     public function crawler_execute_type3($cfgRec, &$session_data, $params, &$pObj)
     {
@@ -431,7 +427,6 @@ class CrawlerHook
      * @param array $session_data Session data for the indexing session spread over multiple instances of the script. Passed by reference so changes hereto will be saved for the next call!
      * @param array $params Parameters from the log queue.
      * @param object $pObj Parent object (from "crawler" extension!)
-     * @return void
      */
     public function crawler_execute_type4($cfgRec, &$session_data, $params, &$pObj)
     {
@@ -491,8 +486,6 @@ class CrawlerHook
 
     /**
      * Look up all old index configurations which are finished and needs to be reset and done
-     *
-     * @return void
      */
     public function cleanUpOldRunningConfigurations()
     {
@@ -661,7 +654,6 @@ class CrawlerHook
      * @param array $r Record to index
      * @param array $cfgRec Configuration Record
      * @param array $rl Rootline array to relate indexing to
-     * @return void
      */
     public function indexSingleRecord($r, $cfgRec, $rl = null)
     {
@@ -762,7 +754,6 @@ class CrawlerHook
      *
      * @param array $cfgRec Configuration record
      * @param string $title Title/URL
-     * @return void
      */
     public function addQueueEntryForHook($cfgRec, $title)
     {
@@ -779,7 +770,6 @@ class CrawlerHook
      * Deletes all data stored by indexed search for a given page
      *
      * @param int $id Uid of the page to delete all pHash
-     * @return void
      */
     public function deleteFromIndex($id)
     {
@@ -840,7 +830,6 @@ class CrawlerHook
      * @param string $id Record ID. If new record its a string pointing to index inside \TYPO3\CMS\Core\DataHandling\DataHandler::substNEWwithIDs
      * @param mixed $value Target value (ignored)
      * @param DataHandler $pObj DataHandler calling object
-     * @return void
      */
     public function processCmdmap_preProcess($command, $table, $id, $value, $pObj)
     {
@@ -858,7 +847,6 @@ class CrawlerHook
      * @param string $id Record ID. If new record its a string pointing to index inside \TYPO3\CMS\Core\DataHandling\DataHandler::substNEWwithIDs
      * @param array $fieldArray Field array of updated fields in the operation
      * @param DataHandler $pObj DataHandler calling object
-     * @return void
      */
     public function processDatamap_afterDatabaseOperations($status, $table, $id, $fieldArray, $pObj)
     {
diff --git a/typo3/sysext/indexed_search/Classes/Hook/TypoScriptFrontendHook.php b/typo3/sysext/indexed_search/Classes/Hook/TypoScriptFrontendHook.php
index 9ba0d221b84a60092f1befe2cbba13799e96b3b5..ffc7da453f6d031d8889007c3d2d3fcc1596caaa 100644
--- a/typo3/sysext/indexed_search/Classes/Hook/TypoScriptFrontendHook.php
+++ b/typo3/sysext/indexed_search/Classes/Hook/TypoScriptFrontendHook.php
@@ -26,7 +26,6 @@ class TypoScriptFrontendHook
      *
      * @param array $params Parameters from frontend
      * @param TypoScriptFrontendController $ref TSFE object
-     * @return void
      */
     public function headerNoCache(array &$params, $ref)
     {
diff --git a/typo3/sysext/indexed_search/Classes/Indexer.php b/typo3/sysext/indexed_search/Classes/Indexer.php
index 8d2fc6a442069fac13d8b3bd4898a7b267f675ad..27532856ac52969b4f31c892c9c17ca53e742a30 100644
--- a/typo3/sysext/indexed_search/Classes/Indexer.php
+++ b/typo3/sysext/indexed_search/Classes/Indexer.php
@@ -247,7 +247,6 @@ class Indexer
      * Parent Object (TSFE) Initialization
      *
      * @param TypoScriptFrontendController $pObj Parent Object, passed by reference
-     * @return void
      */
     public function hook_indexContent(&$pObj)
     {
@@ -349,7 +348,6 @@ class Indexer
      * @param array $uidRL Rootline array of only UIDs.
      * @param array $cHash_array Array of GET variables to register with this indexing
      * @param bool $createCHash If set, calculates a cHash value from the $cHash_array. Probably you will not do that since such cases are indexed through the frontend and the idea of this interface is to index non-cacheable pages from the backend!
-     * @return void
      */
     public function backend_initIndexer($id, $type, $sys_language_uid, $MP, $uidRL, $cHash_array = [], $createCHash = false)
     {
@@ -399,7 +397,6 @@ class Indexer
      *
      * @param int $freeIndexUid Free index UID
      * @param int $freeIndexSetId Set id - an integer identifying the "set" of indexing operations.
-     * @return void
      */
     public function backend_setFreeIndexUid($freeIndexUid, $freeIndexSetId = 0)
     {
@@ -418,7 +415,6 @@ class Indexer
      * @param int $mtime Last modification time, in seconds
      * @param int $crdate The creation date of the content, in seconds
      * @param int $recordUid The record UID that the content comes from (for registration with the indexed rows)
-     * @return void
      */
     public function backend_indexAsTYPO3Page($title, $keywords, $description, $content, $charset, $mtime, $crdate = 0, $recordUid = 0)
     {
@@ -458,8 +454,6 @@ class Indexer
      *******************************/
     /**
      * Initializes the object. $this->conf MUST be set with proper values prior to this call!!!
-     *
-     * @return void
      */
     public function init()
     {
@@ -505,7 +499,6 @@ class Indexer
     /**
      * Initialize external parsers
      *
-     * @return void
      * @access private
      * @see init()
      */
@@ -530,8 +523,6 @@ class Indexer
      *******************************/
     /**
      * Start indexing of the TYPO3 page
-     *
-     * @return void
      */
     public function indexTypo3PageContent()
     {
@@ -759,7 +750,6 @@ class Indexer
      * Extract links (hrefs) from HTML content and if indexable media is found, it is indexed.
      *
      * @param string $content HTML content
-     * @return void
      */
     public function extractLinks($content)
     {
@@ -897,7 +887,6 @@ class Indexer
      * Index External URLs HTML content
      *
      * @param string $externalUrl URL, eg. "http://typo3.org/
-     * @return void
      * @see indexRegularDocument()
      */
     public function indexExternalUrl($externalUrl)
@@ -1115,7 +1104,6 @@ class Indexer
      * @param bool $force If set, indexing is forced (despite content hashes, mtime etc).
      * @param string $contentTmpFile Temporary file with the content to read it from (instead of $file). Used when the $file is a URL.
      * @param string $altExtension File extension for temporary file.
-     * @return void
      */
     public function indexRegularDocument($file, $force = false, $contentTmpFile = '', $altExtension = '')
     {
@@ -1275,7 +1263,6 @@ class Indexer
      *
      * @param array $contentArr Standard content array
      * @param string $charset Charset of the input content (converted to utf-8)
-     * @return void
      */
     public function charsetEntity2utf8(&$contentArr, $charset)
     {
@@ -1352,7 +1339,6 @@ class Indexer
      * @param array $content Standard content array
      * @param string $key Key from standard content array
      * @param int $offset Bit-wise priority to type
-     * @return void
      */
     public function analyzeHeaderinfo(&$retArr, $content, $key, $offset)
     {
@@ -1383,7 +1369,6 @@ class Indexer
      *
      * @param array $retArr Index array, passed by reference
      * @param array $content Standard content array
-     * @return void
      */
     public function analyzeBody(&$retArr, $content)
     {
@@ -1442,8 +1427,6 @@ class Indexer
      *******************************/
     /**
      * Updates db with information about the page (TYPO3 page, not external media)
-     *
-     * @return void
      */
     public function submitPage()
     {
@@ -1530,7 +1513,6 @@ class Indexer
      *
      * @param int $hash Search result record phash
      * @param int $phash_x Actual phash of current content
-     * @return void
      * @see update_grlist()
      */
     public function submit_grlist($hash, $phash_x)
@@ -1555,7 +1537,6 @@ class Indexer
      *
      * @param int $hash phash of TYPO3 parent search result record
      * @param int $hash_t3 phash of the file indexation search record
-     * @return void
      */
     public function submit_section($hash, $hash_t3)
     {
@@ -1576,7 +1557,6 @@ class Indexer
      * Removes records for the indexed page, $phash
      *
      * @param int $phash phash value to flush
-     * @return void
      */
     public function removeOldIndexedPages($phash)
     {
@@ -1616,7 +1596,6 @@ class Indexer
      * @param int $size Size of file in bytes
      * @param int $content_md5h Content HASH value.
      * @param array $contentParts Standard content array (using only title and body for a file)
-     * @return void
      */
     public function submitFilePage($hash, $file, $subinfo, $ext, $mtime, $ctime, $size, $content_md5h, $contentParts)
     {
@@ -1695,7 +1674,6 @@ class Indexer
      * Stores file gr_list for a file IF it does not exist already
      *
      * @param int $hash phash value of file
-     * @return void
      */
     public function submitFile_grlist($hash)
     {
@@ -1742,7 +1720,6 @@ class Indexer
      * Stores file section for a file IF it does not exist
      *
      * @param int $hash phash value of file
-     * @return void
      */
     public function submitFile_section($hash)
     {
@@ -1777,7 +1754,6 @@ class Indexer
      * Removes records for the indexed page, $phash
      *
      * @param int $phash phash value to flush
-     * @return void
      */
     public function removeOldIndexedFiles($phash)
     {
@@ -1950,7 +1926,6 @@ class Indexer
      *
      * @param int $phash phash of the search result that should be found
      * @param int $phash_x The real phash of the current content. The two values are different when a page with userlogin turns out to contain the exact same content as another already indexed version of the page; This is the whole reason for the grlist table in fact...
-     * @return void
      * @see submit_grlist()
      */
     public function update_grlist($phash, $phash_x)
@@ -1979,7 +1954,6 @@ class Indexer
      *
      * @param int $phash phash value
      * @param int $mtime If set, update the mtime field to this value.
-     * @return void
      */
     public function updateTstamp($phash, $mtime = 0)
     {
@@ -2010,7 +1984,6 @@ class Indexer
      * Update SetID of the index_phash record.
      *
      * @param int $phash phash value
-     * @return void
      */
     public function updateSetId($phash)
     {
@@ -2036,7 +2009,6 @@ class Indexer
      *
      * @param int $phash phash value.
      * @param int $parsetime Parsetime value to set.
-     * @return void
      */
     public function updateParsetime($phash, $parsetime)
     {
@@ -2059,8 +2031,6 @@ class Indexer
 
     /**
      * Update section rootline for the page
-     *
-     * @return void
      */
     public function updateRootline()
     {
@@ -2087,7 +2057,6 @@ class Indexer
      * rl0, rl1 and rl2 are standard. A hook might add more.
      *
      * @param array $fieldArray Field array, passed by reference
-     * @return void
      */
     public function getRootLineFields(array &$fieldArray)
     {
@@ -2104,7 +2073,6 @@ class Indexer
     /**
      * Includes the crawler class
      *
-     * @return void
      * @deprecated since TYPO3 v8, will be removed in TYPO3 v9, autoloader is taking care of that functionality
      */
     public function includeCrawlerClass()
@@ -2122,7 +2090,6 @@ class Indexer
      * Adds new words to db
      *
      * @param array $wordListArray Word List array (where each word has information about position etc).
-     * @return void
      */
     public function checkWordList($wordListArray)
     {
@@ -2185,7 +2152,6 @@ class Indexer
      *
      * @param array $wordList Word list array
      * @param int $phash phash value
-     * @return void
      */
     public function submitWords($wordList, $phash)
     {
@@ -2254,8 +2220,6 @@ class Indexer
      *******************************/
     /**
      * Get search hash, T3 pages
-     *
-     * @return void
      */
     public function setT3Hashes()
     {
@@ -2306,7 +2270,6 @@ class Indexer
      *
      * @param string $msg Title to set
      * @param string $key Key (?)
-     * @return void
      */
     public function log_push($msg, $key)
     {
@@ -2315,8 +2278,6 @@ class Indexer
 
     /**
      * Pull function wrapper for TT logging
-     *
-     * @return void
      */
     public function log_pull()
     {
@@ -2328,7 +2289,6 @@ class Indexer
      *
      * @param string $msg Message to set
      * @param int $errorNum Error number
-     * @return void
      */
     public function log_setTSlogMessage($msg, $errorNum = 0)
     {
diff --git a/typo3/sysext/indexed_search/Classes/Lexer.php b/typo3/sysext/indexed_search/Classes/Lexer.php
index 786247b02cf4374270301bcd3c4565e14c727e78..6bb8328b55c5548dae757ec6c79f8b127c6d164e 100644
--- a/typo3/sysext/indexed_search/Classes/Lexer.php
+++ b/typo3/sysext/indexed_search/Classes/Lexer.php
@@ -56,7 +56,6 @@ class Lexer
 
     /**
      * Constructor: Initializes the charset class
-     *
      */
     public function __construct()
     {
@@ -112,7 +111,6 @@ class Lexer
      * @param string $wordString Complete Input string from where to extract word
      * @param int $start Start position of word in input string
      * @param int $len The Length of the word string from start position
-     * @return void
      */
     public function addWords(&$words, &$wordString, $start, $len)
     {
diff --git a/typo3/sysext/indexed_search/Classes/ViewHelpers/Format/FlagValueViewHelper.php b/typo3/sysext/indexed_search/Classes/ViewHelpers/Format/FlagValueViewHelper.php
index d036aed591e67ab9ed5339e64f5c0db133ead5b0..a0a50130bb8423af9e497ed5618679120f2745f6 100644
--- a/typo3/sysext/indexed_search/Classes/ViewHelpers/Format/FlagValueViewHelper.php
+++ b/typo3/sysext/indexed_search/Classes/ViewHelpers/Format/FlagValueViewHelper.php
@@ -27,7 +27,6 @@ class FlagValueViewHelper extends AbstractViewHelper
 
     /**
      * Sets up the needed arguments for this View Helper.
-     * @return void
      */
     public function initializeArguments()
     {
diff --git a/typo3/sysext/info/Classes/Controller/InfoModuleController.php b/typo3/sysext/info/Classes/Controller/InfoModuleController.php
index a3a6a1ff4fe48edc2f293a826b33424937516a7e..24d2bc10486d08ea44270193b4faf6e30d16dc92 100644
--- a/typo3/sysext/info/Classes/Controller/InfoModuleController.php
+++ b/typo3/sysext/info/Classes/Controller/InfoModuleController.php
@@ -82,8 +82,6 @@ class InfoModuleController extends BaseScriptClass
 
     /**
      * Initialize module header etc and call extObjContent function
-     *
-     * @return void
      */
     public function main()
     {
diff --git a/typo3/sysext/info_pagetsconfig/Classes/Controller/InfoPageTyposcriptConfigController.php b/typo3/sysext/info_pagetsconfig/Classes/Controller/InfoPageTyposcriptConfigController.php
index 7418c96d75bd20000fbebe9dbc9d0e9cba859366..5a1fdd5050281ae1919851713a1e38b014eef9c9 100644
--- a/typo3/sysext/info_pagetsconfig/Classes/Controller/InfoPageTyposcriptConfigController.php
+++ b/typo3/sysext/info_pagetsconfig/Classes/Controller/InfoPageTyposcriptConfigController.php
@@ -267,7 +267,6 @@ class InfoPageTyposcriptConfigController extends \TYPO3\CMS\Backend\Module\Abstr
      * @param array $hierarchicArray The hierarchic array (passed by reference)
      * @param array $rootlineArray The rootline array
      * @param array $row The row from the database containing the uid and TSConfig fields
-     * @return void
      */
     protected function setInPageArray(&$hierarchicArray, $rootlineArray, $row)
     {
diff --git a/typo3/sysext/install/Classes/Configuration/AbstractCustomPreset.php b/typo3/sysext/install/Classes/Configuration/AbstractCustomPreset.php
index 3d3f1152d00b38fa50d4386b63888d5ea4636f2b..38e8226f7b70be02e8c7ff53172cae9370e7abe3 100644
--- a/typo3/sysext/install/Classes/Configuration/AbstractCustomPreset.php
+++ b/typo3/sysext/install/Classes/Configuration/AbstractCustomPreset.php
@@ -51,8 +51,6 @@ abstract class AbstractCustomPreset extends AbstractPreset
      * with other presets.
      * Marking the custom preset as active is therefor taken care
      * off by the feature itself if no other preset is active.
-     *
-     * @return void
      */
     public function setActive()
     {
diff --git a/typo3/sysext/install/Classes/Configuration/AbstractFeature.php b/typo3/sysext/install/Classes/Configuration/AbstractFeature.php
index f9c3b2cdbdfcec54c21db2afdf0b9416b872d754..2cb8e4b65fa6a5de33def509425e58c2e758a540 100644
--- a/typo3/sysext/install/Classes/Configuration/AbstractFeature.php
+++ b/typo3/sysext/install/Classes/Configuration/AbstractFeature.php
@@ -45,7 +45,6 @@ abstract class AbstractFeature
      * Initialize presets of feature
      *
      * @param array $postValues List of $POST values of this feature
-     * @return void
      * @throws Exception
      */
     public function initializePresets(array $postValues)
diff --git a/typo3/sysext/install/Classes/Configuration/CustomPresetInterface.php b/typo3/sysext/install/Classes/Configuration/CustomPresetInterface.php
index 6298e7156718a4d7eaba0f9c7ee4df8a65738f5c..5277a2040e7a8bf0842d43cbb2d792ad0e472f74 100644
--- a/typo3/sysext/install/Classes/Configuration/CustomPresetInterface.php
+++ b/typo3/sysext/install/Classes/Configuration/CustomPresetInterface.php
@@ -31,8 +31,6 @@ interface CustomPresetInterface extends PresetInterface
      * with other presets.
      * Marking the custom preset as active is therefor taken care
      * off by the feature itself if no other preset is active.
-     *
-     * @return void
      */
     public function setActive();
 }
diff --git a/typo3/sysext/install/Classes/Configuration/FeatureInterface.php b/typo3/sysext/install/Classes/Configuration/FeatureInterface.php
index f8653e76ae1b98600567443cd7e1bec05d11e080..29a6a37585976c399f4cede1087afa40d0973269 100644
--- a/typo3/sysext/install/Classes/Configuration/FeatureInterface.php
+++ b/typo3/sysext/install/Classes/Configuration/FeatureInterface.php
@@ -23,7 +23,6 @@ interface FeatureInterface
      * Initialize presets
      *
      * @param array $postValues List of $POST values of this feature
-     * @return void
      */
     public function initializePresets(array $postValues);
 
diff --git a/typo3/sysext/install/Classes/Controller/AbstractController.php b/typo3/sysext/install/Classes/Controller/AbstractController.php
index d3d6f7bbe17c7ac635ef46bb25f7adef6695cac6..b256ed4d09d4ffcbc197aa7ffee341609c1e59af 100644
--- a/typo3/sysext/install/Classes/Controller/AbstractController.php
+++ b/typo3/sysext/install/Classes/Controller/AbstractController.php
@@ -52,8 +52,6 @@ class AbstractController
      * Checking ENABLE_INSTALL_TOOL validity is simple:
      * As soon as there is a typo3conf directory at all (not step 1 of "first install"),
      * the file must be there and valid in order to proceed.
-     *
-     * @return void
      */
     protected function outputInstallToolNotEnabledMessageIfNeeded()
     {
@@ -95,7 +93,6 @@ class AbstractController
      * Use form protection API to find out if protected POST forms are ok.
      *
      * @throws Exception
-     * @return void
      */
     protected function checkSessionToken()
     {
@@ -130,7 +127,6 @@ class AbstractController
      * if in install tool, the login form is displayed.
      *
      * @param bool $tokenOk
-     * @return void
      */
     protected function handleSessionTokenCheck($tokenOk)
     {
@@ -154,8 +150,6 @@ class AbstractController
 
     /**
      * Check if session expired.
-     *
-     * @return void
      */
     protected function checkSessionLifetime()
     {
@@ -171,8 +165,6 @@ class AbstractController
     /**
      * If session expired, the current step of step controller is reloaded
      * (if first installation is running) - or the login form is displayed.
-     *
-     * @return void
      */
     protected function handleSessionLifeTimeExpired()
     {
@@ -212,8 +204,6 @@ class AbstractController
 
     /**
      * Validate install tool password and login user if requested
-     *
-     * @return void
      */
     protected function loginIfRequested()
     {
@@ -261,8 +251,6 @@ class AbstractController
     /**
      * Show login for if user is not authorized yet and if
      * not in first installation process.
-     *
-     * @return void
      */
     protected function outputLoginFormIfNotAuthorized()
     {
@@ -277,8 +265,6 @@ class AbstractController
 
     /**
      * If install tool login mail is set, send a mail for a successful login.
-     *
-     * @return void
      */
     protected function sendLoginSuccessfulMail()
     {
@@ -301,8 +287,6 @@ class AbstractController
 
     /**
      * If install tool login mail is set, send a mail for a failed login.
-     *
-     * @return void
      */
     protected function sendLoginFailedMail()
     {
@@ -376,8 +360,6 @@ class AbstractController
      * Initialize session object.
      * Subclass will throw exception if session can not be created or if
      * preconditions like a valid encryption key are not set.
-     *
-     * @return void
      */
     protected function initializeSession()
     {
@@ -404,8 +386,6 @@ class AbstractController
     /**
      * Required extbase ext_localconf
      * Set caching to NullBackend, install tool must not cache anything
-     *
-     * @return void
      */
     protected function loadBaseExtensions()
     {
@@ -493,7 +473,6 @@ class AbstractController
      * @param string $controller Can be set to 'tool' to redirect from step to tool controller
      * @param string $action Set specific action for next request, used in step controller to specify next step
      * @throws Exception\RedirectLoopException
-     * @return void
      */
     protected function redirect($controller = '', $action = '')
     {
diff --git a/typo3/sysext/install/Classes/Controller/Action/AbstractAction.php b/typo3/sysext/install/Classes/Controller/Action/AbstractAction.php
index 63390e6bc7bee47a03f8b2df18a4d41f259481bc..cc5372f5af59eb2b72cceba5783b67c20c6a702a 100644
--- a/typo3/sysext/install/Classes/Controller/Action/AbstractAction.php
+++ b/typo3/sysext/install/Classes/Controller/Action/AbstractAction.php
@@ -70,8 +70,6 @@ abstract class AbstractAction implements ActionInterface
 
     /**
      * Initialize the handle action, sets up fluid stuff and assigns default variables.
-     *
-     * @return void
      */
     protected function initializeHandle()
     {
@@ -110,7 +108,6 @@ abstract class AbstractAction implements ActionInterface
      * Set form protection token
      *
      * @param string $token Form protection token
-     * @return void
      */
     public function setToken($token)
     {
@@ -121,7 +118,6 @@ abstract class AbstractAction implements ActionInterface
      * Set action group. Either string 'step', 'tool' or 'common'
      *
      * @param string $controller Controller name
-     * @return void
      */
     public function setController($controller)
     {
@@ -133,7 +129,6 @@ abstract class AbstractAction implements ActionInterface
      * only for loginForm, the action is login
      *
      * @param string $action Name of target action for forms
-     * @return void
      */
     public function setAction($action)
     {
@@ -144,7 +139,6 @@ abstract class AbstractAction implements ActionInterface
      * Set POST form values of install tool
      *
      * @param array $postValues
-     * @return void
      */
     public function setPostValues(array $postValues)
     {
@@ -192,8 +186,6 @@ abstract class AbstractAction implements ActionInterface
      *
      * Those actions can potentially fatal if some old extension is loaded that triggers
      * a fatal in ext_localconf or ext_tables code! Use only if really needed.
-     *
-     * @return void
      */
     protected function loadExtLocalconfDatabaseAndExtTables()
     {
diff --git a/typo3/sysext/install/Classes/Controller/Action/ActionInterface.php b/typo3/sysext/install/Classes/Controller/Action/ActionInterface.php
index 8dd2033084d0587cac7a9ec88b2aef80a904f75d..68e22e4ec687aa86e52513965f2da609a2fde09b 100644
--- a/typo3/sysext/install/Classes/Controller/Action/ActionInterface.php
+++ b/typo3/sysext/install/Classes/Controller/Action/ActionInterface.php
@@ -30,7 +30,6 @@ interface ActionInterface
      * Set form protection token
      *
      * @param string $token Form protection token
-     * @return void
      */
     public function setToken($token);
 
@@ -38,7 +37,6 @@ interface ActionInterface
      * Set controller, Either string 'step', 'tool' or 'common'
      *
      * @param string $controller Controller name
-     * @return void
      */
     public function setController($controller);
 
@@ -47,7 +45,6 @@ interface ActionInterface
      * only for loginForm, the action is login
      *
      * @param string $action Name of target action for forms
-     * @return void
      */
     public function setAction($action);
 
@@ -55,7 +52,6 @@ interface ActionInterface
      * Set POST values
      *
      * @param array $postValues List of values submitted via POST
-     * @return void
      */
     public function setPostValues(array $postValues);
 
diff --git a/typo3/sysext/install/Classes/Controller/Action/Ajax/AbstractCoreUpdate.php b/typo3/sysext/install/Classes/Controller/Action/Ajax/AbstractCoreUpdate.php
index 845550be3110a60b03a30cd14d99bb80fbb0c9f6..8bd0069c11b576d518e20eb0cff49a33c178ef5b 100644
--- a/typo3/sysext/install/Classes/Controller/Action/Ajax/AbstractCoreUpdate.php
+++ b/typo3/sysext/install/Classes/Controller/Action/Ajax/AbstractCoreUpdate.php
@@ -67,7 +67,6 @@ abstract class AbstractCoreUpdate extends AbstractAjaxAction
     /**
      * Initialize the handle action, sets up fluid stuff and assigns default variables.
      *
-     * @return void
      * @throws \TYPO3\CMS\Install\Controller\Exception
      */
     protected function initializeHandle()
diff --git a/typo3/sysext/install/Classes/Controller/Action/Ajax/ExtensionCompatibilityTester.php b/typo3/sysext/install/Classes/Controller/Action/Ajax/ExtensionCompatibilityTester.php
index d202986e8fdc885fcafea80f48e475866d7fff0d..fb17410fed3725c1996ea74459730700f5886b36 100644
--- a/typo3/sysext/install/Classes/Controller/Action/Ajax/ExtensionCompatibilityTester.php
+++ b/typo3/sysext/install/Classes/Controller/Action/Ajax/ExtensionCompatibilityTester.php
@@ -78,8 +78,6 @@ class ExtensionCompatibilityTester extends AbstractAjaxAction
 
     /**
      * Delete the protocol files if they exist
-     *
-     * @return void
      */
     protected function deleteProtocolFile()
     {
@@ -133,7 +131,6 @@ class ExtensionCompatibilityTester extends AbstractAjaxAction
      * successful.
      *
      * @param array $extensions
-     * @return void
      */
     protected function tryToLoadExtLocalconfAndExtTablesOfExtensions(array $extensions)
     {
@@ -156,7 +153,6 @@ class ExtensionCompatibilityTester extends AbstractAjaxAction
      *
      * @param string $extensionKey
      * @param \ArrayAccess $extension
-     * @return void
      */
     protected function loadExtTablesForExtension($extensionKey, array $extension)
     {
@@ -182,7 +178,6 @@ class ExtensionCompatibilityTester extends AbstractAjaxAction
      *
      * @param string $extensionKey
      * @param \ArrayAccess $extension
-     * @return void
      */
     protected function loadExtLocalconfForExtension($extensionKey, array $extension)
     {
@@ -205,7 +200,6 @@ class ExtensionCompatibilityTester extends AbstractAjaxAction
      * the end of the file.
      *
      * @param string $extensionKey
-     * @return void
      */
     protected function writeCurrentExtensionToFile($extensionKey)
     {
@@ -220,7 +214,6 @@ class ExtensionCompatibilityTester extends AbstractAjaxAction
      * Removes $extensionKey from protocol file.
      *
      * @param string $extensionKey
-     * @return void
      */
     protected function removeCurrentExtensionFromFile($extensionKey)
     {
@@ -235,8 +228,6 @@ class ExtensionCompatibilityTester extends AbstractAjaxAction
 
     /**
      * Log last occurred error for logging.
-     *
-     * @return void
      */
     public function logError()
     {
diff --git a/typo3/sysext/install/Classes/Controller/Action/Ajax/TcaExtTablesCheck.php b/typo3/sysext/install/Classes/Controller/Action/Ajax/TcaExtTablesCheck.php
index 5ff59976ff044659fd62913a4aa3d63360221e8f..2bb5595128f54fdff613d032addf04361e597598 100644
--- a/typo3/sysext/install/Classes/Controller/Action/Ajax/TcaExtTablesCheck.php
+++ b/typo3/sysext/install/Classes/Controller/Action/Ajax/TcaExtTablesCheck.php
@@ -48,7 +48,6 @@ class TcaExtTablesCheck extends AbstractAjaxAction
     /**
      * Initialize the handle action, sets up fluid stuff and assigns default variables.
      * @ToDo Refactor View Initialization for all Ajax Controllers
-     * @return void
      */
     protected function initializeHandle()
     {
diff --git a/typo3/sysext/install/Classes/Controller/Action/Ajax/TcaMigrationsCheck.php b/typo3/sysext/install/Classes/Controller/Action/Ajax/TcaMigrationsCheck.php
index 96280c8fbd121c44ba0297862a08de8f93065c52..8e65459e281d2148c05f0177c8cafc15d55ae222 100644
--- a/typo3/sysext/install/Classes/Controller/Action/Ajax/TcaMigrationsCheck.php
+++ b/typo3/sysext/install/Classes/Controller/Action/Ajax/TcaMigrationsCheck.php
@@ -42,7 +42,6 @@ class TcaMigrationsCheck extends AbstractAjaxAction
     /**
      * Initialize the handle action, sets up fluid stuff and assigns default variables.
      * @ToDo Refactor View Initialization for all Ajax Controllers
-     * @return void
      */
     protected function initializeHandle()
     {
diff --git a/typo3/sysext/install/Classes/Controller/Action/Step/AbstractStepAction.php b/typo3/sysext/install/Classes/Controller/Action/Step/AbstractStepAction.php
index 7403dcc7ed6ffc86a9d5a057e6a768c416dc4ea2..9f19d3d72b79881ab50f8812f2008274249f4782 100644
--- a/typo3/sysext/install/Classes/Controller/Action/Step/AbstractStepAction.php
+++ b/typo3/sysext/install/Classes/Controller/Action/Step/AbstractStepAction.php
@@ -34,7 +34,6 @@ abstract class AbstractStepAction extends \TYPO3\CMS\Install\Controller\Action\A
      *
      * @param int $current The current position
      * @param int $total The total number of steps
-     * @return void
      */
     public function setStepsCounter($current, $total)
     {
@@ -64,8 +63,6 @@ abstract class AbstractStepAction extends \TYPO3\CMS\Install\Controller\Action\A
 
     /**
      * Define the steps to the view.
-     *
-     * @return void
      */
     protected function assignSteps()
     {
diff --git a/typo3/sysext/install/Classes/Controller/Action/Step/DatabaseConnect.php b/typo3/sysext/install/Classes/Controller/Action/Step/DatabaseConnect.php
index 75017679a725666a74ada8c4871805d00543be60..8e964e26d28b5cb55f0428321334a408709757e0 100644
--- a/typo3/sysext/install/Classes/Controller/Action/Step/DatabaseConnect.php
+++ b/typo3/sysext/install/Classes/Controller/Action/Step/DatabaseConnect.php
@@ -283,8 +283,6 @@ class DatabaseConnect extends AbstractStepAction
      * Unix domain socket connections are quicker than TCP/IP, so it is
      * tested if a unix domain socket connection to localhost is successful. If not,
      * a default configuration for TCP/IP is used.
-     *
-     * @return void
      */
     protected function useDefaultValuesForNotConfiguredOptions()
     {
diff --git a/typo3/sysext/install/Classes/Controller/Action/Step/StepInterface.php b/typo3/sysext/install/Classes/Controller/Action/Step/StepInterface.php
index 2c4e1a6e83fe54c8d31ba6ad01fd6b290972e22a..dccb9c89a214bdbc0c31785b64fc14d5d267a00f 100644
--- a/typo3/sysext/install/Classes/Controller/Action/Step/StepInterface.php
+++ b/typo3/sysext/install/Classes/Controller/Action/Step/StepInterface.php
@@ -40,7 +40,6 @@ interface StepInterface
      *
      * @param int $current The current position
      * @param int $total The total number of steps
-     * @return void
      */
     public function setStepsCounter($current, $total);
 
diff --git a/typo3/sysext/install/Classes/Controller/Action/Tool/ImportantActions.php b/typo3/sysext/install/Classes/Controller/Action/Tool/ImportantActions.php
index 6b3ba02ba2fb25e46c119d4196d4f63c83029009..65de4d7969abb5107315b9f3de671b4318620a96 100644
--- a/typo3/sysext/install/Classes/Controller/Action/Tool/ImportantActions.php
+++ b/typo3/sysext/install/Classes/Controller/Action/Tool/ImportantActions.php
@@ -234,8 +234,6 @@ class ImportantActions extends Action\AbstractAction
 
     /**
      * Set new encryption key
-     *
-     * @return void
      */
     protected function setNewEncryptionKeyAndLogOut()
     {
diff --git a/typo3/sysext/install/Classes/Controller/Action/Tool/UpgradeWizard.php b/typo3/sysext/install/Classes/Controller/Action/Tool/UpgradeWizard.php
index fc6b254691b9a9c68864b6c6af0afccdcc29b005..dbf4bfbd5ceeab75a1a0ad51d74626ff7503534d 100644
--- a/typo3/sysext/install/Classes/Controller/Action/Tool/UpgradeWizard.php
+++ b/typo3/sysext/install/Classes/Controller/Action/Tool/UpgradeWizard.php
@@ -125,8 +125,6 @@ class UpgradeWizard extends Action\AbstractAction
 
     /**
      * List of available updates
-     *
-     * @return void
      */
     protected function listUpdates()
     {
@@ -392,7 +390,6 @@ class UpgradeWizard extends Action\AbstractAction
      * Force creation / update of caching framework tables that are needed by some update wizards
      *
      * @TODO: See also the other remarks on this topic in the abstract class, this whole area needs improvements
-     * @return void
      * @throws \TYPO3\CMS\Extbase\SignalSlot\Exception\InvalidSlotReturnException
      * @throws \TYPO3\CMS\Extbase\SignalSlot\Exception\InvalidSlotException
      * @throws \TYPO3\CMS\Core\Database\Schema\Exception\UnexpectedSignalReturnValueTypeException
diff --git a/typo3/sysext/install/Classes/Controller/AjaxController.php b/typo3/sysext/install/Classes/Controller/AjaxController.php
index 23d9090149393716d6429d6e452f1ec1c2b9bf17..42a94cd476e5a2cb1fc4a138d2a81f7744c93b71 100644
--- a/typo3/sysext/install/Classes/Controller/AjaxController.php
+++ b/typo3/sysext/install/Classes/Controller/AjaxController.php
@@ -18,7 +18,6 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 /**
  * Install tool ajax controller, handles ajax requests
- *
  */
 class AjaxController extends AbstractController
 {
@@ -53,8 +52,6 @@ class AjaxController extends AbstractController
 
     /**
      * Main entry point
-     *
-     * @return void
      */
     public function execute()
     {
@@ -72,8 +69,6 @@ class AjaxController extends AbstractController
 
     /**
      * Check whether the install tool is enabled
-     *
-     * @return void
      */
     protected function outputInstallToolNotEnabledMessageIfNeeded()
     {
@@ -84,8 +79,6 @@ class AjaxController extends AbstractController
 
     /**
      * Check if the install tool password is set
-     *
-     * @return void
      */
     protected function checkInstallToolPasswordNotSet()
     {
@@ -96,8 +89,6 @@ class AjaxController extends AbstractController
 
     /**
      * Check login status
-     *
-     * @return void
      */
     protected function checkLogin()
     {
@@ -113,7 +104,6 @@ class AjaxController extends AbstractController
      * In contrast to abstract method, a response "you are not authorized is outputted"
      *
      * @param bool $tokenOk
-     * @return void
      */
     protected function handleSessionTokenCheck($tokenOk)
     {
@@ -125,8 +115,6 @@ class AjaxController extends AbstractController
     /**
      * Overwrites abstract method
      * In contrast to abstract method, a response "you are not authorized is outputted"
-     *
-     * @return void
      */
     protected function handleSessionLifeTimeExpired()
     {
diff --git a/typo3/sysext/install/Classes/Controller/StepController.php b/typo3/sysext/install/Classes/Controller/StepController.php
index 91a2b9a15cabac32f5dd6ce860f1da95e58cf29e..26e96734757e2d26ad7b1ffd4181a10887fe60e6 100644
--- a/typo3/sysext/install/Classes/Controller/StepController.php
+++ b/typo3/sysext/install/Classes/Controller/StepController.php
@@ -40,7 +40,6 @@ class StepController extends AbstractController
      * conditions (new/existing installation). See the single method comments for details.
      *
      * @throws Exception
-     * @return void
      */
     public function execute()
     {
@@ -67,7 +66,6 @@ class StepController extends AbstractController
      * request to test the next step.
      *
      * @throws Exception
-     * @return void
      */
     protected function executeSpecificStep()
     {
@@ -89,8 +87,6 @@ class StepController extends AbstractController
      * The according step is instantiated and 'needsExecution' is called. If
      * it needs execution, the step will be rendered, otherwise a redirect
      * to test the next step is initiated.
-     *
-     * @return void
      */
     protected function outputSpecificStep()
     {
@@ -157,8 +153,6 @@ class StepController extends AbstractController
     /**
      * If the last step was reached and none needs execution, a redirect
      * to call the tool controller is initiated.
-     *
-     * @return void
      */
     protected function redirectToTool()
     {
@@ -176,7 +170,6 @@ class StepController extends AbstractController
      * PackageStates here.
      *
      * @throws \Exception
-     * @return void
      */
     protected function recreatePackageStatesFileIfNotExisting()
     {
@@ -245,8 +238,6 @@ class StepController extends AbstractController
      * So, if no typo3conf directory exists yet, the first step is just rendered, or
      * executed if called so. After that, a redirect is initiated to proceed with
      * other tasks.
-     *
-     * @return void
      */
     protected function executeOrOutputFirstInstallStepIfNeeded()
     {
@@ -313,8 +304,6 @@ class StepController extends AbstractController
 
     /**
      * Call silent upgrade class, redirect to self if configuration was changed.
-     *
-     * @return void
      */
     protected function executeSilentConfigurationUpgradesIfNeeded()
     {
diff --git a/typo3/sysext/install/Classes/Controller/ToolController.php b/typo3/sysext/install/Classes/Controller/ToolController.php
index 1459ead36c8c35591c17863766309b2747da113b..cbe1efaf3786dd34c7a0558244701b2289abe721 100644
--- a/typo3/sysext/install/Classes/Controller/ToolController.php
+++ b/typo3/sysext/install/Classes/Controller/ToolController.php
@@ -43,8 +43,6 @@ class ToolController extends AbstractController
 
     /**
      * Main dispatch method
-     *
-     * @return void
      */
     public function execute()
     {
@@ -66,8 +64,6 @@ class ToolController extends AbstractController
 
     /**
      * Logout user if requested
-     *
-     * @return void
      */
     protected function logoutIfRequested()
     {
@@ -91,8 +87,6 @@ class ToolController extends AbstractController
      * This function registers a shutdown function, which is called even if a fatal error occurs.
      * The request either gets redirected to an action where all extension configurations are checked for compatibility or
      * an information with a link to that action.
-     *
-     * @return void
      */
     protected function registerExtensionConfigurationErrorHandler()
     {
diff --git a/typo3/sysext/install/Classes/FolderStructure/AbstractNode.php b/typo3/sysext/install/Classes/FolderStructure/AbstractNode.php
index 69254a7865f6e1b9b713682b5a6c3427e5aac261..99a6314a88ab0159286b03221c9676dc4b1e815a 100644
--- a/typo3/sysext/install/Classes/FolderStructure/AbstractNode.php
+++ b/typo3/sysext/install/Classes/FolderStructure/AbstractNode.php
@@ -67,8 +67,6 @@ abstract class AbstractNode
      * Set target permission
      *
      * @param string $permission Permissions as a 4 character octal string, i.e. 2775 or 0644
-     *
-     * @return void
      */
     protected function setTargetPermission($permission)
     {
diff --git a/typo3/sysext/install/Classes/FolderStructure/DefaultPermissionsCheck.php b/typo3/sysext/install/Classes/FolderStructure/DefaultPermissionsCheck.php
index f2952bffa98893a52745e322e0a87abaf4defaa1..ca9ef6eb6f736c17316ac80af3d89cb45c1a9039 100644
--- a/typo3/sysext/install/Classes/FolderStructure/DefaultPermissionsCheck.php
+++ b/typo3/sysext/install/Classes/FolderStructure/DefaultPermissionsCheck.php
@@ -18,7 +18,6 @@ use TYPO3\CMS\Install\Status;
 
 /**
  * Service class to check the default folder permissions
- *
  */
 class DefaultPermissionsCheck
 {
diff --git a/typo3/sysext/install/Classes/Http/Application.php b/typo3/sysext/install/Classes/Http/Application.php
index 2943ea7b94f1364d033e0edeeba686906d9f6079..92afb0ef521b043850b4d09b5bb8ecb338b1221b 100644
--- a/typo3/sysext/install/Classes/Http/Application.php
+++ b/typo3/sysext/install/Classes/Http/Application.php
@@ -69,7 +69,6 @@ class Application implements ApplicationInterface
      * Does not call "run()" therefore
      *
      * @param callable $execute
-     * @return void
      */
     public function run(callable $execute = null)
     {
diff --git a/typo3/sysext/install/Classes/Http/RequestHandler.php b/typo3/sysext/install/Classes/Http/RequestHandler.php
index 1bc91c33fa761ccbd7e79f86dd50724bda74ffa5..331c202a1e11a7854a9119f341147f4f79a51ff7 100644
--- a/typo3/sysext/install/Classes/Http/RequestHandler.php
+++ b/typo3/sysext/install/Classes/Http/RequestHandler.php
@@ -46,7 +46,6 @@ class RequestHandler implements RequestHandlerInterface
      * Execute 'tool' or 'step' controller depending on install[controller] GET/POST parameter
      *
      * @param ServerRequestInterface $request
-     * @return void
      */
     public function handleRequest(ServerRequestInterface $request)
     {
diff --git a/typo3/sysext/install/Classes/Report/SecurityStatusReport.php b/typo3/sysext/install/Classes/Report/SecurityStatusReport.php
index c51aad9b8223747c1cc59920e147644437a2c7ad..d0f60edc5b34e9f3090a7868f7e309fc33dfc602 100644
--- a/typo3/sysext/install/Classes/Report/SecurityStatusReport.php
+++ b/typo3/sysext/install/Classes/Report/SecurityStatusReport.php
@@ -21,7 +21,6 @@ use TYPO3\CMS\Reports\Status;
 
 /**
  * Provides an status report of the security of the install tool
- *
  */
 class SecurityStatusReport implements \TYPO3\CMS\Reports\StatusProviderInterface
 {
@@ -109,8 +108,6 @@ class SecurityStatusReport implements \TYPO3\CMS\Reports\StatusProviderInterface
 
     /**
      * Executes commands like removing the Install Tool enable file.
-     *
-     * @return void
      */
     protected function executeAdminCommand()
     {
diff --git a/typo3/sysext/install/Classes/Service/ClearCacheService.php b/typo3/sysext/install/Classes/Service/ClearCacheService.php
index 77c47f47c9fe63d4948efae0632a3bc7563afe55..b2c7170f613019555389d98b850cf84ebeb72ef9 100644
--- a/typo3/sysext/install/Classes/Service/ClearCacheService.php
+++ b/typo3/sysext/install/Classes/Service/ClearCacheService.php
@@ -35,8 +35,6 @@ class ClearCacheService
      * After that ext_tables and ext_localconf of extensions are loaded, those
      * may register additional caches in the caching framework with different
      * backend, and will then clear them with the usual flush() method.
-     *
-     * @return void
      */
     public function clearAll()
     {
diff --git a/typo3/sysext/install/Classes/Service/CoreVersionService.php b/typo3/sysext/install/Classes/Service/CoreVersionService.php
index 4f94ab25ce41e1d6af2490ebebd5b621a8f42473..af4cd53aa85fab272a4845681468e0bea2f44a0a 100644
--- a/typo3/sysext/install/Classes/Service/CoreVersionService.php
+++ b/typo3/sysext/install/Classes/Service/CoreVersionService.php
@@ -57,7 +57,6 @@ class CoreVersionService
     /**
      * Update version matrix from remote and store in registry
      *
-     * @return void
      * @throws Exception\RemoteFetchException
      */
     public function updateVersionMatrix()
diff --git a/typo3/sysext/install/Classes/Service/EnableFileService.php b/typo3/sysext/install/Classes/Service/EnableFileService.php
index d9bebff2274d4ff6546b08938a40a7c01b07373a..f529da5935720194b806b0b3cf23c554ef438529 100644
--- a/typo3/sysext/install/Classes/Service/EnableFileService.php
+++ b/typo3/sysext/install/Classes/Service/EnableFileService.php
@@ -158,8 +158,6 @@ class EnableFileService
 
     /**
      * Updates the last modification of the ENABLE_INSTALL_TOOL file
-     *
-     * @return void
      */
     protected static function extendInstallToolEnableFileLifetime()
     {
diff --git a/typo3/sysext/install/Classes/Service/LoadTcaService.php b/typo3/sysext/install/Classes/Service/LoadTcaService.php
index 6a48115b54fda311b09ae0cf8a7ff47b259ca1be..abeed1a6b7673f17906e9d7b48a78b96b9459528 100644
--- a/typo3/sysext/install/Classes/Service/LoadTcaService.php
+++ b/typo3/sysext/install/Classes/Service/LoadTcaService.php
@@ -85,7 +85,6 @@ class LoadTcaService
      * Load ext_tables.php of a single extension
      *
      * @param string $extensionKey The extension to load a ext_tables.php file from.
-     * @return void
      */
     public function loadSingleExtTablesFile(string $extensionKey)
     {
diff --git a/typo3/sysext/install/Classes/Service/SessionService.php b/typo3/sysext/install/Classes/Service/SessionService.php
index 112a7bcb9d98ca895b9c08d84427fe89da31c4f2..470a5259947ec48b0b2ac490496c9528d1738d64 100644
--- a/typo3/sysext/install/Classes/Service/SessionService.php
+++ b/typo3/sysext/install/Classes/Service/SessionService.php
@@ -238,8 +238,6 @@ class SessionService implements \TYPO3\CMS\Core\SingletonInterface
      * Should only be called if:
      * a) we have a valid session running
      * b) the "password" or some other authorization mechanism really matched
-     *
-     * @return void
      */
     public function setAuthorized()
     {
@@ -292,8 +290,6 @@ class SessionService implements \TYPO3\CMS\Core\SingletonInterface
      * Refreshes our session information, rising the expire time.
      * Also generates a new session ID every 5 minutes to minimize the risk of
      * session hijacking.
-     *
-     * @return void
      */
     public function refreshSession()
     {
@@ -310,7 +306,6 @@ class SessionService implements \TYPO3\CMS\Core\SingletonInterface
      * Add a message to "Flash" message storage.
      *
      * @param \TYPO3\CMS\Install\Status\StatusInterface $message A message to add
-     * @return void
      */
     public function addMessage(\TYPO3\CMS\Install\Status\StatusInterface $message)
     {
@@ -486,8 +481,6 @@ class SessionService implements \TYPO3\CMS\Core\SingletonInterface
      * which due to the APC bug throws a "Fatal error: Class 'GeneralUtility' not found"
      * (and the session data is not saved). Calling session_write_close() at this point
      * seems to be the most easy solution, according to PHP author.
-     *
-     * @return void
      */
     public function __destruct()
     {
diff --git a/typo3/sysext/install/Classes/Service/SilentConfigurationUpgradeService.php b/typo3/sysext/install/Classes/Service/SilentConfigurationUpgradeService.php
index 89783ca9aa9ba7f4ac4b60eec28477b4ec75abe4..3512cdf620d96416519ae665b06a271000c01ff7 100644
--- a/typo3/sysext/install/Classes/Service/SilentConfigurationUpgradeService.php
+++ b/typo3/sysext/install/Classes/Service/SilentConfigurationUpgradeService.php
@@ -104,8 +104,6 @@ class SilentConfigurationUpgradeService
     /**
      * Executed configuration upgrades. Single upgrade methods must throw a
      * RedirectException if something was written to LocalConfiguration.
-     *
-     * @return void
      */
     public function execute()
     {
@@ -131,8 +129,6 @@ class SilentConfigurationUpgradeService
      * and have no impact on the core anymore.
      * To keep the configuration clean, those old settings are just silently
      * removed from LocalConfiguration if set.
-     *
-     * @return void
      */
     protected function removeObsoleteLocalConfigurationSettings()
     {
@@ -148,8 +144,6 @@ class SilentConfigurationUpgradeService
      * Backend login security is set to rsa if rsaauth
      * is installed (but not used) otherwise the default value "normal" has to be used.
      * This forces either 'normal' or 'rsa' to be set in LocalConfiguration.
-     *
-     * @return void
      */
     protected function configureBackendLoginSecurity()
     {
@@ -176,8 +170,6 @@ class SilentConfigurationUpgradeService
      * and the whole TYPO3 link rendering later on. A random key is set here in
      * LocalConfiguration if it does not exist yet. This might possible happen
      * during upgrading and will happen during first install.
-     *
-     * @return void
      */
     protected function generateEncryptionKeyIfNeeded()
     {
@@ -197,8 +189,6 @@ class SilentConfigurationUpgradeService
 
     /**
      * Parse old curl and HTTP options and set new HTTP options, related to Guzzle
-     *
-     * @return void
      */
     protected function transferHttpSettings()
     {
@@ -393,8 +383,6 @@ class SilentConfigurationUpgradeService
      * "Configuration presets" in install tool is not type safe, so value
      * comparisons here are not type safe too, to not trigger changes to
      * LocalConfiguration again.
-     *
-     * @return void
      */
     protected function disableImageMagickDetailSettingsIfImageMagickIsDisabled()
     {
@@ -456,8 +444,6 @@ class SilentConfigurationUpgradeService
      * "Configuration presets" in install tool is not type safe, so value
      * comparisons here are not type safe too, to not trigger changes to
      * LocalConfiguration again.
-     *
-     * @return void
      */
     protected function setImageMagickDetailSettings()
     {
@@ -499,8 +485,6 @@ class SilentConfigurationUpgradeService
     /**
      * Migrate the definition of the image processor from the configuration value
      * im_version_5 to the setting processor.
-     *
-     * @return void
      */
     protected function migrateImageProcessorSetting()
     {
@@ -578,8 +562,6 @@ class SilentConfigurationUpgradeService
 
     /**
      * Migrate the configuration value thumbnails_png to a boolean value.
-     *
-     * @return void
      */
     protected function migrateThumbnailsPngSetting()
     {
@@ -601,8 +583,6 @@ class SilentConfigurationUpgradeService
 
     /**
      * Migrate the configuration setting BE/lockSSL to boolean if set in the LocalConfiguration.php file
-     *
-     * @return void
      */
     protected function migrateLockSslSetting()
     {
@@ -620,8 +600,6 @@ class SilentConfigurationUpgradeService
 
     /**
      * Move the database connection settings to a "Default" connection
-     *
-     * @return void
      */
     protected function migrateDatabaseConnectionSettings()
     {
@@ -703,8 +681,6 @@ class SilentConfigurationUpgradeService
     /**
      * Migrate the configuration setting DB/Connections/Default/charset to 'utf8' as
      * 'utf-8' is not supported by all MySQL versions.
-     *
-     * @return void
      */
     protected function migrateDatabaseConnectionCharset()
     {
@@ -723,8 +699,6 @@ class SilentConfigurationUpgradeService
 
     /**
      * Migrate the configuration setting DB/Connections/Default/driverOptions to array type.
-     *
-     * @return void
      */
     protected function migrateDatabaseDriverOptions()
     {
@@ -744,8 +718,6 @@ class SilentConfigurationUpgradeService
 
     /**
      * Migrate the configuration setting BE/lang/debug if set in the LocalConfiguration.php file
-     *
-     * @return void
      */
     protected function migrateLangDebug()
     {
diff --git a/typo3/sysext/install/Classes/Status/AbstractStatus.php b/typo3/sysext/install/Classes/Status/AbstractStatus.php
index 1ff6d8d4abe066abdffa82eb84b24cfa877eb0a9..ed25ca8026a6f6fb12d3d93358c79f8b4f2bec83 100644
--- a/typo3/sysext/install/Classes/Status/AbstractStatus.php
+++ b/typo3/sysext/install/Classes/Status/AbstractStatus.php
@@ -54,7 +54,6 @@ abstract class AbstractStatus implements StatusInterface
      * Set title
      *
      * @param string $title The title
-     * @return void
      */
     public function setTitle($title)
     {
@@ -75,7 +74,6 @@ abstract class AbstractStatus implements StatusInterface
      * Set status message
      *
      * @param string $message Status message
-     * @return void
      */
     public function setMessage($message)
     {
diff --git a/typo3/sysext/install/Classes/Status/StatusInterface.php b/typo3/sysext/install/Classes/Status/StatusInterface.php
index 0904c0bf7f3612707818d705adf2774120c2f713..b5f6910c449858e4278ae087bd5e79505b57e008 100644
--- a/typo3/sysext/install/Classes/Status/StatusInterface.php
+++ b/typo3/sysext/install/Classes/Status/StatusInterface.php
@@ -37,7 +37,6 @@ interface StatusInterface
      * Set title
      *
      * @param string $title The title
-     * @return void
      */
     public function setTitle($title);
 
@@ -52,7 +51,6 @@ interface StatusInterface
      * Set status message
      *
      * @param string $message Status message
-     * @return void
      */
     public function setMessage($message);
 }
diff --git a/typo3/sysext/install/Classes/Updates/AbstractUpdate.php b/typo3/sysext/install/Classes/Updates/AbstractUpdate.php
index dceb110aec126af5dba8488bba82e66be2cda61a..dcc0b434c99767836dc67075d5fa0a7eaeb66e64 100644
--- a/typo3/sysext/install/Classes/Updates/AbstractUpdate.php
+++ b/typo3/sysext/install/Classes/Updates/AbstractUpdate.php
@@ -80,7 +80,6 @@ abstract class AbstractUpdate
      * Sets the title attribute
      *
      * @param string $title The title of this update wizard
-     * @return void
      */
     public function setTitle($title)
     {
@@ -101,7 +100,6 @@ abstract class AbstractUpdate
      * Sets the identifier attribute
      *
      * @param string $identifier The identifier of this update wizard
-     * @return void
      */
     public function setIdentifier($identifier)
     {
@@ -178,7 +176,6 @@ abstract class AbstractUpdate
      * (e.g. installing in extList, respecting priority, etc.)
      *
      * @param array $extensionKeys List of keys of extensions to install
-     * @return void
      */
     protected function installExtensions(array $extensionKeys)
     {
@@ -197,7 +194,6 @@ abstract class AbstractUpdate
      * Writes the info in LocalConfiguration.php
      *
      * @param mixed $confValue The configuration is set to this value
-     * @return void
      */
     protected function markWizardAsDone($confValue = 1)
     {
diff --git a/typo3/sysext/install/Classes/ViewHelpers/File/ExistsViewHelper.php b/typo3/sysext/install/Classes/ViewHelpers/File/ExistsViewHelper.php
index ba97c37806bee7b832d0dd67597852b6f78ff2b3..de46427cac6582b405f11c62fb4350f1464c51e7 100644
--- a/typo3/sysext/install/Classes/ViewHelpers/File/ExistsViewHelper.php
+++ b/typo3/sysext/install/Classes/ViewHelpers/File/ExistsViewHelper.php
@@ -38,7 +38,6 @@ class ExistsViewHelper extends AbstractViewHelper
     use CompileWithRenderStatic;
 
     /**
-     * @return void
      */
     public function initializeArguments()
     {
diff --git a/typo3/sysext/install/Tests/Unit/Updates/ContentTypesToTextMediaUpdateTest.php b/typo3/sysext/install/Tests/Unit/Updates/ContentTypesToTextMediaUpdateTest.php
index 7bbfd79f95e60834ff17c11c87aecff248ea6da2..2fb098b554ef5bec60e24b5244d7e6aca89672a7 100644
--- a/typo3/sysext/install/Tests/Unit/Updates/ContentTypesToTextMediaUpdateTest.php
+++ b/typo3/sysext/install/Tests/Unit/Updates/ContentTypesToTextMediaUpdateTest.php
@@ -71,7 +71,6 @@ class ContentTypesToTextMediaUpdateTest extends BaseTestCase
 
     /**
      * @test
-     * @return void
      */
     public function updateWizardDoesNotRunIfCssStyledContentIsInstalled()
     {
diff --git a/typo3/sysext/lang/Classes/Command/LanguageCommandController.php b/typo3/sysext/lang/Classes/Command/LanguageCommandController.php
index 688ff6dcdb47066e371c166f8269ab3990d73136..bbe979596b9e3232c572da17841c2715cc64e9d7 100644
--- a/typo3/sysext/lang/Classes/Command/LanguageCommandController.php
+++ b/typo3/sysext/lang/Classes/Command/LanguageCommandController.php
@@ -59,7 +59,6 @@ class LanguageCommandController extends CommandController
      * Update language file for each extension
      *
      * @param string $localesToUpdate Comma separated list of locales that needs to be updated
-     * @return void
      */
     public function updateCommand($localesToUpdate = '')
     {
diff --git a/typo3/sysext/lang/Classes/Controller/LanguageController.php b/typo3/sysext/lang/Classes/Controller/LanguageController.php
index c183bd3abe66d104d1ca28d6a245a2f5b258e1d3..7e4353a11de6951924831d4a6cef2303c8ebdefe 100644
--- a/typo3/sysext/lang/Classes/Controller/LanguageController.php
+++ b/typo3/sysext/lang/Classes/Controller/LanguageController.php
@@ -99,8 +99,6 @@ class LanguageController extends ActionController
 
     /**
      * List languages
-     *
-     * @return void
      */
     public function listLanguagesAction()
     {
@@ -113,8 +111,6 @@ class LanguageController extends ActionController
 
     /**
      * List translations
-     *
-     * @return void
      */
     public function listTranslationsAction()
     {
@@ -126,8 +122,6 @@ class LanguageController extends ActionController
 
     /**
      * Returns the translations
-     *
-     * @return void
      */
     public function getTranslationsAction()
     {
@@ -139,7 +133,6 @@ class LanguageController extends ActionController
      * Fetch all translations for given locale
      *
      * @param array $data The request data
-     * @return void
      */
     public function updateLanguageAction(array $data)
     {
@@ -189,7 +182,6 @@ class LanguageController extends ActionController
      * Fetch the translation for given extension and locale
      *
      * @param array $data The request data
-     * @return void
      */
     public function updateTranslationAction(array $data)
     {
@@ -212,7 +204,6 @@ class LanguageController extends ActionController
      * Activate a language
      *
      * @param array $data The request data
-     * @return void
      */
     public function activateLanguageAction(array $data)
     {
@@ -227,7 +218,6 @@ class LanguageController extends ActionController
      * Deactivate a language
      *
      * @param array $data The request data
-     * @return void
      */
     public function deactivateLanguageAction(array $data)
     {
@@ -242,7 +232,6 @@ class LanguageController extends ActionController
      * Remove a language
      *
      * @param array $data The request data
-     * @return void
      */
     public function removeLanguageAction(array $data)
     {
diff --git a/typo3/sysext/lang/Classes/Domain/Model/Extension.php b/typo3/sysext/lang/Classes/Domain/Model/Extension.php
index a53b5658cdab7296dd747818fd0bb76d586caf6a..f75fe3d0e2a885ca9e717416d587759e75cf4ce8 100644
--- a/typo3/sysext/lang/Classes/Domain/Model/Extension.php
+++ b/typo3/sysext/lang/Classes/Domain/Model/Extension.php
@@ -75,7 +75,6 @@ class Extension extends AbstractEntity
      * Setter for the icon
      *
      * @param string $icon ext_icon path relative to typo3 folder like ../typo3conf/ext/extensionkey/ext_icon.png
-     * @return void
      */
     public function setIcon($icon)
     {
@@ -128,7 +127,6 @@ class Extension extends AbstractEntity
      * Setter for the key
      *
      * @param string $key
-     * @return void
      */
     public function setKey($key)
     {
@@ -149,7 +147,6 @@ class Extension extends AbstractEntity
      * Setter for the title
      *
      * @param string $title
-     * @return void
      */
     public function setTitle($title)
     {
@@ -170,7 +167,6 @@ class Extension extends AbstractEntity
      * Setter for the version
      *
      * @param int $version Needs to have a valid version format like 1003007
-     * @return void
      */
     public function setVersion($version)
     {
@@ -182,7 +178,6 @@ class Extension extends AbstractEntity
      *
      * @param string $version Needs to have a format like '1.3.7' and converts it into an integer like 1003007 before setting the version
      * @see \TYPO3\CMS\Core\Utility\VersionNumberUtility::convertVersionNumberToInteger
-     * @return void
      */
     public function setVersionFromString($version)
     {
@@ -203,7 +198,6 @@ class Extension extends AbstractEntity
      * Setter for updateResult
      *
      * @param array $updateResult Needs to be in a structure like array('icon' => '', 'message' => '')
-     * @return void
      */
     public function setUpdateResult($updateResult)
     {
diff --git a/typo3/sysext/lang/Classes/Domain/Model/Language.php b/typo3/sysext/lang/Classes/Domain/Model/Language.php
index 0cb0dad99677abbe4d5651424f5f208d544d3121..4135468db515cc65241fe7d18872192ae99de987 100644
--- a/typo3/sysext/lang/Classes/Domain/Model/Language.php
+++ b/typo3/sysext/lang/Classes/Domain/Model/Language.php
@@ -77,7 +77,6 @@ class Language extends AbstractEntity
      * Setter for the language
      *
      * @param string $language the label of the language
-     * @return void
      */
     public function setLabel($language)
     {
@@ -98,7 +97,6 @@ class Language extends AbstractEntity
      * Setter for the locale
      *
      * @param string $locale the locale for the language like da, nl or de
-     * @return void
      */
     public function setLocale($locale)
     {
@@ -119,7 +117,6 @@ class Language extends AbstractEntity
      * Setter for the selected
      *
      * @param bool $selected whether the language is available or not
-     * @return void
      */
     public function setSelected($selected)
     {
diff --git a/typo3/sysext/lang/Classes/LanguageService.php b/typo3/sysext/lang/Classes/LanguageService.php
index 13b0002f2f27b89c5b557f2918d1ceb56c728994..7f3dfc59e5a4193db53593ea5adc7f1624486a24 100644
--- a/typo3/sysext/lang/Classes/LanguageService.php
+++ b/typo3/sysext/lang/Classes/LanguageService.php
@@ -122,7 +122,6 @@ class LanguageService
      *
      * @throws \RuntimeException
      * @param string $languageKey The language key (two character string from backend users profile)
-     * @return void
      */
     public function init($languageKey)
     {
@@ -157,7 +156,6 @@ class LanguageService
      *
      * @param array $arr Array with references to module labels, keys: ['labels']['table'],
      * @param string $prefix Module name prefix
-     * @return void
      * @see \TYPO3\CMS\Backend\Module\ModuleLoader
      * @deprecated since TYPO3 v8, will be removed in TYPO3 v9 - use ModuleLoader instead.
      */
@@ -315,7 +313,6 @@ class LanguageService
      * $TCA_DESCR is a global var
      *
      * @param string $table Table name found as key in global array $TCA_DESCR
-     * @return void
      */
     public function loadSingleTableDescription($table)
     {
@@ -451,7 +448,6 @@ class LanguageService
      * @param string $index
      * @param string $value
      * @param bool $overrideDefault Overrides default language
-     * @return void
      * @deprecated since TYPO3 v8, will be removed in TYPO3 v9
      */
     public function overrideLL($index, $value, $overrideDefault = true)
diff --git a/typo3/sysext/lang/Classes/Service/RegistryService.php b/typo3/sysext/lang/Classes/Service/RegistryService.php
index 4f97c61cb2dfb6260fde1b8abea9efd3073a0bdf..85dc05e258082be1d9c720fdbc1d009ec75e031a 100644
--- a/typo3/sysext/lang/Classes/Service/RegistryService.php
+++ b/typo3/sysext/lang/Classes/Service/RegistryService.php
@@ -43,7 +43,6 @@ class RegistryService
      * Set namespace
      *
      * @param string $namespace The namespace
-     * @return void
      */
     public function setNamespace($namespace)
     {
@@ -93,7 +92,6 @@ class RegistryService
      * @param string $name Registry entry name
      * @param mixed $value The value
      * @param string $namespace Optional namespace
-     * @return void
      */
     public function set($name, $value, $namespace = null)
     {
@@ -106,7 +104,6 @@ class RegistryService
      *
      * @param string $name Registry entry name
      * @param string $namespace Optional namespace
-     * @return void
      */
     public function remove($name, $namespace = null)
     {
diff --git a/typo3/sysext/lang/Classes/View/AbstractJsonView.php b/typo3/sysext/lang/Classes/View/AbstractJsonView.php
index d5876fb395e81e03d4936455da63cf99a95c1792..5d73d9c7942b5374bc283bfa07c1fec07e8021c1 100644
--- a/typo3/sysext/lang/Classes/View/AbstractJsonView.php
+++ b/typo3/sysext/lang/Classes/View/AbstractJsonView.php
@@ -38,8 +38,6 @@ abstract class AbstractJsonView extends AbstractView
 
     /**
      * Render template content
-     *
-     * @return void
      */
     public function render()
     {
@@ -58,7 +56,6 @@ abstract class AbstractJsonView extends AbstractView
      * Send response to browser
      *
      * @param array $data The response data
-     * @return void
      */
     protected function sendResponse(array $data)
     {
diff --git a/typo3/sysext/linkvalidator/Classes/LinkAnalyzer.php b/typo3/sysext/linkvalidator/Classes/LinkAnalyzer.php
index b3373531d8f1bbf595ef9760fcc29db85e874296..f8745a18b244ef783564f19545b2cf6c6564bf6c 100644
--- a/typo3/sysext/linkvalidator/Classes/LinkAnalyzer.php
+++ b/typo3/sysext/linkvalidator/Classes/LinkAnalyzer.php
@@ -119,7 +119,6 @@ class LinkAnalyzer
      * @param array $searchField List of fields in which to search for links
      * @param string $pid List of comma separated page uids in which to search for links
      * @param array $tsConfig The currently active TSConfig.
-     * @return void
      */
     public function init(array $searchField, $pid, $tsConfig)
     {
@@ -133,7 +132,6 @@ class LinkAnalyzer
      *
      * @param array $checkOptions List of hook object to activate
      * @param bool $considerHidden Defines whether to look into hidden fields
-     * @return void
      */
     public function getLinkStatistics($checkOptions = [], $considerHidden = false)
     {
@@ -264,7 +262,6 @@ class LinkAnalyzer
      * @param string $table Table name of the record
      * @param array $fields Array of fields to analyze
      * @param array $record Record to analyse
-     * @return void
      */
     public function analyzeRecord(array &$results, $table, array $fields, array $record)
     {
@@ -328,7 +325,6 @@ class LinkAnalyzer
      * @param array $record UID of the current record
      * @param string $field The current field
      * @param string $table The current table
-     * @return void
      */
     protected function analyseLinks(array $resultArray, array &$results, array $record, $field, $table)
     {
@@ -364,7 +360,6 @@ class LinkAnalyzer
      * @param array $record The current record
      * @param string $field The current field
      * @param string $table The current table
-     * @return void
      */
     protected function analyseTypoLinks(array $resultArray, array &$results, $htmlParser, array $record, $field, $table)
     {
diff --git a/typo3/sysext/linkvalidator/Classes/Linktype/AbstractLinktype.php b/typo3/sysext/linkvalidator/Classes/Linktype/AbstractLinktype.php
index 11abbb2f10f26bbd847c2d10c8ad0d2f172f186c..38c7beadf55ed1b7ad5e061778e4aa004baea9fe 100644
--- a/typo3/sysext/linkvalidator/Classes/Linktype/AbstractLinktype.php
+++ b/typo3/sysext/linkvalidator/Classes/Linktype/AbstractLinktype.php
@@ -47,7 +47,6 @@ abstract class AbstractLinktype implements LinktypeInterface
      * Set the value of the protected property errorParams
      *
      * @param array $value All parameters needed for the rendering of the error message
-     * @return void
      */
     protected function setErrorParams($value)
     {
diff --git a/typo3/sysext/linkvalidator/Classes/Report/LinkValidatorReport.php b/typo3/sysext/linkvalidator/Classes/Report/LinkValidatorReport.php
index 7b2e0f65689c74d9abb44bac6bffbfba8c4838da..c99d61b73ea875402e28efade919ea644d964fb7 100644
--- a/typo3/sysext/linkvalidator/Classes/Report/LinkValidatorReport.php
+++ b/typo3/sysext/linkvalidator/Classes/Report/LinkValidatorReport.php
@@ -234,8 +234,6 @@ class LinkValidatorReport extends \TYPO3\CMS\Backend\Module\AbstractFunctionModu
 
     /**
      * Initializes the Module
-     *
-     * @return void
      */
     protected function initialize()
     {
@@ -267,8 +265,6 @@ class LinkValidatorReport extends \TYPO3\CMS\Backend\Module\AbstractFunctionModu
 
     /**
      * Updates the table of stored broken links
-     *
-     * @return void
      */
     protected function updateBrokenLinks()
     {
@@ -308,8 +304,6 @@ class LinkValidatorReport extends \TYPO3\CMS\Backend\Module\AbstractFunctionModu
 
     /**
      * Renders the content of the module
-     *
-     * @return void
      */
     protected function render()
     {
diff --git a/typo3/sysext/linkvalidator/Classes/Task/ValidatorTask.php b/typo3/sysext/linkvalidator/Classes/Task/ValidatorTask.php
index 0993b070fc613dcac41f24da9a9cd59984f90da4..9ec80effe22f9dfb0fdbb33c275c74677e7184ba 100644
--- a/typo3/sysext/linkvalidator/Classes/Task/ValidatorTask.php
+++ b/typo3/sysext/linkvalidator/Classes/Task/ValidatorTask.php
@@ -141,7 +141,6 @@ class ValidatorTask extends AbstractTask
      * Set the value of the private property email.
      *
      * @param string $email Email address to which an email report is sent
-     * @return void
      */
     public function setEmail($email)
     {
@@ -162,7 +161,6 @@ class ValidatorTask extends AbstractTask
      * Set the value of the private property emailOnBrokenLinkOnly
      *
      * @param bool $emailOnBrokenLinkOnly Only send an email, if new broken links were found
-     * @return void
      */
     public function setEmailOnBrokenLinkOnly($emailOnBrokenLinkOnly)
     {
@@ -183,7 +181,6 @@ class ValidatorTask extends AbstractTask
      * Set the value of the private property page
      *
      * @param int $page UID of the start page for this task.
-     * @return void
      */
     public function setPage($page)
     {
@@ -204,7 +201,6 @@ class ValidatorTask extends AbstractTask
      * Set the value of the private property depth
      *
      * @param int $depth Level of pages the task should check
-     * @return void
      */
     public function setDepth($depth)
     {
@@ -225,7 +221,6 @@ class ValidatorTask extends AbstractTask
      * Set the value of the private property emailTemplateFile
      *
      * @param string $emailTemplateFile Template to be used for the email
-     * @return void
      */
     public function setEmailTemplateFile($emailTemplateFile)
     {
@@ -246,7 +241,6 @@ class ValidatorTask extends AbstractTask
      * Set the value of the private property configuration
      *
      * @param array $configuration specific TSconfig for this task
-     * @return void
      */
     public function setConfiguration($configuration)
     {
@@ -606,8 +600,6 @@ class ValidatorTask extends AbstractTask
 
     /**
      * Simulate cli call with setting the required options to the $_SERVER['argv']
-     *
-     * @return void
      */
     protected function setCliArguments()
     {
diff --git a/typo3/sysext/linkvalidator/Classes/Task/ValidatorTaskAdditionalFieldProvider.php b/typo3/sysext/linkvalidator/Classes/Task/ValidatorTaskAdditionalFieldProvider.php
index d48810b45eb5db89edfafea6c6b30856e58acc2b..d885fc0dba623744dd00fef7fe6288cb8e94f85c 100644
--- a/typo3/sysext/linkvalidator/Classes/Task/ValidatorTaskAdditionalFieldProvider.php
+++ b/typo3/sysext/linkvalidator/Classes/Task/ValidatorTaskAdditionalFieldProvider.php
@@ -261,7 +261,6 @@ class ValidatorTaskAdditionalFieldProvider implements AdditionalFieldProviderInt
      *
      * @param array $submittedData Array containing the data submitted by the user
      * @param AbstractTask $task Reference to the current task object
-     * @return void
      */
     public function saveAdditionalFields(array $submittedData, AbstractTask $task)
     {
diff --git a/typo3/sysext/lowlevel/Classes/CleanerCommand.php b/typo3/sysext/lowlevel/Classes/CleanerCommand.php
index 53e32c5f27c8f326bf59862c0d8fee9076af6577..baf4ab81ac819c4989dd7063e5fb5de53435c117 100644
--- a/typo3/sysext/lowlevel/Classes/CleanerCommand.php
+++ b/typo3/sysext/lowlevel/Classes/CleanerCommand.php
@@ -230,7 +230,6 @@ NOW Running --AUTOFIX on result. OK?' . ($this->cli_isArg('--dryrun') ? ' (--dry
      *
      * @param string $header Name of the test (eg. function name)
      * @param array $res Result array from an analyze function
-     * @return void Outputs with echo - capture content with output buffer if needed.
      */
     public function cli_printInfo($header, $res)
     {
@@ -293,7 +292,6 @@ NOW Running --AUTOFIX on result. OK?' . ($this->cli_isArg('--dryrun') ? ' (--dry
      * @param int $depth Depth to traverse. zero is do not traverse at all. 1 = 1 sublevel, 1000= 1000 sublevels (all...)
      * @param int $echoLevel If >0, will echo information about the traversal process.
      * @param string $callBack Call back function (from this class or subclass)
-     * @return void
      */
     public function genTree($rootID, $depth = 1000, $echoLevel = 0, $callBack = '')
     {
@@ -362,7 +360,6 @@ NOW Running --AUTOFIX on result. OK?' . ($this->cli_isArg('--dryrun') ? ' (--dry
      * @param bool $versionSwapmode DON'T set from outside, internal. (indicates we are inside a version of a page)
      * @param int $rootIsVersion DON'T set from outside, internal. (1: Indicates that rootID is a version of a page, 2: ...that it is even a version of a version (which triggers a warning!)
      * @param string $accumulatedPath Internal string that accumulates the path
-     * @return void
      * @access private
      */
     public function genTree_traverse($rootID, $depth, $echoLevel = 0, $callBack = '', $versionSwapmode = false, $rootIsVersion = 0, $accumulatedPath = '')
diff --git a/typo3/sysext/lowlevel/Classes/Command/CleanFlexFormsCommand.php b/typo3/sysext/lowlevel/Classes/Command/CleanFlexFormsCommand.php
index a31fd0e53f814682f5bcbf80e64e367ecec8db2d..78169ae2482f74efc79e62b00e8d4730ba0e7385 100644
--- a/typo3/sysext/lowlevel/Classes/Command/CleanFlexFormsCommand.php
+++ b/typo3/sysext/lowlevel/Classes/Command/CleanFlexFormsCommand.php
@@ -67,8 +67,6 @@ class CleanFlexFormsCommand extends Command
      *
      * @param InputInterface $input
      * @param OutputInterface $output
-     *
-     * @return void
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
@@ -249,7 +247,6 @@ class CleanFlexFormsCommand extends Command
      * @param array $records
      * @param bool $dryRun
      * @param SymfonyStyle $io
-     * @return void
      */
     protected function cleanFlexFormRecords(array $records, bool $dryRun, SymfonyStyle $io)
     {
diff --git a/typo3/sysext/lowlevel/Classes/Command/DeletedRecordsCommand.php b/typo3/sysext/lowlevel/Classes/Command/DeletedRecordsCommand.php
index f15b571645975ad746ae0aa16d9df51469784042..2cb153b2094b9d19ec9bc55999b102192d88f915 100644
--- a/typo3/sysext/lowlevel/Classes/Command/DeletedRecordsCommand.php
+++ b/typo3/sysext/lowlevel/Classes/Command/DeletedRecordsCommand.php
@@ -67,8 +67,6 @@ class DeletedRecordsCommand extends Command
      *
      * @param InputInterface $input
      * @param OutputInterface $output
-     *
-     * @return void
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
@@ -261,7 +259,6 @@ class DeletedRecordsCommand extends Command
      * @param array $deletedRecords two level array with tables and uids
      * @param bool $dryRun check if the records should NOT be deleted (use --dry-run to avoid)
      * @param SymfonyStyle $io
-     * @return void
      */
     protected function deleteRecords(array $deletedRecords, bool $dryRun, SymfonyStyle $io)
     {
diff --git a/typo3/sysext/lowlevel/Classes/Command/FilesWithMultipleReferencesCommand.php b/typo3/sysext/lowlevel/Classes/Command/FilesWithMultipleReferencesCommand.php
index 9b36faa16b602a2444ab2c473e4d8b13b43d3745..5aae376f122819080dd07ede309c62bb351b4ac5 100644
--- a/typo3/sysext/lowlevel/Classes/Command/FilesWithMultipleReferencesCommand.php
+++ b/typo3/sysext/lowlevel/Classes/Command/FilesWithMultipleReferencesCommand.php
@@ -78,8 +78,6 @@ If you want to get more detailed information, use the --verbose option.')
      *
      * @param InputInterface $input
      * @param OutputInterface $output
-     *
-     * @return void
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
@@ -119,7 +117,6 @@ If you want to get more detailed information, use the --verbose option.')
      *
      * @param InputInterface $input holds information about entered parameters
      * @param SymfonyStyle $io necessary for outputting information
-     * @return void
      */
     protected function updateReferenceIndex(InputInterface $input, SymfonyStyle $io)
     {
@@ -194,7 +191,6 @@ If you want to get more detailed information, use the --verbose option.')
      * @param array $multipleReferencesToFiles Contains files which have been referenced multiple times
      * @param bool $dryRun if set, the info is just displayed, but no files are copied nor reference index updated
      * @param SymfonyStyle $io the IO object for output
-     * @return void
      */
     protected function copyMultipleReferencedFiles(array $multipleReferencesToFiles, bool $dryRun, SymfonyStyle $io)
     {
diff --git a/typo3/sysext/lowlevel/Classes/Command/ListSysLogCommand.php b/typo3/sysext/lowlevel/Classes/Command/ListSysLogCommand.php
index d83384414bf8031d1115a0a40a5351a81857389a..94708c98bd06180d269bd885e30a72d14c9720f8 100644
--- a/typo3/sysext/lowlevel/Classes/Command/ListSysLogCommand.php
+++ b/typo3/sysext/lowlevel/Classes/Command/ListSysLogCommand.php
@@ -43,8 +43,6 @@ class ListSysLogCommand extends Command
      *
      * @param InputInterface $input
      * @param OutputInterface $output
-     *
-     * @return void
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
diff --git a/typo3/sysext/lowlevel/Classes/Command/LostFilesCommand.php b/typo3/sysext/lowlevel/Classes/Command/LostFilesCommand.php
index edcd6332d32171e98d1843f35635d0d6290e5aed..33b7cdb26c01d49188c74e15524fdc863049f21d 100644
--- a/typo3/sysext/lowlevel/Classes/Command/LostFilesCommand.php
+++ b/typo3/sysext/lowlevel/Classes/Command/LostFilesCommand.php
@@ -83,8 +83,6 @@ If you want to get more detailed information, use the --verbose option.')
      *
      * @param InputInterface $input
      * @param OutputInterface $output
-     *
-     * @return void
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
@@ -131,7 +129,6 @@ If you want to get more detailed information, use the --verbose option.')
      *
      * @param InputInterface $input holds information about entered parameters
      * @param SymfonyStyle $io necessary for outputting information
-     * @return void
      */
     protected function updateReferenceIndex(InputInterface $input, SymfonyStyle $io)
     {
@@ -232,7 +229,6 @@ If you want to get more detailed information, use the --verbose option.')
      * @param array $lostFiles Contains the lost files found
      * @param bool $dryRun if set, the files are just displayed, but not deleted
      * @param SymfonyStyle $io the IO object for output
-     * @return void
      */
     protected function deleteLostFiles(array $lostFiles, bool $dryRun, SymfonyStyle $io)
     {
diff --git a/typo3/sysext/lowlevel/Classes/Command/MissingFilesCommand.php b/typo3/sysext/lowlevel/Classes/Command/MissingFilesCommand.php
index 192290c30a881aaf94f0de81657a000fce165160..2fb93fb7e1d9a66b34a2444d6c496f42bfa0bd31 100644
--- a/typo3/sysext/lowlevel/Classes/Command/MissingFilesCommand.php
+++ b/typo3/sysext/lowlevel/Classes/Command/MissingFilesCommand.php
@@ -78,8 +78,6 @@ If you want to get more detailed information, use the --verbose option.')
      *
      * @param InputInterface $input
      * @param OutputInterface $output
-     *
-     * @return void
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
@@ -123,7 +121,6 @@ If you want to get more detailed information, use the --verbose option.')
      *
      * @param InputInterface $input holds information about entered parameters
      * @param SymfonyStyle $io necessary for outputting information
-     * @return void
      */
     protected function updateReferenceIndex(InputInterface $input, SymfonyStyle $io)
     {
@@ -218,7 +215,6 @@ If you want to get more detailed information, use the --verbose option.')
      * @param array $missingManagedFiles Contains the records of sys_refindex which need to be updated
      * @param bool $dryRun if set, the references are just displayed, but not removed
      * @param SymfonyStyle $io the IO object for output
-     * @return void
      */
     protected function removeReferencesToMissingFiles(array $missingManagedFiles, bool $dryRun, SymfonyStyle $io)
     {
diff --git a/typo3/sysext/lowlevel/Classes/Command/MissingRelationsCommand.php b/typo3/sysext/lowlevel/Classes/Command/MissingRelationsCommand.php
index 57b6e1b810add4327f883f0a55176f32fc7581c8..0eb3c568e279bcdfd02b77c5bd2c43aaee933af8 100644
--- a/typo3/sysext/lowlevel/Classes/Command/MissingRelationsCommand.php
+++ b/typo3/sysext/lowlevel/Classes/Command/MissingRelationsCommand.php
@@ -93,8 +93,6 @@ If you want to get more detailed information, use the --verbose option.')
      *
      * @param InputInterface $input
      * @param OutputInterface $output
-     *
-     * @return void
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
@@ -181,7 +179,6 @@ If you want to get more detailed information, use the --verbose option.')
      *
      * @param InputInterface $input holds information about entered parameters
      * @param SymfonyStyle $io necessary for outputting information
-     * @return void
      */
     protected function updateReferenceIndex(InputInterface $input, SymfonyStyle $io)
     {
@@ -313,7 +310,6 @@ If you want to get more detailed information, use the --verbose option.')
      * @param array $nonExistingRecords Contains the records non-existing records of sys_refindex which need to be removed
      * @param bool $dryRun if set, the references are just displayed, but not removed
      * @param SymfonyStyle $io the IO object for output
-     * @return void
      */
     protected function removeReferencesToMissingRecords(
         array $offlineVersionRecords,
diff --git a/typo3/sysext/lowlevel/Classes/Command/OrphanRecordsCommand.php b/typo3/sysext/lowlevel/Classes/Command/OrphanRecordsCommand.php
index 6fc02a951bf8215edb1a14a654e937189f388459..009d01b35cf75d24cf2886506ae113f569d3828e 100644
--- a/typo3/sysext/lowlevel/Classes/Command/OrphanRecordsCommand.php
+++ b/typo3/sysext/lowlevel/Classes/Command/OrphanRecordsCommand.php
@@ -66,8 +66,6 @@ Manual repair suggestions:
      *
      * @param InputInterface $input
      * @param OutputInterface $output
-     *
-     * @return void
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
@@ -235,7 +233,6 @@ Manual repair suggestions:
      * @param array $orphanedRecords two level array with tables and uids
      * @param bool $dryRun check if the records should NOT be deleted (use --dry-run to avoid)
      * @param SymfonyStyle $io
-     * @return void
      */
     protected function deleteRecords(array $orphanedRecords, bool $dryRun, SymfonyStyle $io)
     {
diff --git a/typo3/sysext/lowlevel/Classes/Command/RteImagesCommand.php b/typo3/sysext/lowlevel/Classes/Command/RteImagesCommand.php
index d4f6bdf2cfdb79c1f5c4bd93c8ee23f9ed96f5fd..5d7d8a7cabf157908dbcb6f117307f9e20aa14d3 100644
--- a/typo3/sysext/lowlevel/Classes/Command/RteImagesCommand.php
+++ b/typo3/sysext/lowlevel/Classes/Command/RteImagesCommand.php
@@ -84,8 +84,6 @@ If you want to get more detailed information, use the --verbose option.')
      *
      * @param InputInterface $input
      * @param OutputInterface $output
-     *
-     * @return void
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
@@ -173,7 +171,6 @@ If you want to get more detailed information, use the --verbose option.')
      *
      * @param InputInterface $input holds information about entered parameters
      * @param SymfonyStyle $io necessary for outputting information
-     * @return void
      */
     protected function updateReferenceIndex(InputInterface $input, SymfonyStyle $io)
     {
@@ -286,7 +283,6 @@ If you want to get more detailed information, use the --verbose option.')
      * @param array $lostFiles Contains the lost files found
      * @param bool $dryRun if set, the files are just displayed, but not deleted
      * @param SymfonyStyle $io the IO object for output
-     * @return void
      */
     protected function deleteLostFiles(array $lostFiles, bool $dryRun, SymfonyStyle $io)
     {
diff --git a/typo3/sysext/lowlevel/Classes/Command/WorkspaceVersionRecordsCommand.php b/typo3/sysext/lowlevel/Classes/Command/WorkspaceVersionRecordsCommand.php
index 10b75259dfe5851eccc45ddfe4ddd64da9347df2..70e8e63e13774641a30dd8032d03cbb471cc27da 100644
--- a/typo3/sysext/lowlevel/Classes/Command/WorkspaceVersionRecordsCommand.php
+++ b/typo3/sysext/lowlevel/Classes/Command/WorkspaceVersionRecordsCommand.php
@@ -101,8 +101,6 @@ class WorkspaceVersionRecordsCommand extends Command
      *
      * @param InputInterface $input
      * @param OutputInterface $output
-     *
-     * @return void
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
@@ -267,7 +265,6 @@ class WorkspaceVersionRecordsCommand extends Command
      * @param int $depth Depth
      * @param bool $isInsideVersionedPage DON'T set from outside, internal. (indicates we are inside a version of a page)
      * @param bool $rootIsVersion DON'T set from outside, internal. Indicates that rootID is a version of a page
-     * @return void
      */
     protected function traversePageTreeForVersionedRecords(int $rootID, int $depth, bool $isInsideVersionedPage = false, bool $rootIsVersion = false)
     {
@@ -544,7 +541,6 @@ class WorkspaceVersionRecordsCommand extends Command
      * @param array $records two level array with tables and uids
      * @param bool $dryRun check if the records should NOT be deleted (use --dry-run to avoid)
      * @param SymfonyStyle $io
-     * @return void
      */
     protected function deleteRecords(array $records, bool $dryRun, SymfonyStyle $io)
     {
diff --git a/typo3/sysext/lowlevel/Classes/View/ConfigurationView.php b/typo3/sysext/lowlevel/Classes/View/ConfigurationView.php
index 4b30201bb73d8fe05347bf7a37b2969fdf198f74..e48ca65f43a3ccfad80de0fbfc57d523421a29dc 100644
--- a/typo3/sysext/lowlevel/Classes/View/ConfigurationView.php
+++ b/typo3/sysext/lowlevel/Classes/View/ConfigurationView.php
@@ -99,8 +99,6 @@ class ConfigurationView extends BaseScriptClass
 
     /**
      * Initialization
-     *
-     * @return void
      */
     public function init()
     {
@@ -111,8 +109,6 @@ class ConfigurationView extends BaseScriptClass
 
     /**
      * Menu Configuration
-     *
-     * @return void
      */
     public function menuConfig()
     {
@@ -143,8 +139,6 @@ class ConfigurationView extends BaseScriptClass
 
     /**
      * Main function
-     *
-     * @return void
      */
     public function main()
     {
diff --git a/typo3/sysext/lowlevel/Classes/View/DatabaseIntegrityView.php b/typo3/sysext/lowlevel/Classes/View/DatabaseIntegrityView.php
index d2dcd48b9bc50ea9b3be5f91afd678c2d790d4f6..608ee0648992e15b8991bd3749170ad284c6f29b 100644
--- a/typo3/sysext/lowlevel/Classes/View/DatabaseIntegrityView.php
+++ b/typo3/sysext/lowlevel/Classes/View/DatabaseIntegrityView.php
@@ -82,8 +82,6 @@ class DatabaseIntegrityView extends BaseScriptClass
 
     /**
      * Initialization
-     *
-     * @return void
      */
     public function init()
     {
@@ -103,8 +101,6 @@ class DatabaseIntegrityView extends BaseScriptClass
 
     /**
      * Configure menu
-     *
-     * @return void
      */
     public function menuConfig()
     {
@@ -193,8 +189,6 @@ class DatabaseIntegrityView extends BaseScriptClass
 
     /**
      * Main functions, is rendering the content
-     *
-     * @return void
      */
     public function main()
     {
@@ -288,8 +282,6 @@ class DatabaseIntegrityView extends BaseScriptClass
 
     /**
      * Creates the overview menu.
-     *
-     * @return void
      */
     protected function func_default()
     {
@@ -308,8 +300,6 @@ class DatabaseIntegrityView extends BaseScriptClass
      ****************************/
     /**
      * Check and update reference index!
-     *
-     * @return void
      */
     public function func_refindex()
     {
@@ -329,8 +319,6 @@ class DatabaseIntegrityView extends BaseScriptClass
 
     /**
      * Search (Full / Advanced)
-     *
-     * @return void
      */
     public function func_search()
     {
@@ -367,8 +355,6 @@ class DatabaseIntegrityView extends BaseScriptClass
 
     /**
      * Records overview
-     *
-     * @return void
      */
     public function func_records()
     {
@@ -465,8 +451,6 @@ class DatabaseIntegrityView extends BaseScriptClass
 
     /**
      * Show list references
-     *
-     * @return void
      */
     public function func_relations()
     {
diff --git a/typo3/sysext/opendocs/Classes/Backend/ToolbarItems/OpendocsToolbarItem.php b/typo3/sysext/opendocs/Classes/Backend/ToolbarItems/OpendocsToolbarItem.php
index 907bf6e992f38330e5a436c487ca639e05e03e98..0aea761f904a82bb19c00acc82c88d619e11f90d 100644
--- a/typo3/sysext/opendocs/Classes/Backend/ToolbarItems/OpendocsToolbarItem.php
+++ b/typo3/sysext/opendocs/Classes/Backend/ToolbarItems/OpendocsToolbarItem.php
@@ -57,8 +57,6 @@ class OpendocsToolbarItem implements ToolbarItemInterface
 
     /**
      * Loads the opened and recently opened documents from the user
-     *
-     * @return void
      */
     public function loadDocsFromUserSession()
     {
diff --git a/typo3/sysext/recordlist/Classes/Browser/AbstractElementBrowser.php b/typo3/sysext/recordlist/Classes/Browser/AbstractElementBrowser.php
index cf1875852ce882e4b5931555cf7c755fdccc6a6d..903660342a071626dc33d0dc0ffff7dbffa73ad6 100644
--- a/typo3/sysext/recordlist/Classes/Browser/AbstractElementBrowser.php
+++ b/typo3/sysext/recordlist/Classes/Browser/AbstractElementBrowser.php
@@ -93,8 +93,6 @@ abstract class AbstractElementBrowser
 
     /**
      * Main initialization
-     *
-     * @return void
      */
     protected function initialize()
     {
@@ -104,8 +102,6 @@ abstract class AbstractElementBrowser
 
     /**
      * Sets the script url depending on being a module or script request
-     *
-     * @return void
      */
     protected function determineScriptUrl()
     {
@@ -122,7 +118,6 @@ abstract class AbstractElementBrowser
     }
 
     /**
-     * @return void
      */
     protected function initVariables()
     {
@@ -134,8 +129,6 @@ abstract class AbstractElementBrowser
 
     /**
      * Initialize document template object
-     *
-     *  @return void
      */
     protected function initDocumentTemplate()
     {
diff --git a/typo3/sysext/recordlist/Classes/Browser/DatabaseBrowser.php b/typo3/sysext/recordlist/Classes/Browser/DatabaseBrowser.php
index 67c9ec91f61cfd3f0267714c95bac3d751c5a118..4322efb4bc8f4af5a82a7108b8ebef45dba5d80e 100644
--- a/typo3/sysext/recordlist/Classes/Browser/DatabaseBrowser.php
+++ b/typo3/sysext/recordlist/Classes/Browser/DatabaseBrowser.php
@@ -37,7 +37,6 @@ class DatabaseBrowser extends AbstractElementBrowser implements ElementBrowserIn
     protected $expandPage;
 
     /**
-     * @return void
      */
     protected function initialize()
     {
@@ -46,7 +45,6 @@ class DatabaseBrowser extends AbstractElementBrowser implements ElementBrowserIn
     }
 
     /**
-     * @return void
      */
     protected function initVariables()
     {
@@ -159,7 +157,6 @@ class DatabaseBrowser extends AbstractElementBrowser implements ElementBrowserIn
 
     /**
      * If the current Backend User has set a temporary DB mount, it is stored to her/his UC.
-     * @return void
      */
     protected function setTemporaryDbMounts()
     {
diff --git a/typo3/sysext/recordlist/Classes/Browser/FileBrowser.php b/typo3/sysext/recordlist/Classes/Browser/FileBrowser.php
index 6c866546222cbdfb98ae2a0713fa6720eb6901ff..abeeaf7ba973a5aa54116ad1198765cdbd4c93c3 100644
--- a/typo3/sysext/recordlist/Classes/Browser/FileBrowser.php
+++ b/typo3/sysext/recordlist/Classes/Browser/FileBrowser.php
@@ -68,7 +68,6 @@ class FileBrowser extends AbstractElementBrowser implements ElementBrowserInterf
 
     /**
      * Loads additional JavaScript
-     * @return void
      */
     protected function initialize()
     {
@@ -79,7 +78,6 @@ class FileBrowser extends AbstractElementBrowser implements ElementBrowserInterf
 
     /**
      * Checks additional GET/POST requests
-     * @return void
      */
     protected function initVariables()
     {
diff --git a/typo3/sysext/recordlist/Classes/Browser/FolderBrowser.php b/typo3/sysext/recordlist/Classes/Browser/FolderBrowser.php
index 07f70baf7946e11eb98ecd3646198cc3e4261b6d..9bc98e0500c28fee45248194a40c1580a8470898 100644
--- a/typo3/sysext/recordlist/Classes/Browser/FolderBrowser.php
+++ b/typo3/sysext/recordlist/Classes/Browser/FolderBrowser.php
@@ -39,7 +39,6 @@ class FolderBrowser extends AbstractElementBrowser implements ElementBrowserInte
 
     /**
      * Adds additional JavaScript modules
-     * @return void
      */
     protected function initialize()
     {
@@ -53,7 +52,6 @@ class FolderBrowser extends AbstractElementBrowser implements ElementBrowserInte
 
     /**
      * Checks for an additional request parameter
-     * @return void
      */
     protected function initVariables()
     {
diff --git a/typo3/sysext/recordlist/Classes/Controller/AbstractLinkBrowserController.php b/typo3/sysext/recordlist/Classes/Controller/AbstractLinkBrowserController.php
index a71288a83237d7c95d2975e05fbd0410d95d3097..0ec9b728753668097f6426b90ef5125de04df2e3 100644
--- a/typo3/sysext/recordlist/Classes/Controller/AbstractLinkBrowserController.php
+++ b/typo3/sysext/recordlist/Classes/Controller/AbstractLinkBrowserController.php
@@ -122,8 +122,6 @@ abstract class AbstractLinkBrowserController
 
     /**
      * Initialize the controller
-     *
-     * @return void
      */
     protected function init()
     {
@@ -134,7 +132,6 @@ abstract class AbstractLinkBrowserController
      * Initialize hook objects implementing the interface
      *
      * @throws \UnexpectedValueException
-     * @return void
      */
     protected function initHookObjects()
     {
@@ -221,7 +218,6 @@ abstract class AbstractLinkBrowserController
     }
 
     /**
-     * @return void
      * @throws \UnexpectedValueException
      */
     protected function loadLinkHandlers()
@@ -278,8 +274,6 @@ abstract class AbstractLinkBrowserController
 
     /**
      * Initialize $this->currentLinkParts and $this->currentLinkHandler
-     *
-     * @return void
      */
     protected function initCurrentUrl()
     {
@@ -314,8 +308,6 @@ abstract class AbstractLinkBrowserController
 
     /**
      * Initialize document template object
-     *
-     *  @return void
      */
     protected function initDocumentTemplate()
     {
diff --git a/typo3/sysext/recordlist/Classes/Controller/ElementBrowserController.php b/typo3/sysext/recordlist/Classes/Controller/ElementBrowserController.php
index 4b570f709cfb4e3ce9c53da882f9a9b0d5b0f351..612ff2ddec0f23fb6c4cb4897e7ebaa835b8f041 100644
--- a/typo3/sysext/recordlist/Classes/Controller/ElementBrowserController.php
+++ b/typo3/sysext/recordlist/Classes/Controller/ElementBrowserController.php
@@ -66,8 +66,6 @@ class ElementBrowserController
 
     /**
      * Initialize the controller
-     *
-     * @return void
      */
     protected function init()
     {
diff --git a/typo3/sysext/recordlist/Classes/Controller/ElementBrowserFramesetController.php b/typo3/sysext/recordlist/Classes/Controller/ElementBrowserFramesetController.php
index 93a2ad2cf0b51439d788efc0e8446633689a3301..6722d62c6dd0ac27b7472495f7741f2717cc7aa2 100644
--- a/typo3/sysext/recordlist/Classes/Controller/ElementBrowserFramesetController.php
+++ b/typo3/sysext/recordlist/Classes/Controller/ElementBrowserFramesetController.php
@@ -66,8 +66,6 @@ class ElementBrowserFramesetController
     /**
      * Main function.
      * Creates the header code in XHTML, the JavaScript, then the frameset for the two frames.
-     *
-     * @return void
      */
     public function main()
     {
diff --git a/typo3/sysext/recordlist/Classes/LinkHandler/AbstractLinkHandler.php b/typo3/sysext/recordlist/Classes/LinkHandler/AbstractLinkHandler.php
index e7735acfd1d3bff0ee44b7c5999d1b7b917c7bd4..88eb34a0556ac0f6c2992d41126d6dc3f39d4c12 100644
--- a/typo3/sysext/recordlist/Classes/LinkHandler/AbstractLinkHandler.php
+++ b/typo3/sysext/recordlist/Classes/LinkHandler/AbstractLinkHandler.php
@@ -69,8 +69,6 @@ abstract class AbstractLinkHandler
      * @param AbstractLinkBrowserController $linkBrowser
      * @param string $identifier
      * @param array $configuration Page TSconfig
-     *
-     * @return void
      */
     public function initialize(AbstractLinkBrowserController $linkBrowser, $identifier, array $configuration)
     {
@@ -114,7 +112,6 @@ abstract class AbstractLinkHandler
 
     /**
      * Sets a DB mount and stores it in the currently defined backend user in her/his uc
-     * @return void
      */
     protected function setTemporaryDbMounts()
     {
diff --git a/typo3/sysext/recordlist/Classes/LinkHandler/LinkHandlerInterface.php b/typo3/sysext/recordlist/Classes/LinkHandler/LinkHandlerInterface.php
index c437c0ad3ac9d594085f78e136cda5eef745dd02..9414f611851af7c90faf543538a1ba6cd979bc9b 100644
--- a/typo3/sysext/recordlist/Classes/LinkHandler/LinkHandlerInterface.php
+++ b/typo3/sysext/recordlist/Classes/LinkHandler/LinkHandlerInterface.php
@@ -39,8 +39,6 @@ interface LinkHandlerInterface
      * @param AbstractLinkBrowserController $linkBrowser
      * @param string $identifier
      * @param array $configuration Page TSconfig
-     *
-     * @return void
      */
     public function initialize(AbstractLinkBrowserController $linkBrowser, $identifier, array $configuration);
 
diff --git a/typo3/sysext/recordlist/Classes/LinkHandler/PageLinkHandler.php b/typo3/sysext/recordlist/Classes/LinkHandler/PageLinkHandler.php
index 31561585cdcd6f27d0e3d5b1d0f0db45e87412d0..b9f723f586da04ff71959a111c0cfe0333d1b6a5 100644
--- a/typo3/sysext/recordlist/Classes/LinkHandler/PageLinkHandler.php
+++ b/typo3/sysext/recordlist/Classes/LinkHandler/PageLinkHandler.php
@@ -152,8 +152,6 @@ class PageLinkHandler extends AbstractLinkHandler implements LinkHandlerInterfac
      * This adds all content elements on a page to the view and lets you create a link to the element.
      *
      * @param int $pageId Page uid to expand
-     *
-     * @return void
      */
     protected function getRecordsOnExpandedPage($pageId)
     {
@@ -224,7 +222,6 @@ class PageLinkHandler extends AbstractLinkHandler implements LinkHandlerInterfac
 
     /**
      * Sets a DB mount and stores it in the currently defined backend user in her/his uc
-     * @return void
      */
     protected function setTemporaryDbMounts()
     {
diff --git a/typo3/sysext/recordlist/Classes/LinkHandler/RecordLinkHandler.php b/typo3/sysext/recordlist/Classes/LinkHandler/RecordLinkHandler.php
index bc5a35ff8ae85d36eb6e690c5138ba28b1200b76..b73203cdfa1dddfab05fc6a74a2f7ce7663094f9 100644
--- a/typo3/sysext/recordlist/Classes/LinkHandler/RecordLinkHandler.php
+++ b/typo3/sysext/recordlist/Classes/LinkHandler/RecordLinkHandler.php
@@ -63,8 +63,6 @@ class RecordLinkHandler extends AbstractLinkHandler implements LinkHandlerInterf
      * @param AbstractLinkBrowserController $linkBrowser
      * @param string $identifier
      * @param array $configuration Page TSconfig
-     *
-     * @return void
      */
     public function initialize(AbstractLinkBrowserController $linkBrowser, $identifier, array $configuration)
     {
diff --git a/typo3/sysext/recordlist/Classes/RecordList.php b/typo3/sysext/recordlist/Classes/RecordList.php
index ae1c455b8ea4f5d3e1b94b9f6f8cf13db60352af..b903d691fc1f51943211a373a5e212fd4697eeb4 100644
--- a/typo3/sysext/recordlist/Classes/RecordList.php
+++ b/typo3/sysext/recordlist/Classes/RecordList.php
@@ -202,8 +202,6 @@ class RecordList extends AbstractModule
 
     /**
      * Initializing the module
-     *
-     * @return void
      */
     public function init()
     {
@@ -235,8 +233,6 @@ class RecordList extends AbstractModule
 
     /**
      * Initialize function menu array
-     *
-     * @return void
      */
     public function menuConfig()
     {
@@ -254,8 +250,6 @@ class RecordList extends AbstractModule
 
     /**
      * Clears page cache for the current id, $this->id
-     *
-     * @return void
      */
     public function clearCache()
     {
@@ -268,8 +262,6 @@ class RecordList extends AbstractModule
 
     /**
      * Main function, starting the rendering of the list.
-     *
-     * @return void
      */
     public function main()
     {
diff --git a/typo3/sysext/recordlist/Classes/RecordList/AbstractDatabaseRecordList.php b/typo3/sysext/recordlist/Classes/RecordList/AbstractDatabaseRecordList.php
index 2eb761ac7e151378a603fb50f918ee49814d9d47..ce12904c09c4fa87d828e645152e70c666b56dda 100644
--- a/typo3/sysext/recordlist/Classes/RecordList/AbstractDatabaseRecordList.php
+++ b/typo3/sysext/recordlist/Classes/RecordList/AbstractDatabaseRecordList.php
@@ -345,7 +345,6 @@ class AbstractDatabaseRecordList extends AbstractRecordList
      * @param string $search Search word, if any
      * @param int $levels Number of levels to search down the page tree
      * @param int $showLimit Limit of records to be listed.
-     * @return void
      */
     public function start($id, $table, $pointer, $search = '', $levels = 0, $showLimit = 0)
     {
@@ -436,8 +435,6 @@ class AbstractDatabaseRecordList extends AbstractRecordList
      * Traverses the table(s) to be listed and renders the output code for each:
      * The HTML is accumulated in $this->HTMLcode
      * Finishes off with a stopper-gif
-     *
-     * @return void
      */
     public function generateList()
     {
@@ -631,8 +628,6 @@ class AbstractDatabaseRecordList extends AbstractRecordList
     /**
      * Setting the field names to display in extended list.
      * Sets the internal variable $this->setFields
-     *
-     * @return void
      */
     public function setDispFields()
     {
@@ -1294,7 +1289,6 @@ class AbstractDatabaseRecordList extends AbstractRecordList
      * Redirects to FormEngine if a record is just localized.
      *
      * @param string $justLocalized String with table, orig uid and language separated by ":
-     * @return void
      */
     public function localizationRedirect($justLocalized)
     {
@@ -1344,7 +1338,6 @@ class AbstractDatabaseRecordList extends AbstractRecordList
      * Set URL parameters to override or add in the listUrl() method.
      *
      * @param string[] $urlParameters
-     * @return void
      */
     public function setOverrideUrlParameters(array $urlParameters)
     {
diff --git a/typo3/sysext/recordlist/Classes/RecordList/DatabaseRecordList.php b/typo3/sysext/recordlist/Classes/RecordList/DatabaseRecordList.php
index a5dc6e47e9e8ddcb656c2fc1f901dad228ce10c9..0ab504d59fcdb2b0ca6c4494ca21020f00a2998b 100644
--- a/typo3/sysext/recordlist/Classes/RecordList/DatabaseRecordList.php
+++ b/typo3/sysext/recordlist/Classes/RecordList/DatabaseRecordList.php
@@ -2157,8 +2157,6 @@ class DatabaseRecordList extends AbstractDatabaseRecordList
      ************************************/
     /**
      * Initializes internal csvLines array with the header of field names
-     *
-     * @return void
      */
     protected function initCSV()
     {
@@ -2167,8 +2165,6 @@ class DatabaseRecordList extends AbstractDatabaseRecordList
 
     /**
      * Add header line with field names as CSV line
-     *
-     * @return void
      */
     protected function addHeaderRowToCSV()
     {
@@ -2180,7 +2176,6 @@ class DatabaseRecordList extends AbstractDatabaseRecordList
      * Adds selected columns of one table row as CSV line.
      *
      * @param mixed[] $row Record array, from which the values of fields found in $this->fieldArray will be listed in the CSV output.
-     * @return void
      */
     protected function addToCSV(array $row = [])
     {
@@ -2216,7 +2211,6 @@ class DatabaseRecordList extends AbstractDatabaseRecordList
      * Adds input row of values to the internal csvLines array as a CSV formatted line
      *
      * @param mixed[] $csvRow Array with values to be listed.
-     * @return void
      */
     public function setCsvRow($csvRow)
     {
@@ -2228,7 +2222,6 @@ class DatabaseRecordList extends AbstractDatabaseRecordList
      * This function exits!
      *
      * @param string $prefix Filename prefix:
-     * @return void EXITS php execution!
      */
     public function outputCSV($prefix)
     {
diff --git a/typo3/sysext/recycler/Classes/Controller/RecyclerAjaxController.php b/typo3/sysext/recycler/Classes/Controller/RecyclerAjaxController.php
index 8e796f52da64eea12be199a924dd5960c8c94f3f..c6b42cb99ebfc41b9c5fa009d410a2cbdb53e21f 100644
--- a/typo3/sysext/recycler/Classes/Controller/RecyclerAjaxController.php
+++ b/typo3/sysext/recycler/Classes/Controller/RecyclerAjaxController.php
@@ -156,7 +156,6 @@ class RecyclerAjaxController
      *
      * @param string $identifier The identifier to be used to set the data
      * @param string $data The data to be stored in the session
-     * @return void
      */
     protected function setDataInSession($identifier, $data)
     {
diff --git a/typo3/sysext/recycler/Classes/Controller/RecyclerModuleController.php b/typo3/sysext/recycler/Classes/Controller/RecyclerModuleController.php
index e4fe8c45f48c3cea11f9ff51a34080f0d882e70d..33ce50e86d5e0abc0b6ee8fb3d6d38060b43f186 100644
--- a/typo3/sysext/recycler/Classes/Controller/RecyclerModuleController.php
+++ b/typo3/sysext/recycler/Classes/Controller/RecyclerModuleController.php
@@ -75,8 +75,6 @@ class RecyclerModuleController extends ActionController
 
     /**
      * Initializes the Module
-     *
-     * @return void
      */
     public function initializeAction()
     {
@@ -108,7 +106,6 @@ class RecyclerModuleController extends ActionController
      * Initialize the view
      *
      * @param ViewInterface $view The view
-     * @return void
      */
     public function initializeView(ViewInterface $view)
     {
@@ -120,8 +117,6 @@ class RecyclerModuleController extends ActionController
 
     /**
      * Renders the content of the module.
-     *
-     * @return void
      */
     public function indexAction()
     {
@@ -140,7 +135,6 @@ class RecyclerModuleController extends ActionController
     /**
      * Registers the Icons into the docheader
      *
-     * @return void
      * @throws \InvalidArgumentException
      */
     protected function registerDocheaderButtons()
diff --git a/typo3/sysext/recycler/Classes/Domain/Model/DeletedRecords.php b/typo3/sysext/recycler/Classes/Domain/Model/DeletedRecords.php
index ed1c04795b27fb1a8f3e4a8e0543a9379c4741a1..df7a64836400179e8b8fb2714a2b8ab3ca683192 100644
--- a/typo3/sysext/recycler/Classes/Domain/Model/DeletedRecords.php
+++ b/typo3/sysext/recycler/Classes/Domain/Model/DeletedRecords.php
@@ -138,7 +138,6 @@ class DeletedRecords
      * @param string $table Tablename from record
      * @param int $depth How many levels recursive
      * @param string $filter Filter text
-     * @return void
      */
     protected function setData($id, $table, $depth, $filter)
     {
@@ -340,7 +339,6 @@ class DeletedRecords
      *
      * @param string $table Name of the table
      * @param array $rows Record row
-     * @return void
      */
     protected function checkRecordAccess($table, array $rows)
     {
@@ -488,7 +486,6 @@ class DeletedRecords
      *
      * @param string $table Tablename
      * @param array $row Deleted record row
-     * @return void
      */
     public function setDeletedRows($table, array $row)
     {
diff --git a/typo3/sysext/recycler/Classes/Task/CleanerFieldProvider.php b/typo3/sysext/recycler/Classes/Task/CleanerFieldProvider.php
index ca6fba37c4f0d6e9242a0a56e9e66f247f5f91eb..b0d9b379a5c24d1244974c49dcdc40795a645b0e 100644
--- a/typo3/sysext/recycler/Classes/Task/CleanerFieldProvider.php
+++ b/typo3/sysext/recycler/Classes/Task/CleanerFieldProvider.php
@@ -187,7 +187,6 @@ class CleanerFieldProvider implements \TYPO3\CMS\Scheduler\AdditionalFieldProvid
      *
      * @param array $submittedData An array containing the data submitted by the add/edit task form
      * @param AbstractTask $task Reference to the scheduler backend module
-     * @return void
      * @throws \InvalidArgumentException
      */
     public function saveAdditionalFields(array $submittedData, AbstractTask $task)
diff --git a/typo3/sysext/recycler/Classes/Task/CleanerTask.php b/typo3/sysext/recycler/Classes/Task/CleanerTask.php
index 513ae517ec9477247b8046a352384109377b0968..acbd07803759ece91c6956080477d93cb1333811 100644
--- a/typo3/sysext/recycler/Classes/Task/CleanerTask.php
+++ b/typo3/sysext/recycler/Classes/Task/CleanerTask.php
@@ -168,7 +168,6 @@ class CleanerTask extends AbstractTask
      *
      * @param string $table
      * @param array $constraints
-     * @return void
      */
     protected function checkFileResourceFieldsBeforeDeletion($table, array $constraints)
     {
@@ -184,7 +183,6 @@ class CleanerTask extends AbstractTask
      * @param string $table
      * @param array $constraints
      * @param array $fieldList
-     * @return void
      */
     protected function deleteFilesForTable($table, array $constraints, array $fieldList)
     {
diff --git a/typo3/sysext/recycler/Tests/Functional/Recycle/AbstractRecycleTestCase.php b/typo3/sysext/recycler/Tests/Functional/Recycle/AbstractRecycleTestCase.php
index 56cffcff58aecec48ccc255db2cb4a35ac5d78ee..99bfb8e59be3b1f9481aa5742799cdc38ad14470 100644
--- a/typo3/sysext/recycler/Tests/Functional/Recycle/AbstractRecycleTestCase.php
+++ b/typo3/sysext/recycler/Tests/Functional/Recycle/AbstractRecycleTestCase.php
@@ -36,8 +36,6 @@ abstract class AbstractRecycleTestCase extends \TYPO3\TestingFramework\Core\Func
     /**
      * Set up for set up the backend user, initialize the language object
      * and creating the Export instance
-     *
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/recycler/Tests/Functional/Recycle/Pages/AdminRecycleTest.php b/typo3/sysext/recycler/Tests/Functional/Recycle/Pages/AdminRecycleTest.php
index 9f4c8d5e7d42f6877fc3471164cc38953dbb8c2b..4ac808ddb3906ca9855194d989e33f7d3e808ce0 100644
--- a/typo3/sysext/recycler/Tests/Functional/Recycle/Pages/AdminRecycleTest.php
+++ b/typo3/sysext/recycler/Tests/Functional/Recycle/Pages/AdminRecycleTest.php
@@ -28,8 +28,6 @@ class AdminRecycleTest extends \TYPO3\CMS\Recycler\Tests\Functional\Recycle\Abst
 
     /**
      * Set up the test
-     *
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/recycler/Tests/Functional/Recycle/Pages/UserRecycleTest.php b/typo3/sysext/recycler/Tests/Functional/Recycle/Pages/UserRecycleTest.php
index 1729c943d77a0ac3172add52dd71625a53540727..c6288b8810b2701929762ce7eeb687b1504df5a7 100644
--- a/typo3/sysext/recycler/Tests/Functional/Recycle/Pages/UserRecycleTest.php
+++ b/typo3/sysext/recycler/Tests/Functional/Recycle/Pages/UserRecycleTest.php
@@ -28,8 +28,6 @@ class UserRecycleTest extends \TYPO3\CMS\Recycler\Tests\Functional\Recycle\Abstr
 
     /**
      * Set up the test
-     *
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/reports/Classes/Controller/ReportController.php b/typo3/sysext/reports/Classes/Controller/ReportController.php
index 4bddd039e7c7303736b55a77158b7b6488277d5d..d6008637b9845f7758ff011934c4041f831f888a 100644
--- a/typo3/sysext/reports/Classes/Controller/ReportController.php
+++ b/typo3/sysext/reports/Classes/Controller/ReportController.php
@@ -47,8 +47,6 @@ class ReportController extends ActionController
 
     /**
      * Redirect to the saved report
-     *
-     * @return void
      */
     public function initializeAction()
     {
@@ -71,8 +69,6 @@ class ReportController extends ActionController
      * Initialize the view
      *
      * @param ViewInterface $view The view
-     *
-     * @return void
      */
     protected function initializeView(ViewInterface $view)
     {
@@ -85,8 +81,6 @@ class ReportController extends ActionController
 
     /**
      * Overview
-     *
-     * @return void
      */
     public function indexAction()
     {
@@ -99,8 +93,6 @@ class ReportController extends ActionController
      *
      * @param string $extension Extension
      * @param string $report Report
-     *
-     * @return void
      */
     public function detailAction($extension, $report)
     {
@@ -136,8 +128,6 @@ class ReportController extends ActionController
 
     /**
      * Generates the menu
-     *
-     * @return void
      */
     protected function generateMenu()
     {
@@ -173,8 +163,6 @@ class ReportController extends ActionController
 
     /**
      * Gets all buttons for the docheader
-     *
-     * @return void
      */
     protected function generateButtons()
     {
@@ -199,8 +187,6 @@ class ReportController extends ActionController
      *
      * @param string $extension Extension name
      * @param string $report Report name
-     *
-     * @return void
      */
     protected function saveState($extension = '', $report = '')
     {
diff --git a/typo3/sysext/reports/Classes/Report/Status/ConfigurationStatus.php b/typo3/sysext/reports/Classes/Report/Status/ConfigurationStatus.php
index 24c759610868f008b11c4044b9d912d60cceb230..5ec552535b48017c91f26eeee445ba729c027a29 100644
--- a/typo3/sysext/reports/Classes/Report/Status/ConfigurationStatus.php
+++ b/typo3/sysext/reports/Classes/Report/Status/ConfigurationStatus.php
@@ -347,8 +347,6 @@ class ConfigurationStatus implements StatusProviderInterface
      *
      * Currently implemented commands are:
      * - Remove deprecation log file
-     *
-     * @return void
      */
     protected function executeAdminCommand()
     {
@@ -364,8 +362,6 @@ class ConfigurationStatus implements StatusProviderInterface
 
     /**
      * Remove deprecation log file.
-     *
-     * @return void
      */
     protected static function removeDeprecationLogFile()
     {
diff --git a/typo3/sysext/reports/Classes/Report/Status/Status.php b/typo3/sysext/reports/Classes/Report/Status/Status.php
index ae6022d7762d5ffcc7e72db39445b8d5c93245cc..2df473b3efa8a54ef1c56bfe20989e48d18c4262 100644
--- a/typo3/sysext/reports/Classes/Report/Status/Status.php
+++ b/typo3/sysext/reports/Classes/Report/Status/Status.php
@@ -60,8 +60,6 @@ class Status implements ReportInterface
 
     /**
      * Gets all registered status providers and creates instances of them.
-     *
-     * @return void
      */
     protected function getStatusProviders()
     {
diff --git a/typo3/sysext/reports/Classes/Report/Status/WarningMessagePostProcessor.php b/typo3/sysext/reports/Classes/Report/Status/WarningMessagePostProcessor.php
index 7d14f8567715967eb1b01bd697c10a3ccf2f9e60..68573e154c79be31f48e7aa8a45ea250d1ce4dc4 100644
--- a/typo3/sysext/reports/Classes/Report/Status/WarningMessagePostProcessor.php
+++ b/typo3/sysext/reports/Classes/Report/Status/WarningMessagePostProcessor.php
@@ -31,7 +31,6 @@ class WarningMessagePostProcessor
      * control over the system warning messages.
      *
      * @param array $warningMessages An array of messages related to already found issues.
-     * @return void
      */
     public function displayWarningMessages_postProcess(array &$warningMessages)
     {
diff --git a/typo3/sysext/reports/Classes/Task/SystemStatusUpdateTask.php b/typo3/sysext/reports/Classes/Task/SystemStatusUpdateTask.php
index a72f9f60a1bf2123477fe056c644cd73aeb1d79d..e969f2a8fd2d7a202b3911db7776fd285eca1fc1 100644
--- a/typo3/sysext/reports/Classes/Task/SystemStatusUpdateTask.php
+++ b/typo3/sysext/reports/Classes/Task/SystemStatusUpdateTask.php
@@ -77,7 +77,6 @@ class SystemStatusUpdateTask extends AbstractTask
      * Sets the notification email address.
      *
      * @param string $notificationEmail Notification email address.
-     * @return void
      */
     public function setNotificationEmail($notificationEmail)
     {
@@ -88,7 +87,6 @@ class SystemStatusUpdateTask extends AbstractTask
      * Sends a notification email, reporting system issues.
      *
      * @param Status[] $systemStatus Array of statuses
-     * @return void
      */
     protected function sendNotificationEmail(array $systemStatus)
     {
diff --git a/typo3/sysext/reports/Classes/Task/SystemStatusUpdateTaskNotificationEmailField.php b/typo3/sysext/reports/Classes/Task/SystemStatusUpdateTaskNotificationEmailField.php
index ebb1a771ba9e8471395fde5973d501322836f742..c13b5de9dab8f3ee8179073fc0d03b4a00bc78bc 100644
--- a/typo3/sysext/reports/Classes/Task/SystemStatusUpdateTaskNotificationEmailField.php
+++ b/typo3/sysext/reports/Classes/Task/SystemStatusUpdateTaskNotificationEmailField.php
@@ -111,7 +111,6 @@ class SystemStatusUpdateTaskNotificationEmailField implements AdditionalFieldPro
      *
      * @param array $submittedData An array containing the data submitted by the add/edit task form
      * @param \TYPO3\CMS\Scheduler\Task\AbstractTask $task Reference to the scheduler backend module
-     * @return void
      */
     public function saveAdditionalFields(array $submittedData, AbstractTask $task)
     {
diff --git a/typo3/sysext/rsaauth/Classes/BackendWarnings.php b/typo3/sysext/rsaauth/Classes/BackendWarnings.php
index ecd702851d5835f8f40195c33e7d203eff7fa1fe..c8900dc2073db968e300a713b00d88e5a04c18e7 100644
--- a/typo3/sysext/rsaauth/Classes/BackendWarnings.php
+++ b/typo3/sysext/rsaauth/Classes/BackendWarnings.php
@@ -24,7 +24,6 @@ class BackendWarnings
      * Checks RSA configuration and creates warnings if necessary.
      *
      * @param array $warnings Warnings
-     * @return void
      */
     public function displayWarningMessages_postProcess(array &$warnings)
     {
diff --git a/typo3/sysext/rsaauth/Classes/Keypair.php b/typo3/sysext/rsaauth/Classes/Keypair.php
index 37f54dd38dd113fd9713b0642dc37d3badb0164c..28f6a13bf6d7e4f65e8248e5b018519dbeda1b55 100644
--- a/typo3/sysext/rsaauth/Classes/Keypair.php
+++ b/typo3/sysext/rsaauth/Classes/Keypair.php
@@ -67,7 +67,6 @@ class Keypair implements \TYPO3\CMS\Core\SingletonInterface
      * Note: This method must not be called more than one time.
      *
      * @param int $exponent the new exponent
-     * @return void
      * @throws \BadMethodCallException if the method was called more than one time
      */
     public function setExponent($exponent)
@@ -105,7 +104,6 @@ class Keypair implements \TYPO3\CMS\Core\SingletonInterface
      * Note: This method must not be called more than one time.
      *
      * @param string $privateKey The new private key
-     * @return void
      * @throws \BadMethodCallException if the method was called more than one time
      */
     public function setPrivateKey($privateKey)
@@ -143,7 +141,6 @@ class Keypair implements \TYPO3\CMS\Core\SingletonInterface
      * Note: This method must not be called more than one time.
      *
      * @param int $publicKeyModulus the new public key modulus
-     * @return void
      * @throws \BadMethodCallException if the method was called more than one time
      */
     public function setPublicKey($publicKeyModulus)
diff --git a/typo3/sysext/rsaauth/Classes/Storage/SessionStorage.php b/typo3/sysext/rsaauth/Classes/Storage/SessionStorage.php
index a51c4fe5095f9ba96c8d90352dae765c9b29cbd5..f42f28a602525b94a794f06b11861cdf40bbfe38 100644
--- a/typo3/sysext/rsaauth/Classes/Storage/SessionStorage.php
+++ b/typo3/sysext/rsaauth/Classes/Storage/SessionStorage.php
@@ -26,8 +26,6 @@ class SessionStorage extends AbstractStorage
     /**
      * Creates an instance of this class. It checks and initializes PHP
      * sessions if necessary.
-     *
-     * @return void
      */
     public function __construct()
     {
diff --git a/typo3/sysext/rsaauth/Classes/Storage/SplitStorage.php b/typo3/sysext/rsaauth/Classes/Storage/SplitStorage.php
index 38be4de982213915d5e50692e10f47a3f3cce0ec..1fe0306ec7ebb04d855eac9faa62f073e1d12518 100644
--- a/typo3/sysext/rsaauth/Classes/Storage/SplitStorage.php
+++ b/typo3/sysext/rsaauth/Classes/Storage/SplitStorage.php
@@ -66,7 +66,6 @@ class SplitStorage extends AbstractStorage
      * Adds a key to the storage or removes existing key
      *
      * @param string $key The key
-     * @return void
      * @see \TYPO3\CMS\Rsaauth\Storage\AbstractStorage::put()
      */
     public function put($key)
diff --git a/typo3/sysext/rsaauth/Classes/Storage/StorageFactory.php b/typo3/sysext/rsaauth/Classes/Storage/StorageFactory.php
index 9e0480d27323184e4932ca432745e56768168f9a..12ab03e3c75df457631eecef506d6e523709ffdb 100644
--- a/typo3/sysext/rsaauth/Classes/Storage/StorageFactory.php
+++ b/typo3/sysext/rsaauth/Classes/Storage/StorageFactory.php
@@ -59,7 +59,6 @@ class StorageFactory
      * another extension or ext_localconf.php
      *
      * @param string $preferredStorage Preferred storage
-     * @return void
      */
     public static function setPreferredStorage($preferredStorage)
     {
diff --git a/typo3/sysext/rsaauth/Tests/Functional/Storage/SplitStorageTest.php b/typo3/sysext/rsaauth/Tests/Functional/Storage/SplitStorageTest.php
index 69b87e207f1e2564de79837d4b2e1b5d6ae7e69e..207583772a3775b6c01889be4c4f30210851101a 100644
--- a/typo3/sysext/rsaauth/Tests/Functional/Storage/SplitStorageTest.php
+++ b/typo3/sysext/rsaauth/Tests/Functional/Storage/SplitStorageTest.php
@@ -63,8 +63,6 @@ class SplitStorageTest extends \TYPO3\TestingFramework\Core\Functional\Functiona
 
     /**
      * Sets up this test suite.
-     *
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/rsaauth/Tests/Unit/KeypairTest.php b/typo3/sysext/rsaauth/Tests/Unit/KeypairTest.php
index a15bf2506ef8a1332069592c4004edd61e5ec8c6..1ff676cd88571445752dadf5e0615a6ca7b81a1f 100644
--- a/typo3/sysext/rsaauth/Tests/Unit/KeypairTest.php
+++ b/typo3/sysext/rsaauth/Tests/Unit/KeypairTest.php
@@ -68,7 +68,6 @@ class KeypairTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 
     /**
      * @test
-     *
      */
     public function setExponentCalledTwoTimesThrowsException()
     {
@@ -104,7 +103,6 @@ class KeypairTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 
     /**
      * @test
-     *
      */
     public function setPrivateKeyCalledTwoTimesThrowsException()
     {
@@ -140,7 +138,6 @@ class KeypairTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 
     /**
      * @test
-     *
      */
     public function setPublicKeyCalledTwoTimesThrowsException()
     {
diff --git a/typo3/sysext/rte_ckeditor/Classes/Controller/BrowseLinksController.php b/typo3/sysext/rte_ckeditor/Classes/Controller/BrowseLinksController.php
index 7afe7fd12d56245c66d2c95f26dcf312ae2bde7c..bb221ac1da5caf1ed87c4df3187b44b745b97d42 100644
--- a/typo3/sysext/rte_ckeditor/Classes/Controller/BrowseLinksController.php
+++ b/typo3/sysext/rte_ckeditor/Classes/Controller/BrowseLinksController.php
@@ -139,8 +139,6 @@ class BrowseLinksController extends AbstractLinkBrowserController
 
     /**
      * Initialize document template object
-     *
-     *  @return void
      */
     protected function initDocumentTemplate()
     {
@@ -157,8 +155,6 @@ class BrowseLinksController extends AbstractLinkBrowserController
 
     /**
      * Initialize $this->currentLink and $this->currentLinkHandler
-     *
-     * @return void
      */
     protected function initCurrentUrl()
     {
diff --git a/typo3/sysext/rtehtmlarea/Classes/Controller/BrowseLinksController.php b/typo3/sysext/rtehtmlarea/Classes/Controller/BrowseLinksController.php
index 86bcc417a3ee6c1a63e3cb78218b6f234248f23b..e3d573a67fc646134122108c94ad4ccb920c77ef 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Controller/BrowseLinksController.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Controller/BrowseLinksController.php
@@ -203,8 +203,6 @@ class BrowseLinksController extends AbstractLinkBrowserController
 
     /**
      * Initialize document template object
-     *
-     *  @return void
      */
     protected function initDocumentTemplate()
     {
@@ -216,8 +214,6 @@ class BrowseLinksController extends AbstractLinkBrowserController
 
     /**
      * Initialize $this->currentLink and $this->currentLinkHandler
-     *
-     * @return void
      */
     protected function initCurrentUrl()
     {
diff --git a/typo3/sysext/rtehtmlarea/Classes/Controller/ParseHtmlController.php b/typo3/sysext/rtehtmlarea/Classes/Controller/ParseHtmlController.php
index d9461775a920777cfb4090c54dc8f89c5de229b7..ab2c7c416883559ed3f59e4709a5e0a7204fafa8 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Controller/ParseHtmlController.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Controller/ParseHtmlController.php
@@ -69,8 +69,6 @@ class ParseHtmlController
 
     /**
      * Initializes necessary parameters before calling the actual main action.
-     *
-     * @return void
      */
     public function init()
     {
@@ -158,7 +156,6 @@ class ParseHtmlController
      * Such tags are used by the RTE in order to restore the cursor position when the cleaning operation is completed.
      *
      * @param array $HTMLparserConfig: incoming HTMLParser configuration (wil be modified)
-     * @return void
      */
     protected function keepSpanTagsWithId(&$HTMLparserConfig)
     {
diff --git a/typo3/sysext/rtehtmlarea/Classes/Controller/SelectImageController.php b/typo3/sysext/rtehtmlarea/Classes/Controller/SelectImageController.php
index 77aa333a6351f49aea7f1b5894d4a09512f375c0..5d151542ee9c35e6631b8886909eaa4776a906fd 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Controller/SelectImageController.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Controller/SelectImageController.php
@@ -156,7 +156,6 @@ class SelectImageController extends AbstractLinkBrowserController
      * Initialize hook objects implementing the interface
      *
      * @throws \UnexpectedValueException
-     * @return void
      */
     protected function initHookObjects()
     {
@@ -198,8 +197,6 @@ class SelectImageController extends AbstractLinkBrowserController
 
     /**
      * Initialize $this->currentLinkParts and $this->currentLinkHandler
-     *
-     * @return void
      */
     protected function initCurrentUrl()
     {
diff --git a/typo3/sysext/rtehtmlarea/Classes/Controller/SpellCheckingController.php b/typo3/sysext/rtehtmlarea/Classes/Controller/SpellCheckingController.php
index 6bd9da6ee9c25e80628fbbfa8f77b20b241ee57b..39d5b5971692ea7a922b2f6e5141c3eb7f743ff8 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Controller/SpellCheckingController.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Controller/SpellCheckingController.php
@@ -478,8 +478,6 @@ var selectedDictionary = "' . $this->dictionary . '";
 
     /**
      * Ensures that the personal dictionary is utf-8 encoded
-     *
-     * @return void
      */
     protected function fixPersonalDictionaryCharacterSet()
     {
diff --git a/typo3/sysext/rtehtmlarea/Classes/Controller/UserElementsController.php b/typo3/sysext/rtehtmlarea/Classes/Controller/UserElementsController.php
index c0f606d8bc6aa876f82cf110106189194c8f8571..349212f0852d1b810e8a821cbb7f70b475d2e375 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Controller/UserElementsController.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Controller/UserElementsController.php
@@ -64,7 +64,6 @@ class UserElementsController
 
     /**
      * Initializes necessary parameters before calling the actual main action.
-     * @return void
      */
     public function init()
     {
diff --git a/typo3/sysext/rtehtmlarea/Classes/Controller/Wizard/RteController.php b/typo3/sysext/rtehtmlarea/Classes/Controller/Wizard/RteController.php
index 24cb3c2c056c3d711bccba111834f9407e116cf9..39c6d07d2f1714110d589711ab0a517a200bb1a1 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Controller/Wizard/RteController.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Controller/Wizard/RteController.php
@@ -83,8 +83,6 @@ class RteController extends AbstractWizardController
 
     /**
      * Initialization of the class
-     *
-     * @return void
      */
     protected function init()
     {
@@ -116,8 +114,6 @@ class RteController extends AbstractWizardController
 
     /**
      * Main function, rendering the document with the iFrame with the RTE in.
-     *
-     * @return void
      */
     public function main()
     {
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/MicroDataSchema.php b/typo3/sysext/rtehtmlarea/Classes/Extension/MicroDataSchema.php
index 2a3ae33f3c1bc9535f774c2c4ed3879ee91d167f..93d3cc62c2d64ff47afcbbea421b04fd880fcd44 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/MicroDataSchema.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/MicroDataSchema.php
@@ -101,7 +101,6 @@ class MicroDataSchema extends RteHtmlAreaApi
      *
      * @param string $string XML rdf schema to convert into an array
      * @param array	$schema reference to the array to be filled
-     * @return void
      */
     protected function parseSchema($string, &$schema)
     {
diff --git a/typo3/sysext/rtehtmlarea/Classes/Form/Element/RichTextElement.php b/typo3/sysext/rtehtmlarea/Classes/Form/Element/RichTextElement.php
index ac4f3fd4992fc7cc28d5755e3dde58fd69854f63..f8dc3486798c9d70d8b3d9465806026a3a8f12c3 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Form/Element/RichTextElement.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Form/Element/RichTextElement.php
@@ -380,8 +380,6 @@ class RichTextElement extends AbstractFormElement
 
     /**
      * Add registered plugins to the array of enabled plugins
-     *
-     * @return void
      */
     protected function enableRegisteredPlugins()
     {
@@ -430,8 +428,6 @@ class RichTextElement extends AbstractFormElement
 
     /**
      * Set the toolbar config (only in this PHP-Object, not in JS):
-     *
-     * @return void
      */
     protected function setToolbar()
     {
@@ -538,8 +534,6 @@ class RichTextElement extends AbstractFormElement
 
     /**
      * Disable some plugins
-     *
-     * @return void
      */
     protected function setPlugins()
     {
@@ -596,8 +590,6 @@ class RichTextElement extends AbstractFormElement
 
     /**
      * Add RTE main scripts and plugin scripts
-     *
-     * @return void
      */
     protected function loadRequireModulesForRTE()
     {
@@ -653,8 +645,6 @@ class RichTextElement extends AbstractFormElement
 
     /**
      * Return the Javascript code for configuring the RTE
-     *
-     * @return void
      */
     protected function addInstanceJavaScriptRegistration()
     {
@@ -1101,8 +1091,6 @@ class RichTextElement extends AbstractFormElement
 
     /**
      * Return the Javascript code for copying the HTML code from the editor into the hidden input field.
-     *
-     * @return void
      */
     protected function addOnSubmitJavaScriptCode()
     {
@@ -1140,8 +1128,6 @@ class RichTextElement extends AbstractFormElement
 
     /**
      * Initialize a couple of language related local properties
-     *
-     * @return void
      */
     public function initializeLanguageRelatedProperties()
     {
@@ -1200,7 +1186,6 @@ class RichTextElement extends AbstractFormElement
      * @param string $deprecatedProperty: Name of deprecated property
      * @param string $useProperty: Name of property to use instead
      * @param string $version: Version of TYPO3 in which the property will be removed
-     * @return void
      */
     protected function logDeprecatedProperty($deprecatedProperty, $useProperty, $version)
     {
diff --git a/typo3/sysext/rtehtmlarea/Classes/ImageHandler/AddImageHandler.php b/typo3/sysext/rtehtmlarea/Classes/ImageHandler/AddImageHandler.php
index 381ec0d6f875832f46556f439f85fbbf95fb32bd..7e115896aff1aa265b11ab16badb128b5ac0b0fc 100644
--- a/typo3/sysext/rtehtmlarea/Classes/ImageHandler/AddImageHandler.php
+++ b/typo3/sysext/rtehtmlarea/Classes/ImageHandler/AddImageHandler.php
@@ -116,7 +116,6 @@ class AddImageHandler implements LinkParameterProviderInterface, LinkHandlerInte
      * @param string $identifier
      * @param array $configuration Page TSconfig
      *
-     * @return void
      * @throws \InvalidArgumentException
      */
     public function initialize(AbstractLinkBrowserController $linkBrowser, $identifier, array $configuration)
diff --git a/typo3/sysext/rtehtmlarea/Classes/ImageHandler/EditImageHandler.php b/typo3/sysext/rtehtmlarea/Classes/ImageHandler/EditImageHandler.php
index 283c622caa20a07514f3e8447ef7333d8fbec5f3..ccc25028b87948b9269bac6e4a1f7af71ef4a80e 100644
--- a/typo3/sysext/rtehtmlarea/Classes/ImageHandler/EditImageHandler.php
+++ b/typo3/sysext/rtehtmlarea/Classes/ImageHandler/EditImageHandler.php
@@ -44,8 +44,6 @@ class EditImageHandler implements LinkHandlerInterface, LinkParameterProviderInt
      * @param AbstractLinkBrowserController $linkBrowser
      * @param string $identifier
      * @param array $configuration Page TSconfig
-     *
-     * @return void
      */
     public function initialize(AbstractLinkBrowserController $linkBrowser, $identifier, array $configuration)
     {
diff --git a/typo3/sysext/saltedpasswords/Classes/SaltedPasswordService.php b/typo3/sysext/saltedpasswords/Classes/SaltedPasswordService.php
index 4073da2b6440e036dcb5f87c0150aa04dbc00843..f69b46446db111f58c4272676d7a5d0ef49b6ee1 100644
--- a/typo3/sysext/saltedpasswords/Classes/SaltedPasswordService.php
+++ b/typo3/sysext/saltedpasswords/Classes/SaltedPasswordService.php
@@ -213,7 +213,6 @@ class SaltedPasswordService extends \TYPO3\CMS\Sv\AbstractAuthenticationService
      *
      * @param int $uid uid of user record that will be updated
      * @param mixed $updateFields Field values as key=>value pairs to be updated in database
-     * @return void
      */
     protected function updatePassword($uid, $updateFields)
     {
@@ -244,7 +243,6 @@ class SaltedPasswordService extends \TYPO3\CMS\Sv\AbstractAuthenticationService
      *
      * @param string $message Message to output
      * @param array<int, mixed> $params
-     * @return void
      * @see \TYPO3\CMS\Core\Utility\GeneralUtility::sysLog()
      */
     public function writeLogMessage($message, ...$params)
diff --git a/typo3/sysext/saltedpasswords/Classes/Task/BulkUpdateFieldProvider.php b/typo3/sysext/saltedpasswords/Classes/Task/BulkUpdateFieldProvider.php
index dd02b9931cddc6406417fd1a3b12a4afdf8c7cb1..e0ecdfb7a736aa578f735a63a6f2a6973fbf5e6c 100644
--- a/typo3/sysext/saltedpasswords/Classes/Task/BulkUpdateFieldProvider.php
+++ b/typo3/sysext/saltedpasswords/Classes/Task/BulkUpdateFieldProvider.php
@@ -107,7 +107,6 @@ class BulkUpdateFieldProvider implements \TYPO3\CMS\Scheduler\AdditionalFieldPro
      *
      * @param array $submittedData Contains data submitted by the user
      * @param \TYPO3\CMS\Scheduler\Task\AbstractTask|\TYPO3\CMS\Saltedpasswords\Task\BulkUpdateTask $task Reference to the current task object
-     * @return void
      */
     public function saveAdditionalFields(array $submittedData, \TYPO3\CMS\Scheduler\Task\AbstractTask $task)
     {
diff --git a/typo3/sysext/saltedpasswords/Classes/Task/BulkUpdateTask.php b/typo3/sysext/saltedpasswords/Classes/Task/BulkUpdateTask.php
index 6f55256c462f6a81cbb44d9e1b64639c6f5bcef0..0cc87c19358070675070e66f43535342f16c1784 100644
--- a/typo3/sysext/saltedpasswords/Classes/Task/BulkUpdateTask.php
+++ b/typo3/sysext/saltedpasswords/Classes/Task/BulkUpdateTask.php
@@ -132,7 +132,6 @@ class BulkUpdateTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask
      *
      * @param string $mode 'FE' for frontend, 'BE' for backend user records
      * @param array $users With user uids and passwords
-     * @return void
      */
     protected function convertPasswords($mode, array $users)
     {
@@ -154,7 +153,6 @@ class BulkUpdateTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask
      *
      * @param string $mode 'FE' for frontend, 'BE' for backend user records
      * @param array $users With user uids and passwords
-     * @return void
      */
     protected function updatePasswords($mode, array $users)
     {
@@ -222,7 +220,6 @@ class BulkUpdateTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask
      *
      * @param string $mode 'FE' for frontend, 'BE' for backend user records
      * @param int $number Number of handled rows
-     * @return void
      */
     protected function incrementUserRecordPointer($mode, $number)
     {
@@ -232,8 +229,6 @@ class BulkUpdateTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask
     /**
      * Activates this task instance.
      * Uses setDisabled() method of parent \TYPO3\CMS\Scheduler\Task\AbstractTask
-     *
-     * @return void
      */
     protected function activateSelf()
     {
@@ -243,8 +238,6 @@ class BulkUpdateTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask
     /**
      * Deactivates this task instance.
      * Uses setDisabled() method of parent \TYPO3\CMS\Scheduler\Task\AbstractTask
-     *
-     * @return void
      */
     protected function deactivateSelf()
     {
@@ -255,7 +248,6 @@ class BulkUpdateTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask
      * Set if it can deactivate self
      *
      * @param bool $canDeactivateSelf
-     * @return void
      */
     public function setCanDeactivateSelf($canDeactivateSelf)
     {
@@ -276,7 +268,6 @@ class BulkUpdateTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask
      * Set number of records
      *
      * @param int $numberOfRecords
-     * @return void
      */
     public function setNumberOfRecords($numberOfRecords)
     {
diff --git a/typo3/sysext/saltedpasswords/Classes/Utility/ExtensionManagerConfigurationUtility.php b/typo3/sysext/saltedpasswords/Classes/Utility/ExtensionManagerConfigurationUtility.php
index d33f35283a3541bbf60cd43eca366df14af039ef..57fdee2d3cd065b063974b791f7358af3f404376 100644
--- a/typo3/sysext/saltedpasswords/Classes/Utility/ExtensionManagerConfigurationUtility.php
+++ b/typo3/sysext/saltedpasswords/Classes/Utility/ExtensionManagerConfigurationUtility.php
@@ -53,7 +53,6 @@ class ExtensionManagerConfigurationUtility
      * is set already
      *
      * @param string $level One out of error, ok, warning, info
-     * @return void
      */
     protected function setErrorLevel($level)
     {
@@ -143,8 +142,6 @@ class ExtensionManagerConfigurationUtility
 
     /**
      * Initializes this object.
-     *
-     * @return void
      */
     private function init()
     {
diff --git a/typo3/sysext/saltedpasswords/Classes/Utility/SaltedPasswordsUtility.php b/typo3/sysext/saltedpasswords/Classes/Utility/SaltedPasswordsUtility.php
index 4cc247672710d69e1f0ffaa2dfe61db37e40632a..d24eab8874f5fe62da0524cd40f34349cee61164 100644
--- a/typo3/sysext/saltedpasswords/Classes/Utility/SaltedPasswordsUtility.php
+++ b/typo3/sysext/saltedpasswords/Classes/Utility/SaltedPasswordsUtility.php
@@ -75,7 +75,6 @@ class SaltedPasswordsUtility
      *
      * @param array $params Parameter the hook delivers
      * @param \TYPO3\CMS\Felogin\Controller\FrontendLoginController $pObj Parent Object from which the hook is called
-     * @return void
      */
     public function feloginForgotPasswordHook(array &$params, \TYPO3\CMS\Felogin\Controller\FrontendLoginController $pObj)
     {
diff --git a/typo3/sysext/saltedpasswords/Tests/Functional/SaltedPasswordServiceTest.php b/typo3/sysext/saltedpasswords/Tests/Functional/SaltedPasswordServiceTest.php
index c72541322f8d06112307f8675da700f8b3f486a0..a1b0ea3aec1cbfcdb8035729b437ef5455ff0c4f 100644
--- a/typo3/sysext/saltedpasswords/Tests/Functional/SaltedPasswordServiceTest.php
+++ b/typo3/sysext/saltedpasswords/Tests/Functional/SaltedPasswordServiceTest.php
@@ -40,8 +40,6 @@ class SaltedPasswordServiceTest extends \TYPO3\TestingFramework\Core\Functional\
 
     /**
      * Sets up this test suite.
-     *
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/saltedpasswords/Tests/Functional/Task/BulkUpdateTaskTest.php b/typo3/sysext/saltedpasswords/Tests/Functional/Task/BulkUpdateTaskTest.php
index 5bc3c9df79d453c201453d9b5e5e5578c0cccd69..f31e880554b1531aa70fd5fbb5a4f4832436eba4 100644
--- a/typo3/sysext/saltedpasswords/Tests/Functional/Task/BulkUpdateTaskTest.php
+++ b/typo3/sysext/saltedpasswords/Tests/Functional/Task/BulkUpdateTaskTest.php
@@ -49,8 +49,6 @@ class BulkUpdateTaskTest extends \TYPO3\TestingFramework\Core\Functional\Functio
 
     /**
      * Sets up this test suite.
-     *
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/saltedpasswords/Tests/Functional/Utility/SaltedPasswordsUtilityTest.php b/typo3/sysext/saltedpasswords/Tests/Functional/Utility/SaltedPasswordsUtilityTest.php
index ee0f4077006f2d5a504f51a9f2e1849b16df1250..70198230d1c6ab36a460a1ea8b52dc73bd3bf41c 100644
--- a/typo3/sysext/saltedpasswords/Tests/Functional/Utility/SaltedPasswordsUtilityTest.php
+++ b/typo3/sysext/saltedpasswords/Tests/Functional/Utility/SaltedPasswordsUtilityTest.php
@@ -33,8 +33,6 @@ class SaltedPasswordsUtilityTest extends \TYPO3\TestingFramework\Core\Functional
 
     /**
      * Sets up this test suite.
-     *
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/saltedpasswords/Tests/Unit/Salt/BlowfishSaltTest.php b/typo3/sysext/saltedpasswords/Tests/Unit/Salt/BlowfishSaltTest.php
index c1c98e5048b0ea7b5c35f472a5c603597463bca6..549c348df50a4619c1160ec0aa6d1dc1c0f743b8 100644
--- a/typo3/sysext/saltedpasswords/Tests/Unit/Salt/BlowfishSaltTest.php
+++ b/typo3/sysext/saltedpasswords/Tests/Unit/Salt/BlowfishSaltTest.php
@@ -30,8 +30,6 @@ class BlowfishSaltTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 
     /**
      * Sets up the fixtures for this testcase.
-     *
-     * @return void
      */
     protected function setUp()
     {
@@ -42,8 +40,6 @@ class BlowfishSaltTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 
     /**
      * Marks tests as skipped if the blowfish method is not available.
-     *
-     * @return void
      */
     protected function skipTestIfBlowfishIsNotAvailable()
     {
diff --git a/typo3/sysext/saltedpasswords/Tests/Unit/Salt/Md5SaltTest.php b/typo3/sysext/saltedpasswords/Tests/Unit/Salt/Md5SaltTest.php
index 0a09ed428f79ad0b359c09a847b844c082cd048f..930ddf81b82050cb36d6eae526b14f2d5861775c 100644
--- a/typo3/sysext/saltedpasswords/Tests/Unit/Salt/Md5SaltTest.php
+++ b/typo3/sysext/saltedpasswords/Tests/Unit/Salt/Md5SaltTest.php
@@ -30,8 +30,6 @@ class Md5SaltTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 
     /**
      * Sets up the fixtures for this testcase.
-     *
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/saltedpasswords/Tests/Unit/Salt/Pbkdf2SaltTest.php b/typo3/sysext/saltedpasswords/Tests/Unit/Salt/Pbkdf2SaltTest.php
index 4b734f30546a43bec33184486c44131fe748eca5..33403b03e6e1fe8b19fd56339a995e38b081171c 100644
--- a/typo3/sysext/saltedpasswords/Tests/Unit/Salt/Pbkdf2SaltTest.php
+++ b/typo3/sysext/saltedpasswords/Tests/Unit/Salt/Pbkdf2SaltTest.php
@@ -31,8 +31,6 @@ class Pbkdf2SaltTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 
     /**
      * Sets up the fixtures for this testcase.
-     *
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/saltedpasswords/Tests/Unit/Salt/PhpassSaltTest.php b/typo3/sysext/saltedpasswords/Tests/Unit/Salt/PhpassSaltTest.php
index 4772385b9d908edd5d7727b950cd07e64c69d916..671e95474ec57293b9cee6603be48e754f055c28 100644
--- a/typo3/sysext/saltedpasswords/Tests/Unit/Salt/PhpassSaltTest.php
+++ b/typo3/sysext/saltedpasswords/Tests/Unit/Salt/PhpassSaltTest.php
@@ -30,8 +30,6 @@ class PhpassSaltTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 
     /**
      * Sets up the fixtures for this testcase.
-     *
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/saltedpasswords/Tests/Unit/Salt/SaltFactoryTest.php b/typo3/sysext/saltedpasswords/Tests/Unit/Salt/SaltFactoryTest.php
index 12296f1bc0ece7982dd1ddd94b069a5840f70715..642ed4182533d70ae00d08e414da7d9f99be92a6 100644
--- a/typo3/sysext/saltedpasswords/Tests/Unit/Salt/SaltFactoryTest.php
+++ b/typo3/sysext/saltedpasswords/Tests/Unit/Salt/SaltFactoryTest.php
@@ -30,8 +30,6 @@ class SaltFactoryTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 
     /**
      * Sets up the fixtures for this testcase.
-     *
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/scheduler/Classes/AdditionalFieldProviderInterface.php b/typo3/sysext/scheduler/Classes/AdditionalFieldProviderInterface.php
index 84402d699b5e83d8a457f8238646cd26c1312dc0..41436af1cbc4dff30ce000b9648779844aa9f21b 100644
--- a/typo3/sysext/scheduler/Classes/AdditionalFieldProviderInterface.php
+++ b/typo3/sysext/scheduler/Classes/AdditionalFieldProviderInterface.php
@@ -43,7 +43,6 @@ interface AdditionalFieldProviderInterface
      *
      * @param array $submittedData An array containing the data submitted by the add/edit task form
      * @param \TYPO3\CMS\Scheduler\Task\AbstractTask $task Reference to the scheduler backend module
-     * @return void
      */
     public function saveAdditionalFields(array $submittedData, \TYPO3\CMS\Scheduler\Task\AbstractTask $task);
 }
diff --git a/typo3/sysext/scheduler/Classes/Command/SchedulerCommand.php b/typo3/sysext/scheduler/Classes/Command/SchedulerCommand.php
index 585088b7c24724752807163aeac169c6694d26ee..7e314063c0c457cfffc1f46c6723f63313feb537 100644
--- a/typo3/sysext/scheduler/Classes/Command/SchedulerCommand.php
+++ b/typo3/sysext/scheduler/Classes/Command/SchedulerCommand.php
@@ -72,7 +72,6 @@ Call it like this: typo3/cli_dispatch.phpsh scheduler --task=13 -f')
      *
      * @param InputInterface $input
      * @param OutputInterface $output
-     * @return void
      */
     public function execute(InputInterface $input, OutputInterface $output)
     {
diff --git a/typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php b/typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php
index f1b88eb6c4740d19031ab87571a5ce809854c7bf..6e7d68d24e8897c4006d50d9fadd1fd1a043842e 100644
--- a/typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php
+++ b/typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php
@@ -118,8 +118,6 @@ class SchedulerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClas
 
     /**
      * Initializes the backend module
-     *
-     * @return void
      */
     public function init()
     {
@@ -131,8 +129,6 @@ class SchedulerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClas
 
     /**
      * Adds items to the ->MOD_MENU array. Used for the function menu selector.
-     *
-     * @return void
      */
     public function menuConfig()
     {
@@ -148,8 +144,6 @@ class SchedulerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClas
 
     /**
      * Main function of the module. Write the content to $this->content
-     *
-     * @return void
      */
     public function main()
     {
@@ -423,8 +417,6 @@ class SchedulerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClas
 
     /**
      * Delete a task from the execution queue
-     *
-     * @return void
      */
     protected function deleteTask()
     {
@@ -470,8 +462,6 @@ class SchedulerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClas
      * Note that this doesn't actually stop the running script. It just unmarks
      * all executions.
      * @todo find a way to really kill the running task
-     *
-     * @return void
      */
     protected function stopTask()
     {
@@ -498,8 +488,6 @@ class SchedulerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClas
 
     /**
      * Toggles the disabled state of the submitted task
-     *
-     * @return void
      */
     protected function toggleDisableAction()
     {
@@ -515,8 +503,6 @@ class SchedulerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClas
 
     /**
      * Sets the next execution time of the submitted task to now
-     *
-     * @return void
      */
     protected function setNextExecutionTimeAction()
     {
@@ -854,8 +840,6 @@ class SchedulerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClas
 
     /**
      * Execute all selected tasks
-     *
-     * @return void
      */
     protected function executeTasks()
     {
@@ -1226,8 +1210,6 @@ class SchedulerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClas
 
     /**
      * Saves a task specified in the backend form to the database
-     *
-     * @return void
      */
     protected function saveTask()
     {
@@ -1426,7 +1408,6 @@ class SchedulerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClas
      *
      * @param string $input
      * @return int
-     *
      */
     protected function convertToTimestamp(string $input): int
     {
@@ -1449,7 +1430,6 @@ class SchedulerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClas
      *
      * @param string $message The message itself
      * @param int $severity Message level (according to FlashMessage class constants)
-     * @return void
      */
     public function addMessage($message, $severity = FlashMessage::OK)
     {
diff --git a/typo3/sysext/scheduler/Classes/CronCommand/CronCommand.php b/typo3/sysext/scheduler/Classes/CronCommand/CronCommand.php
index ac56ba301b6d5fbabc2779b11e12e0a67a5a3105..15130021b296c0503f431cc601c35d7b8835aaa1 100644
--- a/typo3/sysext/scheduler/Classes/CronCommand/CronCommand.php
+++ b/typo3/sysext/scheduler/Classes/CronCommand/CronCommand.php
@@ -69,7 +69,6 @@ class CronCommand
      * Calculates the date of the next execution.
      *
      * @api
-     * @return void
      * @throws \RuntimeException
      */
     public function calculateNextValue()
diff --git a/typo3/sysext/scheduler/Classes/Example/SleepTaskAdditionalFieldProvider.php b/typo3/sysext/scheduler/Classes/Example/SleepTaskAdditionalFieldProvider.php
index 0123f5f0a4a095d0a0f2c424980bf1b3dd8d377e..4038280c4b2d95917e49f2f6acab3ea6fef0048a 100644
--- a/typo3/sysext/scheduler/Classes/Example/SleepTaskAdditionalFieldProvider.php
+++ b/typo3/sysext/scheduler/Classes/Example/SleepTaskAdditionalFieldProvider.php
@@ -84,7 +84,6 @@ class SleepTaskAdditionalFieldProvider implements \TYPO3\CMS\Scheduler\Additiona
      *
      * @param array $submittedData Array containing the data submitted by the user
      * @param \TYPO3\CMS\Scheduler\Task\AbstractTask $task Reference to the current task object
-     * @return void
      */
     public function saveAdditionalFields(array $submittedData, \TYPO3\CMS\Scheduler\Task\AbstractTask $task)
     {
diff --git a/typo3/sysext/scheduler/Classes/Example/TestTaskAdditionalFieldProvider.php b/typo3/sysext/scheduler/Classes/Example/TestTaskAdditionalFieldProvider.php
index 49c0a6be12aeba838c403e5efe42d1ab78a589d0..3d5a12f7e91a58c5881f766685cabf76d7fee764 100644
--- a/typo3/sysext/scheduler/Classes/Example/TestTaskAdditionalFieldProvider.php
+++ b/typo3/sysext/scheduler/Classes/Example/TestTaskAdditionalFieldProvider.php
@@ -84,7 +84,6 @@ class TestTaskAdditionalFieldProvider implements \TYPO3\CMS\Scheduler\Additional
      *
      * @param array $submittedData Array containing the data submitted by the user
      * @param \TYPO3\CMS\Scheduler\Task\AbstractTask $task Reference to the current task object
-     * @return void
      */
     public function saveAdditionalFields(array $submittedData, \TYPO3\CMS\Scheduler\Task\AbstractTask $task)
     {
diff --git a/typo3/sysext/scheduler/Classes/Execution.php b/typo3/sysext/scheduler/Classes/Execution.php
index db9b9e76069937fd40ab7a5d8102d143b5895f39..9df786cc766e3e8e5b83cc019541ad7f376e346e 100644
--- a/typo3/sysext/scheduler/Classes/Execution.php
+++ b/typo3/sysext/scheduler/Classes/Execution.php
@@ -70,7 +70,6 @@ class Execution
      * This method is used to set the start date
      *
      * @param int $start Start date (timestamp)
-     * @return void
      */
     public function setStart($start)
     {
@@ -91,7 +90,6 @@ class Execution
      * This method is used to set the end date
      *
      * @param int $end End date (timestamp)
-     * @return void
      */
     public function setEnd($end)
     {
@@ -112,7 +110,6 @@ class Execution
      * This method is used to set the interval
      *
      * @param int $interval Interval (in seconds)
-     * @return void
      */
     public function setInterval($interval)
     {
@@ -133,7 +130,6 @@ class Execution
      * This method is used to set the multiple execution flag
      *
      * @param bool $multiple TRUE if concurrent executions are allowed, FALSE otherwise
-     * @return void
      */
     public function setMultiple($multiple)
     {
@@ -154,7 +150,6 @@ class Execution
      * Set the value of the cron command
      *
      * @param string $cmd Cron command, using cron-like syntax
-     * @return void
      */
     public function setCronCmd($cmd)
     {
@@ -181,7 +176,6 @@ class Execution
      * Upon next execution, this flag is set to FALSE.
      *
      * @param bool $isNewSingleExecution Is newly created single execution?
-     * @return void
      * @see \TYPO3\CMS\Scheduler\Execution::getNextExecution()
      */
     public function setIsNewSingleExecution($isNewSingleExecution)
diff --git a/typo3/sysext/scheduler/Classes/Scheduler.php b/typo3/sysext/scheduler/Classes/Scheduler.php
index 70a096c2e0fe4ddb505171dd01748b029fb23594..f9f2f263de0a842e130036cecff8efb7eaba9176 100644
--- a/typo3/sysext/scheduler/Classes/Scheduler.php
+++ b/typo3/sysext/scheduler/Classes/Scheduler.php
@@ -93,8 +93,6 @@ class Scheduler implements \TYPO3\CMS\Core\SingletonInterface
     /**
      * Cleans the execution lists of the scheduled tasks, executions older than 24h are removed
      * @todo find a way to actually kill the job
-     *
-     * @return void
      */
     protected function cleanExecutionArrays()
     {
@@ -206,7 +204,6 @@ class Scheduler implements \TYPO3\CMS\Core\SingletonInterface
      * This method stores information about the last run of the Scheduler into the system registry
      *
      * @param string $type Type of run (manual or command-line (assumed to be cron))
-     * @return void
      */
     public function recordLastRun($type = 'cron')
     {
@@ -458,7 +455,6 @@ class Scheduler implements \TYPO3\CMS\Core\SingletonInterface
      * @param string $message The message to write to the log
      * @param int $status Status (0 = message, 1 = error)
      * @param mixed $code Key for the message
-     * @return void
      */
     public function log($message, $status = 0, $code = 'scheduler')
     {
diff --git a/typo3/sysext/scheduler/Classes/Task/AbstractTask.php b/typo3/sysext/scheduler/Classes/Task/AbstractTask.php
index 8cf8c5e59d2b262f79226c588e51385ac1c23f89..36d8b919210cecbd234cc9778ad2f3d4e81925dd 100644
--- a/typo3/sysext/scheduler/Classes/Task/AbstractTask.php
+++ b/typo3/sysext/scheduler/Classes/Task/AbstractTask.php
@@ -122,7 +122,6 @@ abstract class AbstractTask
      * This method is used to set the unique id of the task
      *
      * @param int $id Primary key (from the database record) of the scheduled task
-     * @return void
      */
     public function setTaskUid($id)
     {
@@ -183,7 +182,6 @@ abstract class AbstractTask
      * This method is used to set the disable status of the task
      *
      * @param bool $flag TRUE if task should be disabled, FALSE otherwise
-     * @return void
      */
     public function setDisabled($flag)
     {
@@ -218,7 +216,6 @@ abstract class AbstractTask
      * This method is used to set the timestamp corresponding to the next execution time of the task
      *
      * @param int $timestamp Timestamp of next execution
-     * @return void
      */
     public function setExecutionTime($timestamp)
     {
@@ -239,7 +236,6 @@ abstract class AbstractTask
      * This method is used to set the task group (uid) of the task
      *
      * @param int $taskGroup Uid of task group
-     * @return void
      */
     public function setTaskGroup($taskGroup)
     {
@@ -260,7 +256,6 @@ abstract class AbstractTask
      * This method is used to set the description of the task
      *
      * @param string $description Description
-     * @return void
      */
     public function setDescription($description)
     {
@@ -279,8 +274,6 @@ abstract class AbstractTask
 
     /**
      * Sets the internal reference to the singleton instance of the Scheduler
-     *
-     * @return void
      */
     public function setScheduler()
     {
@@ -291,8 +284,6 @@ abstract class AbstractTask
      * Unsets the internal reference to the singleton instance of the Scheduler
      * This is done before a task is serialized, so that the scheduler instance
      * is not saved to the database too
-     *
-     * @return void
      */
     public function unsetScheduler()
     {
@@ -326,7 +317,6 @@ abstract class AbstractTask
      * @param int $end The last date/time where this execution should occur (timestamp)
      * @param bool $multiple Set to FALSE if multiple executions of this task are not permitted in parallel
      * @param string $cron_cmd Used like in crontab (minute hour day month weekday)
-     * @return void
      */
     public function registerRecurringExecution($start, $interval, $end = 0, $multiple = false, $cron_cmd = '')
     {
@@ -472,7 +462,6 @@ abstract class AbstractTask
      *
      * @param int $executionID Id of the execution to remove.
      * @param \Exception $failure An exception to signal a failed execution
-     * @return void
      */
     public function unmarkExecution($executionID, \Exception $failure = null)
     {
@@ -571,8 +560,6 @@ abstract class AbstractTask
     /**
      * Stops the task, by replacing the execution object by an empty one
      * NOTE: the task still needs to be saved after that
-     *
-     * @return void
      */
     public function stop()
     {
@@ -581,8 +568,6 @@ abstract class AbstractTask
 
     /**
      * Removes the task totally from the system.
-     *
-     * @return void
      */
     public function remove()
     {
diff --git a/typo3/sysext/scheduler/Classes/Task/CachingFrameworkGarbageCollectionAdditionalFieldProvider.php b/typo3/sysext/scheduler/Classes/Task/CachingFrameworkGarbageCollectionAdditionalFieldProvider.php
index ce3ad6abf04e076fc78f95938d052d5d35855235..fb94f60a532592d9eabf2e20e04d42f513cbd935 100644
--- a/typo3/sysext/scheduler/Classes/Task/CachingFrameworkGarbageCollectionAdditionalFieldProvider.php
+++ b/typo3/sysext/scheduler/Classes/Task/CachingFrameworkGarbageCollectionAdditionalFieldProvider.php
@@ -85,7 +85,6 @@ class CachingFrameworkGarbageCollectionAdditionalFieldProvider implements \TYPO3
      *
      * @param array $submittedData Contains data submitted by the user
      * @param \TYPO3\CMS\Scheduler\Task\AbstractTask $task Reference to the current task object
-     * @return void
      */
     public function saveAdditionalFields(array $submittedData, \TYPO3\CMS\Scheduler\Task\AbstractTask $task)
     {
diff --git a/typo3/sysext/scheduler/Classes/Task/FileStorageExtractionAdditionalFieldProvider.php b/typo3/sysext/scheduler/Classes/Task/FileStorageExtractionAdditionalFieldProvider.php
index d59794b4d92123a9950f292051bb5490f193dfe6..5ee83bbf4c2fda3d351425750fd6d306873cd326 100644
--- a/typo3/sysext/scheduler/Classes/Task/FileStorageExtractionAdditionalFieldProvider.php
+++ b/typo3/sysext/scheduler/Classes/Task/FileStorageExtractionAdditionalFieldProvider.php
@@ -24,7 +24,6 @@ use TYPO3\CMS\Scheduler\Controller\SchedulerModuleController;
 
 /**
  * Additional BE fields for task which extracts metadata from storage
- *
  */
 class FileStorageExtractionAdditionalFieldProvider implements AdditionalFieldProviderInterface
 {
@@ -172,7 +171,6 @@ class FileStorageExtractionAdditionalFieldProvider implements AdditionalFieldPro
      *
      * @param array $submittedData Contains data submitted by the user
      * @param \TYPO3\CMS\Scheduler\Task\AbstractTask $task Reference to the current task object
-     * @return void
      * @throws \InvalidArgumentException
      */
     public function saveAdditionalFields(array $submittedData, \TYPO3\CMS\Scheduler\Task\AbstractTask $task)
diff --git a/typo3/sysext/scheduler/Classes/Task/FileStorageIndexingAdditionalFieldProvider.php b/typo3/sysext/scheduler/Classes/Task/FileStorageIndexingAdditionalFieldProvider.php
index 58214c6489e33903a6e2964ac427780b8ad6148f..2e2242bc20f5721d2a2f54c8ac7fb2dd22c38bb9 100644
--- a/typo3/sysext/scheduler/Classes/Task/FileStorageIndexingAdditionalFieldProvider.php
+++ b/typo3/sysext/scheduler/Classes/Task/FileStorageIndexingAdditionalFieldProvider.php
@@ -92,7 +92,6 @@ class FileStorageIndexingAdditionalFieldProvider implements \TYPO3\CMS\Scheduler
      *
      * @param array $submittedData Contains data submitted by the user
      * @param \TYPO3\CMS\Scheduler\Task\AbstractTask $task Reference to the current task object
-     * @return void
      * @throws \InvalidArgumentException
      */
     public function saveAdditionalFields(array $submittedData, \TYPO3\CMS\Scheduler\Task\AbstractTask $task)
diff --git a/typo3/sysext/scheduler/Classes/Task/OptimizeDatabaseTableAdditionalFieldProvider.php b/typo3/sysext/scheduler/Classes/Task/OptimizeDatabaseTableAdditionalFieldProvider.php
index 0257d45ba690ed8ef9976338f0f4dd0a6728c9a4..c954349b70b524a3d3f2b64a6d1a01be9130459c 100644
--- a/typo3/sysext/scheduler/Classes/Task/OptimizeDatabaseTableAdditionalFieldProvider.php
+++ b/typo3/sysext/scheduler/Classes/Task/OptimizeDatabaseTableAdditionalFieldProvider.php
@@ -109,7 +109,6 @@ class OptimizeDatabaseTableAdditionalFieldProvider implements AdditionalFieldPro
      *
      * @param array $submittedData Contains data submitted by the user
      * @param AbstractTask $task Reference to the current task object
-     * @return void
      */
     public function saveAdditionalFields(array $submittedData, AbstractTask $task)
     {
diff --git a/typo3/sysext/scheduler/Classes/Task/RecyclerGarbageCollectionAdditionalFieldProvider.php b/typo3/sysext/scheduler/Classes/Task/RecyclerGarbageCollectionAdditionalFieldProvider.php
index 71764be9c5c2db8afb9ec9cfe80434b46fd78357..0b75f4ac603e1ab04c9d029982442c8865d80b5f 100644
--- a/typo3/sysext/scheduler/Classes/Task/RecyclerGarbageCollectionAdditionalFieldProvider.php
+++ b/typo3/sysext/scheduler/Classes/Task/RecyclerGarbageCollectionAdditionalFieldProvider.php
@@ -84,7 +84,6 @@ class RecyclerGarbageCollectionAdditionalFieldProvider implements \TYPO3\CMS\Sch
      *
      * @param array $submittedData Contains data submitted by the user
      * @param \TYPO3\CMS\Scheduler\Task\AbstractTask $task Reference to the current task object
-     * @return void
      */
     public function saveAdditionalFields(array $submittedData, \TYPO3\CMS\Scheduler\Task\AbstractTask $task)
     {
diff --git a/typo3/sysext/scheduler/Classes/Task/TableGarbageCollectionAdditionalFieldProvider.php b/typo3/sysext/scheduler/Classes/Task/TableGarbageCollectionAdditionalFieldProvider.php
index 734cb4c61e4397ce868ec9453d8a2615bfe7fadd..b829593fba24028c27989635ee13213d67425f22 100644
--- a/typo3/sysext/scheduler/Classes/Task/TableGarbageCollectionAdditionalFieldProvider.php
+++ b/typo3/sysext/scheduler/Classes/Task/TableGarbageCollectionAdditionalFieldProvider.php
@@ -44,8 +44,6 @@ class TableGarbageCollectionAdditionalFieldProvider implements \TYPO3\CMS\Schedu
 
     /**
      * Initialize the default number of days for all configured tables
-     *
-     * @return void
      */
     protected function initDefaultNumberOfDays()
     {
@@ -248,7 +246,6 @@ class TableGarbageCollectionAdditionalFieldProvider implements \TYPO3\CMS\Schedu
      *
      * @param array $submittedData Contains data submitted by the user
      * @param \TYPO3\CMS\Scheduler\Task\AbstractTask $task Reference to the current task object
-     * @return void
      */
     public function saveAdditionalFields(array $submittedData, \TYPO3\CMS\Scheduler\Task\AbstractTask $task)
     {
diff --git a/typo3/sysext/setup/Classes/Controller/SetupModuleController.php b/typo3/sysext/setup/Classes/Controller/SetupModuleController.php
index 64ea54136d1948938598e1953ee0690e48abde25..d670d11b685f43a47bf9e2f24ac4e74506486684 100644
--- a/typo3/sysext/setup/Classes/Controller/SetupModuleController.php
+++ b/typo3/sysext/setup/Classes/Controller/SetupModuleController.php
@@ -318,8 +318,6 @@ class SetupModuleController extends AbstractModule
      ******************************/
     /**
      * Initializes the module for display of the settings form.
-     *
-     * @return void
      */
     public function init()
     {
@@ -359,8 +357,6 @@ class SetupModuleController extends AbstractModule
 
     /**
      * Generate the main settings form:
-     *
-     * @return void
      */
     public function main()
     {
@@ -740,8 +736,6 @@ class SetupModuleController extends AbstractModule
     /**
      * Will make the simulate-user selector if the logged in user is administrator.
      * It will also set the GLOBAL(!) BE_USER to the simulated user selected if any (and set $this->OLD_BE_USER to logged in user)
-     *
-     * @return void
      */
     public function simulateUser()
     {
@@ -1080,8 +1074,6 @@ class SetupModuleController extends AbstractModule
 
     /**
      * Add FlashMessages for various actions
-     *
-     * @return void
      */
     protected function addFlashMessages()
     {
@@ -1125,7 +1117,6 @@ class SetupModuleController extends AbstractModule
     /**
      * @param array $flashMessages
      * @throws \TYPO3\CMS\Core\Exception
-     * @return void
      */
     protected function enqueueFlashMessages(array $flashMessages)
     {
diff --git a/typo3/sysext/setup/Tests/Unit/SetupModuleControllerTest.php b/typo3/sysext/setup/Tests/Unit/SetupModuleControllerTest.php
index 31be1a67e6335f53c0440f82820673234e8979e5..65c83169b8032b8bf43643ab3c24a8e512add70d 100644
--- a/typo3/sysext/setup/Tests/Unit/SetupModuleControllerTest.php
+++ b/typo3/sysext/setup/Tests/Unit/SetupModuleControllerTest.php
@@ -24,7 +24,6 @@ class SetupModuleControllerTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
 {
     /**
      * @test
-     * @return void
      */
     public function addFlashMessagesAddsMessagesIfSetupIsUpdated()
     {
@@ -50,7 +49,6 @@ class SetupModuleControllerTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
 
     /**
      * @test
-     * @return void
      */
     public function addFlashMessagesAddsMessageIfSettingsAreResetToDefault()
     {
@@ -76,7 +74,6 @@ class SetupModuleControllerTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
 
     /**
      * @test
-     * @return void
      */
     public function addFlashMessagesAddsMessageIfPasswordWasSuccessfullyUpdated()
     {
@@ -102,7 +99,6 @@ class SetupModuleControllerTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
 
     /**
      * @test
-     * @return void
      */
     public function addFlashMessagesAddsMessageIfOldPasswordWasWrong()
     {
@@ -128,7 +124,6 @@ class SetupModuleControllerTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
 
     /**
      * @test
-     * @return void
      */
     public function addFlashMessagesAddsMessageIfPasswordsNotTheSame()
     {
@@ -154,7 +149,6 @@ class SetupModuleControllerTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
 
     /**
      * @test
-     * @return void
      */
     public function addFlashMessagesAddsMessagesToQueue()
     {
diff --git a/typo3/sysext/sv/Classes/AbstractAuthenticationService.php b/typo3/sysext/sv/Classes/AbstractAuthenticationService.php
index 3e9edaad128e307d9503a9e255c2ab0ffd7989d9..ff52a2f344bc65952ac875f53de8a25473761511 100644
--- a/typo3/sysext/sv/Classes/AbstractAuthenticationService.php
+++ b/typo3/sysext/sv/Classes/AbstractAuthenticationService.php
@@ -85,7 +85,6 @@ class AbstractAuthenticationService extends AbstractService
      * @param array $loginData Submitted login form data
      * @param array $authInfo Information array. Holds submitted form data etc.
      * @param AbstractUserAuthentication $pObj Parent object
-     * @return void
      */
     public function initAuth($mode, $loginData, $authInfo, $pObj)
     {
@@ -125,7 +124,6 @@ class AbstractAuthenticationService extends AbstractService
      * @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|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.)
-     * @return void
      */
     public function writelog($type, $action, $error, $details_nr, $details, $data, $tablename = '', $recuid = '', $recpid = '')
     {
diff --git a/typo3/sysext/sv/Tests/Unit/AuthenticationServiceTest.php b/typo3/sysext/sv/Tests/Unit/AuthenticationServiceTest.php
index 2973ecf412a832dfe164ba58f4c182c47631f77f..db4e3485d044d0e7e354e21238059b1bba1b12ab 100644
--- a/typo3/sysext/sv/Tests/Unit/AuthenticationServiceTest.php
+++ b/typo3/sysext/sv/Tests/Unit/AuthenticationServiceTest.php
@@ -16,7 +16,6 @@ namespace TYPO3\CMS\Sv\Tests\Unit;
 
 /**
  * Testcase for class \TYPO3\CMS\Sv\AuthenticationService
- *
  */
 class AuthenticationServiceTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 {
diff --git a/typo3/sysext/sys_action/Classes/ActionTask.php b/typo3/sysext/sys_action/Classes/ActionTask.php
index efbb2a48989e2563543de604ee8a40ed3eed6ba3..98d10ce2cf76dc2fbc71e6b659e78c3431c45295 100644
--- a/typo3/sysext/sys_action/Classes/ActionTask.php
+++ b/typo3/sysext/sys_action/Classes/ActionTask.php
@@ -425,7 +425,6 @@ class ActionTask implements \TYPO3\CMS\Taskcenter\TaskInterface
      *
      * @param int $userId Id of the BE user
      * @param int $actionId Id of the action
-     * @return void
      */
     protected function deleteUser($userId, $actionId)
     {
@@ -702,7 +701,6 @@ class ActionTask implements \TYPO3\CMS\Taskcenter\TaskInterface
      * Create a user directory if defined
      *
      * @param int $uid Id of the user record
-     * @return void
      */
     protected function action_createDir($uid)
     {
@@ -757,7 +755,6 @@ class ActionTask implements \TYPO3\CMS\Taskcenter\TaskInterface
      * Action to create a new record
      *
      * @param array $record sys_action record
-     * @return void Redirect to form to create a record
      */
     protected function viewNewRecord($record)
     {
diff --git a/typo3/sysext/sys_note/Classes/Core/Bootstrap.php b/typo3/sysext/sys_note/Classes/Core/Bootstrap.php
index f87cb83eb57ab48b3e60a845388b9af04f755713..98f0e65a1a9d956af30ca1b8f5d4a3802940fdae 100644
--- a/typo3/sysext/sys_note/Classes/Core/Bootstrap.php
+++ b/typo3/sysext/sys_note/Classes/Core/Bootstrap.php
@@ -102,7 +102,6 @@ class Bootstrap
      * provides a clean way to force a controller and action in backend mode.
      *
      * @param array $arguments The arguments to set
-     * @return void
      */
     protected function overrideGetArguments(array $arguments)
     {
@@ -112,8 +111,6 @@ class Bootstrap
 
     /**
      * Revert previously backuped get arguments
-     *
-     * @return void
      */
     protected function revertGetArguments()
     {
diff --git a/typo3/sysext/sys_note/Classes/Domain/Model/SysNote.php b/typo3/sysext/sys_note/Classes/Domain/Model/SysNote.php
index ec6cf95dd9fba36c99adef2dcf1791e0d5491736..cf404ce83fd338a71f312a45f2ce8911ac07cdbd 100644
--- a/typo3/sysext/sys_note/Classes/Domain/Model/SysNote.php
+++ b/typo3/sysext/sys_note/Classes/Domain/Model/SysNote.php
@@ -64,7 +64,6 @@ class SysNote extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * @param \DateTime $creationDate
-     * @return void
      */
     public function setCreationDate($creationDate)
     {
@@ -81,7 +80,6 @@ class SysNote extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * @param \DateTime $modificationDate
-     * @return void
      */
     public function setModificationDate($modificationDate)
     {
@@ -98,7 +96,6 @@ class SysNote extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * @param \TYPO3\CMS\Extbase\Domain\Model\BackendUser $author
-     * @return void
      */
     public function setAuthor(\TYPO3\CMS\Extbase\Domain\Model\BackendUser $author)
     {
@@ -115,7 +112,6 @@ class SysNote extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * @param string $subject
-     * @return void
      */
     public function setSubject($subject)
     {
@@ -132,7 +128,6 @@ class SysNote extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * @param string $message
-     * @return void
      */
     public function setMessage($message)
     {
@@ -149,7 +144,6 @@ class SysNote extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * @param bool $personal
-     * @return void
      */
     public function setPersonal($personal)
     {
@@ -166,7 +160,6 @@ class SysNote extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 
     /**
      * @param int $category
-     * @return void
      */
     public function setCategory($category)
     {
diff --git a/typo3/sysext/sys_note/Classes/Domain/Repository/SysNoteRepository.php b/typo3/sysext/sys_note/Classes/Domain/Repository/SysNoteRepository.php
index cc36ebb7b93b3c7999677340c85f9e1fe50f224b..6f7f9a70196ae9759578e5fbc40771bad7735c83 100644
--- a/typo3/sysext/sys_note/Classes/Domain/Repository/SysNoteRepository.php
+++ b/typo3/sysext/sys_note/Classes/Domain/Repository/SysNoteRepository.php
@@ -21,8 +21,6 @@ class SysNoteRepository extends \TYPO3\CMS\Extbase\Persistence\Repository
 {
     /**
      * Initialize the repository
-     *
-     * @return void
      */
     public function initializeObject()
     {
diff --git a/typo3/sysext/t3editor/Classes/Hook/TypoScriptTemplateInfoHook.php b/typo3/sysext/t3editor/Classes/Hook/TypoScriptTemplateInfoHook.php
index c565e2ba101008c78cba38c124b87220d003d5a8..17d97f88372f5ee8e5a580eb8cac20fa159b1598 100644
--- a/typo3/sysext/t3editor/Classes/Hook/TypoScriptTemplateInfoHook.php
+++ b/typo3/sysext/t3editor/Classes/Hook/TypoScriptTemplateInfoHook.php
@@ -44,7 +44,6 @@ class TypoScriptTemplateInfoHook
      * Hook-function: inject t3editor JavaScript code before the page is compiled
      * called in \TYPO3\CMS\Backend\Template\DocumentTemplate:startPage
      *
-     * @return void
      * @see \TYPO3\CMS\Backend\Template\DocumentTemplate::startPage
      */
     public function preStartPageHook()
@@ -63,7 +62,6 @@ class TypoScriptTemplateInfoHook
      *
      * @param array $parameters
      * @param \TYPO3\CMS\Tstemplate\Controller\TypoScriptTemplateInformationModuleFunctionController $pObj
-     * @return void
      */
     public function postOutputProcessingHook($parameters, $pObj)
     {
diff --git a/typo3/sysext/t3editor/Classes/T3editor.php b/typo3/sysext/t3editor/Classes/T3editor.php
index 6eb523b791c1e3f1f34a915c3c1080b568bd5b70..2fc078fd96f4c15f1e1e0799d06ebaeffb290979 100644
--- a/typo3/sysext/t3editor/Classes/T3editor.php
+++ b/typo3/sysext/t3editor/Classes/T3editor.php
@@ -102,7 +102,6 @@ class T3editor implements \TYPO3\CMS\Core\SingletonInterface
      * Set mode by file
      *
      * @param string $file
-     * @return void
      */
     public function setModeByFile($file)
     {
@@ -114,7 +113,6 @@ class T3editor implements \TYPO3\CMS\Core\SingletonInterface
      * Set mode by type
      *
      * @param string $type
-     * @return void
      */
     public function setModeByType($type)
     {
diff --git a/typo3/sysext/t3editor/Classes/TypoScriptReferenceLoader.php b/typo3/sysext/t3editor/Classes/TypoScriptReferenceLoader.php
index 8a24330442ab7953beb19a9b55be82fca7e186e3..d76a318b7946683382974c03fa617dea231fe971 100644
--- a/typo3/sysext/t3editor/Classes/TypoScriptReferenceLoader.php
+++ b/typo3/sysext/t3editor/Classes/TypoScriptReferenceLoader.php
@@ -71,7 +71,6 @@ class TypoScriptReferenceLoader
      * Load XML file
      *
      * @param string $filepath
-     * @return void
      */
     protected function loadFile($filepath)
     {
diff --git a/typo3/sysext/taskcenter/Classes/Controller/TaskModuleController.php b/typo3/sysext/taskcenter/Classes/Controller/TaskModuleController.php
index dbe8afa1e8093fd36fbe6afec794894afaf537dc..23a302e28f219307b1122ab8e222b75bd3c8a31a 100644
--- a/typo3/sysext/taskcenter/Classes/Controller/TaskModuleController.php
+++ b/typo3/sysext/taskcenter/Classes/Controller/TaskModuleController.php
@@ -64,8 +64,6 @@ class TaskModuleController extends BaseScriptClass
 
     /**
      * Adds items to the ->MOD_MENU array. Used for the function menu selector.
-     *
-     * @return void
      */
     public function menuConfig()
     {
@@ -137,8 +135,6 @@ class TaskModuleController extends BaseScriptClass
     /**
      * Creates the module's content. In this case it rather acts as a kind of #
      * dispatcher redirecting requests to specific tasks.
-     *
-     * @return void
      */
     public function main()
     {
@@ -164,7 +160,6 @@ class TaskModuleController extends BaseScriptClass
      * Prints out the module's HTML
      *
      * @deprecated since TYPO3 v8, will be removed in TYPO3 v9
-     * @return void
      */
     public function printContent()
     {
@@ -174,8 +169,6 @@ class TaskModuleController extends BaseScriptClass
 
     /**
      * Generates the module content by calling the selected task
-     *
-     * @return void
      */
     protected function renderModuleContent()
     {
@@ -244,8 +237,6 @@ class TaskModuleController extends BaseScriptClass
 
     /**
      * Generates the information content
-     *
-     * @return void
      */
     protected function renderInformationContent()
     {
@@ -418,8 +409,6 @@ class TaskModuleController extends BaseScriptClass
     /**
      * Create the panel of buttons for submitting the form or otherwise
      * perform operations.
-     *
-     * @return void
      */
     protected function getButtons()
     {
diff --git a/typo3/sysext/tstemplate/Classes/Controller/TemplateAnalyzerModuleFunctionController.php b/typo3/sysext/tstemplate/Classes/Controller/TemplateAnalyzerModuleFunctionController.php
index 6b044fabd86e1f8401f2b41c7c4b5eef83b17d6a..d225a88a743ad17817a9f9300bd3fc6b9b0a00f0 100644
--- a/typo3/sysext/tstemplate/Classes/Controller/TemplateAnalyzerModuleFunctionController.php
+++ b/typo3/sysext/tstemplate/Classes/Controller/TemplateAnalyzerModuleFunctionController.php
@@ -52,7 +52,6 @@ class TemplateAnalyzerModuleFunctionController extends AbstractFunctionModule
      *
      * @param TypoScriptTemplateModuleController $pObj
      * @param array $conf
-     * @return void
      */
     public function init(&$pObj, $conf)
     {
diff --git a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php
index 9ecf93b8df294e150718def7710b0aafd5eb32b5..af68eaab76453d0048d2c1bdf9454aa3bfc01fc3 100644
--- a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php
+++ b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php
@@ -129,8 +129,6 @@ class TypoScriptTemplateModuleController extends BaseScriptClass
 
     /**
      * Init
-     *
-     * @return void
      */
     public function init()
     {
@@ -144,8 +142,6 @@ class TypoScriptTemplateModuleController extends BaseScriptClass
 
     /**
      * Clear cache
-     *
-     * @return void
      */
     public function clearCache()
     {
@@ -159,8 +155,6 @@ class TypoScriptTemplateModuleController extends BaseScriptClass
 
     /**
      * Main
-     *
-     * @return void
      */
     public function main()
     {
@@ -249,7 +243,6 @@ class TypoScriptTemplateModuleController extends BaseScriptClass
     /**
      * Generates the menu based on $this->MOD_MENU
      *
-     * @return void
      * @throws \InvalidArgumentException
      */
     protected function generateMenu()
@@ -586,7 +579,6 @@ page.10.value = HELLO WORLD!
      * @param array $pArray
      * @param array $rlArr
      * @param array $row
-     * @return void
      */
     public function setInPageArray(&$pArray, $rlArr, $row)
     {
diff --git a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateObjectBrowserModuleFunctionController.php b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateObjectBrowserModuleFunctionController.php
index 2460846cd7d6303a2abeee6fb31a03bdac0f2a35..7f9dd176c1820689dce1a2d59f16100aa99cce6c 100644
--- a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateObjectBrowserModuleFunctionController.php
+++ b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateObjectBrowserModuleFunctionController.php
@@ -56,7 +56,6 @@ class TypoScriptTemplateObjectBrowserModuleFunctionController extends AbstractFu
      *
      * @param TypoScriptTemplateModuleController $pObj
      * @param array $conf
-     * @return void
      */
     public function init(&$pObj, $conf)
     {
@@ -388,7 +387,6 @@ class TypoScriptTemplateObjectBrowserModuleFunctionController extends AbstractFu
      * Add flash message to queue
      *
      * @param FlashMessage $flashMessage
-     * @return void
      */
     protected function addFlashMessage(FlashMessage $flashMessage)
     {
diff --git a/typo3/sysext/version/Classes/DataHandler/CommandMap.php b/typo3/sysext/version/Classes/DataHandler/CommandMap.php
index 16d6dd34e2a6dc4acc72c8af9bef4db1dc8c6761..d4197f2b78975e5312c0c854e88e2ae5cc008b6e 100644
--- a/typo3/sysext/version/Classes/DataHandler/CommandMap.php
+++ b/typo3/sysext/version/Classes/DataHandler/CommandMap.php
@@ -262,7 +262,6 @@ class CommandMap
      *
      * @param string $callbackMethod
      * @param array $arguments Optional leading arguments for the callback method
-     * @return void
      */
     protected function invokeWorkspacesSwapItems($callbackMethod, array $arguments = [])
     {
@@ -285,8 +284,6 @@ class CommandMap
      * Workspaces records that have children or (relative) parents which are versionized
      * but not published with this request, are removed from the command map. Otherwise
      * this would produce hanging record sets and lost references.
-     *
-     * @return void
      */
     protected function resolveWorkspacesSwapDependencies()
     {
@@ -305,7 +302,6 @@ class CommandMap
      * @param string $table
      * @param int $liveId
      * @param array $properties
-     * @return void
      */
     protected function applyWorkspacesSwapBehaviour($table, $liveId, array $properties)
     {
@@ -333,7 +329,6 @@ class CommandMap
      * @param string $table
      * @param int $liveId
      * @param array $properties
-     * @return void
      */
     protected function addWorkspacesSwapElements(\TYPO3\CMS\Version\Dependency\DependencyResolver $dependency, $table, $liveId, array $properties)
     {
@@ -357,7 +352,6 @@ class CommandMap
      *
      * @param string $callbackMethod
      * @param array $arguments Optional leading arguments for the callback method
-     * @return void
      */
     protected function invokeWorkspacesSetStageItems($callbackMethod, array $arguments = [])
     {
@@ -379,8 +373,6 @@ class CommandMap
      * Resolves workspaces related dependencies for staging of the command map.
      * Workspaces records that have children or (relative) parents which are versionized
      * but not staged with this request, are removed from the command map.
-     *
-     * @return void
      */
     protected function resolveWorkspacesSetStageDependencies()
     {
@@ -400,7 +392,6 @@ class CommandMap
      * @param string $table
      * @param string $versionIdList
      * @param array $properties
-     * @return void
      */
     protected function applyWorkspacesSetStageBehaviour($table, $versionIdList, array $properties)
     {
@@ -443,7 +434,6 @@ class CommandMap
      * @param string $table
      * @param string $versionId
      * @param array $properties
-     * @return void
      */
     protected function addWorkspacesSetStageElements(\TYPO3\CMS\Version\Dependency\DependencyResolver $dependency, $table, $versionId, array $properties)
     {
@@ -454,8 +444,6 @@ class CommandMap
      * Resolves workspaces related dependencies for clearing/flushing of the command map.
      * Workspaces records that have children or (relative) parents which are versionized
      * but not cleared/flushed with this request, are removed from the command map.
-     *
-     * @return void
      */
     protected function resolveWorkspacesClearDependencies()
     {
@@ -481,7 +469,6 @@ class CommandMap
      * @param string $table
      * @param string $versionIdList
      * @param array $properties
-     * @return void
      */
     protected function explodeSetStage($table, $versionIdList, array $properties)
     {
@@ -505,7 +492,6 @@ class CommandMap
      *
      * @param \TYPO3\CMS\Version\Dependency\DependencyResolver $dependency
      * @param string $scope
-     * @return void
      */
     protected function applyWorkspacesDependencies(\TYPO3\CMS\Version\Dependency\DependencyResolver $dependency, $scope)
     {
@@ -541,7 +527,6 @@ class CommandMap
      *
      * @param array $elements
      * @param string $scope
-     * @return void
      */
     protected function purgeWithErrorMessage(array $elements, $scope)
     {
@@ -564,7 +549,6 @@ class CommandMap
      * @param ElementEntity $intersectingElement
      * @param array $elements
      * @param string $scope
-     * @return void
      */
     protected function update(ElementEntity $intersectingElement, array $elements, $scope)
     {
@@ -594,7 +578,6 @@ class CommandMap
      * Merges command map elements to the top of the current command map..
      *
      * @param array $commandMap
-     * @return void
      */
     protected function mergeToTop(array $commandMap)
     {
@@ -606,7 +589,6 @@ class CommandMap
      * Merges command map elements to the bottom of the current command map.
      *
      * @param array $commandMap
-     * @return void
      */
     protected function mergeToBottom(array $commandMap)
     {
@@ -619,7 +601,6 @@ class CommandMap
      * @param string $table
      * @param string $id
      * @param string $command (optional)
-     * @return void
      */
     protected function remove($table, $id, $command = null)
     {
@@ -770,8 +751,6 @@ class CommandMap
     /**
      * Constructs the scope settings.
      * Currently the scopes for swapping/publishing and staging are available.
-     *
-     * @return void
      */
     protected function constructScopes()
     {
diff --git a/typo3/sysext/version/Classes/Dependency/DependencyResolver.php b/typo3/sysext/version/Classes/Dependency/DependencyResolver.php
index acc1fd459ea3dd85e4becf013d7c6b90fc4838e9..e3dd2730b180ba82a7099b52ef0be1cdb85688d9 100644
--- a/typo3/sysext/version/Classes/Dependency/DependencyResolver.php
+++ b/typo3/sysext/version/Classes/Dependency/DependencyResolver.php
@@ -149,7 +149,6 @@ class DependencyResolver
      * Processes and registers the outermost parents accordant to the registered elements.
      *
      * @param \TYPO3\CMS\Version\Dependency\ElementEntity $element
-     * @return void
      */
     protected function processOuterMostParent(\TYPO3\CMS\Version\Dependency\ElementEntity $element)
     {
diff --git a/typo3/sysext/version/Classes/Dependency/ElementEntity.php b/typo3/sysext/version/Classes/Dependency/ElementEntity.php
index 80778aa20a34ed047a44d4999c959078756d16aa..a2bb594068abca7d193c5772ee38eccc1774bdcf 100644
--- a/typo3/sysext/version/Classes/Dependency/ElementEntity.php
+++ b/typo3/sysext/version/Classes/Dependency/ElementEntity.php
@@ -176,7 +176,6 @@ class ElementEntity
      *
      * @param string $key
      * @param mixed $value
-     * @return void
      */
     public function setDataValue($key, $value)
     {
diff --git a/typo3/sysext/version/Classes/Dependency/ElementEntityProcessor.php b/typo3/sysext/version/Classes/Dependency/ElementEntityProcessor.php
index 70cfc49893bfc868437cacfbd80d448a26ee88a3..ca1f13a379099d1eef99f00c5e4a6460f745adf9 100644
--- a/typo3/sysext/version/Classes/Dependency/ElementEntityProcessor.php
+++ b/typo3/sysext/version/Classes/Dependency/ElementEntityProcessor.php
@@ -171,7 +171,6 @@ class ElementEntityProcessor
      * @param array $callerArguments
      * @param array $targetArgument
      * @param string $eventName
-     * @return void
      */
     public function createNewDependentElementCallback(array $callerArguments, array $targetArgument, ElementEntity $caller, $eventName)
     {
diff --git a/typo3/sysext/version/Classes/Hook/DataHandlerHook.php b/typo3/sysext/version/Classes/Hook/DataHandlerHook.php
index 8ae7778f6d53c87cea8cebec1cb6fd7bf5ce0aad..548fc08e842c5a35b73bdc0cb839f911c56d0c00 100644
--- a/typo3/sysext/version/Classes/Hook/DataHandlerHook.php
+++ b/typo3/sysext/version/Classes/Hook/DataHandlerHook.php
@@ -61,7 +61,6 @@ class DataHandlerHook
      * hook that is called before any cmd of the commandmap is executed
      *
      * @param DataHandler $dataHandler reference to the main DataHandler object
-     * @return void
      */
     public function processCmdmap_beforeStart(DataHandler $dataHandler)
     {
@@ -80,7 +79,6 @@ class DataHandlerHook
      * @param mixed $value the value containing the data
      * @param bool $commandIsProcessed can be set so that other hooks or
      * @param DataHandler $dataHandler reference to the main DataHandler object
-     * @return void
      */
     public function processCmdmap($command, $table, $id, $value, &$commandIsProcessed, DataHandler $dataHandler)
     {
@@ -130,7 +128,6 @@ class DataHandlerHook
      * executed
      *
      * @param DataHandler $dataHandler reference to the main DataHandler object
-     * @return void
      */
     public function processCmdmap_afterFinish(DataHandler $dataHandler)
     {
@@ -152,7 +149,6 @@ class DataHandlerHook
      * @param array $record The accordant database record
      * @param bool $recordWasDeleted can be set so that other hooks or
      * @param DataHandler $dataHandler reference to the main DataHandler object
-     * @return void
      */
     public function processCmdmap_deleteAction($table, $id, array $record, &$recordWasDeleted, DataHandler $dataHandler)
     {
@@ -279,7 +275,6 @@ class DataHandlerHook
      * @param int $resolvedPid The final page ID of the record
      * @param bool $recordWasMoved can be set so that other hooks or
      * @param DataHandler $dataHandler
-     * @return void
      */
     public function moveRecord($table, $uid, $destPid, array $propArr, array $moveRec, $resolvedPid, &$recordWasMoved, DataHandler $dataHandler)
     {
@@ -361,7 +356,6 @@ class DataHandlerHook
      * @param int $resolvedPageId Resolved real destination page id
      * @param string $table Name of parent table
      * @param int $uid UID of the parent record
-     * @return void
      */
     protected function moveRecord_processFields(DataHandler $dataHandler, $resolvedPageId, $table, $uid)
     {
@@ -391,7 +385,6 @@ class DataHandlerHook
      * @param string $field Name of the field of the parent record
      * @param string $value Value of the field of the parent record
      * @param array $configuration TCA field configuration of the parent record
-     * @return void
      */
     protected function moveRecord_processFieldValue(DataHandler $dataHandler, $resolvedPageId, $table, $uid, $field, $value, array $configuration)
     {
@@ -437,7 +430,6 @@ class DataHandlerHook
      * @param string $comment User comment sent along with action
      * @param DataHandler $dataHandler DataHandler object
      * @param array $notificationAlternativeRecipients List of recipients to notify instead of be_users selected by sys_workspace, list is generated by workspace extension module
-     * @return void
      */
     protected function notifyStageChange(array $stat, $stageId, $table, $id, $comment, DataHandler $dataHandler, array $notificationAlternativeRecipients = [])
     {
@@ -706,7 +698,6 @@ class DataHandlerHook
      * @param bool $notificationEmailInfo Accumulate state changes in memory for compiled notification email?
      * @param DataHandler $dataHandler DataHandler object
      * @param array $notificationAlternativeRecipients comma separated list of recipients to notify instead of normal be_users
-     * @return void
      */
     protected function version_setStage($table, $id, $stageId, $comment = '', $notificationEmailInfo = false, DataHandler $dataHandler, array $notificationAlternativeRecipients = [])
     {
@@ -763,7 +754,6 @@ class DataHandlerHook
      * @param string $comment Notification comment
      * @param bool $notificationEmailInfo Accumulate state changes in memory for compiled notification email?
      * @param array $notificationAlternativeRecipients comma separated list of recipients to notificate instead of normal be_users
-     * @return void
      */
     protected function version_swap($table, $id, $swapWith, $swapIntoWS = 0, DataHandler $dataHandler, $comment = '', $notificationEmailInfo = false, $notificationAlternativeRecipients = [])
     {
@@ -1030,7 +1020,6 @@ class DataHandlerHook
      * @param \TYPO3\CMS\Core\Database\RelationHandler $dbAnalysis Instance that holds the sorting order of child records
      * @param array $configuration The TCA field configuration
      * @param int $parentId The uid of the parent record
-     * @return void
      */
     public function writeRemappedForeignField(\TYPO3\CMS\Core\Database\RelationHandler $dbAnalysis, array $configuration, $parentId)
     {
@@ -1052,7 +1041,6 @@ class DataHandlerHook
      * @param array $liveData: Live record data
      * @param array $versionData: Version record data
      * @param DataHandler $dataHandler Calling data-handler object
-     * @return void
      */
     protected function version_swap_processFields($tableName, $fieldName, array $configuration, array $liveData, array $versionData, DataHandler $dataHandler)
     {
@@ -1101,7 +1089,6 @@ class DataHandlerHook
      * @param int[] $foreignIds
      * @param array $configuration
      * @param int $targetWorkspaceId
-     * @return void
      * @internal
      */
     public function updateInlineForeignFieldSorting($parentTableName, $parentId, $foreignTableName, $foreignIds, array $configuration, $targetWorkspaceId)
@@ -1131,7 +1118,6 @@ class DataHandlerHook
      * @param int $id Record UID
      * @param bool $flush If set, will completely delete element
      * @param DataHandler $dataHandler DataHandler object
-     * @return void
      */
     protected function version_clearWSID($table, $id, $flush = false, DataHandler $dataHandler)
     {
@@ -1273,7 +1259,6 @@ class DataHandlerHook
      * @param array $pageIdList List of PIDs to search
      * @param int $workspaceId Workspace ID
      * @param array $elementList List of found elements. Key is table name, value is array of element UIDs
-     * @return void
      */
     public function findPageElementsForVersionStageChange(array $pageIdList, $workspaceId, array &$elementList)
     {
@@ -1332,7 +1317,6 @@ class DataHandlerHook
      * @param int $workspaceId Workspace ID. We need this parameter because user can be in LIVE but he still can publisg DRAFT from ws module!
      * @param array $pageIdList List of found page UIDs
      * @param array $elementList List of found element UIDs. Key is table name, value is list of UIDs
-     * @return void
      */
     public function findPageIdsForVersionStateChange($table, array $idList, $workspaceId, array &$pageIdList, array &$elementList)
     {
@@ -1388,7 +1372,6 @@ class DataHandlerHook
      * Finds real page IDs for state change.
      *
      * @param array $idList List of page UIDs, possibly versioned
-     * @return void
      */
     public function findRealPageIds(array &$idList)
     {
@@ -1411,7 +1394,6 @@ class DataHandlerHook
      * @param int $destPid Position to move to: $destPid: >=0 then it points to a page-id on which to insert the record (as the first element). <0 then it points to a uid from its own table after which to insert it (works if
      * @param int $wsUid UID of offline version of online record
      * @param DataHandler $dataHandler DataHandler object
-     * @return void
      * @see moveRecord()
      */
     protected function moveRecord_wsPlaceholders($table, $uid, $destPid, $wsUid, DataHandler $dataHandler)
diff --git a/typo3/sysext/viewpage/Classes/Controller/ViewModuleController.php b/typo3/sysext/viewpage/Classes/Controller/ViewModuleController.php
index ac61d77168d2abb3c9d166a005db75dbb04d674d..cc8d6a8a4a5a5e93dc7c965ddbfba6d3508d90fd 100644
--- a/typo3/sysext/viewpage/Classes/Controller/ViewModuleController.php
+++ b/typo3/sysext/viewpage/Classes/Controller/ViewModuleController.php
@@ -88,8 +88,6 @@ class ViewModuleController extends ActionController
 
     /**
      * Gets called before each action
-     *
-     * @return void
      */
     public function initializeAction()
     {
@@ -100,8 +98,6 @@ class ViewModuleController extends ActionController
 
     /**
      * Show selected page from pagetree in iframe
-     *
-     * @return void
      */
     public function showAction()
     {
diff --git a/typo3/sysext/workspaces/Classes/Controller/AbstractController.php b/typo3/sysext/workspaces/Classes/Controller/AbstractController.php
index 92f8572b97ebd73c3d8a0ac09ee31df74af45814..2c27af85c022ea6e87caffde38101905b4376e47 100644
--- a/typo3/sysext/workspaces/Classes/Controller/AbstractController.php
+++ b/typo3/sysext/workspaces/Classes/Controller/AbstractController.php
@@ -55,8 +55,6 @@ class AbstractController extends ActionController
 
     /**
      * Initializes the controller before invoking an action method.
-     *
-     * @return void
      */
     protected function initializeAction()
     {
@@ -95,8 +93,6 @@ class AbstractController extends ActionController
 
     /**
      * Assigns additional Workspace settings to TYPO3.settings.Workspaces.extension
-     *
-     * @return void
      */
     protected function assignExtensionSettings()
     {
diff --git a/typo3/sysext/workspaces/Classes/Controller/PreviewController.php b/typo3/sysext/workspaces/Classes/Controller/PreviewController.php
index a199d8f7a259cc589953542fe46d58524d042207..da62bcc280a9787a345e2a68f167c49648a190e6 100644
--- a/typo3/sysext/workspaces/Classes/Controller/PreviewController.php
+++ b/typo3/sysext/workspaces/Classes/Controller/PreviewController.php
@@ -57,8 +57,6 @@ class PreviewController extends AbstractController
 
     /**
      * Initializes the controller before invoking an action method.
-     *
-     * @return void
      */
     protected function initializeAction()
     {
@@ -79,7 +77,6 @@ class PreviewController extends AbstractController
      * only the frames-urls we've to generate here
      *
      * @param int $previewWS
-     * @return void
      */
     public function indexAction($previewWS = null)
     {
@@ -190,7 +187,6 @@ class PreviewController extends AbstractController
     }
 
     /**
-     * @return void
      */
     public function newPageAction()
     {
diff --git a/typo3/sysext/workspaces/Classes/Controller/Remote/ActionHandler.php b/typo3/sysext/workspaces/Classes/Controller/Remote/ActionHandler.php
index 688befb4fb9494e9b2993b83873cdf36b9bc8b14..adc2669a3ddb276aece1b71c6eff4458a05b0afc 100644
--- a/typo3/sysext/workspaces/Classes/Controller/Remote/ActionHandler.php
+++ b/typo3/sysext/workspaces/Classes/Controller/Remote/ActionHandler.php
@@ -69,7 +69,6 @@ class ActionHandler extends AbstractHandler
      * @param string $table
      * @param int $t3ver_oid
      * @param int $orig_uid
-     * @return void
      * @todo What about reporting errors back to the ExtJS interface? /olly/
      */
     public function swapSingleRecord($table, $t3ver_oid, $orig_uid)
@@ -92,7 +91,6 @@ class ActionHandler extends AbstractHandler
      *
      * @param string $table
      * @param int $uid
-     * @return void
      * @todo What about reporting errors back to the ExtJS interface? /olly/
      */
     public function deleteSingleRecord($table, $uid)
@@ -189,7 +187,6 @@ class ActionHandler extends AbstractHandler
      * Saves the selected columns to be shown to the preferences of the current backend user.
      *
      * @param \stdClass $model
-     * @return void
      */
     public function saveColumnModel($model)
     {
@@ -217,7 +214,6 @@ class ActionHandler extends AbstractHandler
      * Saves the selected language.
      *
      * @param int|string $language
-     * @return void
      */
     public function saveLanguageSelection($language)
     {
diff --git a/typo3/sysext/workspaces/Classes/Controller/ReviewController.php b/typo3/sysext/workspaces/Classes/Controller/ReviewController.php
index 7dd689ac2fee010667acc24594895078462775df..2ffb5ddc7c5bd2f4ea945602ea0205feedb74916 100644
--- a/typo3/sysext/workspaces/Classes/Controller/ReviewController.php
+++ b/typo3/sysext/workspaces/Classes/Controller/ReviewController.php
@@ -61,8 +61,6 @@ class ReviewController extends AbstractController
     /**
      * Renders the review module user dependent with all workspaces.
      * The module will show all records of one workspace.
-     *
-     * @return void
      */
     public function indexAction()
     {
@@ -132,8 +130,6 @@ class ReviewController extends AbstractController
     /**
      * Renders the review module user dependent.
      * The module will show all records of all workspaces.
-     *
-     * @return void
      */
     public function fullIndexAction()
     {
@@ -164,8 +160,6 @@ class ReviewController extends AbstractController
     /**
      * Renders the review module for a single page. This is used within the
      * workspace-preview frame.
-     *
-     * @return void
      */
     public function singleIndexAction()
     {
@@ -194,8 +188,6 @@ class ReviewController extends AbstractController
 
     /**
      * Initializes the controller before invoking an action method.
-     *
-     * @return void
      */
     protected function initializeAction()
     {
diff --git a/typo3/sysext/workspaces/Classes/Domain/Model/CombinedRecord.php b/typo3/sysext/workspaces/Classes/Domain/Model/CombinedRecord.php
index 9bac649f653969a97aa51d4bb0010a5de7744e2a..24ae0d5994a0342e2bb8b98c3c6fb7280c4aa189 100644
--- a/typo3/sysext/workspaces/Classes/Domain/Model/CombinedRecord.php
+++ b/typo3/sysext/workspaces/Classes/Domain/Model/CombinedRecord.php
@@ -92,7 +92,6 @@ class CombinedRecord
      * Sets the name of the database table.
      *
      * @param string $table
-     * @return void
      */
     public function setTable($table)
     {
@@ -113,7 +112,6 @@ class CombinedRecord
      * Sets the live-record object.
      *
      * @param \TYPO3\CMS\Workspaces\Domain\Model\DatabaseRecord $liveRecord
-     * @return void
      */
     public function setLiveRecord(DatabaseRecord $liveRecord)
     {
@@ -134,7 +132,6 @@ class CombinedRecord
      * Sets the version-record object.
      *
      * @param \TYPO3\CMS\Workspaces\Domain\Model\DatabaseRecord $versionRecord
-     * @return void
      */
     public function setVersionRecord(DatabaseRecord $versionRecord)
     {
diff --git a/typo3/sysext/workspaces/Classes/Domain/Model/DatabaseRecord.php b/typo3/sysext/workspaces/Classes/Domain/Model/DatabaseRecord.php
index 4919d0ed7b9ed6241f8cb81f36b86fa542e736a2..fb3a1dd35fa0c8b6c6fe2899c1609c21d3d90410 100644
--- a/typo3/sysext/workspaces/Classes/Domain/Model/DatabaseRecord.php
+++ b/typo3/sysext/workspaces/Classes/Domain/Model/DatabaseRecord.php
@@ -86,7 +86,6 @@ class DatabaseRecord
      * Sets the name of the database table.
      *
      * @param string $table
-     * @return void
      */
     public function setTable($table)
     {
@@ -107,7 +106,6 @@ class DatabaseRecord
      * Sets the id of the database record row.
      *
      * @param int $uid
-     * @return void
      */
     public function setUid($uid)
     {
@@ -129,7 +127,6 @@ class DatabaseRecord
      * Sets the database record row.
      *
      * @param array $row
-     * @return void
      */
     public function setRow(array $row)
     {
@@ -148,8 +145,6 @@ class DatabaseRecord
 
     /**
      * Loads the database record row (if not available yet).
-     *
-     * @return void
      */
     protected function loadRow()
     {
diff --git a/typo3/sysext/workspaces/Classes/Hook/BackendUtilityHook.php b/typo3/sysext/workspaces/Classes/Hook/BackendUtilityHook.php
index 50f5d51de7bb6ee311d17f3c41b38730e642ef37..f477383b477b6afcd7f956908708749b08cabc03 100644
--- a/typo3/sysext/workspaces/Classes/Hook/BackendUtilityHook.php
+++ b/typo3/sysext/workspaces/Classes/Hook/BackendUtilityHook.php
@@ -42,7 +42,6 @@ class BackendUtilityHook implements \TYPO3\CMS\Core\SingletonInterface
      * @param string $viewScript
      * @param string $additionalGetVars
      * @param bool $switchFocus
-     * @return void
      */
     public function preProcess(&$pageUid, $backPath, $rootLine, $anchorSection, &$viewScript, $additionalGetVars, $switchFocus)
     {
diff --git a/typo3/sysext/workspaces/Classes/Hook/DataHandlerHook.php b/typo3/sysext/workspaces/Classes/Hook/DataHandlerHook.php
index e1055711cd841533e10d868064eaba4ec2bfb77c..a77acd455e7decb00dd68a0c4d1c0204b99f4b88 100644
--- a/typo3/sysext/workspaces/Classes/Hook/DataHandlerHook.php
+++ b/typo3/sysext/workspaces/Classes/Hook/DataHandlerHook.php
@@ -36,7 +36,6 @@ class DataHandlerHook
      * @param string $id
      * @param string $value
      * @param \TYPO3\CMS\Core\DataHandling\DataHandler $dataHandler
-     * @return void
      */
     public function processCmdmap_postProcess($command, $table, $id, $value, \TYPO3\CMS\Core\DataHandling\DataHandler $dataHandler)
     {
@@ -54,7 +53,6 @@ class DataHandlerHook
      * executed
      *
      * @param \TYPO3\CMS\Core\DataHandling\DataHandler $dataHandler reference to the main DataHandler object
-     * @return void
      */
     public function processCmdmap_afterFinish(\TYPO3\CMS\Core\DataHandling\DataHandler $dataHandler)
     {
@@ -67,7 +65,6 @@ class DataHandlerHook
      * as orphan records.
      *
      * @param int $stageId Elements with this stage are resetted
-     * @return void
      */
     protected function resetStageOfElements($stageId)
     {
@@ -102,7 +99,6 @@ class DataHandlerHook
      * Flushes elements of a particular workspace to avoid orphan records.
      *
      * @param int $workspaceId The workspace to be flushed
-     * @return void
      */
     protected function flushWorkspaceElements($workspaceId)
     {
@@ -156,7 +152,6 @@ class DataHandlerHook
      * Flushes the workspace cache for current workspace and for the virtual "all workspaces" too.
      *
      * @param int $workspaceId The workspace to be flushed in cache
-     * @return void
      */
     protected function flushWorkspaceCacheEntriesByWorkspaceId($workspaceId)
     {
diff --git a/typo3/sysext/workspaces/Classes/Hook/PreviewHook.php b/typo3/sysext/workspaces/Classes/Hook/PreviewHook.php
index 2756189a7641092b0d004545eb894968a8dbbbda..a4c5e96fb0090256ac5c821e7b11f9cb74a424a8 100644
--- a/typo3/sysext/workspaces/Classes/Hook/PreviewHook.php
+++ b/typo3/sysext/workspaces/Classes/Hook/PreviewHook.php
@@ -63,7 +63,6 @@ class PreviewHook implements \TYPO3\CMS\Core\SingletonInterface
      *
      * @param array $params (not needed right now)
      * @param \TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController $pObj
-     * @return void
      */
     public function checkForPreview($params, &$pObj)
     {
@@ -102,7 +101,6 @@ class PreviewHook implements \TYPO3\CMS\Core\SingletonInterface
      *
      * @param array $params holding the BE_USER object
      * @param \TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController $pObj
-     * @return void
      */
     public function initializePreviewUser(&$params, &$pObj)
     {
diff --git a/typo3/sysext/workspaces/Classes/Hook/TypoScriptFrontendControllerHook.php b/typo3/sysext/workspaces/Classes/Hook/TypoScriptFrontendControllerHook.php
index 6fc8cce4754fc53abe69536c691512b3161443fa..0d103983b58ffddc8b2c5b51a3a0d53aed1e81bc 100644
--- a/typo3/sysext/workspaces/Classes/Hook/TypoScriptFrontendControllerHook.php
+++ b/typo3/sysext/workspaces/Classes/Hook/TypoScriptFrontendControllerHook.php
@@ -22,7 +22,6 @@ class TypoScriptFrontendControllerHook
     /**
      * @param array $params
      * @param \TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController $pObj
-     * @return void
      */
     public function hook_eofe($params, $pObj)
     {
diff --git a/typo3/sysext/workspaces/Classes/Hooks/PagetreeCollectionsProcessor.php b/typo3/sysext/workspaces/Classes/Hooks/PagetreeCollectionsProcessor.php
index a36b4f925773abf07774bd09a299a25cbaab921e..6a51d4d7be2aa58ff272b3ae7ae1465861cc0ba9 100644
--- a/typo3/sysext/workspaces/Classes/Hooks/PagetreeCollectionsProcessor.php
+++ b/typo3/sysext/workspaces/Classes/Hooks/PagetreeCollectionsProcessor.php
@@ -32,7 +32,6 @@ class PagetreeCollectionsProcessor implements \TYPO3\CMS\Backend\Tree\Pagetree\C
      * @param int $mountPoint
      * @param int $level
      * @param \TYPO3\CMS\Backend\Tree\Pagetree\PagetreeNodeCollection $nodeCollection
-     * @return void
      */
     public function postProcessGetNodes($node, $mountPoint, $level, $nodeCollection)
     {
@@ -47,7 +46,6 @@ class PagetreeCollectionsProcessor implements \TYPO3\CMS\Backend\Tree\Pagetree\C
      * @param string $searchFilter
      * @param int $mountPoint
      * @param \TYPO3\CMS\Backend\Tree\Pagetree\PagetreeNodeCollection $nodeCollection
-     * @return void
      */
     public function postProcessFilteredNodes($node, $searchFilter, $mountPoint, $nodeCollection)
     {
@@ -60,7 +58,6 @@ class PagetreeCollectionsProcessor implements \TYPO3\CMS\Backend\Tree\Pagetree\C
     /**
      * @param string $searchFilter
      * @param \TYPO3\CMS\Backend\Tree\Pagetree\PagetreeNodeCollection $nodeCollection
-     * @return void
      */
     public function postProcessGetTreeMounts($searchFilter, $nodeCollection)
     {
@@ -75,7 +72,6 @@ class PagetreeCollectionsProcessor implements \TYPO3\CMS\Backend\Tree\Pagetree\C
      * in the current workspace
      *
      * @param \TYPO3\CMS\Backend\Tree\TreeNode $node
-     * @return void
      */
     protected function highlightVersionizedElements(\TYPO3\CMS\Backend\Tree\TreeNode $node)
     {
diff --git a/typo3/sysext/workspaces/Classes/Service/AdditionalColumnService.php b/typo3/sysext/workspaces/Classes/Service/AdditionalColumnService.php
index e7a272886d7631a509096f6d66b66ece1a7053e4..538ab7478ec600d4c2a715766193f2ef73a80f39 100644
--- a/typo3/sysext/workspaces/Classes/Service/AdditionalColumnService.php
+++ b/typo3/sysext/workspaces/Classes/Service/AdditionalColumnService.php
@@ -45,7 +45,6 @@ class AdditionalColumnService implements \TYPO3\CMS\Core\SingletonInterface
      *
      * @param string $columnName
      * @param string|object $dataProviderClassOrObject
-     * @return void
      * @throws \RuntimeException
      */
     public function register($columnName, $dataProviderClassOrObject)
diff --git a/typo3/sysext/workspaces/Classes/Service/AdditionalResourceService.php b/typo3/sysext/workspaces/Classes/Service/AdditionalResourceService.php
index 92123eb982944e9c90977700762e33ee49830634..6ce5ad35c273ddfc856dbd6ed500e208c9853b24 100644
--- a/typo3/sysext/workspaces/Classes/Service/AdditionalResourceService.php
+++ b/typo3/sysext/workspaces/Classes/Service/AdditionalResourceService.php
@@ -55,7 +55,6 @@ class AdditionalResourceService implements \TYPO3\CMS\Core\SingletonInterface
     /**
      * @param string $name
      * @param string $resourcePath
-     * @return void
      */
     public function addJavaScriptResource($name, $resourcePath)
     {
@@ -65,7 +64,6 @@ class AdditionalResourceService implements \TYPO3\CMS\Core\SingletonInterface
     /**
      * @param string $name
      * @param string $resourcePath
-     * @return void
      */
     public function addStylesheetResource($name, $resourcePath)
     {
@@ -74,7 +72,6 @@ class AdditionalResourceService implements \TYPO3\CMS\Core\SingletonInterface
 
     /**
      * @param string $resourcePath
-     * @return void
      */
     public function addLocalizationResource($resourcePath)
     {
diff --git a/typo3/sysext/workspaces/Classes/Service/AutoPublishService.php b/typo3/sysext/workspaces/Classes/Service/AutoPublishService.php
index 1006f4c7ef88958c35d15dfac4536b63b1f775fe..b2484568d866ca766096f4e429856e93b74b8a53 100644
--- a/typo3/sysext/workspaces/Classes/Service/AutoPublishService.php
+++ b/typo3/sysext/workspaces/Classes/Service/AutoPublishService.php
@@ -28,8 +28,6 @@ class AutoPublishService
      * the autopublication process
      * It searches for workspaces whose publication date is in the past
      * and publishes them
-     *
-     * @return void
      */
     public function autoPublishWorkspaces()
     {
diff --git a/typo3/sysext/workspaces/Classes/Service/GridDataService.php b/typo3/sysext/workspaces/Classes/Service/GridDataService.php
index 8fc60ab445cf931e6925ef848353715f245763a4..a80240ec02ac2fca54350f2b9b011c61e24bd768 100644
--- a/typo3/sysext/workspaces/Classes/Service/GridDataService.php
+++ b/typo3/sysext/workspaces/Classes/Service/GridDataService.php
@@ -113,7 +113,6 @@ class GridDataService
      *
      * @param array $versions All available version records
      * @param string $filterTxt Text to be used to filter record result
-     * @return void
      */
     protected function generateDataArray(array $versions, $filterTxt)
     {
@@ -233,8 +232,6 @@ class GridDataService
     /**
      * Resolves dependencies of nested structures
      * and sort data elements considering these dependencies.
-     *
-     * @return void
      */
     protected function resolveDataArrayDependencies()
     {
@@ -283,8 +280,6 @@ class GridDataService
 
     /**
      * Initializes the workspace cache
-     *
-     * @return void
      */
     protected function initializeWorkspacesCachingFramework()
     {
@@ -347,8 +342,6 @@ class GridDataService
     /**
      * Performs sorting on the data array accordant to the
      * selected column in the grid view to be used for sorting.
-     *
-     * @return void
      */
     protected function sortDataArray()
     {
diff --git a/typo3/sysext/workspaces/Classes/Service/IntegrityService.php b/typo3/sysext/workspaces/Classes/Service/IntegrityService.php
index 547adfe2ac1075712577c6db5ad0240ae3d64c47..1c833bbffd7f71c457695a130609ea08f3ef294b 100644
--- a/typo3/sysext/workspaces/Classes/Service/IntegrityService.php
+++ b/typo3/sysext/workspaces/Classes/Service/IntegrityService.php
@@ -81,7 +81,6 @@ class IntegrityService
      * Sets the affected elements.
      *
      * @param \TYPO3\CMS\Workspaces\Domain\Model\CombinedRecord[] $affectedElements
-     * @return void
      */
     public function setAffectedElements(array $affectedElements)
     {
@@ -90,8 +89,6 @@ class IntegrityService
 
     /**
      * Checks integrity of affected records.
-     *
-     * @return void
      */
     public function check()
     {
@@ -104,7 +101,6 @@ class IntegrityService
      * Checks a single element.
      *
      * @param \TYPO3\CMS\Workspaces\Domain\Model\CombinedRecord $element
-     * @return void
      */
     public function checkElement(\TYPO3\CMS\Workspaces\Domain\Model\CombinedRecord $element)
     {
@@ -118,7 +114,6 @@ class IntegrityService
      * then boths (localization and localization parent) should be published.
      *
      * @param \TYPO3\CMS\Workspaces\Domain\Model\CombinedRecord $element
-     * @return void
      */
     protected function checkLocalization(\TYPO3\CMS\Workspaces\Domain\Model\CombinedRecord $element)
     {
@@ -232,7 +227,6 @@ class IntegrityService
      * @param string $identifier Record identifier (table:id)
      * @param int $status Status code (see constants)
      * @param string $message Message/description of the issue
-     * @return void
      */
     protected function addIssue($identifier, $status, $message)
     {
diff --git a/typo3/sysext/workspaces/Classes/Service/StagesService.php b/typo3/sysext/workspaces/Classes/Service/StagesService.php
index cee3f2441ce44c02ffbcb61413b9fbb982eca444..2e24df50f935eb470b2095375e77693817ec2ffe 100644
--- a/typo3/sysext/workspaces/Classes/Service/StagesService.php
+++ b/typo3/sysext/workspaces/Classes/Service/StagesService.php
@@ -580,7 +580,6 @@ class StagesService implements \TYPO3\CMS\Core\SingletonInterface
 
     /**
      * @param array $groups
-     * @return void
      */
     private function fetchGroupsFromDB(array $groups)
     {
diff --git a/typo3/sysext/workspaces/Tests/Functional/ActionHandler/ActionHandlerTest.php b/typo3/sysext/workspaces/Tests/Functional/ActionHandler/ActionHandlerTest.php
index b2c049454e994d2c3d07f5053171f776dcf1a1ec..40ed63b024e000a46a9324db7676def9c2d6cfbf 100644
--- a/typo3/sysext/workspaces/Tests/Functional/ActionHandler/ActionHandlerTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/ActionHandler/ActionHandlerTest.php
@@ -28,8 +28,6 @@ class ActionHandlerTest extends \TYPO3\TestingFramework\Core\Functional\Function
 
     /**
      * Set up
-     *
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/workspaces/Tests/Functional/Tca/WorkspaceStageVisibleFieldsTest.php b/typo3/sysext/workspaces/Tests/Functional/Tca/WorkspaceStageVisibleFieldsTest.php
index 11af98d52d473e28a2d75901fc901d8ea0fcf3ea..6059cd9b0138e6de15890ca116ae0090f0b8e647 100644
--- a/typo3/sysext/workspaces/Tests/Functional/Tca/WorkspaceStageVisibleFieldsTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/Tca/WorkspaceStageVisibleFieldsTest.php
@@ -39,8 +39,6 @@ class WorkspaceStageVisibleFieldsTest extends \TYPO3\TestingFramework\Core\Funct
 
     /**
      * Sets up this test case.
-     *
-     * @return void
      */
     protected function setUp()
     {
diff --git a/typo3/sysext/workspaces/Tests/Functional/Tca/WorkspaceVisibleFieldsTest.php b/typo3/sysext/workspaces/Tests/Functional/Tca/WorkspaceVisibleFieldsTest.php
index c81c345e29ce258c6df940009178b7fe1243353b..6137754cb8e3ccd70ae13b553a1bf1a4c11fd4d1 100644
--- a/typo3/sysext/workspaces/Tests/Functional/Tca/WorkspaceVisibleFieldsTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/Tca/WorkspaceVisibleFieldsTest.php
@@ -55,8 +55,6 @@ class WorkspaceVisibleFieldsTest extends \TYPO3\TestingFramework\Core\Functional
 
     /**
      * Sets up this test case.
-     *
-     * @return void
      */
     protected function setUp()
     {