Skip to content

Commit

Permalink
Merge pull request #498 from mimmi20/dependabot/composer/master/frien…
Browse files Browse the repository at this point in the history
…dsofphp/php-cs-fixer-tw-v3.57.2

composer(deps): update friendsofphp/php-cs-fixer requirement from ^v3.57.1 to ^v3.57.2
  • Loading branch information
mimmi20 authored May 21, 2024
2 parents 99e16fd + e154b9a commit c6fcd0f
Show file tree
Hide file tree
Showing 3 changed files with 90 additions and 19 deletions.
47 changes: 33 additions & 14 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,15 @@
"mimmi20"
],
"automerge": false,
"branchConcurrentLimit": 0,
"commitBody": "Signed-off-by: {{{gitAuthor}}}",
"commitBodyTable": true,
"configMigration": true,
"dependencyDashboard": true,
"dependencyDashboardApproval": true,
"enabledManagers": ["composer", "github-actions", "npm"],
"configWarningReuseIssue": false,
"dependencyDashboard": false,
"dependencyDashboardApproval": false,
"dependencyDashboardOSVVulnerabilitySummary": "all",
//"enabledManagers": ["composer", "github-actions", "npm"],
"ignoreTests": false,
"ignoreUnstable": true,
"internalChecksFilter": "strict",
Expand All @@ -24,6 +27,7 @@
"lockFileMaintenance": {
"enabled": false
},
"osvVulnerabilityAlerts": true,
"platformAutomerge": false,
"prBodyColumns": [
"Package",
Expand All @@ -37,6 +41,7 @@
"Update": "{{{updateType}}}",
"Change": "[{{#if displayFrom}}`{{{displayFrom}}}` -> {{else}}{{#if currentValue}}`{{{currentValue}}}` -> {{/if}}{{/if}}{{#if displayTo}}`{{{displayTo}}}`{{else}}`{{{newValue}}}`{{/if}}]({{#if depName}}https://renovatebot.com/diffs/npm/{{replace '/' '%2f' depName}}/{{{currentVersion}}}/{{{newVersion}}}{{/if}})"
},
"prConcurrentLimit": 0,
"prCreation": "immediate",
"prHourlyLimit": 0,
"rangeStrategy": "bump",
Expand All @@ -53,26 +58,40 @@
"updateLockFiles": false,
"updateNotScheduled": false,
"packageRules": [
{
"groupName": "PHP",
"matchDepNames": ["php"],
"allowedVersions": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
"ignoreUnstable": false,
"rangeStrategy": "widen"
},
{
"groupName": "Node",
"matchDepNames": ["node"],
"allowedVersions": "~19.5.0 || ~20.0.0 || ~21.0.0 || ~22.0.0",
"ignoreUnstable": false,
"rangeStrategy": "widen"
},
{
"groupName": "devDependencies",
"matchDepTypes": ["devDependencies", "peerDependencies"],
"rangeStrategy": "widen"
},
{
"matchPackageNames": ["nikic/php-parser", "infection/infection"],
"rangeStrategy": "widen"
},
{
"groupName": "all non-major dependencies",
"groupSlug": "all-minor-patch-dependencies",
"matchPackagePatterns": [
"*"
],
"matchUpdateTypes": [
"minor",
"patch"
]
},
{
"groupName": "PHP",
"matchPackageNames": ["php"],
"allowedVersions": "^8.1",
"ignoreUnstable": false,
"rangeStrategy": "widen"
}
],
"vulnerabilityAlerts": {
"enabled": true
"enabled": true,
"labels": ["security"]
}
}
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"require": {
"php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
"dealerdirect/phpcodesniffer-composer-installer": "^1.0.0",
"friendsofphp/php-cs-fixer": "^v3.57.1",
"friendsofphp/php-cs-fixer": "^v3.57.2",
"sirbrillig/phpcs-variable-analysis": "^2.11.18",
"slevomat/coding-standard": "^8.15.0",
"squizlabs/php_codesniffer": "^3.9.2"
Expand Down
60 changes: 56 additions & 4 deletions phpstan.neon
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,61 @@ parameters:
# - '~PHP_CodeSniffer\\Files\\File~'
# - '~PHP_CodeSniffer\\Sniffs\\Sniff~'

rules:
# code complexity
- Symplify\PHPStanRules\Rules\Explicit\NoMixedPropertyFetcherRule
- Symplify\PHPStanRules\Rules\Explicit\NoMixedMethodCallerRule
- Symplify\PHPStanRules\Rules\NoDynamicNameRule
# - Symplify\PHPStanRules\Rules\NoReturnArrayVariableListRule # todo: fix

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

# domain
- Symplify\PHPStanRules\Rules\Domain\RequireExceptionNamespaceRule
- Symplify\PHPStanRules\Rules\Domain\RequireAttributeNamespaceRule
- Symplify\PHPStanRules\Rules\Enum\RequireUniqueEnumConstantRule
- Symplify\PHPStanRules\Rules\ForbiddenParamTypeRemovalRule
- Symplify\PHPStanRules\Rules\PreventParentMethodVisibilityOverrideRule

# paths
- Symplify\PHPStanRules\Rules\NoMissingDirPathRule
- Symplify\PHPStanRules\Rules\NoAbstractMethodRule
- Symplify\PHPStanRules\Rules\NoReferenceRule # References are required
- Symplify\PHPStanRules\Rules\NoArrayAccessOnObjectRule

- Symplify\PHPStanRules\Rules\NoNullableArrayPropertyRule

# dead-code
- Symplify\PHPStanRules\Rules\NoIssetOnObjectRule

# explicit naming
- 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

# regexes
- Symplify\PHPStanRules\Rules\AnnotateRegexClassConstWithRegexLinkRule
- Symplify\PHPStanRules\Rules\NoInlineStringRegexRule
- Symplify\PHPStanRules\Rules\RegexSuffixInRegexConstantRule

# 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
- Symplify\PHPStanRules\Rules\CheckClassNamespaceFollowPsr4Rule

includes:
- vendor/symplify/phpstan-rules/config/code-complexity-rules.neon
- vendor/symplify/phpstan-rules/config/collector-rules.neon
- vendor/symplify/phpstan-rules/config/naming-rules.neon
- vendor/symplify/phpstan-rules/config/regex-rules.neon
- vendor/symplify/phpstan-rules/config/static-rules.neon

0 comments on commit c6fcd0f

Please sign in to comment.