Skip to content

chore(deps-dev): bump friendsofphp/php-cs-fixer from 3.95.0 to 3.95.1 - #6

Merged
vardumper merged 4 commits into
mainfrom
dependabot/composer/friendsofphp/php-cs-fixer-3.95.1
Jun 19, 2026
Merged

chore(deps-dev): bump friendsofphp/php-cs-fixer from 3.95.0 to 3.95.1#6
vardumper merged 4 commits into
mainfrom
dependabot/composer/friendsofphp/php-cs-fixer-3.95.1

Conversation

@dependabot

@dependabot dependabot Bot commented on behalf of github Apr 16, 2026

Copy link
Copy Markdown
Contributor

Bumps friendsofphp/php-cs-fixer from 3.95.0 to 3.95.1.

Release notes

Sourced from friendsofphp/php-cs-fixer's releases.

v3.95.1 Adalbertus

What's Changed

Full Changelog: PHP-CS-Fixer/PHP-CS-Fixer@v3.95.0...v3.95.1

Changelog

Sourced from friendsofphp/php-cs-fixer's changelog.

Changelog for v3.95.1

  • chore: add tests for FinalInternalClassFixer (#9547)
  • chore: cleanup PhpdocToParamTypeFixer (#9550)
  • fix: MethodArgumentSpaceFixer - Do not collapse nested arguments when using ensure_single_line_for_single_argument option for on_multiline (#9552)
  • test: fix type after variable name in @param in PhpdocToParamTypeFixerTest (#9549)
Commits
  • a972767 prepared the 3.95.1 release
  • 29a4bbe fix: MethodArgumentSpaceFixer - Do not collapse nested arguments when using...
  • 2493ab2 chore: cleanup PhpdocToParamTypeFixer (#9550)
  • 58e092e test: fix type after variable name in @param in `PhpdocToParamTypeFixerTest...
  • c00d60f chore: add tests for FinalInternalClassFixer (#9547)
  • 7d9691a bumped version
  • See full diff in compare view

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually 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)

Bumps [friendsofphp/php-cs-fixer](https://github.com/PHP-CS-Fixer/PHP-CS-Fixer) from 3.95.0 to 3.95.1.
- [Release notes](https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/releases)
- [Changelog](https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/master/CHANGELOG.md)
- [Commits](PHP-CS-Fixer/PHP-CS-Fixer@v3.95.0...v3.95.1)

---
updated-dependencies:
- dependency-name: friendsofphp/php-cs-fixer
  dependency-version: 3.95.1
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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 Apr 16, 2026
@github-actions
github-actions Bot force-pushed the dependabot/composer/friendsofphp/php-cs-fixer-3.95.1 branch from f54c915 to 61a64a1 Compare April 16, 2026 21:37
@vardumper

Copy link
Copy Markdown
Owner

@copilot resolve the merge conflicts in this pull request

…riendsofphp/php-cs-fixer-3.95.1

# Conflicts:
#	composer.lock
#	sbom.json

Copilot AI commented Jun 19, 2026

Copy link
Copy Markdown
Contributor

@copilot resolve the merge conflicts in this pull request

Resolved the merge conflicts in commit f26cc3a. The conflicts were in composer.lock and sbom.json — both caused by origin/main having updated symfony/polyfill-* packages from v1.36.0 to v1.37.0. Both files were resolved by accepting main's version, which already included php-cs-fixer v3.95.1 (from a chore: update composer deps commit that landed on main in the interim).

Copilot AI requested a review from vardumper June 19, 2026 07:06
@vardumper
vardumper merged commit debe87d into main Jun 19, 2026
@dependabot
dependabot Bot deleted the dependabot/composer/friendsofphp/php-cs-fixer-3.95.1 branch June 19, 2026 07:18
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