Merge branch '10.5'

.github/workflows/ci.yml

@@ -51,7 +51,7 @@ jobs:
           tools: none
 
       - name: Install dependencies with Composer
-        run: ./tools/composer update --no-interaction --no-ansi --no-progress
+        run: ./tools/composer install --no-interaction --no-ansi --no-progress
 
       - name: Run Psalm on public API
         run: ./tools/psalm --config=.psalm/static-analysis.xml --no-progress --show-info=false
@@ -97,7 +97,7 @@ jobs:
           tools: none
 
       - name: Install dependencies with Composer
-        run: php ./tools/composer update --no-ansi --no-interaction --no-progress
+        run: php ./tools/composer install --no-ansi --no-interaction --no-progress
 
       - name: Run tests with PHPUnit
         run: php ./phpunit --testsuite unit
@@ -144,7 +144,7 @@ jobs:
           tools: none
 
       - name: Install dependencies with Composer
-        run: php ./tools/composer update --no-ansi --no-interaction --no-progress
+        run: php ./tools/composer install --no-ansi --no-interaction --no-progress
 
       - name: Run tests with PHPUnit
         run: php ./phpunit --testsuite end-to-end
@@ -171,7 +171,7 @@ jobs:
           tools: none
 
       - name: Install dependencies with Composer
-        run: ./tools/composer update --no-ansi --no-interaction --no-progress
+        run: ./tools/composer install --no-ansi --no-interaction --no-progress
 
       - name: Collect code coverage with PHPUnit
         run: ./phpunit --coverage-clover=coverage.xml

.gitignore

@@ -3,7 +3,6 @@
 
 # Composer
 /vendor
-/composer.lock
 
 # Apache Ant
 /.ant_targets

build.xml

@@ -7,7 +7,6 @@
         <delete dir="${basedir}/build/artifacts"/>
         <delete dir="${basedir}/build/tmp"/>
         <delete dir="${basedir}/vendor"/>
-        <delete file="${basedir}/composer.lock"/>
 
         <property name="clean.done" value="true"/>
     </target>
@@ -30,12 +29,12 @@
     </target>
 
     <target name="-dependencies-installed">
-        <available file="${basedir}/composer.lock" property="dependencies-installed"/>
+        <available type="dir" file="${basedir}/vendor" property="dependencies-installed"/>
     </target>
 
     <target name="install-dependencies" unless="dependencies-installed" depends="-dependencies-installed,validate-composer-json" description="Install dependencies with Composer">
         <exec executable="${basedir}/tools/composer" taskname="composer">
-            <arg value="update"/>
+            <arg value="install"/>
             <arg value="--no-interaction"/>
             <arg value="--no-progress"/>
             <arg value="--no-ansi"/>
@@ -376,7 +375,6 @@
 
     <target name="build-phar-and-run-phar-specific-tests" depends="clean,phar-snapshot" description="Build PHAR and run the PHAR-specific tests with it">
         <delete dir="${basedir}/vendor"/>
-        <delete file="${basedir}/composer.lock"/>
 
         <antcall target="run-phar-specific-tests"/>
     </target>