From d594a34e4a76136da88d3f3146e6bd859fa8ad8a Mon Sep 17 00:00:00 2001 From: Bec White Date: Thu, 6 Oct 2022 15:27:16 -0500 Subject: [PATCH] Try updating to Phing 3 again. I don't like this yet because: * There isn't yet a stable release of Phing 3, so I had to set a minimum-stability in composer.json * The alpha and RC versions of Phing 3 require dev releases of the phing packages, meaning they either need to be enumerated OR the-build's minumum stability needs to be dropped to dev (this is not desirable) * Need to test the Phing 3 support of symlinks, because that patch no longer applies --- composer.json | 40 ++++++++++++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index aafcec7c..16198f50 100644 --- a/composer.json +++ b/composer.json @@ -13,14 +13,39 @@ ], "require": { "composer-runtime-api": "^2.2.2", - "cweagans/composer-patches": "^1.7", "drupal/coder": "^8.3.6", "drush/drush": ">=9", "mglaman/drupal-check": "^1.2", - "palantirnet/phing-drush-task": "^1.1", + "palantirnet/phing-drush-task": ">=1.1", "pear/http_request2": "^2.3", "pear/versioncontrol_git": "@dev", - "phing/phing": "^2.14", + "phing/phing": "^3", + "phing/phing-composer-configurator": "dev-master", + "phing/task-analyzers": "dev-main", + "phing/task-apigen": "dev-main as dev-master", + "phing/task-archives": "dev-main", + "phing/task-aws": "dev-main", + "phing/task-coverage": "dev-main as dev-master", + "phing/task-dbdeploy": "dev-main", + "phing/task-ftpdeploy": "dev-main as dev-master", + "phing/task-git": "dev-main", + "phing/task-hg": "dev-main", + "phing/task-http": "dev-main", + "phing/task-inifile": "dev-main", + "phing/task-ioncube": "dev-main as dev-master", + "phing/task-jshint": "dev-main as dev-master", + "phing/task-jsmin": "dev-main as dev-master", + "phing/task-liquibase": "dev-main as dev-master", + "phing/task-phkpackage": "dev-main as dev-master", + "phing/task-phpdoc": "dev-main as dev-master", + "phing/task-phpunit": "dev-main as dev-master", + "phing/task-sass": "dev-main as dev-master", + "phing/task-smarty": "dev-main as dev-master", + "phing/task-ssh": "dev-main as dev-master", + "phing/task-svn": "dev-main as dev-master", + "phing/task-visualizer": "dev-main as dev-master", + "phing/task-zendcodeanalyser": "dev-main as dev-master", + "phing/task-zendserverdevelopmenttools": "dev-main as dev-master", "phpmd/phpmd": "^2.4", "phpspec/prophecy-phpunit": "^2" }, @@ -29,18 +54,13 @@ "TheBuild\\": "src/" } }, + "minimum-stability": "alpha", "config": { "sort-packages": true, "allow-plugins": { "cweagans/composer-patches": true, + "phing/phing-composer-configurator": true, "dealerdirect/phpcodesniffer-composer-installer": true } - }, - "extra": { - "patches": { - "phing/phing": { - "Support relative symliks in Phing": "https://raw.githubusercontent.com/palantirnet/the-build/7cdc28b6019fb88a0604261366f9ea35f1e21d96/patches/phing-relative-symlinks.patch" - } - } } }