Commit Graph

2948 Commits

Author SHA1 Message Date
Fabien Potencier b7e6f85ab9 Merge branch '1.x'
* 1.x:
  updated CHANGELOG
  [DOC] Fixed typos in advanced.rst
  Improve deprecations message Add the version in the message
  Make file cache tolerant for trailing (back)slashes on directory configuration.
2016-01-11 14:10:29 +01:00
Fabien Potencier 8ea9d44921 replaced dirname(__FILE__) with __DIR__ 2016-01-11 14:05:04 +01:00
Fabien Potencier 934f6f0093 updated CHANGELOG 2016-01-11 13:46:47 +01:00
Fabien Potencier 8dacaeca7e minor #1954 Improve deprecations message (Ener-Getick)
This PR was merged into the 1.x branch.

Discussion
----------

Improve deprecations message

This PR specifies the version in which some ``Twig_SimpleTest`` were deprecated to make it easier to upgrade a package.

Commits
-------

fdb1937 Improve deprecations message Add the version in the message
2016-01-11 13:24:54 +01:00
Fabien Potencier 4474392b86 bug #1953 rtrim cache dir (SpacePossum)
This PR was merged into the 1.x branch.

Discussion
----------

rtrim cache dir

@see #1951

Commits
-------

c3ec2fb Make file cache tolerant for trailing (back)slashes on directory configuration.
2016-01-11 13:21:56 +01:00
Fabien Potencier dba78c81cd minor #1929 [DOC] Fixed typos in advanced.rst (althaus)
This PR was submitted for the master branch but it was merged into the 1.x branch instead (closes #1929).

Discussion
----------

[DOC] Fixed typos in advanced.rst

Hey,

there are two typos of `Interace`. Although it sounds cool, `Interface` works better for copy and paste.

Cheers
Matthais

Commits
-------

57cd302 [DOC] Fixed typos in advanced.rst
2016-01-07 22:43:28 +01:00
Matthias Althaus 57cd302f50 [DOC] Fixed typos in advanced.rst
There are two typos of `Interace`. Although it sounds cool, `Interface` works better for copy and paste.
2016-01-07 22:43:13 +01:00
Fabien Potencier 37bde2e4bc updated CHANGELOG 2016-01-07 22:38:20 +01:00
Fabien Potencier 3af3dcb6d3 feature #1955 Let PHP convert Twig_Markup to JSON instead of pre-filtering it (stof)
This PR was merged into the 2.0-dev branch.

Discussion
----------

Let PHP convert Twig_Markup to JSON instead of pre-filtering it

See http://blog.blackfire.io/blackfire-on-blackfire-twig-and-json.html for the reason to do this.
The bump of the requirement to PHP 5.5+ in Twig 2 makes it possible to rely on ``JsonSerializable``

Commits
-------

8bd96c1 Let PHP convert Twig_Markup to JSON instead of pre-filtering it
2016-01-07 22:37:36 +01:00
Christophe Coevoet 8bd96c12d3 Let PHP convert Twig_Markup to JSON instead of pre-filtering it 2016-01-07 22:29:55 +01:00
Ener-Getick fdb19375f5 Improve deprecations message
Add the version in the message
2016-01-07 18:53:18 +01:00
Possum c3ec2fb1de Make file cache tolerant for trailing (back)slashes on directory configuration. 2016-01-06 10:29:32 +01:00
Fabien Potencier 1a817fc8ee Merge branch '1.x'
* 1.x:
  Update copyright year
  Removed usage of deprecated constant
2016-01-03 16:38:03 +01:00
Fabien Potencier 23e47c5242 minor #1952 Update copyright year (jeroenvisser101)
This PR was merged into the 1.x branch.

Discussion
----------

Update copyright year

Happy new year!

Commits
-------

c07c4ab Update copyright year
2016-01-03 16:37:06 +01:00
Jeroen Visser c07c4ab585 Update copyright year
Happy new year!
2016-01-01 02:33:03 +01:00
Fabien Potencier 7df0a5512d minor #1940 Removed usage of deprecated constant (hason)
This PR was merged into the 1.x branch.

Discussion
----------

Removed usage of deprecated constant

Commits
-------

f19318d Removed usage of deprecated constant
2015-12-26 22:40:37 +01:00
Fabien Potencier 1e90f3252f minor #1947 remove php 5.2 compatibility for filesystemhelper (Tobion)
This PR was merged into the 2.0-dev branch.

Discussion
----------

remove php 5.2 compatibility for filesystemhelper

#1945 for 2.x

Commits
-------

4ce9587 remove php 5.2 compatibility for filesystemhelper
2015-12-26 22:39:16 +01:00
Tobias Schultze 4ce9587fe5 remove php 5.2 compatibility for filesystemhelper 2015-12-26 19:07:18 +01:00
Fabien Potencier ea3883e780 Merge branch '1.x'
* 1.x: (22 commits)
  skip read-only dir tests on windows and cleanup tmp dirs correctly
  Fixing a slight typo in interface
  made a small refactoring
  fixed typo
  deprecated a class that has never been used
  bumped version to 1.23.2-DEV
  prepared the 1.23.1 release
  updated CHANGELOG
  Add dot to the end of exception messages.
  set back default
  Typo in doc
  CS
  static vs. self
  Code grooming
  fix deprecation message typo
  fixed typos
  fixed CS
  fix BC, revert to pre 1.23 behavior, and make use of pattern an option
  make cache per user (on linux)
  fixed Twig_Extension_GlobalsInterface name in comments
  ...
2015-12-26 18:06:06 +01:00
Fabien Potencier 0190f9407e minor #1945 skip read-only dir tests on windows and cleanup tmp dirs correctly (Tobion)
This PR was squashed before being merged into the 1.x branch (closes #1945).

Discussion
----------

skip read-only dir tests on windows and cleanup tmp dirs correctly

- fix tests on windows (skipping them as read-only dirs are not possible on windows, only read-only files; read-only attribute on folders (`exec('attrib +R '`) does not prevent files to be created inside them)
- correctly cleanup tmp directories at the end of tests

Commits
-------

c6601a1 skip read-only dir tests on windows and cleanup tmp dirs correctly
2015-12-26 17:40:53 +01:00
Tobias Schultze c6601a15c0 skip read-only dir tests on windows and cleanup tmp dirs correctly 2015-12-26 17:40:42 +01:00
Martin Hasoň f19318d0e7 Removed usage of deprecated constant 2015-12-14 09:19:50 +01:00
Fabien Potencier db93842e80 minor #1921 Fixing a slight typo in interface (jez-strawberrysoup)
This PR was merged into the 1.x branch.

Discussion
----------

Fixing a slight typo in interface

Just a typo in the ExtensionInterface

Commits
-------

de15975 Fixing a slight typo in interface
2015-11-17 13:22:13 +01:00
Jez Emery de15975cb3 Fixing a slight typo in interface 2015-11-17 10:34:18 +00:00
Fabien Potencier 9d5e746026 made a small refactoring 2015-11-12 07:56:39 +01:00
Fabien Potencier 093bf70d6c fixed typo 2015-11-11 16:18:23 +01:00
Fabien Potencier b7c124bae0 deprecated a class that has never been used 2015-11-08 10:55:30 +01:00
Fabien Potencier bf326dbb75 bumped version to 1.23.2-DEV 2015-11-05 13:52:08 +01:00
Fabien Potencier d9b6333ae8 prepared the 1.23.1 release v1.23.1 2015-11-05 13:49:06 +01:00
Fabien Potencier e4bedf07d8 updated CHANGELOG 2015-11-05 13:47:51 +01:00
Fabien Potencier 93ec90b857 minor #1910 Code grooming (SpacePossum)
This PR was merged into the 1.x branch.

Discussion
----------

Code grooming

Commits
-------

aa7c53a Add dot to the end of exception messages.
b8a6e72 set back default
0f5f9aa Typo in doc
8bb9b83 CS
355213b static vs. self
d4e3ada Code grooming
2015-11-05 13:38:16 +01:00
Possum aa7c53ae0a Add dot to the end of exception messages. 2015-11-05 13:20:01 +01:00
Possum b8a6e72414 set back default 2015-11-05 12:52:55 +01:00
Possum 0f5f9aaf2a Typo in doc 2015-11-05 10:22:46 +01:00
Possum 8bb9b83e32 CS 2015-11-05 10:12:15 +01:00
Possum 355213ba6c static vs. self 2015-11-05 10:11:09 +01:00
Possum d4e3adaaee Code grooming 2015-11-05 10:04:30 +01:00
Fabien Potencier fd84403ac7 minor #1909 [Extension] Fix deprecation message typo (Rvanlaak)
This PR was merged into the 1.x branch.

Discussion
----------

[Extension] Fix deprecation message typo

Commits
-------

cb5ea52 fix deprecation message typo
2015-11-03 19:31:41 +01:00
Richard van Laak cb5ea5244f fix deprecation message typo 2015-11-03 17:56:06 +01:00
Fabien Potencier e7e334c8b2 bug #1907 made exception messages more precise (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

made exception messages more precise

Replaces #1906 and #1902

Commits
-------

04d6738 fixed typos
2015-11-02 19:00:50 +01:00
Fabien Potencier 79af12a1d2 bug #1905 fix BC, revert to pre 1.23 behavior, and make use of pattern an option (remicollet)
This PR was merged into the 1.x branch.

Discussion
----------

fix BC, revert to pre 1.23 behavior, and make use of pattern an option

For context see twigphp/Twig-extensions#155

Commits
-------

ee5e25e fix BC, revert to pre 1.23 behavior, and make use of pattern an option
2015-11-02 15:52:06 +01:00
Fabien Potencier 7203d4bee6 minor #1901 fixed Twig_Extension_GlobalsInterface name in comments (craue)
This PR was merged into the 1.x branch.

Discussion
----------

fixed Twig_Extension_GlobalsInterface name in comments

It looks like renaming `Twig_Extension_GlobalsProviderInterace` to `Twig_Extension_GlobalsInterface` was done only partially while working on #1897.

Commits
-------

2660286 fixed Twig_Extension_GlobalsInterface name in comments
2015-11-02 15:49:25 +01:00
Fabien Potencier 04d6738ddf fixed typos 2015-11-02 15:47:58 +01:00
Fabien Potencier 20249a0320 fixed CS 2015-11-02 15:44:22 +01:00
Fabien Potencier 52b8d992dc minor #1904 make cache per user (on linux) (remicollet)
This PR was merged into the 1.x branch.

Discussion
----------

make cache per user (on linux)

Just because I hate having failed test when I run test once on 1 account, then once on another account ;)

Commits
-------

da5cac6 make cache per user (on linux)
2015-11-02 15:44:00 +01:00
Remi Collet ee5e25eb46 fix BC, revert to pre 1.23 behavior, and make use of pattern an option 2015-11-02 15:13:46 +01:00
Remi Collet da5cac6b54 make cache per user (on linux) 2015-11-02 15:09:33 +01:00
Christian Raue 2660286d28 fixed Twig_Extension_GlobalsInterface name in comments 2015-11-02 13:15:25 +01:00
Fabien Potencier b9b6f367e1 bumped version to 1.23.1-DEV 2015-10-29 16:33:13 -07:00
Fabien Potencier 5868cd822f prepared the 1.23.0 release v1.23.0 2015-10-29 16:29:01 -07:00