Skip to content
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.

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

Syncronize last changes master to 2.2. #20130

Merged
merged 15 commits into from
Mar 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
22 changes: 22 additions & 0 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: lint

on: [push, pull_request]

jobs:
phpcs:
runs-on: ubuntu-latest
name: PHP_CodeSniffer
steps:
- uses: actions/checkout@v4

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.2'
tools: cs2pr

- name: Install dependencies
run: composer install --prefer-dist

- name: Run phpcs
run: vendor/bin/phpcs -q --report=checkstyle framework/ | cs2pr
27 changes: 0 additions & 27 deletions .php_cs

This file was deleted.

7 changes: 4 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@
"dms/phpunit-arraysubset-asserts": "^0.5",
"phpunit/phpunit": "^9.6",
"cebe/indent": "~1.0.2",
"friendsofphp/php-cs-fixer": "^3.0"
"dealerdirect/phpcodesniffer-composer-installer": "*",
"yiisoft/yii2-coding-standards": "^3.0"
},
"repositories": [
{
Expand All @@ -102,14 +103,14 @@
},
"autoload-dev": {
"psr-4": {
"yii\\cs\\": "cs/src/",
"yii\\build\\": "build/",
"yiiunit\\": "tests/"
}
},
"config": {
"allow-plugins": {
"yiisoft/yii2-composer": true
"yiisoft/yii2-composer": true,
"dealerdirect/phpcodesniffer-composer-installer": true
}
},
"bin": [
Expand Down
Loading
Loading