Skip to content
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

composer(deps): update friendsofphp/php-cs-fixer requirement from ^3.59.3 to ^3.60.0 #536

Merged
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
75 changes: 32 additions & 43 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,19 @@ updates:
interval: "daily"

groups:
# Specify a name for the group, which will be used in pull request titles
# and branch names
security-updates:
applies-to: "security-updates"
update-types:
- "minor"
- "patch"
patterns:
- "*"
exclude-patterns:
- "friendsofphp/php-cs-fixer"
- "sirbrillig/phpcs-variable-analysis"
- "slevomat/coding-standard"
- "squizlabs/php_codesniffer"
version-updates:
applies-to: "version-updates"
update-types:
- "minor"
- "patch"
patterns:
- "*"
exclude-patterns:
- "friendsofphp/php-cs-fixer"
- "sirbrillig/phpcs-variable-analysis"
Expand Down Expand Up @@ -59,29 +55,30 @@ updates:
# - '*'

ignore:
- dependency-name: "laminas/laminas-servicemanager"
- dependency-name: "psr/container"
- dependency-name: "nikic/php-parser"
- dependency-name: "infection/infection"
- dependency-name: "psr/http-message"
- dependency-name: "psr/simple-cache"
- dependency-name: "illuminate/view"
- dependency-name: "browscap/browscap"
- dependency-name: "elasticsearch/elasticsearch"
- dependency-name: "endorphin-studio/browser-detector-tests"
- dependency-name: "illuminate/config"
- dependency-name: "illuminate/container"
- dependency-name: "illuminate/contracts"
- dependency-name: "illuminate/events"
- dependency-name: "illuminate/filesystem"
- dependency-name: "endorphin-studio/browser-detector-tests"
- dependency-name: "illuminate/view"
- dependency-name: "infection/infection"
- dependency-name: "laminas/laminas-diactoros"
- dependency-name: "laminas/laminas-servicemanager"
- dependency-name: "nikic/php-parser"
- dependency-name: "phpunit/phpunit"
- dependency-name: "predis/predis"
- dependency-name: "psr/container"
- dependency-name: "psr/http-message"
- dependency-name: "psr/log"
- dependency-name: "psr/simple-cache"
- dependency-name: "symfony/console"
- dependency-name: "symfony/filesystem"
- dependency-name: "symfony/finder"
- dependency-name: "symfony/yaml"
- dependency-name: "symfony/http-foundation"
- dependency-name: "psr/log"
- dependency-name: "browscap/browscap"
- dependency-name: "symfony/filesystem"
- dependency-name: "predis/predis"
- dependency-name: "elasticsearch/elasticsearch"
- dependency-name: "symfony/yaml"

# Disable rebasing for all pull requests
rebase-strategy: "disabled"
Expand All @@ -94,18 +91,14 @@ updates:
interval: "daily"

groups:
# Specify a name for the group, which will be used in pull request titles
# and branch names
security-updates:
applies-to: "security-updates"
update-types:
- "minor"
- "patch"
patterns:
- "*"
version-updates:
applies-to: "version-updates"
update-types:
- "minor"
- "patch"
patterns:
- "*"

open-pull-requests-limit: 10

Expand All @@ -118,7 +111,7 @@ updates:
labels:
- "dependencies"

versioning-strategy: "widen"
versioning-strategy: "increase"

target-branch: "master"

Expand All @@ -127,10 +120,6 @@ updates:
prefix: "npm"

ignore:
- dependency-name: "@vitest/coverage-istanbul"
- dependency-name: "@vitest/ui"
- dependency-name: "vitest"
- dependency-name: "supports-color"
- dependency-name: "@localnerve/imagemin-gifsicle"
- dependency-name: "@localnerve/imagemin-pngquant"
- dependency-name: "@node-minify/core"
Expand All @@ -140,10 +129,14 @@ updates:
- dependency-name: "@typescript-eslint/parser"
- dependency-name: "@typescript-eslint/typescript-estree"
- dependency-name: "@vheemstra/vite-plugin-imagemin"
- dependency-name: "@vitest/coverage-istanbul"
- dependency-name: "@vitest/ui"
- dependency-name: "cssnano"
- dependency-name: "cssnano-preset-default"
- dependency-name: "imagemin"
- dependency-name: "postcss-load-config"
- dependency-name: "supports-color"
- dependency-name: "vitest"

# Disable rebasing for all pull requests
rebase-strategy: "disabled"
Expand All @@ -158,16 +151,12 @@ updates:
groups:
# Specify a name for the group, which will be used in pull request titles
# and branch names
version-updates:
applies-to: "version-updates"
# Define patterns to include dependencies in the group (based on
# dependency name)
patterns:
- "*"
security-updates:
applies-to: "security-updates"
# Define patterns to include dependencies in the group (based on
# dependency name)
patterns:
- "*"
version-updates:
applies-to: "version-updates"
patterns:
- "*"

Expand Down
3 changes: 2 additions & 1 deletion .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
":combinePatchMinorReleases",
":disableDependencyDashboard",
":disableRateLimiting",
":enableRenovate",
":disableRenovate",
":enableVulnerabilityAlertsWithLabel(security)",
":gitSignOff",
":ignoreUnstable",
Expand Down Expand Up @@ -43,6 +43,7 @@
"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}})"
},
"rangeStrategy": "bump",
"recreateWhen": "never",
"rollbackPrs": true,
"schedule": ["before 4am"],
"packageRules": [
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
cancel-in-progress: true

jobs:

validate:
name: "Validate Project"

Expand All @@ -35,7 +34,7 @@

needs: "validate"

uses: "mimmi20/ci/.github/workflows/install.yml@master"
uses: "mimmi20/ci/.github/workflows/install.yml@8.1"
with:
extensions: "ctype, curl, iconv, mbstring, ctype, dom, intl, simplexml, tokenizer, xml, xmlwriter, pdo"
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"
Expand Down Expand Up @@ -204,7 +203,7 @@
uses: "ramsey/composer-install@3.0.0"
with:
dependency-versions: "lowest"
composer-options: "${{ inputs.composer-options }}"

Check failure on line 206 in .github/workflows/continuous-integration.yml

View workflow job for this annotation

GitHub Actions / actionlint

property "composer-options" is not defined in object type {}

- name: "Run phpstan/phpstan"
run: "vendor/bin/phpstan analyse -c phpstan.neon --memory-limit=768M --no-progress"
Expand Down Expand Up @@ -258,7 +257,7 @@
uses: "ramsey/composer-install@3.0.0"
with:
dependency-versions: "lowest"
composer-options: "${{ inputs.composer-options }}"

Check failure on line 260 in .github/workflows/continuous-integration.yml

View workflow job for this annotation

GitHub Actions / actionlint

property "composer-options" is not defined in object type {}

- name: "Run phpmd/phpmd"
run: "phpmd src github phpmd.ruleset.xml"
Expand Down Expand Up @@ -312,7 +311,7 @@
uses: "ramsey/composer-install@3.0.0"
with:
dependency-versions: "lowest"
composer-options: "${{ inputs.composer-options }}"

Check failure on line 314 in .github/workflows/continuous-integration.yml

View workflow job for this annotation

GitHub Actions / actionlint

property "composer-options" is not defined in object type {}

- name: "Run checks with rector/rector"
run: "rector process --ansi --dry-run"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint-workflow-files.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ jobs:
- name: "install libimagequant-dev"
run: "sudo apt-get install libimagequant-dev -y"

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

- name: "Check workflow files"
uses: "raven-actions/actionlint@v2"
Expand Down
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": "^3.59.3",
"friendsofphp/php-cs-fixer": "^3.60.0",
"sirbrillig/phpcs-variable-analysis": "^2.11.19",
"slevomat/coding-standard": "^8.15.0",
"squizlabs/php_codesniffer": "^3.10.2"
Expand Down
Loading