geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-11-10 20:16:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,407 Commits 29 Branches 275 Tags
bbc33772da8e531e2d70f41ea2e09a0258ce5697
Commit Graph

22 Commits

Author SHA1 Message Date
Fabien Potencier ceb4de0448 Merge branch '1.x' into 2.x 
* 1.x:
  Update CHANGELOG
  Revert "bug #3499 Fix: A template name cannot be an absolute path (mvorisek)"
 2021-05-16 14:07:24 +02:00
Fabien Potencier 124f10c27e Revert "bug #3499 Fix: A template name cannot be an absolute path (mvorisek)" 
This reverts commit 83f26e402b, reversing
changes made to f5d3c704df.
 2021-05-16 14:06:26 +02:00
Fabien Potencier 2dd1d909b9 Fix CS 2021-05-12 09:37:17 +02:00
Fabien Potencier 59f3e8e5dc Fix CS 2021-05-12 09:19:37 +02:00
Fabien Potencier 953974a7b3 Fix code for PHP 8.1 2021-04-10 10:14:28 +02:00
Fabien Potencier 02fe3a544c Merge branch '1.x' into 2.x 
* 1.x:
  Fix: A template name cannot be an absolute path
 2021-04-07 17:57:49 +02:00
Michael Voříšek 3a67fc7dc5 Fix: A template name cannot be an absolute path 2021-04-07 17:57:24 +02:00
Fabien Potencier 0b103dfeb0 Merge branch '1.x' into 2.x 
* 1.x:
  added PHP 8.1 as experimental
 2021-03-22 09:23:06 +01:00
Oleg Andreyev bef89dcc1e added PHP 8.1 as experimental 2021-03-22 09:19:53 +01:00
Fabien Potencier e99363231b Fix CS 2020-06-22 08:11:03 +02:00
Tim van Dijen 2c1c00ba0e Remove duplicate phpdoc 2019-06-10 12:15:10 +02:00
Fabien Potencier a560bfb98f Merge branch '1.x' into 2.x 
* 1.x:
  fixed CS
  Update TemplateWrapper.php
  bumped version to 1.40
 2019-04-24 17:24:15 +02:00
Fabien Potencier f497913961 fixed CS 2019-04-24 17:00:49 +02:00
Fabien Potencier d201b957f6 Merge branch '1.x' into 2.x 
* 1.x:
  allowed Twig\Loader\FilesystemLoader::findTemplate() to return "null" instead of "false" (same meaning)
 2019-04-24 15:01:24 +02:00
Fabien Potencier 5138cfd2d5 allowed Twig\Loader\FilesystemLoader::findTemplate() to return "null" instead of "false" (same meaning) 2019-04-24 12:08:10 +02:00
Fabien Potencier b523515682 fixed CS 2019-04-08 13:03:33 +02:00
Fabien Potencier 1dead73882 added some type hints on constructors 2019-03-16 15:26:39 +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