Skip to content

Commit

Permalink
Merge pull request #564 from phpDocumentor/upgrade-phpunit
Browse files Browse the repository at this point in the history
Upgrade to phpunit 10
  • Loading branch information
jaapio authored May 7, 2024
2 parents 9ec1019 + f211c11 commit 05240bf
Show file tree
Hide file tree
Showing 63 changed files with 645 additions and 3,044 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/integrate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,18 +54,18 @@ jobs:

static-analysis:
name: "Static analysis"
uses: "phpDocumentor/.github/.github/workflows/static-analysis.yml@v0.6"
uses: "phpDocumentor/.github/.github/workflows/static-analysis.yml@main"
with:
php-version: "8.2"
php-extensions: "none, ctype, dom, json, mbstring, phar, simplexml, tokenizer, xml, xmlwriter, fileinfo, pcntl, posix"

unit-tests:
name: "Unit test"
uses: "phpDocumentor/.github/.github/workflows/continuous-integration.yml@v0.6"
uses: "phpDocumentor/.github/.github/workflows/continuous-integration.yml@v0.7"

integration-tests:
name: "Integration test"
uses: "phpDocumentor/.github/.github/workflows/continuous-integration.yml@v0.6"
uses: "phpDocumentor/.github/.github/workflows/continuous-integration.yml@v0.7"
needs: "unit-tests"
with:
test-suite: "integration"
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ vendor/
# By default the phpunit.xml.dist is provided; you can override this using a local config file
phpunit.xml
.phpunit.result.cache
.phpunit.cache
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ fix-code-style:
.PHONY: static-code-analysis
static-code-analysis: vendor ## Runs a static code analysis with phpstan/phpstan and vimeo/psalm
docker run -it --rm -v${PWD}:/opt/project -w /opt/project php:8.1-cli vendor/bin/phpstan --configuration=phpstan.neon
docker run -it --rm -v${PWD}:/opt/project -w /opt/project php:8.1-cli vendor/bin/psalm
docker run -it --rm -v${PWD}:/opt/project -w /opt/project php:8.1-cli vendor/bin/psalm.phar

.PHONY: test
test: test-unit test-functional ## Runs all test suites with phpunit/phpunit
Expand Down
3 changes: 2 additions & 1 deletion composer-require-checker.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"symbol-whitelist" : [
"null", "true", "false",
"static", "self", "parent",
"array", "string", "int", "float", "bool", "iterable", "callable", "void", "object"
"array", "string", "int", "float", "bool", "iterable", "callable", "void", "object",
"PhpParser\\Node\\Stmt\\PropertyProperty"
],
"php-core-extensions" : [
"Core",
Expand Down
9 changes: 4 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
},
"require": {
"php": "8.1.*|8.2.*|8.3.*",
"nikic/php-parser": "~4.14 || ^5.0",
"nikic/php-parser": "~4.18 || ^5.0",
"phpdocumentor/reflection-common": "^2.1",
"phpdocumentor/reflection-docblock": "^5",
"phpdocumentor/type-resolver": "^1.2",
Expand All @@ -35,12 +35,11 @@
"phpspec/prophecy-phpunit": "^2.0",
"phpstan/extension-installer": "^1.1",
"phpstan/phpstan": "^1.8",
"phpstan/phpstan-php-parser": "^1.1",
"phpstan/phpstan-webmozart-assert": "^1.2",
"phpunit/phpunit": "^9.5",
"phpunit/phpunit": "^10.0",
"psalm/phar": "^5.24",
"rector/rector": "^1.0.0",
"squizlabs/php_codesniffer": "^3.8",
"vimeo/psalm": "^5.0"
"squizlabs/php_codesniffer": "^3.8"
},
"config": {
"preferred-install": {
Expand Down
Loading

0 comments on commit 05240bf

Please sign in to comment.