From 66bb59061d487b78e50c341ce57537b5521b3ff0 Mon Sep 17 00:00:00 2001
From: Bec White <white@palantir.net>
Date: Thu, 18 Oct 2018 18:21:23 -0500
Subject: [PATCH 1/3] Use Phing's ComposerTask instead of ExecTask.

---
 tasks/artifact.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tasks/artifact.xml b/tasks/artifact.xml
index 736a4bd1..c4667bf1 100644
--- a/tasks/artifact.xml
+++ b/tasks/artifact.xml
@@ -230,7 +230,9 @@
 
     <target name="artifact-build">
         <echo>Installing composer dependencies in the artifact...</echo>
-        <exec dir="${artifact.directory}" command="composer install --no-interaction --no-dev" checkreturn="true" />
+        <composer command="install">
+            <arg line="--no-interaction --no-dev --working-dir=${artifact.directory}" />
+        </composer>
 
         <echo>Deleting .git subdirectories added by Composer...</echo>
         <delete includeemptydirs="true">

From 28a87d438580215a48ce859d4ddd506f8ab2ca49 Mon Sep 17 00:00:00 2001
From: Bec White <white@palantir.net>
Date: Thu, 18 Oct 2018 18:27:22 -0500
Subject: [PATCH 2/3] Configure the composer command to use.

---
 defaults.properties.yml |  9 +++++++++
 tasks/artifact.xml      |  2 +-
 tasks/the-build.xml     | 13 +++++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/defaults.properties.yml b/defaults.properties.yml
index 0119f1bc..11a8d4b8 100644
--- a/defaults.properties.yml
+++ b/defaults.properties.yml
@@ -236,6 +236,7 @@ phpmd:
   # File extensions to review.
   suffixes: php,inc,module,theme,profile,install,test
 
+
 # Configuration for running behat tests.
 #
 # Putting these flags in configuration allows you to vary the behat configuration per
@@ -248,3 +249,11 @@ phpmd:
 #     http://docs.behat.org/en/v2.5/guides/7.config.html#profiles)
 behat:
   args: "--suite=default --strict"
+
+
+# Configuration for composer.
+#
+# Use this configuration if you're running on an environment where composer is not available on the command line as
+# `composer` or `composer.phar`.
+# composer:
+#   composer: ${build.thebuild.dir}/vendor/bin/composer.phar
diff --git a/tasks/artifact.xml b/tasks/artifact.xml
index c4667bf1..24bb4c6c 100644
--- a/tasks/artifact.xml
+++ b/tasks/artifact.xml
@@ -230,7 +230,7 @@
 
     <target name="artifact-build">
         <echo>Installing composer dependencies in the artifact...</echo>
-        <composer command="install">
+        <composer command="install" composer="${composer.composer}">
             <arg line="--no-interaction --no-dev --working-dir=${artifact.directory}" />
         </composer>
 
diff --git a/tasks/the-build.xml b/tasks/the-build.xml
index ba98211f..0dd92d46 100644
--- a/tasks/the-build.xml
+++ b/tasks/the-build.xml
@@ -91,6 +91,19 @@
     <property name="drush.config" value="${build.dir}/drush/drushrc.php" />
 
 
+    <!-- Configure the composer command, depending on whether `composer` or `composer.phar` is available. -->
+    <exec command="command -V composer" returnProperty="composer.not_available.composer" />
+    <exec command="command -V composer.phar" returnProperty="composer.not_available.composer_phar" />
+    <if>
+        <isfalse value="${composer.not_available.composer}" />
+        <then><property name="composer.composer" value="composer" /></then>
+    </if>
+    <if>
+        <isfalse value="${composer.not_available.composer_phar}" />
+        <then><property name="composer.composer" value="composer.phar" /></then>
+    </if>
+
+
     <!--
         Default target: the-build
         This target is included only because the <project> tag requires it.

From 3594630f457c764ba8b7b66498292c4bb4f4f969 Mon Sep 17 00:00:00 2001
From: Bec White <white@palantir.net>
Date: Tue, 13 Nov 2018 10:07:34 -0600
Subject: [PATCH 3/3] Update usage/comments for the new composer.composer
 property.

---
 defaults.properties.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/defaults.properties.yml b/defaults.properties.yml
index 11a8d4b8..3b816bb3 100644
--- a/defaults.properties.yml
+++ b/defaults.properties.yml
@@ -253,7 +253,8 @@ behat:
 
 # Configuration for composer.
 #
-# Use this configuration if you're running on an environment where composer is not available on the command line as
-# `composer` or `composer.phar`.
+# Use this configuration if you're running on an environment where composer is not
+# available on the command line as `composer` or `composer.phar`. In some cases, you may
+# need to add composer to your project itself with `composer require composer/composer`.
 # composer:
-#   composer: ${build.thebuild.dir}/vendor/bin/composer.phar
+#   composer: /path/to/composer.phar