4813 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Fabien Potencier	51242d807f	made a class final	2019-08-10 14:48:51 +02:00
Fabien Potencier	19a1487f85	feature #3118 Add suggestions for extra extensions (fabpot) ... This PR was merged into the 2.x branch. Discussion ---------- Add suggestions for extra extensions Commits ------- 908eef05 added suggestions for extra extensions	2019-08-10 14:32:15 +02:00
Fabien Potencier	908eef05de	added suggestions for extra extensions	2019-08-10 14:29:58 +02:00
Fabien Potencier	879d1b1e76	fixed path	2019-08-10 14:29:31 +02:00
Fabien Potencier	a8ccf22d4b	added missing dep	2019-08-10 14:21:21 +02:00
Fabien Potencier	af1ead5014	fixed Travis config	2019-08-10 14:19:10 +02:00
Fabien Potencier	2658b4a390	fixed config/ directory in extra bundle	2019-08-10 14:18:25 +02:00
Fabien Potencier	43a7e3ae09	minor #3119 Revamping bundle structure to not mix source code with config files (yceruto) ... This PR was merged into the 2.x branch. Discussion ---------- Revamping bundle structure to not mix source code with config files Still compatible with any Symfony version. Commits ------- f24f057a Revamping bundle structure to not mix source code with config files	2019-08-10 14:11:12 +02:00
Yonel Ceruto	f24f057a15	Revamping bundle structure to not mix source code with config files	2019-08-10 08:00:43 -04:00
Fabien Potencier	8374211dd8	minor #3117 Fix PHPDoc of twig_get_attribute() (szepeviktor) ... This PR was submitted for the 3.x branch but it was merged into the 2.x branch instead (closes #3117). Discussion ---------- Fix PHPDoc of twig_get_attribute() @fabpot Repel the attack of the French keyboard props. @phpstan Commits ------- 1aa7dbff Fix PHPDoc of twig_get_attribute()	2019-08-10 13:39:14 +02:00
Viktor Szépe	1aa7dbff35	Fix PHPDoc of twig_get_attribute() ... Repel the attack of the French keyboard	2019-08-10 13:39:07 +02:00
Fabien Potencier	33fbbe5097	fixed composer.json	2019-08-10 11:50:28 +02:00
Fabien Potencier	5d6205ba90	feature #3115 Add the Markdown extension (fabpot) ... This PR was merged into the 2.x branch. Discussion ---------- Add the Markdown extension Commits ------- 741ea46e added the Markdown extension	2019-08-10 11:29:54 +02:00
Fabien Potencier	741ea46e02	added the Markdown extension	2019-08-10 11:29:35 +02:00
Fabien Potencier	f8c0c76f46	fixed package name	2019-08-10 11:23:15 +02:00
Fabien Potencier	2e3aa4f7ec	fixed Travis	2019-08-10 11:21:33 +02:00
Fabien Potencier	be629b591b	bug #3116 Fix HTML extension (fabpot) ... This PR was merged into the 2.x branch. Discussion ---------- Fix HTML extension Commits ------- 5cc40a06 fixed HTML extension	2019-08-10 11:08:29 +02:00
Fabien Potencier	5cc40a06f1	fixed HTML extension	2019-08-10 11:07:38 +02:00
Fabien Potencier	40fa5ea8ab	feature #3113 move the HTML extension to an external Composer package (fabpot) ... This PR was merged into the 2.x branch. Discussion ---------- move the HTML extension to an external Composer package Commits ------- 59bb9d10 moved the HTML extension to an external Composer package	2019-08-10 07:41:42 +02:00
Fabien Potencier	59bb9d1033	moved the HTML extension to an external Composer package	2019-08-08 18:10:45 +02:00
Fabien Potencier	f07a7f388d	Merge branch '1.x' into 2.x ... * 1.x: added an entry to .gitignore	2019-08-08 18:07:29 +02:00
Fabien Potencier	a8c77b85a7	added an entry to .gitignore	2019-08-08 18:07:23 +02:00
Fabien Potencier	c7b0a459ca	removed usage of getmockBuilder() when not needed	2019-08-08 13:34:04 +02:00
Fabien Potencier	656c295ed9	Merge branch '1.x' into 2.x ... * 1.x: removed usage of getmockBuilder() when not needed	2019-08-08 13:33:07 +02:00
Fabien Potencier	3ee934ef45	minor #3112 Remove usage of getmockBuilder() when not needed (fabpot) ... This PR was merged into the 1.x branch. Discussion ---------- Remove usage of getmockBuilder() when not needed /cc @jderusse Commits ------- 5861a539 removed usage of getmockBuilder() when not needed	2019-08-08 12:14:28 +02:00
Fabien Potencier	5861a539e4	removed usage of getmockBuilder() when not needed	2019-08-08 11:59:51 +02:00
Fabien Potencier	bd45dfa518	minor #3111 Fix compatibility with PHPUnit 8 (jderusse) ... This PR was merged into the 2.x branch. Discussion ---------- Fix compatibility with PHPUnit 8 adds `: void` return typehint on methods `setup` and `teardown` Commits ------- f348f6ea Fix compatibility with PHPUnit 8	2019-08-08 11:13:19 +02:00
Jérémy Derussé	f348f6ea64	Fix compatibility with PHPUnit 8	2019-08-08 11:06:58 +02:00
Fabien Potencier	c8577f8b77	minor #3110 Fix PHPUnit deprecations (fabpot) ... This PR was squashed before being merged into the 2.x branch (closes #3110). Discussion ---------- Fix PHPUnit deprecations #3103 followup for 2.x Commits ------- 5ebcecf2 Fix PHPUnit deprecations	2019-08-08 11:03:14 +02:00
Fabien Potencier	5ebcecf24b	Fix PHPUnit deprecations	2019-08-08 11:03:05 +02:00
Fabien Potencier	c829dafd75	Merge branch '1.x' into 2.x ... * 1.x: Update to PhpUnitBridge and fix deprecations	2019-08-08 10:19:01 +02:00
Fabien Potencier	5aae9ba07a	minor #3103 Update PhpUnitBridge and fix deprecations (jderusse) ... This PR was merged into the 1.x branch. Discussion ---------- Update PhpUnitBridge and fix deprecations This PR: - update dev dependency to `phpunit-bridge` to `^4.4@dev` in order to get polyfill methods - fix deprecated tests - update cs-fixer rule Commits ------- b776e41f Update to PhpUnitBridge and fix deprecations	2019-08-08 10:00:23 +02:00
Jérémy Derussé	b776e41f5a	Update to PhpUnitBridge and fix deprecations	2019-08-08 09:39:49 +02:00
Fabien Potencier	0ab30d5c54	Merge branch '1.x' into 2.x ... * 1.x: bumped some deps	2019-08-08 01:33:46 +02:00
Fabien Potencier	9270385cd2	bumped some deps	2019-08-08 01:33:12 +02:00
Fabien Potencier	9975e7a8ed	fixed docs	2019-08-08 00:47:00 +02:00
Fabien Potencier	9d30f39511	simplified .travis.yml	2019-08-08 00:46:21 +02:00
Fabien Potencier	a36019c28e	Merge branch '1.x' into 2.x ... * 1.x: fixed CHANGELOG Upgrade minimal version of php Restore tests on PHP 5.4	2019-08-08 00:45:59 +02:00
Fabien Potencier	d1927ade9a	fixed CHANGELOG	2019-08-08 00:44:22 +02:00
Fabien Potencier	079e408357	feature #3107 Upgrade minimal version of php (jderusse) ... This PR was merged into the 1.x branch. Discussion ---------- Upgrade minimal version of php Following this comment https://github.com/twigphp/Twig/pull/3103#issuecomment-519282356 Bump the minimal required version of PHP to 5.5 Commits ------- 074e46ae Upgrade minimal version of php	2019-08-08 00:43:19 +02:00
Jérémy Derussé	074e46ae33	Upgrade minimal version of php	2019-08-08 00:31:49 +02:00
Fabien Potencier	ee35a9129d	minor #3106 Restore tests on PHP 5.4 (jderusse) ... This PR was merged into the 1.x branch. Discussion ---------- Restore tests on PHP 5.4 Commits ------- f8eda56c Restore tests on PHP 5.4	2019-08-07 23:51:52 +02:00
Jérémy Derussé	f8eda56c69	Restore tests on PHP 5.4	2019-08-07 23:16:00 +02:00
Fabien Potencier	336d69c166	fixed CS	2019-08-07 20:54:50 +02:00
Fabien Potencier	d0c0f7e3b0	Merge branch '1.x' into 2.x ... * 1.x: fixed the "empty" test on Traversable instances avoid confusion between .. and ..	2019-08-07 17:07:59 +02:00
Fabien Potencier	c87fe47373	bug #3104 Fix the "empty" test on Traversable instances (fabpot) ... This PR was merged into the 1.x branch. Discussion ---------- Fix the "empty" test on Traversable instances closes #3101 Commits ------- b202fe38 fixed the "empty" test on Traversable instances	2019-08-07 17:07:43 +02:00
Fabien Potencier	b202fe3809	fixed the "empty" test on Traversable instances	2019-08-07 17:02:01 +02:00
Fabien Potencier	20d60b5f25	avoid confusion between .. and ..	2019-08-07 16:28:20 +02:00
Fabien Potencier	2a32f38be7	fixed phpdocs	2019-08-07 16:22:21 +02:00
Fabien Potencier	472cb913fd	feature #3094 Add extra argument to filter column (DarkBee) ... This PR was merged into the 2.x branch. Discussion ---------- Add extra argument to filter column Added optional argument to `twig_array_column`, `$index_key`, to reflect proper arguments for underlaying `PHP` function `column` Commits ------- 7ca47f2e Update CoreExtension.php	2019-08-07 16:21:35 +02:00