Skip to content

Commit

Permalink
fix issues
Browse files Browse the repository at this point in the history
  • Loading branch information
mimmi20 committed Jun 1, 2024
1 parent 066ae2c commit 88bea75
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 17 deletions.
15 changes: 14 additions & 1 deletion .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@

"extends": ["mergeConfidence:all-badges"],

"enabled": false,
"enabled": true,

"assignees": [
"mimmi20"
],
"automerge": false,
"branchConcurrentLimit": 0,
"commitBody": "Signed-off-by: {{{gitAuthor}}}",
"commitBodyTable": true,
Expand All @@ -16,9 +17,16 @@
"dependencyDashboard": false,
"dependencyDashboardApproval": false,
"dependencyDashboardOSVVulnerabilitySummary": "all",
// "enabledManagers": ["composer", "github-actions", "npm"],
"ignoreTests": false,
"ignoreUnstable": true,
"internalChecksFilter": "strict",
"labels": [
"dependencies"
],
"lockFileMaintenance": {
"enabled": false
},
"osvVulnerabilityAlerts": true,
"platformAutomerge": false,
"prBodyColumns": [
Expand All @@ -41,9 +49,14 @@
"reviewers": [
"mimmi20"
],
"rollbackPrs": true,
"schedule": ["at 4:00 am on Friday"],
"semanticCommits": "disabled",
"separateMajorMinor": true,
"separateMinorPatch": false,
"timezone": "Europe/Berlin",
"updateLockFiles": false,
"updateNotScheduled": false,
"packageRules": [
{
"groupName": "PHP",
Expand Down
19 changes: 14 additions & 5 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,15 @@ jobs:
- name: "Run unit tests with phpunit/phpunit"
run: "vendor/bin/phpunit -c phpunit.xml --no-coverage --display-warnings --display-deprecations"

- name: "Enable annotations for validation errors and warnings"
uses: "korelstar/xmllint-problem-matcher@v1"

- name: "Validate phpcs.xml"
uses: "ChristophWurst/xmllint-action@v1"
with:
xml-file: "phpunit.xml"
xml-schema-file: "vendor/phpunit/phpunit/phpunit.xsd"

code-coverage:
name: "Code Coverage with PHPUnit"

Expand Down Expand Up @@ -182,11 +191,6 @@ jobs:
env:
CODECOV_TOKEN: "${{ secrets.CODECOV_TOKEN }}"

- name: "Run mutation tests with infection/infection"
env:
STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}
run: "vendor/bin/infection --show-mutations --only-covered --min-covered-msi=97 --min-msi=97 --coverage=.build/coverage --logger-github --no-progress -vv"

- name: "Upload coverage to Codeclimate"
uses: "paambaati/[email protected]"
env:
Expand All @@ -205,6 +209,11 @@ jobs:
format: "clover"
debug: false

- name: "Run mutation tests with infection/infection"
env:
STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}
run: "vendor/bin/infection --show-mutations --only-covered --min-covered-msi=97 --min-msi=97 --coverage=.build/coverage --logger-github --no-progress -vv"

finish-code-coverage:
runs-on: "ubuntu-22.04"

Expand Down
14 changes: 7 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"ext-mbstring": "*",
"monolog/monolog": "^3.6.0",
"psr/container": "^1.1.2 || ^2.0.2",
"symfony/console": "^v6.4.7"
"symfony/console": "^6.4.7"
},
"require-dev": {
"ext-ctype": "*",
Expand All @@ -34,7 +34,7 @@
"laminas/laminas-modulemanager": "^2.15.0",
"laminas/laminas-servicemanager": "^3.22.1 || ^4.0.0",
"mimmi20/coding-standard": "^5.2.33",
"nikic/php-parser": "^v4.19.1 || ^v5.0.2",
"nikic/php-parser": "^4.19.1 || ^5.0.2",
"phpstan/extension-installer": "^1.3.1",
"phpstan/phpstan": "^1.11.2",
"phpstan/phpstan-deprecation-rules": "^1.2.0",
Expand All @@ -57,14 +57,14 @@
}
},
"config": {
"preferred-install": "dist",
"sort-packages": true,
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true,
"phpstan/extension-installer": true,
"infection/extension-installer": true
"infection/extension-installer": true,
"phpstan/extension-installer": true
},
"lock": false
"lock": false,
"preferred-install": "dist",
"sort-packages": true
},
"extra": {
"laminas": {
Expand Down
4 changes: 0 additions & 4 deletions phpstan.neon
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ rules:
# - Symplify\PHPStanRules\Rules\NoReturnArrayVariableListRule # todo: fix

- Symplify\PHPStanRules\Rules\ForbiddenExtendOfNonAbstractClassRule
- Symplify\PHPStanRules\Rules\Complexity\ForbiddenSameNamedNewInstanceRule

# domain
- Symplify\PHPStanRules\Rules\Domain\RequireExceptionNamespaceRule
Expand All @@ -146,12 +145,10 @@ rules:
- Symplify\PHPStanRules\Rules\ForbiddenMultipleClassLikeInOneFileRule

# comlexity
- Symplify\PHPStanRules\Rules\Complexity\ForbiddenSameNamedNewInstanceRule
- Symplify\PHPStanRules\Rules\NarrowType\NoReturnFalseInNonBoolClassMethodRule

- Symplify\PHPStanRules\Rules\Complexity\ForbiddenArrayMethodCallRule
# - Symplify\PHPStanRules\Rules\CheckRequiredInterfaceInContractNamespaceRule
- Symplify\PHPStanRules\Rules\NoEmptyClassRule

# naming
- Symplify\PHPStanRules\Rules\RequireAttributeNameRule
Expand All @@ -164,7 +161,6 @@ rules:
# naming
- Symplify\PHPStanRules\Rules\Explicit\ExplicitClassPrefixSuffixRule
- Symplify\PHPStanRules\Rules\NoReturnSetterMethodRule
- Symplify\PHPStanRules\Rules\NoVoidGetterMethodRule
- Symplify\PHPStanRules\Rules\UppercaseConstantRule
- Symplify\PHPStanRules\Rules\ClassNameRespectsParentSuffixRule
- Symplify\PHPStanRules\Rules\CheckTypehintCallerTypeRule
Expand Down

0 comments on commit 88bea75

Please sign in to comment.