Skip to content

Commit

Permalink
Merge pull request #303 from mimmi20/dependabot/composer/master/minor…
Browse files Browse the repository at this point in the history
…-patch-dependencies-8e0c714e1a

composer(deps-dev): bump the minor-patch-dependencies group with 4 updates
  • Loading branch information
mimmi20 committed Jun 16, 2024
2 parents 434a114 + 2d4ec30 commit 0d4527e
Show file tree
Hide file tree
Showing 6 changed files with 87 additions and 45 deletions.
87 changes: 66 additions & 21 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,18 @@ updates:
schedule:
interval: "weekly"
day: "saturday"
time: "03:00"
time: "04:00"
timezone: "Europe/Berlin"

groups:
# Specify a name for the group, which will be used in pull request titles
# and branch names
minor-patch-dependencies:
applies-to: "version-updates"
# Define patterns to include dependencies in the group (based on
# dependency name)
patterns:
- "*"
# update-types:
# - "minor"
# - "patch"
# exclude-patterns:
# - "gc_ruboconfig"

open-pull-requests-limit: 10

Expand All @@ -48,19 +44,69 @@ updates:
include: "scope"
prefix: "composer"

#allow:
# - '*'

ignore:
- dependency-name: "laminas/laminas-servicemanager"
- dependency-name: "psr/container"
versions:
- ">= 0"
- dependency-name: "psr/simple-cache"
versions:
- ">= 0"
- dependency-name: "nikic/php-parser"
versions:
- ">= 0"
- dependency-name: "infection/infection"
versions:
- ">= 0"
- dependency-name: "psr/http-message"
- dependency-name: "psr/simple-cache"

# Disable rebasing for all pull requests
rebase-strategy: "disabled"

#- package-ecosystem: "composer"
#
# directory: "/"
#
# schedule:
# interval: "weekly"
# day: "saturday"
# time: "04:00"
# timezone: "Europe/Berlin"
#
# groups:
# # Specify a name for the group, which will be used in pull request titles
# # and branch names
# minor-patch-dependencies:
# applies-to: "version-updates"
# # Define patterns to include dependencies in the group (based on
# # dependency name)
# patterns:
# - "*"
#
# open-pull-requests-limit: 10
#
# reviewers:
# - "mimmi20"
#
# assignees:
# - "mimmi20"
#
# labels:
# - "dependencies"
#
# versioning-strategy: "widen"
#
# target-branch: "master"
#
# commit-message:
# include: "scope"
# prefix: "composer"
#
# allow:
# - dependency-name: "psr/container"
# - dependency-name: "infection/infection"
# - dependency-name: "nikic/php-parser"
# - dependency-name: "psr/http-message"
# - dependency-name: "laminas/laminas-servicemanager"
# - dependency-name: "psr/simple-cache"
#
# # Disable rebasing for all pull requests
# rebase-strategy: "disabled"

- package-ecosystem: "github-actions"

Expand All @@ -69,22 +115,18 @@ updates:
schedule:
interval: "weekly"
day: "saturday"
time: "03:00"
time: "04:00"
timezone: "Europe/Berlin"

groups:
# Specify a name for the group, which will be used in pull request titles
# and branch names
minor-patch-dependencies:
applies-to: "version-updates"
# Define patterns to include dependencies in the group (based on
# dependency name)
patterns:
- "*"
# update-types:
# - "minor"
# - "patch"
# exclude-patterns:
# - "gc_ruboconfig"

open-pull-requests-limit: 10

Expand All @@ -101,3 +143,6 @@ updates:

commit-message:
prefix: "github-actions"

# Disable rebasing for all pull requests
rebase-strategy: "disabled"
2 changes: 1 addition & 1 deletion .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"rangeStrategy": "widen"
},
{
"matchPackageNames": ["nikic/php-parser", "infection/infection"],
"matchPackageNames": ["nikic/php-parser", "infection/infection", "psr/container", "psr/http-message", "laminas/laminas-servicemanager", "psr/simple-cache"],
"rangeStrategy": "widen"
},
{
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
skip-phpmd: false

tests:
name: "UnitTests & Code Coverage"
name: "UnitTests with PHPUnit"

needs: "analytics"

Expand Down
8 changes: 8 additions & 0 deletions .github/workflows/lint-workflow-files.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,14 @@ jobs:
lfs: false
persist-credentials: false

- name: "install libimagequant-dev"
run: "sudo apt-get install libimagequant-dev -y"

- name: "Use Node.js 20"
uses: "actions/setup-node@v4"
with:
node-version: "20"

- name: "Check workflow files"
uses: "raven-actions/actionlint@v1"
with:
Expand Down
9 changes: 5 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,20 +34,21 @@
"ext-xml": "*",
"ext-xmlwriter": "*",
"infection/infection": "^0.27.11 || ^0.28.1",
"laminas/laminas-modulemanager": "^2.15.0",
"laminas/laminas-modulemanager": "^2.16.0",
"laminas/laminas-servicemanager": "^3.22.1",
"mimmi20/coding-standard": "^5.2.33",
"nikic/php-parser": "^4.19.1 || ^5.0.2",
"phpstan/extension-installer": "^1.4.0",
"phpstan/extension-installer": "^1.4.1",
"phpstan/phpstan": "^1.11.4",
"phpstan/phpstan-deprecation-rules": "^1.2.0",
"phpstan/phpstan-phpunit": "^1.4.0",
"phpunit/phpunit": "^10.5.20",
"psr/container": "^1.1.2 || ^2.0.2",
"rector/rector": "^1.1.0",
"symplify/phpstan-rules": "^12.7.0",
"rector/type-perfect": "^0.1.3",
"symplify/phpstan-rules": "^13.0.0",
"tomasvotruba/cognitive-complexity": "^0.2.3",
"tomasvotruba/type-coverage": "^0.3.0",
"tomasvotruba/type-coverage": "^0.3.1",
"tomasvotruba/unused-public": "^0.3.9"
},
"suggest": {
Expand Down
24 changes: 6 additions & 18 deletions phpstan.neon
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,11 @@ parameters:
constants: true
local_methods: true

type_perfect:
null_over_false: true
no_mixed: true
narrow_param: true

ignoreErrors:
# - '~is not subtype of Throwable~'
- '~Call to static method PHPUnit\\Framework\\Assert::assert.*\(\) with .* will always evaluate to true~'
Expand All @@ -121,8 +126,6 @@ parameters:

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

Expand All @@ -132,25 +135,14 @@ rules:
- 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\NoReferenceRule # References are required
- Symplify\PHPStanRules\Rules\NoArrayAccessOnObjectRule

- Symplify\PHPStanRules\Rules\NoNullableArrayPropertyRule

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

# explicit naming
- Symplify\PHPStanRules\Rules\ForbiddenMultipleClassLikeInOneFileRule

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

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

Expand All @@ -167,8 +159,4 @@ rules:
- Symplify\PHPStanRules\Rules\NoReturnSetterMethodRule
- Symplify\PHPStanRules\Rules\UppercaseConstantRule
- Symplify\PHPStanRules\Rules\ClassNameRespectsParentSuffixRule
- Symplify\PHPStanRules\Rules\CheckTypehintCallerTypeRule
- Symplify\PHPStanRules\Rules\CheckClassNamespaceFollowPsr4Rule

includes:
- vendor/symplify/phpstan-rules/config/collector-rules.neon

0 comments on commit 0d4527e

Please sign in to comment.