Skip to content

Commit

Permalink
[TASK] Update build plans to support Composer 2
Browse files Browse the repository at this point in the history
Executed command:

  composer require --dev friendsofphp/php-cs-fixer:^2.16.7

Resolves: #92735
Releases: master, 10.4, 9.5
Change-Id: I569b5566745b966c23e3f14a943bae38c4b52ca3
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/66354
Tested-by: Andreas Fernandez <a.fernandez@scripting-base.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: TYPO3com <noreply@typo3.com>
Reviewed-by: Andreas Fernandez <a.fernandez@scripting-base.de>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
  • Loading branch information
andreaskienast committed Oct 30, 2020
1 parent a1b7be5 commit 818abee
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 377 deletions.
6 changes: 3 additions & 3 deletions Build/bamboo/src/main/java/core/AbstractCoreSpec.java
Expand Up @@ -1718,7 +1718,7 @@ Task getTaskComposerInstall(String requirementIdentifier) {
.inlineBody(
this.getScriptTaskBashInlineBody() +
this.getScriptTaskComposer(requirementIdentifier) +
"composer install --no-progress --no-suggest --no-interaction"
"composer install --no-progress --no-interaction"
)
.environmentVariables(this.composerRootVersionEnvironment);
}
Expand All @@ -1740,7 +1740,7 @@ Task getTaskComposerUpdateMax(String requirementIdentifier) {
this.getScriptTaskBashInlineBody() +
this.getScriptTaskComposer(requirementIdentifier) +
"composer config --unset platform.php \n" +
"composer update --no-progress --no-suggest --no-interaction"
"composer update --no-progress --no-interaction"
)
.environmentVariables(this.composerRootVersionEnvironment);
}
Expand All @@ -1762,7 +1762,7 @@ Task getTaskComposerUpdateMin(String requirementIdentifier) {
this.getScriptTaskBashInlineBody() +
this.getScriptTaskComposer(requirementIdentifier) +
"composer config platform.php 7.2.0\n" +
"composer update --prefer-lowest --no-progress --no-suggest --no-interaction"
"composer update --prefer-lowest --no-progress --no-interaction"
)
.environmentVariables(this.composerRootVersionEnvironment);
}
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Expand Up @@ -86,7 +86,7 @@
"codeception/module-filesystem": "^1.0",
"codeception/module-webdriver": "^1.0.1",
"composer/package-versions-deprecated": "^1.10",
"friendsofphp/php-cs-fixer": "^2.16.1",
"friendsofphp/php-cs-fixer": "^2.16.7",
"friendsoftypo3/phpstan-typo3": "^0.5.0",
"php-webdriver/webdriver": "^1.8",
"phpspec/prophecy": "^1.7.5",
Expand Down

0 comments on commit 818abee

Please sign in to comment.