From a1f9baa11813d105729378be4650155ca5d07669 Mon Sep 17 00:00:00 2001
From: Jordi Boggiano <j.boggiano@seld.be>
Date: Wed, 13 Apr 2022 16:42:12 +0200
Subject: [PATCH 1/4] Fix 5.3/5.4 builds

---
 tests/Composer/Test/Repository/Vcs/GitDriverTest.php | 2 +-
 tests/Composer/Test/Repository/Vcs/HgDriverTest.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/Composer/Test/Repository/Vcs/GitDriverTest.php b/tests/Composer/Test/Repository/Vcs/GitDriverTest.php
index c8cfdab0a..30041c0dd 100644
--- a/tests/Composer/Test/Repository/Vcs/GitDriverTest.php
+++ b/tests/Composer/Test/Repository/Vcs/GitDriverTest.php
@@ -56,7 +56,7 @@ GIT;
 
     public function testFileGetContentInvalidIdentifier()
     {
-        $this->expectException('\RuntimeException');
+        $this->setExpectedException('\RuntimeException');
 
         $process = new ProcessExecutorMock;
         $io = $this->getMockBuilder('Composer\IO\IOInterface')->getMock();
diff --git a/tests/Composer/Test/Repository/Vcs/HgDriverTest.php b/tests/Composer/Test/Repository/Vcs/HgDriverTest.php
index 356a28c48..e4784d92b 100644
--- a/tests/Composer/Test/Repository/Vcs/HgDriverTest.php
+++ b/tests/Composer/Test/Repository/Vcs/HgDriverTest.php
@@ -103,7 +103,7 @@ HG_BOOKMARKS;
 
     public function testFileGetContentInvalidIdentifier()
     {
-        $this->expectException('\RuntimeException');
+        $this->setExpectedException('\RuntimeException');
 
         $process = new ProcessExecutorMock;
         $driver = new HgDriver(array('url' => 'https://example.org/acme.git'), $this->io, $this->config, $this->getMockBuilder('Composer\Util\HttpDownloader')->disableOriginalConstructor()->getMock(), $process);

From ba61e768b410736efe61df01b61f1ec44f51474f Mon Sep 17 00:00:00 2001
From: Jordi Boggiano <j.boggiano@seld.be>
Date: Wed, 13 Apr 2022 16:42:25 +0200
Subject: [PATCH 2/4] Release 2.2.12

---
 src/Composer/Composer.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Composer/Composer.php b/src/Composer/Composer.php
index 624e02507..00e574156 100644
--- a/src/Composer/Composer.php
+++ b/src/Composer/Composer.php
@@ -52,10 +52,10 @@ class Composer
      * const RELEASE_DATE = '@release_date@';
      * const SOURCE_VERSION = '1.8-dev+source';
      */
-    const VERSION = '@package_version@';
-    const BRANCH_ALIAS_VERSION = '@package_branch_alias_version@';
-    const RELEASE_DATE = '@release_date@';
-    const SOURCE_VERSION = '2.2.999-dev+source';
+    const VERSION = '2.2.12';
+    const BRANCH_ALIAS_VERSION = '';
+    const RELEASE_DATE = '2022-04-13 16:42:25';
+    const SOURCE_VERSION = '';
 
     /**
      * Version number of the internal composer-runtime-api package

From 699956867db2779d95a43d40bc62d630ca03ecfe Mon Sep 17 00:00:00 2001
From: Jordi Boggiano <j.boggiano@seld.be>
Date: Wed, 13 Apr 2022 16:42:26 +0200
Subject: [PATCH 3/4] Reverting release version changes

---
 src/Composer/Composer.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Composer/Composer.php b/src/Composer/Composer.php
index 00e574156..624e02507 100644
--- a/src/Composer/Composer.php
+++ b/src/Composer/Composer.php
@@ -52,10 +52,10 @@ class Composer
      * const RELEASE_DATE = '@release_date@';
      * const SOURCE_VERSION = '1.8-dev+source';
      */
-    const VERSION = '2.2.12';
-    const BRANCH_ALIAS_VERSION = '';
-    const RELEASE_DATE = '2022-04-13 16:42:25';
-    const SOURCE_VERSION = '';
+    const VERSION = '@package_version@';
+    const BRANCH_ALIAS_VERSION = '@package_branch_alias_version@';
+    const RELEASE_DATE = '@release_date@';
+    const SOURCE_VERSION = '2.2.999-dev+source';
 
     /**
      * Version number of the internal composer-runtime-api package

From 9a62ef7ff204aee67589220c1d09e67de614f1de Mon Sep 17 00:00:00 2001
From: Jordi Boggiano <j.boggiano@seld.be>
Date: Wed, 13 Apr 2022 17:07:33 +0200
Subject: [PATCH 4/4] Add missing return type

---
 tests/Composer/Test/Repository/Vcs/GitDriverTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Composer/Test/Repository/Vcs/GitDriverTest.php b/tests/Composer/Test/Repository/Vcs/GitDriverTest.php
index 30041c0dd..848946aac 100644
--- a/tests/Composer/Test/Repository/Vcs/GitDriverTest.php
+++ b/tests/Composer/Test/Repository/Vcs/GitDriverTest.php
@@ -71,7 +71,7 @@ GIT;
      * @param GitDriver $driver
      * @param string $path
      */
-    private function setRepoDir($driver, $path)
+    private function setRepoDir($driver, $path): void
     {
         $reflectionClass = new \ReflectionClass($driver);
         $reflectionProperty = $reflectionClass->getProperty('repoDir');