Skip to content

#134 - phpdocs items spacing #141

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
krzysztofrewak merged 1 commit into from
Mar 3, 2025
Merged

#134 - phpdocs items spacing #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@

codestyle.php export-ignore
docker-compose.yml export-ignore
Makefile export-ignore
logo.png export-ignore
Makefile export-ignore
renovate5.json export-ignore
8 changes: 4 additions & 4 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
"type": "library",
"require": {
"php": "^8.2",
"friendsofphp/php-cs-fixer": "^3.59",
"kubawerlos/php-cs-fixer-custom-fixers": "^3.21"
"friendsofphp/php-cs-fixer": "^3.70",
"kubawerlos/php-cs-fixer-custom-fixers": "^3.23"
},
"require-dev": {
"jetbrains/phpstorm-attributes": "^1.1",
"phpunit/phpunit": "^10.0|^11.2",
"symfony/console": "^6.0|^7.0"
"phpunit/phpunit": "^11.2",
"symfony/console": "^7.0"
},
"authors": [
{
Expand Down
4 changes: 1 addition & 3 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
version: "3.7"

services:
php:
image: ghcr.io/blumilksoftware/php:8.2
image: ghcr.io/blumilksoftware/php:8.3
container_name: blumilk-codestyle-php
working_dir: /application
user: ${CURRENT_UID:-1000}
Expand Down
2 changes: 2 additions & 0 deletions src/Configuration/Defaults/CommonRules.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
use PhpCsFixer\Fixer\Phpdoc\NoBlankLinesAfterPhpdocFixer;
use PhpCsFixer\Fixer\Phpdoc\NoEmptyPhpdocFixer;
use PhpCsFixer\Fixer\Phpdoc\NoSuperfluousPhpdocTagsFixer;
use PhpCsFixer\Fixer\Phpdoc\PhpdocAlignFixer;
use PhpCsFixer\Fixer\Phpdoc\PhpdocIndentFixer;
use PhpCsFixer\Fixer\Phpdoc\PhpdocLineSpanFixer;
use PhpCsFixer\Fixer\Phpdoc\PhpdocNoEmptyReturnFixer;
Expand Down Expand Up @@ -372,5 +373,6 @@ class CommonRules extends Rules
ConstantCaseFixer::class => true,
PhpUnitAttributesFixer::class => true,
SpacesInsideParenthesesFixer::class => true,
PhpdocAlignFixer::class => ["align" => "left"],
];
}
8 changes: 8 additions & 0 deletions tests/fixtures/phpdocs/actual.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,12 @@ public function add(int $i): void
{
$this->i = $this->i + $i;
}

/**
* @param int $i
*/
public function remove($i): void
{
$this->i = $this->i - $i;
}
}
8 changes: 8 additions & 0 deletions tests/fixtures/phpdocs/expected.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,12 @@ public function add(int $i): void
{
$this->i = $this->i + $i;
}

/**
* @param int $i
*/
public function remove($i): void
{
$this->i = $this->i - $i;
}
}
Loading