Skip to content

Commit 9c32871

Browse files
author
Ivan Gavryshko
committed
MAGETWO-38917: Process composer generated messages
- chamges according to CR
1 parent 67140cf commit 9c32871

File tree

1 file changed

+5
-21
lines changed

1 file changed

+5
-21
lines changed

src/MagentoComposerApplication.php

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ public function runComposerCommand(array $commandParams, $workingDir = null)
130130
* @param array $packages
131131
* @param string|null $workingDir
132132
* @return string
133+
* @throws \RuntimeException
133134
*/
134135
public function runUpdateDryRun($packages, $workingDir = null)
135136
{
@@ -139,9 +140,7 @@ public function runUpdateDryRun($packages, $workingDir = null)
139140
$workingDir
140141
);
141142
} catch (\RuntimeException $e) {
142-
143-
$errorMessage = $this->generateAdditionalErrorMessage($e->getMessage(), $packages);
144-
143+
$errorMessage = $this->generateAdditionalErrorMessage($e->getMessage(), $packages, $workingDir);
145144
throw new \RuntimeException($errorMessage . PHP_EOL . $e->getMessage());
146145
}
147146

@@ -161,17 +160,10 @@ protected function generateAdditionalErrorMessage($message, $inputPackages, $wor
161160
$matches = [];
162161
$errorMessage = '';
163162
$packages = [];
164-
165163
$rawLines = explode(PHP_EOL, $message);
166164

167165
foreach ($rawLines as $line) {
168-
if (preg_match(
169-
'/- (.*) requires (.*) -> no matching package/',
170-
$line,
171-
$matches
172-
173-
)
174-
) {
166+
if (preg_match('/- (.*) requires (.*) -> no matching package/', $line, $matches)) {
175167
$packages[] = $matches[1];
176168
$packages[] = $matches[2];
177169
}
@@ -187,13 +179,11 @@ protected function generateAdditionalErrorMessage($message, $inputPackages, $wor
187179

188180
foreach ($inputPackages as $package => $version) {
189181
if (isset($packages[$package])) {
190-
$currentVersion = $packages[$package];
191-
$update[] = $package . ' from version ' . $currentVersion . ' to ' . $version;
182+
$update[] = $package . ' to ' . $version;
192183
}
193184
}
194185

195186
foreach (array_diff_key($packages, $inputPackages) as $package => $version) {
196-
197187
$output = $this->runComposerCommand(
198188
['command' => 'show', 'package' => $package],
199189
$workingDir
@@ -242,13 +232,7 @@ protected function getPackageVersions($outputMessage)
242232
{
243233
$versions = [];
244234

245-
if (preg_match(
246-
'/versions : (.*)/',
247-
$outputMessage,
248-
$matches
249-
250-
)
251-
) {
235+
if (preg_match('/versions : (.*)/', $outputMessage, $matches)) {
252236
$versions = $matches[1];
253237
$versions = explode(', ', $versions);
254238
$versions = array_filter(

0 commit comments

Comments
 (0)