D496.id1285.diff
No OneTemporary
Actions

Subscribers

None

File Metadata

	Index: tools/build/targets/common.xml
	===================================================================
	--- tools/build/targets/common.xml
	+++ tools/build/targets/common.xml
	@@ -168,7 +168,7 @@
	code. This indicates potential refactorings.-->
	<target name="phpcpd" description="Find duplicate code using PHPCPD" depends="init">
	<exec command="which phpcpd" outputProperty="phpcpd_binary"/>
	- <exec executable="php" passthru="true">
	+ <exec executable="${php.binary}" passthru="true">
	<arg value="-d memory_limit=-1"/>
	<arg value="${phpcpd_binary}"/>
	<arg value="--log-pmd=${build.logs.dir}/pmd-cpd.xml"/>
	@@ -201,6 +201,8 @@
	</target>

	<target name="create-aliases" description="Creating directory aliases" hidden="true">
	+ <php expression="PHP_BINARY" returnProperty="php.binary"/>
	+
	<property name="pdo.dsn.without.db" value="mysql:host=${db.host}"/>
	<property name="pdo.dsn" value="${pdo.dsn.without.db};dbname=${db.name}"/>

	Index: tools/build/targets/deploy.xml
	===================================================================
	--- tools/build/targets/deploy.xml
	+++ tools/build/targets/deploy.xml
	@@ -34,7 +34,7 @@
	<target name="inportal-deploy" description="Runs In-Portal deployment script">
	<echo msg="Running In-Portal Deployment Script (part of 'do_update') ..."/>

	- <exec executable="php" logoutput="true" checkreturn="true">
	+ <exec executable="${php.binary}" logoutput="true" checkreturn="true">
	<arg path="${base.dir}/tools/run_event.php"/>
	<arg value="adm:OnDeploy"/>
	<arg value="${cli.key}"/>