From 986b4e0651d665c72ec011542f95b4bd9529c6a8 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Thu, 21 Oct 2021 20:32:37 +0100 Subject: [PATCH] Enforce single-line PhpDoc for properties where possible --- .github/workflows/main.yml | 4 ++-- .php-cs-fixer.php | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 79f39f899..67790cea1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -272,10 +272,10 @@ jobs: - uses: actions/checkout@v2 - name: Setup PHP and tools - uses: shivammathur/setup-php@2.12.0 + uses: shivammathur/setup-php@2.15.0 with: php-version: 8.0 - tools: php-cs-fixer + tools: php-cs-fixer:3.2 - name: Run PHP-CS-Fixer run: php-cs-fixer fix --dry-run --diff diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php index 373c8fc80..590f6ebd8 100644 --- a/.php-cs-fixer.php +++ b/.php-cs-fixer.php @@ -62,6 +62,11 @@ return (new PhpCsFixer\Config) ], 'sort_algorithm' => 'alpha' ], + 'phpdoc_line_span' => [ + 'property' => 'single', + 'method' => null, + 'const' => null + ], 'phpdoc_trim' => true, 'phpdoc_trim_consecutive_blank_line_separation' => true, 'single_import_per_statement' => true,