Skip to content

Commit 28ab1a1

Browse files
Backport #5577 to PHPUnit 9.6
1 parent 5585037 commit 28ab1a1

File tree

3 files changed

+1661
-5
lines changed

3 files changed

+1661
-5
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
# Composer
55
/vendor
6-
/composer.lock
76

87
# Apache Ant
98
/.ant_targets

build.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<delete dir="${basedir}/build/artifacts"/>
88
<delete dir="${basedir}/build/tmp"/>
99
<delete dir="${basedir}/vendor"/>
10-
<delete file="${basedir}/composer.lock"/>
1110

1211
<property name="clean.done" value="true"/>
1312
</target>
@@ -30,12 +29,12 @@
3029
</target>
3130

3231
<target name="-dependencies-installed">
33-
<available file="${basedir}/composer.lock" property="dependencies-installed"/>
32+
<available type="dir" file="${basedir}/vendor" property="dependencies-installed"/>
3433
</target>
3534

3635
<target name="install-dependencies" unless="dependencies-installed" depends="-dependencies-installed,validate-composer-json" description="Install dependencies with Composer">
3736
<exec executable="${basedir}/tools/composer" taskname="composer">
38-
<arg value="update"/>
37+
<arg value="install"/>
3938
<arg value="--no-interaction"/>
4039
<arg value="--no-progress"/>
4140
<arg value="--no-ansi"/>
@@ -436,7 +435,6 @@
436435

437436
<target name="build-phar-and-run-phar-specific-tests" depends="clean,phar-snapshot" description="Build PHAR and run the PHAR-specific tests with it">
438437
<delete dir="${basedir}/vendor"/>
439-
<delete file="${basedir}/composer.lock"/>
440438

441439
<antcall target="run-phar-specific-tests"/>
442440
</target>

0 commit comments

Comments
 (0)