Skip to content

Commit 8817de0

Browse files
committed
Merge branch '5.0'
* 5.0: Tweak the code to avoid fabbot false positives Remove UPGRADE files for 4.x
2 parents d5eb0f9 + 6440de6 commit 8817de0

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Compiler/AbstractRecursivePass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ protected function getConstructor(Definition $definition, bool $required)
150150
throw new RuntimeException(sprintf('Invalid service "%s": class "%s" does not exist.', $this->currentId, $class));
151151
}
152152
} catch (\ReflectionException $e) {
153-
throw new RuntimeException(sprintf('Invalid service "%s": %s.', $this->currentId, lcfirst(rtrim($e->getMessage(), '.'))));
153+
throw new RuntimeException(sprintf('Invalid service "%s": '.lcfirst($e->getMessage()), $this->currentId));
154154
}
155155
if (!$r = $r->getConstructor()) {
156156
if ($required) {

Loader/YamlFileLoader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,7 @@ protected function loadFile($file)
681681
try {
682682
$configuration = $this->yamlParser->parseFile($file, Yaml::PARSE_CONSTANT | Yaml::PARSE_CUSTOM_TAGS);
683683
} catch (ParseException $e) {
684-
throw new InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML: "%s".', $file, $e->getMessage()), 0, $e);
684+
throw new InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML: '.$e->getMessage(), $file), 0, $e);
685685
}
686686

687687
return $this->validate($configuration, $file);

0 commit comments

Comments
 (0)