13 Commits

Author	SHA1	Message	Date
Fabien Potencier	acdf2581c9	replaced require with class_exists	2017-06-05 17:04:54 -07:00
Fabien Potencier	4ec8473a56	Merge branch '1.x' into 2.x ... * 1.x: replaced require with class_exists	2017-06-05 17:04:25 -07:00
Fabien Potencier	e92a13aae9	replaced require with class_exists	2017-06-05 17:04:19 -07:00
Fabien Potencier	fd70cf0c60	Merge branch '1.x' into 2.x ... * 1.x: Use class_exists instead of require	2017-06-05 16:59:17 -07:00
Maxime Steinhausser	2c174e4015	Use class_exists instead of require	2017-06-05 23:42:50 +02:00
Fabien Potencier	ca67cda8d0	Merge branch '1.x' into 2.x ... * 1.x: Fix Twig\Environment alias	2017-06-01 06:51:40 -07:00
Nicolas Grekas	8e03fa3e1c	Fix Twig\Environment alias	2017-06-01 06:42:27 +02:00
Fabien Potencier	f783be6e85	Merge branch '1.x' into 2.x ... * 1.x: [1.x] Allow using namespaced aliases as extension names	2017-05-31 10:36:08 -07:00
Nicolas Grekas	c9a2f3db8b	[1.x] Allow using namespaced aliases as extension names	2017-05-31 14:35:57 +02:00
Fabien Potencier	a887fc9119	feature #2486 [2.x] Add namespaced aliases (nicolas-grekas) ... This PR was merged into the 2.x branch. Discussion ---------- [2.x] Add namespaced aliases The 2.x-only part of #2484 Commits ------- 71265c40 [2.x] Add namespaced aliases	2017-05-25 15:40:35 -07:00
Nicolas Grekas	5420a5e3f8	Add the aliases	2017-05-25 08:32:07 +02:00
Nicolas Grekas	71265c4000	[2.x] Add namespaced aliases	2017-05-25 08:29:23 +02:00
Nicolas Grekas	71af32b306	Add namespaced aliases	2017-05-24 10:12:32 +02:00