Skip to content

Commit

Permalink
Merge branch 'master' into sync-to-master.
Browse files Browse the repository at this point in the history
  • Loading branch information
terabytesoftw committed Mar 20, 2024
2 parents 3587dfb + e2a1670 commit 20d6c65
Show file tree
Hide file tree
Showing 516 changed files with 1,272 additions and 2,345 deletions.
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.

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

0 comments on commit 20d6c65

Please sign in to comment.