Skip to content

Commit

Permalink
Add php-cs-fixer and run config
Browse files Browse the repository at this point in the history
  • Loading branch information
garbast committed May 25, 2024
1 parent cf2828d commit ed8a2ee
Show file tree
Hide file tree
Showing 12 changed files with 214 additions and 39 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ var/
public/
vendor/
composer.lock
.php-cs-fixer.cache
4 changes: 2 additions & 2 deletions Build/Scripts/runTests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -826,7 +826,7 @@ case ${TEST_SUITE} in
if [ -n "${CGLCHECK_DRY_RUN}" ]; then
CGLCHECK_DRY_RUN="--dry-run --diff"
fi
COMMAND="php -dxdebug.mode=off bin/php-cs-fixer fix -v ${CGLCHECK_DRY_RUN} --path-mode intersection --config=Build/php-cs-fixer/config.php typo3/"
COMMAND="php -dxdebug.mode=off bin/php-cs-fixer fix -v ${CGLCHECK_DRY_RUN} --path-mode intersection --config=Build/php-cs-fixer/config.php ."
${CONTAINER_BIN} run ${CONTAINER_COMMON_PARAMS} --name cgl-${SUFFIX} ${IMAGE_PHP} ${COMMAND}
SUITE_EXIT_CODE=$?
;;
Expand All @@ -839,7 +839,7 @@ case ${TEST_SUITE} in
if [ -n "${CGLCHECK_DRY_RUN}" ]; then
CGLCHECK_DRY_RUN="--dry-run --diff"
fi
COMMAND="php -dxdebug.mode=off bin/php-cs-fixer fix -v ${CGLCHECK_DRY_RUN} --path-mode intersection --config=Build/php-cs-fixer/header-comment.php typo3/"
COMMAND="php -dxdebug.mode=off bin/php-cs-fixer fix -v ${CGLCHECK_DRY_RUN} --path-mode intersection --config=Build/php-cs-fixer/header-comment.php ."
${CONTAINER_BIN} run ${CONTAINER_COMMON_PARAMS} --name cgl-header-${SUFFIX} ${IMAGE_PHP} ${COMMAND}
SUITE_EXIT_CODE=$?
;;
Expand Down
116 changes: 116 additions & 0 deletions Build/php-cs-fixer/config.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
<?php

declare(strict_types=1);

/*
* This file is copied from the TYPO3 CMS project.
*
* It is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License, either version 2
* of the License, or any later version.
*
* For the full copyright and license information, please read the
* LICENSE.txt file that was distributed with this source code.
*
* The TYPO3 project - inspiring people to share!
*/

/**
* This file represents the configuration for Code Sniffing PER-related
* automatic checks of coding guidelines.
*
* Run it using runTests.sh, see 'runTests.sh -h' for more options.
*
* Fix entire extension:
* > Build/Scripts/additionalTests.sh -p 8.3 -s composerInstallPackage -q "typo3/cms-core:[dev-main,13...]"
* > Build/Scripts/runTests.sh -s cgl
*
* Fix your current patch:
* > Build/Scripts/runTests.sh -s cglGit
*/
if (PHP_SAPI !== 'cli') {
die('This script supports command line usage only. Please check your command.');
}

// Return a Code Sniffing configuration using
// all sniffers needed for PER
// and additionally:
// - Remove leading slashes in use clauses.
// - PHP single-line arrays should not have trailing comma.
// - Single-line whitespace before closing semicolon are prohibited.
// - Remove unused use statements in the PHP source code
// - Ensure Concatenation to have at least one whitespace around
// - Remove trailing whitespace at the end of blank lines.
return (new \PhpCsFixer\Config())
->setParallelConfig(\PhpCsFixer\Runner\Parallel\ParallelConfigFactory::detect())
->setFinder(
PhpCsFixer\Finder::create()
->ignoreVCSIgnored(true)
->in(realpath(__DIR__ . '/../../'))
->exclude('bin')
->exclude('public')
->exclude('typo3temp')
->exclude('vendor')
)
->setRiskyAllowed(true)
->setRules([
'@DoctrineAnnotation' => true,
// @todo: Switch to @PER-CS2.0 once php-cs-fixer's todo list is done: https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7247
'@PER-CS1.0' => true,
'array_indentation' => true,
'array_syntax' => ['syntax' => 'short'],
'cast_spaces' => ['space' => 'none'],
// @todo: Can be dropped once we enable @PER-CS2.0
'concat_space' => ['spacing' => 'one'],
'declare_equal_normalize' => ['space' => 'none'],
'declare_parentheses' => true,
'dir_constant' => true,
// @todo: Can be dropped once we enable @PER-CS2.0
'function_declaration' => [
'closure_fn_spacing' => 'none',
],
'function_to_constant' => ['functions' => ['get_called_class', 'get_class', 'get_class_this', 'php_sapi_name', 'phpversion', 'pi']],
'type_declaration_spaces' => true,
'global_namespace_import' => ['import_classes' => false, 'import_constants' => false, 'import_functions' => false],
'list_syntax' => ['syntax' => 'short'],
// @todo: Can be dropped once we enable @PER-CS2.0
'method_argument_space' => true,
'modernize_strpos' => true,
'modernize_types_casting' => true,
'native_function_casing' => true,
'no_alias_functions' => true,
'no_blank_lines_after_phpdoc' => true,
'no_empty_phpdoc' => true,
'no_empty_statement' => true,
'no_extra_blank_lines' => true,
'no_leading_namespace_whitespace' => true,
'no_null_property_initialization' => true,
'no_short_bool_cast' => true,
'no_singleline_whitespace_before_semicolons' => true,
'no_superfluous_elseif' => true,
'no_trailing_comma_in_singleline' => true,
'no_unneeded_control_parentheses' => true,
'no_unused_imports' => true,
'no_useless_else' => true,
'no_useless_nullsafe_operator' => true,
'ordered_imports' => ['imports_order' => ['class', 'function', 'const'], 'sort_algorithm' => 'alpha'],
'php_unit_construct' => ['assertions' => ['assertEquals', 'assertSame', 'assertNotEquals', 'assertNotSame']],
'php_unit_mock_short_will_return' => true,
'php_unit_test_case_static_method_calls' => ['call_type' => 'self'],
'phpdoc_no_access' => true,
'phpdoc_no_empty_return' => true,
'phpdoc_no_package' => true,
'phpdoc_scalar' => true,
'phpdoc_trim' => true,
'phpdoc_types' => true,
'phpdoc_types_order' => ['null_adjustment' => 'always_last', 'sort_algorithm' => 'none'],
'return_type_declaration' => ['space_before' => 'none'],
'single_quote' => true,
'single_space_around_construct' => true,
'single_line_comment_style' => ['comment_types' => ['hash']],
// @todo: Can be dropped once we enable @PER-CS2.0
'single_line_empty_body' => true,
'trailing_comma_in_multiline' => ['elements' => ['arrays']],
'whitespace_after_comma_in_array' => ['ensure_single_space' => true],
'yoda_style' => ['equal' => false, 'identical' => false, 'less_and_greater' => false],
]);
75 changes: 75 additions & 0 deletions Build/php-cs-fixer/header-comment.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
<?php

declare(strict_types=1);

/*
* This file is developed by evoWeb.
*
* It is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License, either version 2
* of the License, or any later version.
*
* For the full copyright and license information, please read the
* LICENSE.txt file that was distributed with this source code.
*/

/**
* This file adds header to php file which don't have any.
*
* Run it using runTests.sh, see 'runTests.sh -h' for more options.
*
* Fix entire extension:
* > Build/Scripts/additionalTests.sh -p 8.3 -s composerInstallPackage -q "typo3/cms-core:[dev-main,13...]"
* > Build/Scripts/runTests.sh -s cglHeader
*
* Fix your current patch:
* > Build/Scripts/runTests.sh -s cglHeaderGit
*/
if (PHP_SAPI !== 'cli') {
die('This script supports command line usage only. Please check your command.');
}

$finder = PhpCsFixer\Finder::create()
->name('*.php')
->in(__DIR__ . '/../../')
->exclude('Acceptance/Support/_generated') // EXT:core
->exclude('Build')
// Configuration files do not need header comments
->exclude('Configuration')
->notName('*locallang*.php')
->notName('ext_localconf.php')
->notName('ext_tables.php')
->notName('ext_emconf.php')
// ClassAliasMap files do not need header comments
->notName('ClassAliasMap.php')
// CodeSnippets and Examples in Documentation do not need header comments
->exclude('Documentation')
// Third-party inclusion files should not have a changed comment
->notName('Rfc822AddressesParser.php')
->notName('ClassMapGenerator.php')
;

$headerComment = <<<COMMENT
This file is developed by evoWeb.
It is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License, either version 2
of the License, or any later version.
For the full copyright and license information, please read the
LICENSE.txt file that was distributed with this source code.
COMMENT;

return (new \PhpCsFixer\Config())
->setParallelConfig(\PhpCsFixer\Runner\Parallel\ParallelConfigFactory::detect())
->setRiskyAllowed(false)
->setRules([
'no_extra_blank_lines' => true,
'header_comment' => [
'header' => $headerComment,
'comment_type' => 'comment',
'separate' => 'both',
'location' => 'after_declare_strict',
],
])
->setFinder($finder);
4 changes: 1 addition & 3 deletions Classes/Controller/FileController.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ public function __construct(
protected ModuleTemplateFactory $moduleTemplateFactory,
protected Converter $fileConverter,
protected ExtensionService $extensionService,
) {
}
) {}

public function selectExtensionAction(ServerRequestInterface $request): ResponseInterface
{
Expand Down Expand Up @@ -199,7 +198,6 @@ protected function initializeModuleTemplate(ServerRequestInterface $request): Mo
} catch (\Exception) {
}


return $moduleTemplate;
}

Expand Down
24 changes: 6 additions & 18 deletions Classes/File/Converter.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,14 @@
declare(strict_types=1);

/*
* Copyright notice
* This file is developed by evoWeb.
*
* (c) 2011 Xavier Perseguers <[email protected]>
* All rights reserved
* It is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License, either version 2
* of the License, or any later version.
*
* This script is part of the TYPO3 project. The TYPO3 project is
* free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* The GNU General Public License can be found at
* http://www.gnu.org/copyleft/gpl.html.
*
* This script is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* This copyright notice MUST APPEAR in all copies of the script!
* For the full copyright and license information, please read the
* LICENSE.txt file that was distributed with this source code.
*/

namespace Evoweb\EwLlxml2xliff\File;
Expand Down
6 changes: 2 additions & 4 deletions Classes/Localization/Parser/LocallangXmlParser.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,14 @@
declare(strict_types=1);

/*
* This file is part of the TYPO3 CMS project.
* This file is developed by evoWeb.
*
* It is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License, either version 2
* of the License, or any later version.
*
* For the full copyright and license information, please read the
* LICENSE.txt file that was distributed with this source code.
*
* The TYPO3 project - inspiring people to share!
*/

namespace Evoweb\EwLlxml2xliff\Localization\Parser;
Expand Down Expand Up @@ -90,7 +88,7 @@ protected function getParsedDataForElement(\SimpleXMLElement $bodyOfFileTag, str
foreach ($children as $translationElement) {
if ($translationElement->getName() === 'label') {
$parsedData[(string)$translationElement['index']][0] = [
$element => (string)$translationElement
$element => (string)$translationElement,
];
}
}
Expand Down
7 changes: 3 additions & 4 deletions Classes/Service/ExtensionService.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@
public function __construct(
protected ListUtility $listUtility,
protected Converter $converter,
) {
}
) {}

public function getLocalExtensions(): array
{
Expand Down Expand Up @@ -68,7 +67,7 @@ public function getFilesOfExtension(string $extensionKey): array
if ($this->isLanguageFile($file) && !$this->xliffFileAlreadyExists($extensionPath, $file)) {
$filename = GeneralUtility::removePrefixPathFromList([$file], $extensionPath)[0];
$result[$filename] = [
'filename' => $filename
'filename' => $filename,
];
}
}
Expand Down Expand Up @@ -110,7 +109,7 @@ public function convertLanguageFile(string $selectedExtension, string $selectedF
'wasConvertedPreviously' => $wasConvertedPreviously,
'fileConvertedSuccessfully' => $fileConvertedSuccessfully,
'messages' => $messages,
'files' => $files
'files' => $files,
];
}

Expand Down
2 changes: 1 addition & 1 deletion Configuration/Backend/Modules.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
],
'convertFile' => [
'target' => FileController::class . '::convertFileAction',
]
],
],
],
];
4 changes: 2 additions & 2 deletions Configuration/Icons.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
return [
'llxml2xlifficon' => [
'provider' => SvgIconProvider::class,
'source' => 'EXT:ew_llxml2xliff/Resources/Public/Icons/Extension.svg'
'source' => 'EXT:ew_llxml2xliff/Resources/Public/Icons/Extension.svg',
],
'llxml2xliff-convert' => [
'provider' => SvgIconProvider::class,
'source' =>
'EXT:ew_llxml2xliff/Resources/Public/Icons/transition_conversion_convert_transfer_motion_icon_196300.svg'
'EXT:ew_llxml2xliff/Resources/Public/Icons/transition_conversion_convert_transfer_motion_icon_196300.svg',
],
];
File renamed without changes.
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,17 @@
}
},
"require": {
"ext-simplexml": "*",
"ext-libxml": "*",
"typo3/cms-core": "^13.0 || 13.0.x-dev || dev-main",
"ext-simplexml": "*",
"psr/http-message": "^1.1 || ^2.0",
"typo3/cms-backend": "^13.0 || 13.0.x-dev || dev-main",
"typo3/cms-core": "^13.0",
"typo3/cms-extbase": "^13.0 || 13.0.x-dev || dev-main",
"typo3/cms-fluid": "^13.0 || 13.0.x-dev || dev-main",
"typo3/cms-extensionmanager": "^13.0 || 13.0.x-dev || dev-main",
"psr/http-message": "^1.1 || ^2.0"
"typo3/cms-fluid": "^13.0 || 13.0.x-dev || dev-main"
},
"require-dev": {
"sbuerk/typo3-cmscomposerinstallers-testingframework-bridge": "dev-main",
"friendsofphp/php-cs-fixer": "^3.57.1",
"typo3/testing-framework": "dev-main"
},
"extra": {
Expand Down

0 comments on commit ed8a2ee

Please sign in to comment.