Commit Graph

45 Commits

Author SHA1 Message Date
Fabien Potencier c2a264a91d Merge branch '1.x' into 2.x
* 1.x:
  Enhancement: Introduce DOCtor-RST config + Sphinx build + GithubActions
  Enhancement: Use GithubActions instead of Travis for tests
  Fix `odd` not working for negative numbers
  Bump version to 1.44.2-DEV
  Prepare the 1.44.1 release
2020-11-05 13:31:01 +01:00
Harry Bournis 53a3ccd2d2 Fix odd not working for negative numbers 2020-11-05 11:55:45 +01:00
Fabien Potencier 53650c55c1 Merge branch '1.x' into 2.x
* 1.x:
  Fix PHP 8 support
2020-10-21 14:27:01 +02:00
Fabien Potencier b1c9faa33e Fix PHP 8 support 2020-10-21 14:08:16 +02:00
Nicolas Grekas 791f001ae6 Merge branch '1.x' into 2.x
* 1.x:
  Minor fixes
2020-05-21 11:15:20 +02:00
Nicolas Grekas 5dc364469b Minor fixes 2020-05-21 11:01:36 +02:00
Fabien Potencier 663b8fa832 Fix typo 2020-05-19 16:03:12 +02:00
Christian Flothmann fcaa9991b1 fix constructor argument types 2020-05-19 15:18:10 +02:00
Fabien Potencier 2d5e36b759 Merge branch '1.x' into 2.x
* 1.x:
  Fix integration tests
  Fix PHP 8 compat
  Install the phpunit-bridge with PHP 7.4 when testing nightly
  Add PHP 8 / nightly in Travis matrix
  Drop support for PHP 7.0
2020-05-19 15:03:51 +02:00
Nicolas Grekas 8b1f0c7f7e Fix integration tests 2020-05-19 14:52:37 +02:00
Fabien Potencier 6a0ab744d2 Fix PHP 8 compat 2020-05-19 14:22:31 +02:00
Fabien Potencier 54a87ed247 Merge branch '1.x' into 2.x
* 1.x:
  Fix optimize context access on PHP 7.4
2020-02-12 12:01:30 +01:00
Robert Korulczyk e3c20d39d6 Fix optimize context access on PHP 7.4 2020-02-11 21:11:57 +01:00
Fabien Potencier c2fd9990fc Merge branch '1.x' into 2.x
* 1.x:
  Optimize block('foo') ?? 'bar'
  bumped version to 1.42.4-DEV
  prepared the 1.42.3 release
  updated  ChANGELOG
2019-09-20 14:53:54 +02:00
Fabien Potencier 7a99a4e7e5 Optimize block('foo') ?? 'bar' 2019-09-20 12:40:56 +02:00
Fabien Potencier f5950a5b1f added the spaceship operator 2019-08-20 10:30:06 +02:00
Fabien Potencier 95352743eb fixed using macros in arrow functions 2019-07-03 20:17:43 +02:00
Fabien Potencier 21ecf010a3 fixed macro inheritance 2019-06-03 11:11:17 +02:00
Fabien Potencier 1153534aac added a better error message for unknown macros 2019-05-18 09:01:55 +02:00
Fabien Potencier 9fe3213d1b added support for macros on "is defined" tests 2019-05-17 18:04:15 +02:00
Fabien Potencier e138164015 macros imported "globally" in a template are now available in macros without re-importing them 2019-05-17 13:03:55 +02:00
Fabien Potencier 5c484ce7eb Merge branch '1.x' into 2.x
* 1.x:
  added the key to the map and filter filters
  added support for iterators
  removed fn in front of arrow functions
  changed arrow syntax
  added "filter", "map", and "reduce" filters
  simplified code
  fixed CS
  fixed partial output leak when a PHP fatal error occurs
2019-05-09 13:25:49 +02:00
Fabien Potencier dc2776359c changed arrow syntax 2019-05-03 17:09:12 +02:00
Fabien Potencier b30bce1139 added "filter", "map", and "reduce" filters 2019-05-03 17:09:12 +02:00
Fabien Potencier 804cf65ec0 Merge branch '1.x' into 2.x
* 1.x:
  optimized context access on PHP 7.4
2019-04-30 15:01:59 +02:00
Fabien Potencier 5b5f5659a2 optimized context access on PHP 7.4 2019-04-29 19:20:52 +02:00
Fabien Potencier f37212b022 added template line number to twig_get_attribute() 2019-04-16 22:24:37 +02:00
Fabien Potencier 1c80fa7205 Merge branch '1.x' into 2.x
* 1.x:
  added more tests
  added missing hints in some runtime exceptions
2019-04-12 12:08:49 +02:00
Fabien Potencier d4db91535d added missing hints in some runtime exceptions 2019-04-12 10:29:05 +02:00
Fabien Potencier 253f3e8e88 Merge branch '1.x' into 2.x
* 1.x:
  made escaping on ternary expressions more fine-grained
2019-04-11 21:10:58 +02:00
Fabien Potencier dfa9411310 made escaping on ternary expressions more fine-grained 2019-04-11 17:26:15 +02:00
Fabien Potencier c844cdbe64 fixed CS 2019-04-03 16:07:17 +02:00
Fabien Potencier b7e812a917 fixed variadic support 2019-03-23 15:22:16 +01:00
Fabien Potencier 1dead73882 added some type hints on constructors 2019-03-16 15:26:39 +01:00
Fabien Potencier 241f95cb25 added some type hints on private methods 2019-03-16 13:24:59 +01:00
Fabien Potencier 2861b40965 Merge branch '1.x' into 2.x
* 1.x:
  removed -2 magic number
  tried to avoid guessing template info on errors
2019-03-11 16:18:55 +01:00
Fabien Potencier 2389faeae3 tried to avoid guessing template info on errors 2019-03-11 16:04:11 +01:00
Fabien Potencier 29a2e18e14 Merge branch '1.x' into 2.x
* 1.x:
  fixed some issues
2019-03-06 22:09:35 +01:00
Fabien Potencier c58fa84054 fixed some issues 2019-03-06 22:08:00 +01:00
Fabien Potencier 2717a4769b fixed more un-namespaced classes 2019-03-06 18:17:28 +01:00
Fabien Potencier 037ee67224 switched to namespace first, PSR-0 as a fallback 2019-03-05 08:14:45 +01:00
Fabien Potencier baa70287f5 switched to namespace first, PSR-0 as a fallback 2019-03-04 21:33:40 +01:00
Maxime Steinhausser 2c174e4015 Use class_exists instead of require 2017-06-05 23:42:50 +02:00
Nicolas Grekas 5420a5e3f8 Add the aliases 2017-05-25 08:32:07 +02:00
Nicolas Grekas 71af32b306 Add namespaced aliases 2017-05-24 10:12:32 +02:00