23 Commits

Author SHA1 Message Date
Fabien Potencier d97690ff37 Merge branch '2.x' into 3.x
* 2.x:
  Use faster hash algorithm (xxh128) on PHP 8.1
2021-12-16 11:54:25 -08:00
Jérôme TAMARELLE 4fcc6b1c47 Use faster hash algorithm (xxh128) on PHP 8.1 2021-12-15 06:29:16 +01:00
Fabien Potencier 9e6e700f96 minor #3509 Some code style fixes (dionisvl)
This PR was squashed before being merged into the 3.x branch.

Discussion
----------

Some code style fixes

Fixes that:
- Type cast is unnecessary
- Unnecessary curly braces syntax for variable
- Operations priority might differ that except

Commits
-------

17c6371f Some code style fixes
2021-05-14 10:26:10 +02:00
Den 17c6371fb5 Some code style fixes 2021-05-14 10:26:05 +02:00
Fabien Potencier 13e360972a Merge branch '2.x' into 3.x
* 2.x:
  Fix CS
  Fix CS
  Migrate to the new PHP CS Fixer config file
  Fixing links
2021-05-12 09:45:40 +02:00
Fabien Potencier 2dd1d909b9 Fix CS 2021-05-12 09:37:17 +02:00
Fabien Potencier 157fa56829 Merge branch '1.x' into 2.x
* 1.x:
  Fix CS
  Migrate to the new PHP CS Fixer config file
2021-05-12 09:27:30 +02:00
Fabien Potencier 59f3e8e5dc Fix CS 2021-05-12 09:19:37 +02:00
Fabien Potencier c83ede7fcd Merge branch '2.x' into 3.x
* 2.x:
  Fix CS
  Fix CS
2020-06-22 08:17:05 +02:00
Fabien Potencier c2019904bb Merge branch '1.x' into 2.x
* 1.x:
  Fix CS
2020-06-22 08:13:34 +02:00
Fabien Potencier e99363231b Fix CS 2020-06-22 08:11:03 +02:00
Fabien Potencier 273b666a71 removed the obsolete lib/ directory, removed PSR-0 class aliases 2019-04-23 16:34:05 +02:00
Fabien Potencier a90d984587 Merge branch '1.x' into 2.x
* 1.x:
  fixed various small bugs
  bumped version to 1.39.1-DEV
  prepared the 1.39.0 release
2019-04-16 17:41:34 +02:00
Fabien Potencier d2cd4d9cfa fixed various small bugs 2019-04-16 17:33:43 +02:00
Fabien Potencier c91c625f01 Merge branch '1.x' into 2.x
* 1.x:
  simplified code
  use load() instead of loadTemplate() in tests
  added the possibility to pass a TemplateWrapper to Twig\Environment::load()
2019-03-11 19:58:03 +01:00
Fabien Potencier e2103c87ae use load() instead of loadTemplate() in tests 2019-03-11 19:18:00 +01:00
Fabien Potencier 1958e6daf4 Merge branch '1.x' into 2.x
* 1.x:
  fixed wrong usage of Error() constructor
2019-03-06 13:23:02 +01:00
Fabien Potencier e6b805c80d fixed wrong usage of Error() constructor 2019-03-06 13:22:09 +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