Show both missing packages in the same error message

wouterj · wouterj · commit f46228538194 · 2020-02-01T19:46:42.000+01:00
diff --git a/src/Symfony/Bridge/Twig/Mime/NotificationEmail.php b/src/Symfony/Bridge/Twig/Mime/NotificationEmail.php
@@ -41,12 +41,17 @@ class NotificationEmail extends TemplatedEmail
 
     public function __construct(Headers $headers = null, AbstractPart $body = null)
     {
+        $missingPackages = [];
         if (!class_exists(CssInlinerExtension::class)) {
-            throw new \LogicException(sprintf('You cannot use "%s" if the CSS Inliner Twig extension is not available; try running "composer require twig/cssinliner-extra".', static::class));
+            $missingPackages['twig/cssinliner-extra'] = ' CSS Inliner';
         }
 
         if (!class_exists(InkyExtension::class)) {
-            throw new \LogicException(sprintf('You cannot use "%s" if the Inky Twig extension is not available; try running "composer require twig/inky-extra".', static::class));
+            $missingPackages['twig/inky-extra'] = 'Inky';
+        }
+
+        if ([] !== $missingPackages) {
+            throw new \LogicException(sprintf('You cannot use "%s" if the %s Twig extension%s not available; try running "composer require %s".', static::class, implode(' and ', $missingPackages), \count($missingPackages) > 1 ? 's are' : ' is', implode(' ', array_keys($missingPackages))));
         }
 
         parent::__construct($headers, $body);

Original file line number	Diff line number	Diff line change
`@@ -41,12 +41,17 @@ class No A7F4 tificationEmail extends TemplatedEmail`
`41`	`41`
`42`	`42`	`public function __construct(Headers $headers = null, AbstractPart $body = null)`
`43`	`43`	`{`
	`44`	`+ $missingPackages = [];`
`44`	`45`	`if (!class_exists(CssInlinerExtension::class)) {`
`45`		`- throw new \LogicException(sprintf('You cannot use "%s" if the CSS Inliner Twig extension is not available; try running "composer require twig/cssinliner-extra".', static::class));`
	`46`	`+ $missingPackages['twig/cssinliner-extra'] = ' CSS Inliner';`
`46`	`47`	`}`
`47`	`48`
`48`	`49`	`if (!class_exists(InkyExtension::class)) {`
`49`		`- throw new \LogicException(sprintf('You cannot use "%s" if the Inky Twig extension is not available; try running "composer require twig/inky-extra".', static::class));`
	`50`	`+ $missingPackages['twig/inky-extra'] = 'Inky';`
	`51`	`+ }`
	`52`	`+`
	`53`	`+ if ([] !== $missingPackages) {`
	`54`	`+ throw new \LogicException(sprintf('You cannot use "%s" if the %s Twig extension%s not available; try running "composer require %s".', static::class, implode(' and ', $missingPackages), \count($missingPackages) > 1 ? 's are' : ' is', implode(' ', array_keys($missingPackages))));`
`50`	`55`	`}`
`51`	`56`
`52`	`57`	`parent::__construct($headers, $body);`