Skip to content

Commit 05bcc28

Browse files
mimmi20mimmi20
authored
Merge pull request #293 from mimmi20/dependabot/composer/master/minor-patch-dependencies-b90a64d883
composer(deps-dev): bump the minor-patch-dependencies group with 2 updates
2 parents 6e78bdc + 0abdf68 commit 05bcc28

File tree

6 files changed

+133
-33
lines changed

6 files changed

+133
-33
lines changed

‎.github/dependabot.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ updates:
5252
- dependency-name: "psr/container"
5353
versions:
5454
- ">= 0"
55-
# - dependency-name: phpunit/phpunit
56-
# versions:
57-
# - ">= 0"
55+
- dependency-name: "nikic/php-parser"
56+
versions:
57+
- ">= 0"
5858
# - dependency-name: mezzio/mezzio-authentication
5959
# versions:
6060
# - ">= 0"

‎.github/renovate.json5‎

Lines changed: 38 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
{
22
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
33

4-
"extends": ["github>whitesource/merge-confidence:beta"],
4+
"extends": ["mergeConfidence:all-badges"],
5+
6+
"enabled": true,
57

6-
"enabled": false,
78
"assignees": [
89
"mimmi20"
910
],
10-
"automerge": false,
11+
"branchConcurrentLimit": 0,
1112
"commitBody": "Signed-off-by: {{{gitAuthor}}}",
1213
"commitBodyTable": true,
13-
"dependencyDashboard": false,
14-
"enabledManagers": ["composer", "github-actions", "npm"],
15-
"ignoreUnstable": true,
14+
"configMigration": true,
15+
"configWarningReuseIssue": false,
16+
"dependencyDashboard": true,
17+
"dependencyDashboardApproval": true,
18+
"dependencyDashboardOSVVulnerabilitySummary": "all",
1619
"labels": [
17-
"dependencies",
18-
"patch"
20+
"dependencies"
1921
],
20-
"lockFileMaintenance": {
21-
"enabled": false
22-
},
22+
"osvVulnerabilityAlerts": true,
2323
"platformAutomerge": false,
2424
"prBodyColumns": [
2525
"Package",
@@ -33,41 +33,52 @@
3333
"Update": "{{{updateType}}}",
3434
"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}})"
3535
},
36+
"prConcurrentLimit": 0,
3637
"prCreation": "immediate",
38+
"prHourlyLimit": 0,
3739
"rangeStrategy": "bump",
3840
"rebaseWhen": "behind-base-branch",
3941
"reviewers": [
4042
"mimmi20"
4143
],
42-
"rollbackPrs": true,
4344
"schedule": ["at 4:00 am on Monday"],
4445
"semanticCommits": "disabled",
45-
"separateMajorMinor": true,
46-
"separateMinorPatch": false,
4746
"timezone": "Europe/Berlin",
48-
"updateLockFiles": false,
49-
"updateNotScheduled": false,
5047
"packageRules": [
48+
{
49+
"groupName": "PHP",
50+
"matchDepNames": ["php"],
51+
"allowedVersions": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
52+
"ignoreUnstable": false,
53+
"rangeStrategy": "widen"
54+
},
55+
{
56+
"groupName": "Node",
57+
"matchDepNames": ["node"],
58+
"allowedVersions": "~19.5.0 || ~20.0.0 || ~21.0.0 || ~22.0.0",
59+
"ignoreUnstable": false,
60+
"rangeStrategy": "widen"
61+
},
62+
{
63+
"groupName": "devDependencies",
64+
"matchDepTypes": ["devDependencies", "peerDependencies"],
65+
"rangeStrategy": "widen"
66+
},
67+
{
68+
"matchPackageNames": ["nikic/php-parser"],
69+
"rangeStrategy": "widen"
70+
},
5171
{
5272
"groupName": "all non-major dependencies",
5373
"groupSlug": "all-minor-patch-dependencies",
54-
"matchPackagePatterns": [
55-
"*"
56-
],
5774
"matchUpdateTypes": [
5875
"minor",
5976
"patch"
6077
]
61-
},
62-
{
63-
"groupName": "PHP",
64-
"matchPackageNames": ["php"],
65-
"allowedVersions": "^8.1",
66-
"ignoreUnstable": false,
67-
"rangeStrategy": "widen"
6878
}
6979
],
7080
"vulnerabilityAlerts": {
71-
"enabled": true
81+
"enabled": true,
82+
"labels": ["security"]
7283
}
7384
}

‎.github/workflows/continuous-integration.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ jobs:
3939
extensions: "ctype, curl, dom, iconv, intl, mbstring, simplexml, tokenizer, xml, xmlwriter"
4040
ini-values: "opcache.enable=1, opcache.fast_shutdown=0, zend.assertions=1, assert.exception=On, intl.default_locale=de, intl.use_exceptions=1, zend.exception_ignore_args=0"
4141
composer-options: "--optimize-autoloader --prefer-dist --prefer-stable -v"
42+
skip-php-install: false
43+
skip-npm-install: true
4244

4345
analytics:
4446
name: "Project Analysis"

‎composer.json‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,18 @@
4040
"ext-xmlwriter": "*",
4141
"infection/infection": "^0.27.11",
4242
"laminas/laminas-servicemanager": "^4.1.0",
43-
"mimmi20/coding-standard": "^5.2.26",
44-
"nikic/php-parser": "^4.19.1",
43+
"mimmi20/coding-standard": "^5.2.29",
44+
"nikic/php-parser": "^v4.19.1 || ^v5.0.2",
4545
"phpstan/extension-installer": "^1.3.1",
4646
"phpstan/phpstan": "^1.10.67",
4747
"phpstan/phpstan-deprecation-rules": "^1.1.4",
4848
"phpstan/phpstan-phpunit": "^1.3.16",
4949
"phpunit/phpunit": "^10.5.20",
50-
"rector/rector": "^1.0.4"
50+
"rector/rector": "^1.0.5",
51+
"symplify/phpstan-rules": "^12.4.9",
52+
"tomasvotruba/cognitive-complexity": "^0.2.3",
53+
"tomasvotruba/type-coverage": "^0.2.8",
54+
"tomasvotruba/unused-public": "^0.3.9"
5155
},
5256
"conflict": {
5357
"container-interop/container-interop": "<1.2.0",

‎phpstan.neon‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,5 +97,85 @@ parameters:
9797
missingCheckedExceptionInThrows: true
9898
tooWideThrowType: true
9999

100+
cognitive_complexity:
101+
class: 9
102+
function: 9
103+
104+
type_coverage:
105+
return: 100
106+
param: 100
107+
property: 100
108+
# also, how many files has declare strict types
109+
declare: 100
110+
111+
unused_public:
112+
methods: true
113+
properties: true
114+
constants: true
115+
local_methods: true
116+
100117
# ignoreErrors:
101118
# - '~Call to static method .* with .* will always evaluate to true~'
119+
120+
rules:
121+
# code complexity
122+
- Symplify\PHPStanRules\Rules\Explicit\NoMixedPropertyFetcherRule
123+
- Symplify\PHPStanRules\Rules\Explicit\NoMixedMethodCallerRule
124+
- Symplify\PHPStanRules\Rules\Enum\RequireEnumDocBlockOnConstantListPassRule
125+
- Symplify\PHPStanRules\Rules\NoDynamicNameRule
126+
- Symplify\PHPStanRules\Rules\Explicit\NoRelativeFilePathRule
127+
# - Symplify\PHPStanRules\Rules\NoReturnArrayVariableListRule # todo: fix
128+
129+
- Symplify\PHPStanRules\Rules\NoProtectedClassElementRule
130+
- Symplify\PHPStanRules\Rules\ForbiddenExtendOfNonAbstractClassRule
131+
- Symplify\PHPStanRules\Rules\Complexity\ForbiddenSameNamedNewInstanceRule
132+
133+
# domain
134+
- Symplify\PHPStanRules\Rules\Domain\RequireExceptionNamespaceRule
135+
- Symplify\PHPStanRules\Rules\Domain\RequireAttributeNamespaceRule
136+
- Symplify\PHPStanRules\Rules\Enum\RequireUniqueEnumConstantRule
137+
- Symplify\PHPStanRules\Rules\ForbiddenParamTypeRemovalRule
138+
- Symplify\PHPStanRules\Rules\PreventParentMethodVisibilityOverrideRule
139+
140+
# paths
141+
- Symplify\PHPStanRules\Rules\NoMissingDirPathRule
142+
- Symplify\PHPStanRules\Rules\NoAbstractMethodRule
143+
- Symplify\PHPStanRules\Rules\NoReferenceRule # References are required
144+
- Symplify\PHPStanRules\Rules\NoArrayAccessOnObjectRule
145+
146+
- Symplify\PHPStanRules\Rules\NoNullableArrayPropertyRule
147+
- Symplify\PHPStanRules\Rules\BoolishClassMethodPrefixRule
148+
149+
# dead-code
150+
- Symplify\PHPStanRules\Rules\NoIssetOnObjectRule
151+
152+
# explicit naming
153+
- Symplify\PHPStanRules\Rules\ForbiddenMultipleClassLikeInOneFileRule
154+
155+
# comlexity
156+
- Symplify\PHPStanRules\Rules\Complexity\ForbiddenSameNamedNewInstanceRule
157+
- Symplify\PHPStanRules\Rules\NarrowType\NoReturnFalseInNonBoolClassMethodRule
158+
159+
- Symplify\PHPStanRules\Rules\Complexity\ForbiddenArrayMethodCallRule
160+
# - Symplify\PHPStanRules\Rules\CheckRequiredInterfaceInContractNamespaceRule
161+
- Symplify\PHPStanRules\Rules\NoEmptyClassRule
162+
163+
# naming
164+
- Symplify\PHPStanRules\Rules\RequireAttributeNameRule
165+
166+
# regexes
167+
- Symplify\PHPStanRules\Rules\AnnotateRegexClassConstWithRegexLinkRule
168+
- Symplify\PHPStanRules\Rules\NoInlineStringRegexRule
169+
- Symplify\PHPStanRules\Rules\RegexSuffixInRegexConstantRule
170+
171+
# naming
172+
- Symplify\PHPStanRules\Rules\Explicit\ExplicitClassPrefixSuffixRule
173+
- Symplify\PHPStanRules\Rules\NoReturnSetterMethodRule
174+
- Symplify\PHPStanRules\Rules\NoVoidGetterMethodRule
175+
- Symplify\PHPStanRules\Rules\UppercaseConstantRule
176+
- Symplify\PHPStanRules\Rules\ClassNameRespectsParentSuffixRule
177+
- Symplify\PHPStanRules\Rules\CheckTypehintCallerTypeRule
178+
- Symplify\PHPStanRules\Rules\CheckClassNamespaceFollowPsr4Rule
179+
180+
includes:
181+
- vendor/symplify/phpstan-rules/config/collector-rules.neon

‎src/ConfigProvider.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ public function __invoke(): array
3737
* @throws void
3838
*
3939
* @phpcs:disable Squiz.Arrays.ArrayDeclaration.MultiLineNotAllowed
40+
* @api
4041
*/
4142
public function getAuthorizationConfig(): array
4243
{
@@ -80,6 +81,8 @@ public function getAuthorizationConfig(): array
8081
* @return array<string, array<string, string>>
8182
*
8283
* @throws void
84+
*
85+
* @api
8386
*/
8487
public function getDependencies(): array
8588
{

0 commit comments

Comments
 (0)