Changing implementation of php.memory_limit param.

acquia · Dec 13, 2016 · 9b2f0f3 · 9b2f0f3
1 parent 8687e9b
commit 9b2f0f3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git 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}');" verbose="true" />
 
   <!--@todo Warn if Windows is being used.-->
 

diff --git 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"/>