Fixed phpcs issues.

Author: rvock

Classes/Backend/BackendLayoutDataProvider.php

@@ -51,7 +51,7 @@ public function addBackendLayouts(DataProviderContext $dataProviderContext, Back
 	}
 
 	/**
-	 * @phpcsSuppress SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingAnyTypeHint
+	 * {@inheritdoc}
 	 */
 	public function getBackendLayout($identifier, $pageId) {
 		$backendLayout = null;

Classes/ExtensionBuilder/Service/FileGenerator.php

@@ -32,10 +32,7 @@ protected function generateTCAFiles(): void {
 		}
 	}
 
-	/**
-	 * @phpstan-return void
-	 */
-	protected function writeFile($targetFile, $fileContents): void {
+	protected function writeFile(string $targetFile, string $fileContents): void {
 		// replace spaces with tabs
 		$fileContents = (string)preg_replace_callback('/^(    )+/m', function($matches)  {
 			return str_replace('    ', "\t", $matches[0]);

Classes/ExtensionBuilder/Service/Printer.php

@@ -87,6 +87,9 @@ public function renderFileObject(File $fileObject, bool $addDeclareStrictTypes =
 		return $resultingCode;
 	}
 
+	/**
+	 * {@inheritdoc}
+	 */
 	public function render($stmts): string {
 		$code = parent::render($stmts);
 		$code = $this->trimTrailingWhitespace($code);

Classes/Form/FormDataProvider/GridelementsMergeTsConfig.php

@@ -15,7 +15,6 @@ class GridelementsMergeTsConfig implements FormDataProviderInterface {
 	/**
 	 * Merge type specific page TS to pageTsConfig
 	 *
-	 * @param array $result
 	 * @return array
 	 * @phpcsSuppress SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingNativeTypeHint
 	 */

Classes/Frontend/ContentObject/ScalableVectorGraphicsContentObject.php

@@ -21,6 +21,7 @@ class ScalableVectorGraphicsContentObject extends AbstractContentObject {
 	 * @param array $conf Array of TypoScript properties
 	 * @return string Empty string (the cObject only sets internal data!)
 	 * @phpcsSuppress SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingNativeTypeHint
+	 * @phpcsSuppress SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint
 	 */
 	public function render($conf = []) {
 		$cObj = $this->getContentObjectRenderer();

Classes/Hooks/ContentElements.php

@@ -232,8 +232,6 @@ static protected function generateException(string $message, int $code): void {
 
 	/**
 	 * add Content Elements
-	 *
-	 * @param string $extensionKey
 	 */
 	static public function addFCEs(string $extensionKey, bool $isLocalConf = false): void {
 		if (!$isLocalConf) {
@@ -310,7 +308,6 @@ static public function addFCEs(string $extensionKey, bool $isLocalConf = false):
 	 * Generate TCA for FCEs.
 	 * Gets called in TCA/Overrides/tt_content.php and will be cached.
 	 *
-	 * @param array $TCA
 	 * @return array modified $TCA
 	 */
 	static public function addTCA(array $TCA): array {

Classes/Hooks/DataHandler.php

@@ -16,6 +16,7 @@ class DataHandler {
 	 * @param int $id The uid of the page we are currently working on
 	 * @param array $fieldArray The array of fields and values that have been saved to the datamap
 	 * @param \TYPO3\CMS\Core\DataHandling\DataHandler $parentObj The parent object that triggered this hook
+	 * @phpcsSuppress SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint
 	 */
 	public function processDatamap_postProcessFieldArray($status, $table, $id, array &$fieldArray, \TYPO3\CMS\Core\DataHandling\DataHandler $parentObj): void {
 

Classes/Hooks/JavascriptOptimization.php

@@ -65,7 +65,7 @@ public function minifyJsFiles(array $jsFiles): array {
 	 * @param string $filename Source filename, relative to requested page
 	 * @return string Filename of the compressed file, relative to requested page
 	 */
-	public function minifyJsFile($filename): string {
+	public function minifyJsFile(string $filename): string {
 		// generate the unique name of the file
 		$filenameAbsolute = Environment::getPublicPath() . '/' . $filename;
 		$unique = $filenameAbsolute . '-min';

Classes/Imaging/GraphicalFunctionsTrait.php

@@ -21,7 +21,7 @@ public function init(): void {
 	}
 
 	/**
-	 * @phpcsSuppress SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingAnyTypeHint
+	 * {@inheritdoc}
 	 */
 	public function imageMagickConvert($imagefile, $newExt = '', $w = '', $h = '', $params = '', $frame = '', $options = [], $mustCreate = true) {
 		// Note: mustCreate has another default value
@@ -66,7 +66,7 @@ public function imageMagickConvert($imagefile, $newExt = '', $w = '', $h = '', $
 	}
 
 	/**
-	 * @phpcsSuppress SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingAnyTypeHint
+	 * {@inheritdoc}
 	 */
 	public function imageMagickExec($input, $output, $params, $frame = 0) {
 		if (!$this->processorEnabled) {

Classes/Log/Writer/MailWriter.php

@@ -47,10 +47,7 @@ public function __construct(array $options) {
 		parent::__construct($options);
 	}
 
-	/**
-	 * @param int|string $minErrorLevel
-	 */
-	public function setMinErrorLevel($minErrorLevel): void {
+	public function setMinErrorLevel(int|string $minErrorLevel): void {
 		$this->sendMail = false;
 		$this->minErrorLevel = LogLevel::normalizeLevel($minErrorLevel);
 	}

Classes/Resource/FilterFiles.php

@@ -13,7 +13,7 @@ class FilterFiles {
 	/**
 	 * @return bool|int -1 is the "false" value. call_user_func might also return false
 	 */
-	static public function filterFilesCallback(string $itemName, string $itemIdentifier, string $parentIdentifier, array $additionalInformation, DriverInterface $driverInstance) {
+	static public function filterFilesCallback(string $itemName, string $itemIdentifier, string $parentIdentifier, array $additionalInformation, DriverInterface $driverInstance): bool|int {
 		$ignoreFolders = ['_vti_cnf', '_vti_pvt', '.git', '.svn', 'CVS', 'Thumbs.db', '.DS_Store'];
 		if (in_array($itemName, $ignoreFolders)) {
 			return -1;

Classes/Resource/LocalDriver.php

@@ -6,7 +6,7 @@
 class LocalDriver extends \TYPO3\CMS\Core\Resource\Driver\LocalDriver {
 
 	/**
-	 * @phpcsSuppress SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingAnyTypeHint
+	 * {@inheritdoc}
 	 */
 	public function sanitizeFileName($fileName, $charset = 'utf-8') {
 		$fileName = parent::sanitizeFileName($fileName, $charset);

Classes/Routing/Aspect/AutomaticSlugPatternMapper.php

@@ -65,11 +65,6 @@ protected function createRouteResult(?array $result): ?string {
 		);
 	}
 
-	/**
-	 * @param QueryBuilder $queryBuilder
-	 * @param array $values
-	 * @return array
-	 */
 	protected function createRouteFieldConstraints(QueryBuilder $queryBuilder, array $values): array {
 		// check if all match-fields are set
 		if (count($this->settings['matchFields']) !== count(array_intersect($this->settings['matchFields'], array_keys($values)))) {

Classes/ViewHelpers/SvgViewHelper.php

@@ -41,11 +41,7 @@ public function initializeArguments(): void {
 	/**
 	 * renders an SVG
 	 *
-	 * @param array $arguments
-	 * @param \Closure $renderChildrenClosure
-	 * @param \TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface $renderingContext
-	 * @return string
-	 * @phpcsSuppress SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingNativeTypeHint
+	 * {@inheritdoc}
 	 */
 	public static function renderStatic(array $arguments, \Closure $renderChildrenClosure, RenderingContextInterface $renderingContext) {
 		$cObj = GeneralUtility::makeInstance(ContentObjectRenderer::class);

Classes/XClass/Core/Resource/StorageRepository.php

@@ -12,7 +12,7 @@
 class StorageRepository extends \TYPO3\CMS\Core\Resource\StorageRepository {
 
 	/**
-	 * @phpcsSuppress SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingAnyTypeHint
+	 * {@inheritdoc}
 	 */
 	protected function testCaseSensitivity($absolutePath) {
 		return true;

Tests/Unit/Resource/FilterFilesTest.php

@@ -12,9 +12,8 @@ class FilterFilesTest extends UnitTestCase {
 
 	/**
 	 * @dataProvider getSanitizeFileNameTestData
-	 * @param bool|int $expected
 	 */
-	public function testFilterFilesCallback($expected, string $itemName, string $itemIdentifier): void {
+	public function testFilterFilesCallback(bool|int $expected, string $itemName, string $itemIdentifier): void {
 		/** @var DriverInterface $driverInstance */
 		$driverInstance = $this->getMockBuilder(DriverInterface::class)
 			->disableOriginalConstructor()

composer.json

@@ -89,7 +89,7 @@
 	},
 	"scripts": {
 		"phplint": "find . -name \\*.php ! -path \"./.Build/*\" | parallel --gnu php -d display_errors=stderr -l {} > /dev/null \\;",
-		"phpcs": "phpcs -n --runtime-set ignore_warnings_on_exit 1 --standard=.Build/vendor/vierwd/coding-standard/ForwardMediaPHP74 Classes/ Tests/",
+		"phpcs": "phpcs -n --runtime-set ignore_warnings_on_exit 1 --standard=.Build/vendor/vierwd/coding-standard/ForwardMediaPHP80 Classes/ Tests/",
 		"phpstan": "phpstan analyze",
 		"unit-test": "phpunit -c Tests/UnitTests.xml Tests/Unit/",
 		"test-all": [