Skip to content

composer: update ergebnis/php-cs-fixer-config requirement from ^6.60 to ^6.62#69

Merged
Vitexus merged 2 commits into
mainfrom
dependabot/composer/ergebnis/php-cs-fixer-config-tw-6.62
Jul 17, 2026
Merged

composer: update ergebnis/php-cs-fixer-config requirement from ^6.60 to ^6.62#69
Vitexus merged 2 commits into
mainfrom
dependabot/composer/ergebnis/php-cs-fixer-config-tw-6.62

Conversation

@dependabot

@dependabot dependabot Bot commented on behalf of github May 25, 2026

Copy link
Copy Markdown
Contributor

Updates the requirements on ergebnis/php-cs-fixer-config to permit the latest version.

Release notes

Sourced from ergebnis/php-cs-fixer-config's releases.

6.62.1

What's Changed

Full Changelog: ergebnis/php-cs-fixer-config@6.62.0...6.62.1

Changelog

Sourced from ergebnis/php-cs-fixer-config's changelog.

[6.62.1][6.62.1]

For a full diff see [6.62.0...6.62.1][6.62.0...6.62.1].

Fixed

[6.62.0][6.62.0]

For a full diff see [6.61.1...6.62.0][6.61.1...6.62.0].

Changed

  • Updated kubawerlos/php-cs-fixer-custom-fixers (#1412), by [@​dependabot]
  • Enabled make_version_complete option of PhpCsFixerCustomFixers/php_unit_requires_constraint fixer (#1415), by [@​localheinz]

[6.61.1][6.61.1]

For a full diff see [6.61.0...6.61.1][6.61.0...6.61.1].

Fixed

[6.61.0][6.61.0]

For a full diff see [6.60.2...6.61.0][6.60.2...6.61.0].

Changed

  • Enabled the no_whitespace_in_empty_array fixer (#1401), by [@​localheinz]
  • Started using ensure_single_line_for_single_argument for on_multiline option of method_argument_space fixer (#1402), by [@​localheinz]

[6.60.2][6.60.2]

For a full diff see [6.60.1...6.60.2][6.60.1...6.60.2].

Fixed

[6.60.1][6.60.1]

For a full diff see [6.60.0...6.60.1][6.60.0...6.60.1].

Fixed

... (truncated)

Commits
  • a0ffd53 Enhancement: Prepare release
  • 99559c4 Merge pull request #1418 from ergebnis/dependabot/composer/friendsofphp/php-c...
  • 3b1d4d5 Enhancement: Update CHANGELOG.md
  • 64fc27f Merge pull request #1419 from ergebnis/dependabot/github_actions/shivammathur...
  • d0b1d03 github-actions(deps): Bump shivammathur/setup-php from 2.37.0 to 2.37.1
  • 0f8ca0e composer(deps): Bump friendsofphp/php-cs-fixer from 3.95.1 to 3.95.2
  • 6ff80cd Merge pull request #1416 from ergebnis/dependabot/composer/kubawerlos/php-cs-...
  • 49ab3f6 Enhancement: Update CHANGELOG.md
  • 86e25d9 composer(deps): Bump kubawerlos/php-cs-fixer-custom-fixers
  • 7118828 Merge pull request #1417 from ergebnis/dependabot/composer/rector/rector-2.4.3
  • Additional commits viewable in compare view

You can trigger a rebase of this PR by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

Note
Automatic rebases have been disabled on this pull request as it has been open for over 30 days.

Updates the requirements on [ergebnis/php-cs-fixer-config](https://github.com/ergebnis/php-cs-fixer-config) to permit the latest version.
- [Release notes](https://github.com/ergebnis/php-cs-fixer-config/releases)
- [Changelog](https://github.com/ergebnis/php-cs-fixer-config/blob/main/CHANGELOG.md)
- [Commits](ergebnis/php-cs-fixer-config@6.60.0...6.62.1)

---
updated-dependencies:
- dependency-name: ergebnis/php-cs-fixer-config
  dependency-version: 6.62.1
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot dependabot Bot added dependencies Pull requests that update a dependency file php Pull requests that update php code labels May 25, 2026
@Vitexus

Vitexus commented Jul 17, 2026

Copy link
Copy Markdown
Member

@copilot resolve the merge conflicts in this pull request

1 similar comment
@Vitexus

Vitexus commented Jul 17, 2026

Copy link
Copy Markdown
Member

@copilot resolve the merge conflicts in this pull request

Copilot AI commented Jul 17, 2026

Copy link
Copy Markdown
Contributor

@copilot resolve the merge conflicts in this pull request

Resolved and committed in 9a4d3e7. I merged origin/main into this branch and fixed the composer.json conflict by keeping the dependency bump to ergebnis/php-cs-fixer-config:^6.62 while preserving the newer friendsofphp/php-cs-fixer and phpstan/phpstan versions from main.

Copilot AI commented Jul 17, 2026

Copy link
Copy Markdown
Contributor

@copilot resolve the merge conflicts in this pull request

The merge conflicts were already resolved in commit 9a4d3e7. The branch is currently clean with ergebnis/php-cs-fixer-config: ^6.62 (from this PR) merged with the latest changes from main.

@Vitexus
Vitexus merged commit 0d1bcfc into main Jul 17, 2026
2 checks passed
@dependabot
dependabot Bot deleted the dependabot/composer/ergebnis/php-cs-fixer-config-tw-6.62 branch July 17, 2026 19:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

dependencies Pull requests that update a dependency file php Pull requests that update php code

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants