Skip to content

Conversation

@dependabot
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Jun 17, 2023

Bumps phpunit/phpunit from 9.6.8 to 9.6.9.

Changelog

Sourced from phpunit/phpunit's changelog.

[9.6.9] - 2023-06-11

Fixed

  • #5405: XML configuration migration does not migrate whitelist/file elements
  • Always use X.Y.Z version number (and not just X.Y) of PHPUnit's version when checking whether a PHAR-distributed extension is compatible
Commits
  • a9aceaf Prepare release
  • 324512e Closes #5405
  • 70e8497 Update ChangeLog
  • 284eedd Use Version::id() instead of Version::series() to check extension compatibility
  • 8eae9e1 Merge branch '8.5' into 9.6
  • f37fc18 Disable phpdoc_to_comment fixer (because it renders psalm-suppress annotation...
  • 8a8e449 Fix: Avoid multiline parameter lists
  • 0da2376 Merge branch '8.5' into 9.6
  • f7e7556 Delete superfluous tests
  • 72c58ad Also test --filter option with both configuration and argument
  • Additional commits viewable 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 will merge this PR once CI passes on it, as requested by @nextcloud-command.


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 merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @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)

@dependabot dependabot bot requested a review from nickvergessen as a code owner June 17, 2023 01:56
@dependabot dependabot bot added 3. to review dependencies Pull requests that update a dependency file labels Jun 17, 2023
Copy link
Contributor

@nextcloud-command nextcloud-command left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dependabot merge

@dependabot dependabot bot force-pushed the dependabot/composer/tests/Integration/phpunit/phpunit-9.6.9 branch from 8aec52f to aa6913b Compare June 20, 2023 10:17
Copy link
Contributor

@nextcloud-command nextcloud-command left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dependabot merge

@dependabot @github
Copy link
Contributor Author

dependabot bot commented on behalf of github Jun 20, 2023

One of your CI runs failed on this pull request, so Dependabot won't merge it.

Dependabot will still automatically merge this pull request if you amend it and your tests pass.

dependabot bot and others added 2 commits June 21, 2023 07:57
Bumps [phpunit/phpunit](https://github.com/sebastianbergmann/phpunit) from 9.6.8 to 9.6.9.
- [Changelog](https://github.com/sebastianbergmann/phpunit/blob/9.6.9/ChangeLog-9.6.md)
- [Commits](sebastianbergmann/phpunit@9.6.8...9.6.9)

---
updated-dependencies:
- dependency-name: phpunit/phpunit
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
@nickvergessen nickvergessen force-pushed the dependabot/composer/tests/Integration/phpunit/phpunit-9.6.9 branch from e3b2abe to 476e09a Compare June 21, 2023 05:57
@dependabot dependabot bot merged commit e05ba30 into master Jun 21, 2023
@dependabot dependabot bot deleted the dependabot/composer/tests/Integration/phpunit/phpunit-9.6.9 branch June 21, 2023 06:47
@nickvergessen
Copy link
Member

/backport 476e09a to stable27

@nickvergessen
Copy link
Member

/backport 476e09a to stable26

@nickvergessen
Copy link
Member

/backport 476e09a to stable25

@backportbot-nextcloud
Copy link

The backport to stable25 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable25
git pull origin stable25

# Create the new backport branch
git checkout -b fix/foo-stable25

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable25

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to review dependencies Pull requests that update a dependency file

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants