diff --git a/phpBB/phpbb/composer/installer.php b/phpBB/phpbb/composer/installer.php
index 8b4c762c92..3e140e9a5f 100644
--- a/phpBB/phpbb/composer/installer.php
+++ b/phpBB/phpbb/composer/installer.php
@@ -20,12 +20,10 @@ use Composer\IO\NullIO;
 use Composer\Json\JsonFile;
 use Composer\Package\BasePackage;
 use Composer\Package\CompletePackage;
-use Composer\Package\Link;
-use Composer\Package\PackageInterface;
 use Composer\Repository\ComposerRepository;
-use Composer\Repository\RepositoryInterface;
 use Composer\Semver\Constraint\ConstraintInterface;
 use Composer\Util\RemoteFilesystem;
+use phpbb\composer\io\null_io;
 use phpbb\config\config;
 use phpbb\exception\runtime_exception;
 use phpbb\filesystem\filesystem;
@@ -147,7 +145,7 @@ class installer
 	{
 		if (!$io)
 		{
-			$io = new NullIO();
+			$io = new null_io();
 		}
 
 		$this->generate_ext_json_file($packages);
@@ -241,7 +239,7 @@ class installer
 
 			$installed = [];
 
-			/** @var Link[] $required_links */
+			/** @var \Composer\Package\Link[] $required_links */
 			$required_links = $composer->getPackage()->getRequires();
 			$installed_packages = $composer->getRepositoryManager()->getLocalRepository()->getCanonicalPackages();
 
@@ -318,7 +316,7 @@ class installer
 			$compatible_packages = [];
 			$repositories = $composer->getRepositoryManager()->getRepositories();
 
-			/** @var RepositoryInterface $repository */
+			/** @var \Composer\Repository\RepositoryInterface $repository */
 			foreach ($repositories as $repository)
 			{
 				try
@@ -339,7 +337,7 @@ class installer
 							$hostname = parse_url($url, PHP_URL_HOST) ?: $url;
 							$json     = $rfs->getContents($hostname, $url, false);
 
-							/** @var PackageInterface $package */
+							/** @var \Composer\Package\PackageInterface $package */
 							foreach (JsonFile::parseJson($json, $url)['packageNames'] as $package)
 							{
 								$versions            = $repository->findPackages($package);
@@ -351,7 +349,7 @@ class installer
 					{
 						// Pre-filter repo packages by their type
 						$packages = [];
-						/** @var PackageInterface $package */
+						/** @var \Composer\Package\PackageInterface $package */
 						foreach ($repository->getPackages() as $package)
 						{
 							if ($package->getType() === $type)
@@ -454,7 +452,7 @@ class installer
 	{
 		$core_stability_value = BasePackage::$stabilities[$core_stability];
 		//VersionParser::parseStability($version['version'])
-		/** @var PackageInterface $version */
+		/** @var \Composer\Package\PackageInterface $version */
 		foreach ($versions as $version)
 		{
 			if (BasePackage::$stabilities[$version->getStability()] > $core_stability_value)
diff --git a/phpBB/phpbb/composer/io/io_interface.php b/phpBB/phpbb/composer/io/io_interface.php
index 2b1f0c1007..a1d41122cb 100644
--- a/phpBB/phpbb/composer/io/io_interface.php
+++ b/phpBB/phpbb/composer/io/io_interface.php
@@ -13,13 +13,7 @@
 
 namespace phpbb\composer\io;
 
-use Composer\IO\ConsoleIO;
 use Composer\IO\IOInterface;
-use Composer\IO\NullIO;
-use phpbb\language\language;
-use Symfony\Component\Console\Helper\HelperSet;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
 
 interface io_interface extends IOInterface
 {
diff --git a/phpBB/phpbb/composer/io/null_io.php b/phpBB/phpbb/composer/io/null_io.php
index d38020d5f2..9a667ca097 100644
--- a/phpBB/phpbb/composer/io/null_io.php
+++ b/phpBB/phpbb/composer/io/null_io.php
@@ -13,14 +13,9 @@
 
 namespace phpbb\composer\io;
 
-use Composer\IO\ConsoleIO;
 use Composer\IO\NullIO;
-use phpbb\language\language;
-use Symfony\Component\Console\Helper\HelperSet;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
 
-class console_io extends NullIO implements io_interface
+class null_io extends NullIO implements io_interface
 {
 	/**
 	 * {@inheritdoc}
diff --git a/phpBB/phpbb/composer/io/translate_composer_trait.php b/phpBB/phpbb/composer/io/translate_composer_trait.php
index 9f8653f570..09cc76fa8e 100644
--- a/phpBB/phpbb/composer/io/translate_composer_trait.php
+++ b/phpBB/phpbb/composer/io/translate_composer_trait.php
@@ -13,7 +13,6 @@
 
 namespace phpbb\composer\io;
 
-use phpbb\language\language;
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**
@@ -22,7 +21,7 @@ use Symfony\Component\Console\Output\OutputInterface;
 trait translate_composer_trait
 {
 	/**
-	 * @var language
+	 * @var \phpbb\language\language
 	 */
 	protected $language;