[ticket/11150] Preserve original requirements and avoid finally

Tristan Darricau · Nicofuma · commit 8a1ca4375e75 · 2017-04-23T21:01:02.000+02:00
PHPBB3-11150
diff --git a/phpBB/phpbb/composer/installer.php b/phpBB/phpbb/composer/installer.php
@@ -119,20 +119,19 @@ public function install(array $packages, $whitelist, IOInterface $io = null)
 			->setRunScripts(false)
 			->setDryRun(false);
 
-		$result = 0;
 		try
 		{
 			$result = $install->run();
+
+			putenv('COMPOSER_VENDOR_DIR=' . $original_vendor_dir);
 			//$output = $io->getOutput();
 			//$error_pos = strpos($output, 'Your requirements could not be resolved to an installable set of packages.');
 		}
 		catch (\Exception $e)
 		{
-			throw new runtime_exception('Cannot install packages', [], $e);
-		}
-		finally
-		{
+
 			putenv('COMPOSER_VENDOR_DIR=' . $original_vendor_dir);
+			throw new runtime_exception('Cannot install packages', [], $e);
 		}
 
 		if ($result !== 0)
@@ -161,25 +160,24 @@ public function get_installed_packages($types)
 			$composer = Factory::create($io, $this->get_composer_ext_json_filename(), false);
 
 			$installed = [];
-			$packages = $composer->getPackage()->getRequires();//$composer->getRepositoryManager()->getLocalRepository()->getCanonicalPackages();
+			$required_links = $composer->getPackage()->getRequires();
+			$installed_packages = $composer->getRepositoryManager()->getLocalRepository()->getCanonicalPackages();
 
-			foreach ($packages as $package)
+			foreach ($installed_packages as $package)
 			{
-				if (in_array($package->getType(), $types, true))
+				if (array_key_exists($package->getName(), $required_links) && in_array($package->getType(), $types, true))
 				{
-					$installed[$package->getName()] = $package->getPrettyVersion();
+					$installed[$package->getName()] = $required_links[$package->getName()]->getPrettyConstraint();
 				}
 			}
 
+			putenv('COMPOSER_VENDOR_DIR=' . $original_vendor_dir);
 			return $installed;
 		}
 		catch (\Exception $e)
-		{
-			return [];
-		}
-		finally
 		{
 			putenv('COMPOSER_VENDOR_DIR=' . $original_vendor_dir);
+			return [];
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -119,20 +119,19 @@ public function install(array $packages, $whitelist, IOInterface $io = null)`
`119`	`119`	`->setRunScripts(false)`
`120`	`120`	`->setDryRun(false);`
`121`	`121`
`122`		`- $result = 0;`
`123`	`122`	`try`
`124`	`123`	`{`
`125`	`124`	`$result = $install->run();`
	`125`	`+`
	`126`	`+ putenv('COMPOSER_VENDOR_DIR=' . $original_vendor_dir);`
`126`	`127`	`//$output = $io->getOutput();`
`127`	`128`	`//$error_pos = strpos($output, 'Your requirements could not be resolved to an installable set of packages.');`
`128`	`129`	`}`
`129`	`130`	`catch (\Exception $e)`
`130`	`131`	`{`
`131`		`- throw new runtime_exception('Cannot install packages', [], $e);`
`132`		`- }`
`133`		`- finally`
`134`		`- {`
	`132`	`+`
`135`	`133`	`putenv('COMPOSER_VENDOR_DIR=' . $original_vendor_dir);`
	`134`	`+ throw new runtime_exception('Cannot install packages', [], $e);`
`136`	`135`	`}`
`137`	`136`
`138`	`137`	`if ($result !== 0)`
`@@ -161,25 +160,24 @@ public function get_installed_packages($types)`
`161`	`160`	`$composer = Factory::create($io, $this->get_composer_ext_json_filename(), false);`
`162`	`161`
`163`	`162`	`$installed = [];`
`164`		`- $packages = $composer->getPackage()->getRequires();//$composer->getRepositoryManager()->getLocalRepository()->getCanonicalPackages();`
	`163`	`+ $required_links = $composer->getPackage()->getRequires();`
	`164`	`+ $installed_packages = $composer->getRepositoryManager()->getLocalRepository()->getCanonicalPackages();`
`165`	`165`
`166`		`- foreach ($packages as $package)`
	`166`	`+ foreach ($installed_packages as $package)`
`167`	`167`	`{`
`168`		`- if (in_array($package->getType(), $types, true))`
	`168`	`+ if (array_key_exists($package->getName(), $required_links) && in_array($package->getType(), $types, true))`
`169`	`169`	`{`
`170`		`- $installed[$package->getName()] = $package->getPrettyVersion();`
	`170`	`+ $installed[$package->getName()] = $required_links[$package->getName()]->getPrettyConstraint();`
`171`	`171`	`}`
`172`	`172`	`}`
`173`	`173`
	`174`	`+ putenv('COMPOSER_VENDOR_DIR=' . $original_vendor_dir);`
`174`	`175`	`return $installed;`
`175`	`176`	`}`
`176`	`177`	`catch (\Exception $e)`
`177`		`- {`
`178`		`- return [];`
`179`		`- }`
`180`		`- finally`
`181`	`178`	`{`
`182`	`179`	`putenv('COMPOSER_VENDOR_DIR=' . $original_vendor_dir);`
	`180`	`+ return [];`
`183`	`181`	`}`
`184`	`182`	`}`
`185`	`183`