@@ -130,6 +130,7 @@ public function runComposerCommand(array $commandParams, $workingDir = null)
130
130
* @param array $packages
131
131
* @param string|null $workingDir
132
132
* @return string
133
+ * @throws \RuntimeException
133
134
*/
134
135
public function runUpdateDryRun ($ packages , $ workingDir = null )
135
136
{
@@ -139,9 +140,7 @@ public function runUpdateDryRun($packages, $workingDir = null)
139
140
$ workingDir
140
141
);
141
142
} catch (\RuntimeException $ e ) {
142
-
143
- $ errorMessage = $ this ->generateAdditionalErrorMessage ($ e ->getMessage (), $ packages );
144
-
143
+ $ errorMessage = $ this ->generateAdditionalErrorMessage ($ e ->getMessage (), $ packages , $ workingDir );
145
144
throw new \RuntimeException ($ errorMessage . PHP_EOL . $ e ->getMessage ());
146
145
}
147
146
@@ -161,17 +160,10 @@ protected function generateAdditionalErrorMessage($message, $inputPackages, $wor
161
160
$ matches = [];
162
161
$ errorMessage = '' ;
163
162
$ packages = [];
164
-
165
163
$ rawLines = explode (PHP_EOL , $ message );
166
164
167
165
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 )) {
175
167
$ packages [] = $ matches [1 ];
176
168
$ packages [] = $ matches [2 ];
177
169
}
@@ -187,13 +179,11 @@ protected function generateAdditionalErrorMessage($message, $inputPackages, $wor
187
179
188
180
foreach ($ inputPackages as $ package => $ version ) {
189
181
if (isset ($ packages [$ package ])) {
190
- $ currentVersion = $ packages [$ package ];
191
- $ update [] = $ package . ' from version ' . $ currentVersion . ' to ' . $ version ;
182
+ $ update [] = $ package . ' to ' . $ version ;
192
183
}
193
184
}
194
185
195
186
foreach (array_diff_key ($ packages , $ inputPackages ) as $ package => $ version ) {
196
-
197
187
$ output = $ this ->runComposerCommand (
198
188
['command ' => 'show ' , 'package ' => $ package ],
199
189
$ workingDir
@@ -242,13 +232,7 @@ protected function getPackageVersions($outputMessage)
242
232
{
243
233
$ versions = [];
244
234
245
- if (preg_match (
246
- '/versions : (.*)/ ' ,
247
- $ outputMessage ,
248
- $ matches
249
-
250
- )
251
- ) {
235
+ if (preg_match ('/versions : (.*)/ ' , $ outputMessage , $ matches )) {
252
236
$ versions = $ matches [1 ];
253
237
$ versions = explode (', ' , $ versions );
254
238
$ versions = array_filter (
0 commit comments