From 1de375b708d72e63c19d612933991773fe97b845 Mon Sep 17 00:00:00 2001
From: Matthew Grasmick <matt.grasmick@gmail.com>
Date: Mon, 12 Dec 2016 20:11:15 -0500
Subject: [PATCH] Changing implementation of php.memory_limit param.

---
 phing/build.xml            | 4 +++-
 phing/tasks/properties.xml | 9 ---------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/phing/build.xml b/phing/build.xml
index 511b34167..368537155 100644
--- a/phing/build.xml
+++ b/phing/build.xml
@@ -18,7 +18,9 @@
   </if>
 
   <!--Increase PHP memory limit. -->
-  <php expression="ini_set('memory_limit', '1G');" level="verbose" />
+  <property name="php.memory_limit" value="2G" override="false" />
+  <echo>Setting memory allocation to ${php.memory_limit}</echo>
+  <php expression="ini_set('memory_limit', '${php.memory_limit}');"/>
 
   <!--@todo Warn if Windows is being used.-->
 
diff --git a/phing/tasks/properties.xml b/phing/tasks/properties.xml
index 677307fbb..f4c4bd1ad 100644
--- a/phing/tasks/properties.xml
+++ b/phing/tasks/properties.xml
@@ -1,14 +1,5 @@
 <project name="properties" default="build">
 
-  <!-- Set the memory limit for php. -->
-  <if>
-    <isset property="php.mem_limit"/>
-    <then>
-      <echo>Setting memory allocation to ${php.mem_limit}</echo>
-      <php expression="ini_set('memory_limit', '${php.mem_limit}');"/>
-    </then>
-  </if>
-
   <!-- Define the repo root as a property, and resolve to an absolute file path. -->
   <!-- We assume that Phing is running in vendor/acquia/blt/phing of a parent project. -->
   <property name="repo.root.relative" value="${phing.dir}/../../../.." logoutput="false"/>