Commit 7fed08c0 authored by Simon Gilli's avatar Simon Gilli Committed by Oliver Bartsch
Browse files

[TASK] Relax PackageArtifactBuilder to support PHP 7.1

Composer 2.1 supports PHP 5.3 and higher and to avoid issues during the
deployment or on systems where the CLI version is not equal to the FPM
version, the PackageArtifactBuilder is relaxed to also support PHP 7.1
and higher.

Resolves: #96017
Releases: master
Change-Id: I008368c2dbdb2023eb95bdc3650f2e00f528eb23
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/72220


Reviewed-by: Andreas Fernandez's avatarAndreas Fernandez <a.fernandez@scripting-base.de>
Reviewed-by: Helmut Hummel's avatarHelmut Hummel <typo3@helhum.io>
Reviewed-by: Georg Ringer's avatarGeorg Ringer <georg.ringer@gmail.com>
Reviewed-by: Oliver Bartsch's avatarOliver Bartsch <bo@cedev.de>
Tested-by: Helmut Hummel's avatarHelmut Hummel <typo3@helhum.io>
Tested-by: core-ci's avatarcore-ci <typo3@b13.com>
Tested-by: Oliver Bartsch's avatarOliver Bartsch <bo@cedev.de>
parent 0cb761cb
Pipeline #19435 passed with stages
in 37 minutes and 18 seconds
......@@ -57,10 +57,6 @@ parameters:
message: "#^Parameter \\$rootPackage of method TYPO3\\\\CMS\\\\Core\\\\Composer\\\\PackageArtifactBuilder\\:\\:handleRootPackage\\(\\) has invalid typehint type Composer\\\\Package\\\\PackageInterface\\.$#"
count: 1
path: typo3/sysext/core/Classes/Composer/PackageArtifactBuilder.php
-
message: "#^Property TYPO3\\\\CMS\\\\Core\\\\Composer\\\\PackageArtifactBuilder\\:\\:\\$event has unknown class Composer\\\\Script\\\\Event as its type\\.$#"
count: 1
path: typo3/sysext/core/Classes/Composer/PackageArtifactBuilder.php
-
message: "#^Parameter \\$filesystem of method TYPO3\\\\CMS\\\\Core\\\\Package\\\\Cache\\\\ComposerPackageArtifact\\:\\:__construct\\(\\) has invalid typehint type Composer\\\\Util\\\\Filesystem\\.$#"
count: 1
......
......@@ -46,8 +46,15 @@ use TYPO3\CMS\Core\Utility\PathUtility;
*/
class PackageArtifactBuilder extends PackageManager implements InstallerScript
{
private Event $event;
private Config $config;
/**
* @var Event $event
*/
private $event;
/**
* @var Config $config
*/
private $config;
/**
* Array of Composer package names (as array key) that are installed by Composer but have no relation to TYPO3 extension API
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment