Skip to content

Adapt CS to core changes #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gagnieray merged 4 commits into from
Jan 3, 2026
Merged

Adapt CS to core changes #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1bf4118
Use core cs-fixer configuration
trasher Jan 3, 2026
0a53573
Apply CS, remove useless doc comments; remove useless methods params …
trasher Jan 3, 2026
c6ec8a6
Use core phpcodesniffer config
trasher Jan 3, 2026
acd8ed6
Fix CS
trasher Jan 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 51 additions & 2 deletions .php-cs-fixer.dist.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,58 @@
'@PER-CS' => true,
'@PHP8x2Migration' => true,
'trailing_comma_in_multiline' => false,
'cast_spaces' => false,
'cast_spaces' => ['space' => 'none'],
'single_line_empty_body' => false,
'no_unused_imports' => true
'no_unused_imports' => true,
// rules for phpdoc
// Removes @param, @return and @var tags that don't provide any useful information - https://mlocati.github.io/php-cs-fixer-configurator/#version:3.90|fixer:no_superfluous_phpdoc_tags
'no_superfluous_phpdoc_tags' => [
'allow_mixed' => true,
'remove_inheritdoc' => true,
],
// require phpdoc for non typed arguments - https://mlocati.github.io/php-cs-fixer-configurator/#version:3.90|fixer:phpdoc_add_missing_param_annotation
'phpdoc_add_missing_param_annotation' => true,
// no @access - https://mlocati.github.io/php-cs-fixer-configurator/#version:3.90|fixer:phpdoc_no_access
'phpdoc_no_access' => true,
// no @package - https://mlocati.github.io/php-cs-fixer-configurator/#version:3.90|fixer:phpdoc_no_package
'phpdoc_no_package' => true,
// order phpdoc tags - https://mlocati.github.io/php-cs-fixer-configurator/#version:3.90|fixer:phpdoc_order
'phpdoc_order' => ['order' => ['since', 'var', 'see', 'param', 'return', 'throw', 'todo', 'deprecated']],
// phpdoc param in same order as signature - https://mlocati.github.io/php-cs-fixer-configurator/#version:3.90|fixer:phpdoc_param_order
'phpdoc_param_order' => true,
// align tags - https://mlocati.github.io/php-cs-fixer-configurator/#version:3.90|fixer:phpdoc_align
'phpdoc_align' => [
'align' => 'vertical',
'tags' => [
'param',
'property',
'property-read',
'property-write',
'phpstan-param',
'phpstan-property',
'phpstan-property-read',
'phpstan-property-write',
'phpstan-assert',
'phpstan-assert-if-true',
'phpstan-assert-if-false',
'psalm-param',
'psalm-param-out',
'psalm-property',
'psalm-property-read',
'psalm-property-write',
'psalm-assert',
'psalm-assert-if-true',
'psalm-assert-if-false'
],
],
// Check types case - https://mlocati.github.io/php-cs-fixer-configurator/#version:3.90|fixer:phpdoc_types
'phpdoc_types' => true,
// Use native scalar types - https://mlocati.github.io/php-cs-fixer-configurator/#version:3.90|fixer:phpdoc_scalar
'phpdoc_scalar' => true,
// remove extra empty lines - https://mlocati.github.io/php-cs-fixer-configurator/#version:3.90|fixer:phpdoc_trim
'phpdoc_trim' => true,
// remove empty lines inside phpdoc block - https://mlocati.github.io/php-cs-fixer-configurator/#version:3.90|fixer:phpdoc_trim_consecutive_blank_line_separation
'phpdoc_trim_consecutive_blank_line_separation' => true,
])
->setFinder($finder)
;
24 changes: 23 additions & 1 deletion .phpcs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,35 @@
<!-- Include the whole PSR12 standard -->
<rule ref="PSR12"/>

<rule ref="Generic.Arrays.DisallowLongArraySyntax"/>

<!-- Comments rules from PEAR standard -->
<rule ref="PEAR.Commenting.ClassComment">
<exclude name="PEAR.Commenting.ClassComment.MissingCategoryTag"/>
<exclude name="PEAR.Commenting.ClassComment.MissingPackageTag"/>
<exclude name="PEAR.Commenting.ClassComment.MissingLicenseTag"/>
<exclude name="PEAR.Commenting.ClassComment.MissingLinkTag"/>
</rule>
<rule ref="PEAR.Commenting.FunctionComment"/>
<rule ref="Galette.Commenting.FunctionComment"/>
<rule ref="PEAR.Commenting.InlineComment"/>

<!-- Type hinting -->
<rule ref="SlevomatCodingStandard.TypeHints.ParameterTypeHint">
<exclude name="SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingTraversableTypeHintSpecification"/>
</rule>
<!-- Force native typehint on methods properties -->
<rule ref="SlevomatCodingStandard.TypeHints.PropertyTypeHint">
<exclude name="SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingTraversableTypeHintSpecification"/>
</rule>
<!-- Force native typehint on methods return -->
<rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHint">
<exclude name="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingTraversableTypeHintSpecification"/>
</rule>
<rule ref="SlevomatCodingStandard.TypeHints.DeclareStrictTypes">
<properties>
<property name="spacesCountAroundEqualsSign" value="0"/>
</properties>
</rule>
<rule ref="SlevomatCodingStandard.TypeHints.LongTypeHints"/>
<rule ref="SlevomatCodingStandard.Variables.UnusedVariable"/>
</ruleset>
66 changes: 7 additions & 59 deletions lib/GaletteHelloasso/Controllers/HelloassoController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,8 @@ class HelloassoController extends AbstractPluginController

/**
* Main form
*
* @param Request $request PSR Request
* @param Response $response PSR Response
*
* @return Response
*/
public function form(Request $request, Response $response): Response
public function form(Response $response): Response
{
$helloasso = new Helloasso($this->zdb, $this->preferences);

Expand Down Expand Up @@ -100,20 +95,13 @@ public function form(Request $request, Response $response): Response

/**
* Checkout form
*
* @param Request $request PSR Request
* @param Response $response PSR Response
*
* @return Response
*/
public function formCheckout(Request $request, Response $response): Response
{
$helloasso_request = $request->getParsedBody();
$helloasso = new Helloasso($this->zdb, $this->preferences);
$adherent = new Adherent($this->zdb);
$contribution_type = new ContributionsTypes($this->zdb, (int) $helloasso_request['item_id']);

$current_url = $this->preferences->getURL();
$contribution_type = new ContributionsTypes($this->zdb, (int)$helloasso_request['item_id']);

// Check the amount
$item_id = $helloasso_request['item_id'];
Expand Down Expand Up @@ -165,15 +153,10 @@ public function formCheckout(Request $request, Response $response): Response
/**
* Logs page
*
* @param Request $request PSR Request
* @param Response $response PSR Response
* @param string|null $option Either order, reset or page
* @param string|int|null $value Option value
*
* @return Response
* @param string|null $option Either order, reset or page
* @param string|int|null $value Option value
*/
public function logs(
Request $request,
Response $response,
?string $option = null,
string|int|null $value = null
Expand All @@ -190,7 +173,7 @@ public function logs(
if ($option !== null) {
switch ($option) {
case 'page':
$filters->current_page = (int) $value;
$filters->current_page = (int)$value;
break;
case 'order':
$filters->orderby = $value;
Expand Down Expand Up @@ -229,11 +212,6 @@ public function logs(

/**
* Filter
*
* @param Request $request PSR Request
* @param Response $response PSR Response
*
* @return Response
*/
public function filter(Request $request, Response $response): Response
{
Expand All @@ -256,11 +234,6 @@ public function filter(Request $request, Response $response): Response

/**
* Preferences
*
* @param Request $request PSR Request
* @param Response $response PSR Response
*
* @return Response
*/
public function preferences(Request $request, Response $response): Response
{
Expand Down Expand Up @@ -294,11 +267,6 @@ public function preferences(Request $request, Response $response): Response

/**
* Store Preferences
*
* @param Request $request PSR Request
* @param Response $response PSR Response
*
* @return Response
*/
public function storePreferences(Request $request, Response $response): Response
{
Expand Down Expand Up @@ -354,11 +322,6 @@ public function storePreferences(Request $request, Response $response): Response

/**
* Webhook
*
* @param Request $request PSR Request
* @param Response $response PSR Response
*
* @return Response
*/
public function webhook(Request $request, Response $response): Response
{
Expand Down Expand Up @@ -487,13 +450,8 @@ public function webhook(Request $request, Response $response): Response

/**
* Return URL
*
* @param Request $request PSR Request
* @param Response $response PSR Response
*
* @return Response
*/
public function returnUrl(Request $request, Response $response): Response
public function returnUrl(Response $response): Response
{
$params = [
'page_title' => _T('Helloasso payment success', 'helloasso')
Expand All @@ -510,13 +468,8 @@ public function returnUrl(Request $request, Response $response): Response

/**
* Cancel URL
*
* @param Request $request PSR Request
* @param Response $response PSR Response
*
* @return Response
*/
public function cancelUrl(Request $request, Response $response): Response
public function cancelUrl(Response $response): Response
{
$this->flash->addMessage(
'warning_detected',
Expand All @@ -529,11 +482,6 @@ public function cancelUrl(Request $request, Response $response): Response

/**
* Error URL
*
* @param Request $request PSR Request
* @param Response $response PSR Response
*
* @return Response
*/
public function errorUrl(Request $request, Response $response): Response
{
Expand Down
Loading