From 6c0e413324cd4bc46145dc4b9313ff446c58972e Mon Sep 17 00:00:00 2001 From: "Ralph J. Smit" <59207045+ralphjsmit@users.noreply.github.com> Date: Tue, 19 Mar 2024 09:03:59 +0100 Subject: [PATCH] chore: Pint update (#68) * WIP * Update pint.yml * Update pint.yml --- .github/workflows/php-cs-fixer.yml | 23 ----------------- .github/workflows/pint.yml | 27 ++++++++++++++++++++ .php_cs.dist.php | 40 ------------------------------ pint.json | 6 +---- 4 files changed, 28 insertions(+), 68 deletions(-) delete mode 100644 .github/workflows/php-cs-fixer.yml create mode 100644 .github/workflows/pint.yml delete mode 100644 .php_cs.dist.php diff --git a/.github/workflows/php-cs-fixer.yml b/.github/workflows/php-cs-fixer.yml deleted file mode 100644 index c85de4c..0000000 --- a/.github/workflows/php-cs-fixer.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: Check & fix styling - -on: [ release ] - -jobs: - php-cs-fixer: - runs-on: ubuntu-latest - - steps: - - name: Checkout code - uses: actions/checkout@v4 - with: - ref: ${{ github.head_ref }} - - - name: Run PHP CS Fixer - uses: docker://oskarstark/php-cs-fixer-ga - with: - args: --config=.php_cs.dist.php --allow-risky=yes - - - name: Commit changes - uses: stefanzweifel/git-auto-commit-action@v5 - with: - commit_message: Fix styling diff --git a/.github/workflows/pint.yml b/.github/workflows/pint.yml new file mode 100644 index 0000000..7fed9c2 --- /dev/null +++ b/.github/workflows/pint.yml @@ -0,0 +1,27 @@ +name: Lint with Pint + +on: + pull_request: + workflow_call: + workflow_dispatch: + +jobs: + pint: + name: Run Pint + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v3 + with: + ref: ${{ github.head_ref }} + + - name: Run Pint + uses: aglipanci/laravel-pint-action@latest + with: + verboseMode: true + + - name: Commit changes + uses: stefanzweifel/git-auto-commit-action@v5 + with: + commit_message: "style: apply Pint" \ No newline at end of file diff --git a/.php_cs.dist.php b/.php_cs.dist.php deleted file mode 100644 index 8d8a790..0000000 --- a/.php_cs.dist.php +++ /dev/null @@ -1,40 +0,0 @@ -in([ - __DIR__ . '/src', - __DIR__ . '/tests', - ]) - ->name('*.php') - ->notName('*.blade.php') - ->ignoreDotFiles(true) - ->ignoreVCS(true); - -return (new PhpCsFixer\Config()) - ->setRules([ - '@PSR12' => true, - 'array_syntax' => ['syntax' => 'short'], - 'ordered_imports' => ['sort_algorithm' => 'alpha'], - 'no_unused_imports' => true, - 'not_operator_with_successor_space' => true, - 'trailing_comma_in_multiline' => true, - 'phpdoc_scalar' => true, - 'unary_operator_spaces' => true, - 'binary_operator_spaces' => true, - 'blank_line_before_statement' => [ - 'statements' => ['break', 'continue', 'declare', 'return', 'throw', 'try'], - ], - 'phpdoc_single_line_var_spacing' => true, - 'phpdoc_var_without_name' => true, - 'class_attributes_separation' => [ - 'elements' => [ - 'method' => 'one', - ], - ], - 'method_argument_space' => [ - 'on_multiline' => 'ensure_fully_multiline', - 'keep_multiple_spaces_after_comma' => true, - ], - 'single_trait_insert_per_statement' => true, - ]) - ->setFinder($finder); diff --git a/pint.json b/pint.json index 6714b02..15a44c3 100644 --- a/pint.json +++ b/pint.json @@ -15,9 +15,5 @@ "types_spaces": { "space": "single" } - }, - "exclude": [ - "lang", - "vendor.nosync" - ] + } } \ No newline at end of file