search

T3Voila / templavoilaplus

TYPO3 Extension TemplaVoilà! Plus for TYPO3 8/9/10/11/12 LTS
https://extensions.typo3.org/extension/templavoilaplus/
GNU General Public License v2.0
26 stars 27 forks source link

Combine current PRs, point to main instead of 8.2.x and green the tests (backport #517) #519

Closed mergify[bot] closed 1 year ago

mergify[bot] commented 1 year ago

This is an automatic backport of pull request #517 done by Mergify. Cherry-pick of 885d9325681a06bc9796c228f810fe713e85e8fd has failed:

On branch mergify/bp/8.1.x/pr-517
Your branch is up to date with 'origin/8.1.x'.

You are currently cherry-picking commit 885d9325.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both added:      Classes/Controller/Backend/LinkBrowserController.php
    both modified:   Configuration/Backend/Routes.php

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 541a3b7247bf07670c06b8cd0ba9461d683e9a35 has failed:

On branch mergify/bp/8.1.x/pr-517
Your branch is ahead of 'origin/8.1.x' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 541a3b72.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   Classes/Controller/Backend/LinkBrowserController.php
    both modified:   Configuration/Backend/Routes.php

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of afecec12d446a98c54cf23fb6da8d8c8d869543e has failed:

On branch mergify/bp/8.1.x/pr-517
Your branch is ahead of 'origin/8.1.x' by 9 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit afecec12.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
    modified:   Classes/Form/Container/FlexFormTabsContainer.php

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   Classes/Form/Container/FlexFormElementContainer.php

Cherry-pick of b596a8abf3a5e5c8fb324682700064ede1255c21 has failed:

On branch mergify/bp/8.1.x/pr-517
Your branch is ahead of 'origin/8.1.x' by 12 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit b596a8ab.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
    modified:   Classes/Service/DataHandling/DataHandler.php
    modified:   Classes/Service/UserFunc/Access.php
    modified:   Configuration/Backend/AjaxRoutes.php
    modified:   Configuration/Backend/Routes.php

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   Classes/Controller/Backend/LinkBrowserController.php

Cherry-pick of 43e9a08c01e911d6e69b3a3846df3cf6b790c428 has failed:

On branch mergify/bp/8.1.x/pr-517
Your branch is ahead of 'origin/8.1.x' by 13 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 43e9a08c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   composer.json

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 16387b75edfd0c952095b071c6227ba57fb9c6fa has failed:

On branch mergify/bp/8.1.x/pr-517
Your branch is ahead of 'origin/8.1.x' by 14 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 16387b75.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   composer.json

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of d4a28893a50d13f0b822c98bda7d3bcffa9f9af0 has failed:

On branch mergify/bp/8.1.x/pr-517
Your branch is ahead of 'origin/8.1.x' by 15 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit d4a28893.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
    modified:   Classes/Service/DataHandling/DataHandler.php

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   phpstan-baseline.neon

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Mergify commands and options
More conditions and actions can be found in the [documentation](https://docs.mergify.com/). You can also trigger Mergify actions by commenting on this pull request: - `@Mergifyio refresh` will re-evaluate the rules - `@Mergifyio rebase` will rebase this PR on its base branch - `@Mergifyio update` will merge the base branch into this PR - `@Mergifyio backport ` will backport this PR on `` branch Additionally, on Mergify [dashboard](https://dashboard.mergify.com) you can: - look at your merge queues - generate the Mergify configuration with the config editor. Finally, you can contact us on https://mergify.com