bug #25737 [TwigBridge] swap filter/function and package names (xabbuh)

fabpot · fabpot · commit bbcdbfac9759 · 2018-01-10T08:52:17.000+01:00
This PR was merged into the 3.4 branch. Discussion ---------- [TwigBridge] swap filter/function and package names | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Error message was `Did you forget to run "composer require symfony/csrf_token"? Unknown function "form" in "Security/Pages/login.html".` and will now be `Did you forget to run "composer require symfony/form"? Unknown function "csrf_token" in "Security/Pages/login.html".` Commits ------- 9db699b swap filter/function and package names
diff --git a/src/Symfony/Bridge/Twig/UndefinedCallableHandler.php b/src/Symfony/Bridge/Twig/UndefinedCallableHandler.php
@@ -62,7 +62,7 @@ public static function onUndefinedFilter($name)
         }
 
         // Twig will append the source context to the message, so that it will end up being like "[...] Unknown filter "%s" in foo.html.twig on line 123."
-        throw new SyntaxError(sprintf('Did you forget to run "composer require symfony/%s"? Unknown filter "%s".', $name, self::$filterComponents[$name]));
+        throw new SyntaxError(sprintf('Did you forget to run "composer require symfony/%s"? Unknown filter "%s".', self::$filterComponents[$name], $name));
     }
 
     public static function onUndefinedFunction($name)
@@ -71,6 +71,6 @@ public static function onUndefinedFunction($name)
             return false;
         }
 
-        throw new SyntaxError(sprintf('Did you forget to run "composer require symfony/%s"? Unknown function "%s".', $name, self::$functionComponents[$name]));
+        throw new SyntaxError(sprintf('Did you forget to run "composer require symfony/%s"? Unknown function "%s".', self::$functionComponents[$name], $name));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public static function onUndefinedFilter($name)`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`// Twig will append the source context to the message, so that it will end up being like "[...] Unknown filter "%s" in foo.html.twig on line 123."`
`65`		`- throw new SyntaxError(sprintf('Did you forget to run "composer require symfony/%s"? Unknown filter "%s".', $name, self::$filterComponents[$name]));`
	`65`	`+ throw new SyntaxError(sprintf('Did you forget to run "composer require symfony/%s"? Unknown filter "%s".', self::$filterComponents[$name], $name));`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`public static function onUndefinedFunction($name)`
`@@ -71,6 +71,6 @@ public static function onUndefinedFunction($name)`
`71`	`71`	`return false;`
`72`	`72`	`}`
`73`	`73`
`74`		`- throw new SyntaxError(sprintf('Did you forget to run "composer require symfony/%s"? Unknown function "%s".', $name, self::$functionComponents[$name]));`
	`74`	`+ throw new SyntaxError(sprintf('Did you forget to run "composer require symfony/%s"? Unknown function "%s".', self::$functionComponents[$name], $name));`
`75`	`75`	`}`
`76`	`76`	`}`