Skip to content

Commit

Permalink
Merge branch 'master' into 2.x-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
caendesilva committed Jul 31, 2024
2 parents bb29ca3 + d83724a commit cce5ea0
Show file tree
Hide file tree
Showing 7 changed files with 201 additions and 453 deletions.
10 changes: 6 additions & 4 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -547,14 +547,16 @@ jobs:
php-version: "8.1"
- uses: actions/checkout@v4

- name: Install Composer Dependencies
run: composer install --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
- name: Download static analysis tools
run: |
wget https://github.com/php-parallel-lint/PHP-Parallel-Lint/releases/latest/download/parallel-lint.phar
wget https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar
- name: Check syntax (PHP Parallel Lint)
run: vendor/bin/parallel-lint --colors app config packages tests --show-deprecated
run: php parallel-lint.phar --colors app config packages tests --show-deprecated

- name: Check coding syntax/standards (PHP CodeSniffer)
run: vendor/bin/phpcs --colors --cache=build/cache/phpcs.cache packages --standard=PSR2 --extensions="php" --ignore="*test.php,*.blade.php,ValidationService.php" || true
run: php phpcs.phar --colors --cache=build/cache/phpcs.cache packages --standard=PSR2 --extensions="php" --ignore="*test.php,*.blade.php,ValidationService.php" || true


run-static-analysis-psalm:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/split-monorepo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ jobs:
rm hyde/phpunit.dusk.xml -v
rm hyde/phpunit.xml.dist -v
rm hyde/psalm.xml -v
rm hyde/rector.php -v
rm hyde/ide.json -v
rm hyde/_ide_helper.php -v
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:

- name: Run Psalm
id: analysis
run: vendor/bin/psalm > psalmout.txt || exit 0
run: vendor/bin/psalm --show-info=true > psalmout.txt || exit 0

- name: Print Psalm output
run: cat psalmout.txt
Expand Down
3 changes: 0 additions & 3 deletions .idea/php.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 2 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,14 @@
},
"require-dev": {
"desilva/psalm-coverage": "dev-master",
"driftingly/rector-laravel": "^1.2.0",
"hyde/monorepo-dev-tools": "*",
"hyde/realtime-compiler": "*",
"hyde/testing": "*",
"jetbrains/phpstorm-attributes": "^1.0",
"laravel/tinker": "^2.7",
"pestphp/pest-plugin-type-coverage": "^2.8",
"php-parallel-lint/php-parallel-lint": "^1.3",
"pestphp/pest-plugin-type-coverage": "2.x-dev",
"phpstan/phpstan": "^1.8",
"psalm/plugin-laravel": "^2.11",
"rector/rector": "^1.2.1",
"squizlabs/php_codesniffer": "^3.7"
"psalm/plugin-laravel": "^2.11"
},
"replace": {
"symfony/polyfill-php72": "*",
Expand Down
Loading

0 comments on commit cce5ea0

Please sign in to comment.