From d4c8478df52f9eb5335108d558d363b668d12f8d Mon Sep 17 00:00:00 2001 From: Ayesh Karunaratne Date: Mon, 4 May 2020 00:38:31 +0700 Subject: [PATCH 1/2] Improve regex in \Composer\Repository\ComposerRepository::fetchFile() by removing unnecessary greedy operator --- src/Composer/Repository/ComposerRepository.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Composer/Repository/ComposerRepository.php b/src/Composer/Repository/ComposerRepository.php index f9d3155c1..5f68de635 100644 --- a/src/Composer/Repository/ComposerRepository.php +++ b/src/Composer/Repository/ComposerRepository.php @@ -997,7 +997,7 @@ class ComposerRepository extends ArrayRepository implements ConfigurableReposito } // url-encode $ signs in URLs as bad proxies choke on them - if (($pos = strpos($filename, '$')) && preg_match('{^https?://.*}i', $filename)) { + if (($pos = strpos($filename, '$')) && preg_match('{^https?://}i', $filename)) { $filename = substr($filename, 0, $pos) . '%24' . substr($filename, $pos + 1); } From aa2041399079a82280a96ed5515d1f51557c4eaf Mon Sep 17 00:00:00 2001 From: Ayesh Karunaratne Date: Mon, 4 May 2020 00:50:53 +0700 Subject: [PATCH 2/2] Improve regex in \Composer\Downloader\SvnDownloader::getCommitLogs() by removing unnecessary greedy operator --- src/Composer/Downloader/SvnDownloader.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Composer/Downloader/SvnDownloader.php b/src/Composer/Downloader/SvnDownloader.php index 0281862b5..634c4a7d5 100644 --- a/src/Composer/Downloader/SvnDownloader.php +++ b/src/Composer/Downloader/SvnDownloader.php @@ -178,7 +178,7 @@ class SvnDownloader extends VcsDownloader */ protected function getCommitLogs($fromReference, $toReference, $path) { - if (preg_match('{.*@(\d+)$}', $fromReference) && preg_match('{.*@(\d+)$}', $toReference)) { + if (preg_match('{@(\d+)$}', $fromReference) && preg_match('{@(\d+)$}', $toReference)) { // retrieve the svn base url from the checkout folder $command = sprintf('svn info --non-interactive --xml %s', ProcessExecutor::escape($path)); if (0 !== $this->process->execute($command, $output, $path)) {