Skip to content

Commit

Permalink
Merge pull request #1169 from phpDocumentor/backport/1.x/pr-1168
Browse files Browse the repository at this point in the history
Backport/1.x/pr 1168
  • Loading branch information
jaapio authored Nov 7, 2024
2 parents 97dfc49 + 11c112b commit 8f95ae5
Show file tree
Hide file tree
Showing 14 changed files with 121 additions and 1,431 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/integrate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:

static-analysis:
name: "Static analysis"
uses: "phpDocumentor/.github/.github/workflows/static-analysis.yml@v0.6"
uses: "phpDocumentor/.github/.github/workflows/static-analysis.yml@v0.8"
with:
php-version: "8.2"
composer-root-version: "1.x-dev"
Expand Down
6 changes: 1 addition & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ fix-code-style: add-license
$(PHP_BIN) vendor/bin/phpcbf

.PHONY: static-code-analysis
static-code-analysis: vendor phpstan psalm test-architecture ## Runs a static code analysis with phpstan/phpstan and vimeo/psalm
static-code-analysis: vendor phpstan test-architecture ## Runs a static code analysis with phpstan/phpstan and vimeo/psalm

.PHONY: phpstan-baseline
phpstan-baseline:
Expand All @@ -23,10 +23,6 @@ phpstan-baseline:
phpstan:
$(PHP_BIN) -d memory_limit=1024M vendor/bin/phpstan --configuration=phpstan.neon

.PHONY: psalm
psalm:
$(PHP_BIN) vendor/bin/psalm --update-baseline

.PHONY: test
test: test-unit test-functional test-integration test-xml test-docs## Runs all test suites with phpunit/phpunit

Expand Down
4 changes: 1 addition & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,11 @@
"phpstan/phpstan-strict-rules": "^1.5",
"phpstan/phpstan-webmozart-assert": "^1.2",
"phpunit/phpunit": "^10.5",
"psalm/plugin-phpunit": "^0.18.4",
"qossmic/deptrac-shim": "^1.0.2",
"rector/rector": "^1.0.1",
"squizlabs/php_codesniffer": "^3.9",
"symfony/finder": "^6.4.0 || ^7.0",
"symplify/phpstan-rules": "^12.4",
"vimeo/psalm": "^5.22"
"symplify/phpstan-rules": "^12.4"
},
"suggest": {
"league/csv:": "To use the CSV tables"
Expand Down
Loading

0 comments on commit 8f95ae5

Please sign in to comment.