Skip to content

Updated dependecies, cleanup tools #479

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

Merged
merged 5 commits into from
Apr 25, 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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,22 @@ updates:
schedule:
interval: "daily"
- package-ecosystem: "composer"
directory: "/tools"
directory: "/tools/cs-fixer"
schedule:
interval: "daily"
interval: "monthly"
- package-ecosystem: "composer"
directory: "/tools/infection"
schedule:
interval: "monthly"
- package-ecosystem: "composer"
directory: "/tools/phpbench"
schedule:
interval: "monthly"
- package-ecosystem: "composer"
directory: "/tools/phpstan"
schedule:
interval: "monthly"
- package-ecosystem: "composer"
directory: "/tools/psalm"
schedule:
interval: "monthly"
2 changes: 1 addition & 1 deletion .github/workflows/automation-changelog-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: "Automation - Changelog Update"
on:
push:
branches:
- "3.x"
- "6.x"

jobs:
automation:
Expand Down
38 changes: 25 additions & 13 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,12 @@
"doctrine/lexer": "^3.0"
},
"require-dev": {
"ext-pcov": "*",
"phpunit/phpunit": "^10.4",
"openlss/lib-array2xml": "^1.0",
"symfony/expression-language": "^2.3|^3.0|^4.0|^5.0|^6.0",
"symfony/cache": "^2.3|^3.0|^4.0|^5.0|^6.0",
"nikic/php-parser": "^4.18",
"symfony/var-exporter": "^2.3|^3.0|^4.0|^5.0|^6.0"
"symfony/expression-language": "^5.4|^6.4|^7.0",
"symfony/cache": "^5.4|^6.4",
"nikic/php-parser": "^4.0",
"symfony/var-exporter": "^5.4|^6.4|^7.0"
},
"suggest": {
"openlss/lib-array2xml": "In order ot use Coduo\\PHPMatcher\\Matcher\\XmlMatcher",
Expand All @@ -53,34 +52,47 @@
"scripts": {
"benchmark": [
"Composer\\Config::disableProcessTimeout",
"tools\/phpbench run --report=matcher"
"tools\/phpbench\/vendor\/bin\/phpbench run --report=matcher"
],
"build": [
"@static:analyze",
"@test",
"@test:mutation"
],
"cs:php:fix": [
"tools\/vendor\/bin\/php-cs-fixer fix --using-cache=no"
"tools\/cs-fixer\/vendor\/bin\/php-cs-fixer fix --using-cache=no"
],
"test" : [
"vendor\/bin\/phpunit --coverage-html var/phpunit/coverage/html --coverage-filter src"
],
"test:mutation": [
"Composer\\Config::disableProcessTimeout",
"tools\/vendor\/bin\/infection"
"tools\/infection\/vendor\/bin\/infection -j2"
],
"static:analyze": [
"tools\/vendor\/bin\/psalm --shepherd --stats",
"tools\/vendor\/bin\/phpstan analyze -c phpstan.neon",
"tools\/vendor\/bin\/php-cs-fixer fix --dry-run"
"tools\/cs-fixer\/vendor\/bin\/php-cs-fixer fix --dry-run",
"tools\/psalm\/vendor\/bin\/psalm --shepherd --stats",
"tools\/phpstan\/vendor\/bin\/phpstan analyze -c phpstan.neon"
],
"tools:install": [
"composer install --working-dir=./tools/cs-fixer",
"composer install --working-dir=./tools/infection",
"composer install --working-dir=./tools/phpbench",
"composer install --working-dir=./tools/phpstan",
"composer install --working-dir=./tools/psalm"
],
"tools:update": [
"composer update --working-dir=./tools/cs-fixer",
"composer update --working-dir=./tools/infection",
"composer update --working-dir=./tools/phpbench",
"composer update --working-dir=./tools/phpstan",
"composer update --working-dir=./tools/psalm"
],
"tools:install": "composer install --working-dir=./tools",
"post-install-cmd": [
"@tools:install"
],
"post-update-cmd": [
"@tools:install"
"@tools:update"
]
}
}
6 changes: 2 additions & 4 deletions composer.lock

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

25 changes: 16 additions & 9 deletions phpbench.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,21 @@
{
"bootstrap": "./vendor/autoload.php",
"path": "benchmark",
"retry_threshold": 5,
"progress": "dots",
"reports": {
"runner.bootstrap": "./vendor/autoload.php",
"runner.path": "benchmark",
"runner.retry_threshold": 5,
"runner.progress": "dots",
"report.generators": {
"matcher": {
"generator": "table",
"break": ["benchmark"],
"sort": {"mean": "asc"}
"generator": "expression",
"cols": {
"benchmark": null,
"subject": null,
"revs": null,
"its": null,
"mem_peak": null,
"mode": null,
"rstdev": null
}
}
},
"xml_storage_path": "./var/phpbench"
"storage.xml_storage_path": "./var/phpbench"
}
5 changes: 5 additions & 0 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@
bootstrap="vendor/autoload.php"
cacheDirectory=".phpunit.cache"
>
<source>
<include>
<directory>./src</directory>
</include>
</source>
<testsuites>
<testsuite name="unit">
<directory>./tests/</directory>
Expand Down
2 changes: 2 additions & 0 deletions psalm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
xmlns="https://getpsalm.org/schema/config"
xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
cacheDirectory="var/psalm/cache"
findUnusedBaselineEntry="false"
findUnusedCode="false"
>
<projectFiles>
<directory name="src" />
Expand Down
Loading