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

3500 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabien Potencier e7e1a71bd5 fixed CS 2019-02-17 11:04:35 +01:00
Fabien Potencier e9919c2187 fixed CS 2019-02-17 10:53:37 +01:00
Fabien Potencier 1e9c84adef minor #2848 Use statements everywhere (fabpot) 
This PR was squashed before being merged into the 1.x branch (closes #2848).

Discussion
----------

Use statements everywhere

Commits
-------

1ddb8253 moved most FQCN to use statements
c92feb6a prepared use statements
 2019-02-17 10:43:43 +01:00
Fabien Potencier 1ddb825336 moved most FQCN to use statements 2019-02-17 10:37:46 +01:00
Fabien Potencier c92feb6ab9 prepared use statements 2019-02-17 10:31:45 +01:00
Fabien Potencier 210fb60a0d feature #2844 Use namespaced classes by default (fabpot) 
This PR was squashed before being merged into the 1.x branch (closes #2844).

Discussion
----------

Use namespaced classes by default

Commits
-------

3632a46e moved to namespaced classes by default
db751d62 fixed some class names
66b708bd bumped version to 1.38
 2019-02-15 08:31:33 +01:00
Fabien Potencier 3632a46e82 moved to namespaced classes by default 2019-02-15 08:28:49 +01:00
Fabien Potencier db751d62d3 fixed some class names 2019-02-15 08:28:49 +01:00
Fabien Potencier 66b708bde8 bumped version to 1.38 2019-02-15 08:28:49 +01:00
Fabien Potencier 966296ff42 fixed CS 2019-02-15 07:56:53 +01:00
Fabien Potencier 7600efc010 minor #2843 Fix some PHPUnit assertions (fabpot) 
This PR was merged into the 1.x branch.

Discussion
----------

Fix some PHPUnit assertions

Commits
-------

40c6f1d1 fixed some PHPUnit assertions
 2019-02-15 07:20:44 +01:00
Fabien Potencier 40c6f1d1b9 fixed some PHPUnit assertions 2019-02-15 07:19:24 +01:00
Fabien Potencier 3ea04337b7 minor #2842 Tweak PHP-CS-Fixer config (fabpot) 
This PR was merged into the 1.x branch.

Discussion
----------

Tweak PHP-CS-Fixer config

Commits
-------

98a15a89 tweaked PHP-CS-Fixer config
 2019-02-15 06:18:14 +01:00
Fabien Potencier 98a15a8973 tweaked PHP-CS-Fixer config 2019-02-15 06:17:13 +01:00
Fabien Potencier a8e7eacd46 minor #2841 Change PHP-CS config (fabpot) 
This PR was merged into the 1.x branch.

Discussion
----------

Change PHP-CS config

Commits
-------

add887d6 fixed CS
 2019-02-15 06:04:38 +01:00
Fabien Potencier cfca482226 minor #2840 Cs fixes (fabpot) 
This PR was merged into the 1.x branch.

Discussion
----------

Cs fixes

Commits
-------

b8daa6c4 prefixed some classes with a backslash
 2019-02-15 05:53:51 +01:00
Fabien Potencier b8daa6c458 prefixed some classes with a backslash 2019-02-15 05:51:47 +01:00
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