geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-10 17:36:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,483 Commits 9 Branches 273 Tags
add887d60cf5e55bfbcff4df78eee16152de7633
Commit Graph

3483 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabien Potencier add887d60c fixed CS 2019-02-15 04:46:05 +01:00
Fabien Potencier 3845d5247a minor #2839 Simplify some phpdocs (fabpot) 
This PR was merged into the 1.x branch.

Discussion
----------

Simplify some phpdocs

Commits
-------

ceb3c93e simplified some phpdocs
 2019-02-15 04:22:20 +01:00
Fabien Potencier ceb3c93e28 simplified some phpdocs 2019-02-15 04:20:04 +01:00
Fabien Potencier 18f9780c6b minor #2834 Clarify the difference between the include function and tag (fabpot) 
This PR was merged into the 1.x branch.

Discussion
----------

Clarify the difference between the include function and tag

should close #2829

Commits
-------

2d902484 added some docs about the difference between the include tag and the include function
 2019-02-15 04:03:34 +01:00
Fabien Potencier 4ea6ff4a55 minor #2837 Fix Travis config (fabpot) 
This PR was merged into the 1.x branch.

Discussion
----------

Fix Travis config

Commits
-------

325acd21 fixed Travis config
 2019-02-14 07:45:28 +01:00
Fabien Potencier 325acd2141 fixed Travis config 2019-02-14 07:43:01 +01:00
Fabien Potencier 2d9024843f added some docs about the difference between the include tag and the include function 2019-02-13 09:34:17 +01:00
Fabien Potencier c88e944958 minor #2832 Remove the <pre> tag in docblocks (fabpot) 
This PR was merged into the 1.x branch.

Discussion
----------

Remove the <pre> tag in docblocks

closes #2831 and closes #2830

Commits
-------

dcf228e9 removed the <pre> tag in docblocks
 2019-02-12 08:52:58 +01:00
Fabien Potencier dcf228e91d removed the <pre> tag in docblocks 2019-02-12 08:50:54 +01:00
Fabien Potencier d142b77ddb bug #2825 remove duplicated directory separator (xabbuh) 
This PR was merged into the 1.x branch.

Discussion
----------

remove duplicated directory separator

The $rootPath property is already initialized with a trailing directory
separator in the class constructor.

Commits
-------

edcbcc18 remove duplicated directory separator
 2019-02-04 17:41:01 +01:00
Christian Flothmann edcbcc18ad remove duplicated directory separator 
The $rootPath property is already initialized with a trailing directory
separator in the class constructor.
 2019-02-04 13:03:18 +01:00
Fabien Potencier 3d822167aa minor #2816 Fix typo (Lesik) 
This PR was submitted for the 2.x branch but it was merged into the 1.x branch instead (closes #2816).

Discussion
----------

Fix typo

Commits
-------

e773c8fc Fix typo
 2019-01-15 08:54:13 +01:00
Lesik e773c8fc9c Fix typo 2019-01-15 08:54:07 +01:00
Fabien Potencier 3afb492c4d minor #2815 Revert "minor #2809 Fixed 2.x tests (yceruto)" (xabbuh) 
This PR was merged into the 1.x branch.

Discussion
----------

Revert "minor #2809 Fixed 2.x tests (yceruto)"

This reverts commit 59c26ae211, reversing
changes made to 3fd85beda4.

Commits
-------

577a8b12 backport tests
 2019-01-14 16:13:59 +01:00
Fabien Potencier 9544f7ef87 bumped version to 1.37.2-DEV 2019-01-14 16:00:04 +01:00
Fabien Potencier 66be9366c7 prepared the 1.37.1 release v1.37.1 2019-01-14 15:59:29 +01:00
Christian Flothmann 577a8b121f backport tests 2019-01-14 15:57:41 +01:00
Fabien Potencier 86acbefe5c updated CHANGELOG 2019-01-14 14:57:13 +01:00
Fabien Potencier 366a0fd34d bug #2813 fix key exists check for non ArrayObject objects (xabbuh) 
This PR was merged into the 1.x branch.

Discussion
----------

fix key exists check for non ArrayObject objects

fixes #2810

Commits
-------

6df989ba fix key exists check for non ArrayObject objects
 2019-01-14 14:56:07 +01:00
Christian Flothmann 6df989bafe fix key exists check for non ArrayObject objects 2019-01-14 13:02:12 +01:00
Fabien Potencier 361d864178 fixed logic in TemplateWrapper 2019-01-14 10:42:01 +01:00
Fabien Potencier 9f0ed3c39b bumped version to 1.37.1-DEV 2019-01-14 09:21:52 +01:00
Fabien Potencier e48a7b32a4 prepared the 1.37.0 release v1.37.0 2019-01-14 09:20:10 +01:00
Fabien Potencier d50a64e016 fixed CS 2019-01-14 09:15:41 +01:00
Fabien Potencier 67dab869e5 added missing items in the CHANGELOG 2019-01-14 09:13:12 +01:00
Fabien Potencier 1f7fb33147 bug #2808 Fix embedded templates starting with a BOM (fabpot) 
This PR was merged into the 1.x branch.

Discussion
----------

Fix embedded templates starting with a BOM

fixes #2137

Commits
-------

a573d464 fixed embedded templates starting with a BOM
 2019-01-14 08:56:06 +01:00
Fabien Potencier 749075252c removed obsolete code 2019-01-13 15:13:51 +01:00
Fabien Potencier 844ab8f45e minor #2806 Remove pre PHP v5.3 code (rosier) 
This PR was merged into the 1.x branch.

Discussion
----------

Remove pre PHP v5.3 code

Commits
-------

4f8c480d Remove pre PHP v5.3 code
 2019-01-13 15:12:41 +01:00
Fabien Potencier a573d464af fixed embedded templates starting with a BOM 2019-01-13 15:10:13 +01:00
Fabien Potencier c2e67488a9 bug #2749 Fixed ArrayObject access with a null value (yceruto) 
This PR was merged into the 1.x branch.

Discussion
----------

Fixed ArrayObject access with a null value

fixes https://github.com/twigphp/Twig/issues/2744

Commits
-------

80e65b4c fixed ArrayObject access with a null value
 2019-01-13 12:00:33 +01:00
Jan Rosier 4f8c480d07 Remove pre PHP v5.3 code 2019-01-12 21:19:44 +01:00
Yonel Ceruto 80e65b4c73 fixed ArrayObject access with a null value 2019-01-12 07:44:29 -05:00
Fabien Potencier 9d36daf19e bug #2805 Fix using a Twig_TemplateWrapper instance as an argument to extends (fabpot) 
This PR was merged into the 1.x branch.

Discussion
----------

Fix using a Twig_TemplateWrapper instance as an argument to extends

fixes #2546

Commits
-------

547fc612 fixed using a Twig_TemplateWrapper instance as an argument to extends
 2019-01-12 11:34:56 +01:00
Fabien Potencier 547fc6120e fixed using a Twig_TemplateWrapper instance as an argument to extends 2019-01-12 11:31:49 +01:00
Fabien Potencier 15912f8f6b fixed tests 2019-01-12 04:56:28 +01:00
Fabien Potencier 6891bb3203 fixed tests 2019-01-12 04:48:35 +01:00
Fabien Potencier a4ebc27300 minor #2802 Add missing information in the precedence paragraph (fabpot) 
This PR was merged into the 1.x branch.

Discussion
----------

Add missing information in the precedence paragraph

closes #2766
closes #2728
closes #2731

Commits
-------

fb511950 added missing information in the precedence paragraph
 2019-01-12 02:59:44 +01:00
Fabien Potencier fb51195059 added missing information in the precedence paragraph 2019-01-12 02:55:55 +01:00
Fabien Potencier ac81fc25d8 minor #2801 Add missing ] (rosier) 
This PR was merged into the 1.x branch.

Discussion
----------

Add missing ]

Commits
-------

c760d62a Add missing ]
 2019-01-12 02:32:42 +01:00
rosier c760d62a67 Add missing ] 2019-01-11 20:02:58 +01:00
Fabien Potencier 4208bb14e4 bug #2795 Fix float representation in compiled templates (fabpot) 
This PR was merged into the 1.x branch.

Discussion
----------

Fix float representation in compiled templates

closes #2788

Commits
-------

e346c2ac fixed float representation in compiled templates
 2019-01-08 17:50:30 +01:00
Fabien Potencier beedb3ac44 minor #2796 Switch to short array notation (fabpot) 
This PR was squashed before being merged into the 1.x branch (closes #2796).

Discussion
----------

Switch to short array notation

Commits
-------

d39f6a87 fixed .php_cs CS
8753069c removed 5.3 from Travis matrix
1c9bdd06 removed array notation in comments
a2c42534 enabled short array notation in docs
b75c9fab fixed usage of short array notation in tests
a0399fe6 fixed usage of short array notation in tests
0446296d fixed more short array notations
5c55243d switched to use PHP short array notation for Twig's code
8758b570 switched to use short arrays in generated code
63702811 dropped PHP 5.3 support
777912e5 bumped version
 2019-01-08 16:26:05 +01:00
Fabien Potencier d39f6a87a0 fixed .php_cs CS 2019-01-08 16:20:52 +01:00
Fabien Potencier 8753069c88 removed 5.3 from Travis matrix 2019-01-08 12:02:22 +01:00
Fabien Potencier 1c9bdd0626 removed array notation in comments 2019-01-08 11:59:04 +01:00
Fabien Potencier a2c4253406 enabled short array notation in docs 2019-01-08 11:56:48 +01:00
Fabien Potencier b75c9fab71 fixed usage of short array notation in tests 2019-01-08 11:56:46 +01:00
Fabien Potencier a0399fe6da fixed usage of short array notation in tests 2019-01-08 11:56:30 +01:00
Fabien Potencier 0446296d5f fixed more short array notations 2019-01-08 11:56:16 +01:00
Fabien Potencier 5c55243d71 switched to use PHP short array notation for Twig's code 2019-01-08 09:35:30 +01:00