geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-13 10:56:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,559 Commits 9 Branches 273 Tags
cb88e0a68cc611a02e643c54f3ca96552e790761
Commit Graph

5559 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabien Potencier cb88e0a68c Merge branch '2.x' into 3.x 
* 2.x:
  Move things around
 2021-01-01 15:58:18 +01:00
Fabien Potencier 846ebbd7c8 minor #3461 Move things around (fabpot) 
This PR was merged into the 2.x branch.

Discussion
----------

Move things around

Commits
-------

18689187 Move things around
 2021-01-01 15:57:43 +01:00
Fabien Potencier 1868918724 Move things around 2021-01-01 15:53:48 +01:00
Fabien Potencier b0afeb512e Merge branch '2.x' into 3.x 
* 2.x:
  Move Extra Bundle config from XML to PHP
  bump license year
 2021-01-01 15:33:39 +01:00
Fabien Potencier 7314edbb8a minor #3460 Move Extra Bundle config from XML to PHP (fabpot) 
This PR was merged into the 2.x branch.

Discussion
----------

Move Extra Bundle config from XML to PHP

Commits
-------

b9712ce1 Move Extra Bundle config from XML to PHP
 2021-01-01 15:33:06 +01:00
Fabien Potencier b9712ce137 Move Extra Bundle config from XML to PHP 2021-01-01 15:29:30 +01:00
Fabien Potencier 7fab4be1bb minor #3457 bump license year (abdounikarim) 
This PR was submitted for the 3.x branch but it was merged into the 2.x branch instead.

Discussion
----------

bump license year

Hello,

I updated licenses year to 2021.

Commits
-------

bed8f31b bump license year
 2021-01-01 10:21:08 +01:00
abdounikarim bed8f31b96 bump license year 2021-01-01 10:21:03 +01:00
Fabien Potencier 351a97ed15 Fix Composer version 2021-01-01 10:05:00 +01:00
Fabien Potencier 5162646cfa Merge branch '2.x' into 3.x 
* 2.x:
  Fix Composer version
 2021-01-01 10:04:14 +01:00
Fabien Potencier dae3868f04 Fix Composer version 2021-01-01 10:02:52 +01:00
Fabien Potencier 903461aeab feature #3458 Add "registerUndefinedTokenParserCallback" (fabpot) 
This PR was merged into the 3.x branch.

Discussion
----------

Add "registerUndefinedTokenParserCallback"

Commits
-------

81751d66 Add "registerUndefinedTokenParserCallback"
 2020-12-31 09:20:27 +01:00
Fabien Potencier 81751d6671 Add "registerUndefinedTokenParserCallback" 2020-12-31 09:12:48 +01:00
Fabien Potencier dc7e21fb20 Merge branch '2.x' into 3.x 
* 2.x:
  Remove some PHP in docs
 2020-12-30 09:23:56 +01:00
Fabien Potencier 39991a167c Remove some PHP in docs 2020-12-30 09:23:51 +01:00
Fabien Potencier e8e9e0fba3 Bump version 2020-12-30 09:19:17 +01:00
Fabien Potencier 8eb855ffb6 Bump version 2020-12-30 09:17:29 +01:00
Fabien Potencier 9ec64811c2 Merge branch '2.x' into 3.x 
* 2.x:
  Bump copyright year
 2020-12-30 09:16:33 +01:00
Fabien Potencier 9fd55773e3 Merge branch '1.x' into 2.x 
* 1.x:
  Bump copyright year
 2020-12-30 09:16:23 +01:00
Fabien Potencier d6cbc70064 Bump copyright year 2020-12-30 09:16:13 +01:00
Fabien Potencier e3bca056f1 feature #3448 Mark built-in node visitors as @internal (fabpot) 
This PR was squashed before being merged into the 3.x branch.

Discussion
----------

Mark built-in node visitors as @internal

refs #3445

Commits
-------

b95735da Mark built-in token parsers as @internal
ca3bb518 Mark built-in node visitors as @internal
 2020-11-30 13:06:55 +01:00
Fabien Potencier b95735da2e Mark built-in token parsers as @internal 2020-11-30 12:04:32 +01:00
Fabien Potencier ca3bb5188c Mark built-in node visitors as @internal 2020-11-30 09:16:20 +01:00
Fabien Potencier 155f7404df Merge branch '2.x' into 3.x 
* 2.x:
  Fix typo
  Typo
 2020-11-27 14:05:45 +01:00
Fabien Potencier c5379903e5 Merge branch '1.x' into 2.x 
* 1.x:
  Fix typo
  Typo
 2020-11-27 14:05:37 +01:00
Fabien Potencier 2f0947e1af Fix typo 2020-11-27 14:05:10 +01:00
Fabien Potencier 0feba1ade4 minor #3442 Typo (OlafvdSpek) 
This PR was submitted for the 3.x branch but it was merged into the 1.x branch instead.

Discussion
----------

Typo

Commits
-------

43f382ba Typo
 2020-11-27 14:04:49 +01:00
Olaf van der Spek 43f382ba1b Typo 2020-11-27 14:04:41 +01:00
Fabien Potencier 83ab9166a5 minor #3441 Remove is_int since typehint exists (ybenhssaien) 
This PR was merged into the 3.x branch.

Discussion
----------

Remove is_int since typehint exists

Since `$optimizers` param is always `int` no needs to check `is_int`

Commits
-------

d8a4113a Remove is_int since typehint exists
 2020-11-11 08:52:08 +01:00
Youssef Benhssaien d8a4113a74 Remove is_int since typehint exists 2020-11-11 07:27:35 +01:00
Fabien Potencier 3687ccd1b4 Merge branch '2.x' into 3.x 
* 2.x:
  Fix include documentation - change filter tag to apply
 2020-11-09 14:33:44 +01:00
Fabien Potencier e133d1fd8c minor #3440 Fix include documentation - change filter tag to apply (tkm) 
This PR was submitted for the 3.x branch but it was merged into the 2.x branch instead.

Discussion
----------

Fix include documentation - change filter tag to apply

Fixes #3438

Commits
-------

752bcc7b Fix include documentation - change filter tag to apply
 2020-11-09 14:33:24 +01:00
Fabien Potencier 829eaaccb6 minor #3437 Add return type for getGlobals() to documentation. The return type is defined in the GlobalsInterface (maartendekeizer) 
This PR was merged into the 3.x branch.

Discussion
----------

Add return type for getGlobals() to documentation. The return type is defined in the GlobalsInterface

Commits
-------

904ed22d Add return type for getGlobals() to documentation. The return type is defied in the GlobalsInterface
 2020-11-09 14:31:05 +01:00
tkm 752bcc7be6 Fix include documentation - change filter tag to apply 2020-11-09 15:08:48 +02:00
Maarten de Keizer 904ed22daa Add return type for getGlobals() to documentation. The return type is 
defied in the GlobalsInterface
 2020-11-06 10:59:01 +01:00
Fabien Potencier e7a4b69e95 minor #3417 Enhancement: Introduce DOCtor-RST config + GithubAction (OskarStark) 
This PR was squashed before being merged into the 3.x branch.

Discussion
----------

Enhancement: Introduce DOCtor-RST config + GithubAction

Commits
-------

8ac8cb71 Enhancement: Introduce DOCtor-RST config + GithubAction
 2020-11-06 08:11:00 +01:00
Oskar Stark 8ac8cb719a Enhancement: Introduce DOCtor-RST config + GithubAction 2020-11-06 08:10:54 +01:00
Fabien Potencier d3eaaccc0d Fix doc 2020-11-06 08:07:52 +01:00
Fabien Potencier 1a8dd9ef53 Merge branch '2.x' into 3.x 
* 2.x:
  Fix: Add missing versionadded directive
 2020-11-06 08:07:36 +01:00
Fabien Potencier ff3045289b minor #3436 Fix: Add missing versionadded directive (OskarStark) 
This PR was submitted for the 3.x branch but it was merged into the 2.x branch instead.

Discussion
----------

Fix: Add missing versionadded directive

mentioned by @stof in https://github.com/twigphp/Twig/pull/3434/files/5ceda707edeabd9e1462c43f199aa61606a29ff9#diff-cb39a2af448a7ea26e78809ebffa995c051f742afdb1f6d3e68ab85b09b801b8

Commits
-------

965ba57d Fix: Add missing versionadded directive
 2020-11-06 08:07:20 +01:00
Fabien Potencier 8caeb1a1e1 minor #3419 Enhancement: Use GithubActions instead of Travis for tests (OskarStark) 
This PR was merged into the 3.x branch.

Discussion
----------

Enhancement: Use GithubActions instead of Travis for tests

You can see the run here: https://github.com/OskarStark/Twig/pull/1

Commits
-------

8ac1f822 Enhancement: Use GithubActions instead of Travis for tests
 2020-11-06 08:05:20 +01:00
Oskar Stark 8ac1f822ac Enhancement: Use GithubActions instead of Travis for tests 2020-11-05 20:12:42 +01:00
Oskar Stark 965ba57d76 Fix: Add missing versionadded directive 
mentioned by @stof in https://github.com/twigphp/Twig/pull/3434/files/5ceda707edeabd9e1462c43f199aa61606a29ff9#diff-cb39a2af448a7ea26e78809ebffa995c051f742afdb1f6d3e68ab85b09b801b8
 2020-11-05 20:10:12 +01:00
Fabien Potencier 9d3963d059 Fix branch in tests 2020-11-05 18:38:53 +01:00
Fabien Potencier 22537dd1c4 Merge branch '2.x' into 3.x 
* 2.x:
  Fix small typo
  Fix: Typo
  Enhancement: Use GithubActions instead of Travis for tests
  Fix: DOCtor-RST build
  Enhancement: Use no_explicit_use_of_code_block_php rule
  Fix: Highlighting
  Enhancement: Introduce DOCtor-RST config + Sphinx build + GithubActions
  Enhancement: Use GithubActions instead of Travis for tests
  Fix `odd` not working for negative numbers
  Bump version to 2.14.2-DEV
  Prepare the 2.14.1 release
  Update CHANGELOG
  Bump version to 1.44.2-DEV
  Prepare the 1.44.1 release
 2020-11-05 18:38:00 +01:00
Fabien Potencier 4afea9870d Merge branch '1.x' into 2.x 
* 1.x:
  Enhancement: Use no_explicit_use_of_code_block_php rule
 2020-11-05 18:30:36 +01:00
Fabien Potencier 65189bf9f8 minor #3427 Enhancement: Use GithubActions instead of Travis for tests (OskarStark) 
This PR was merged into the 2.x branch.

Discussion
----------

Enhancement: Use GithubActions instead of Travis for tests

You can see the first run in https://github.com/OskarStark/Twig/pull/2

Commits
-------

fdafd406 Enhancement: Use GithubActions instead of Travis for tests
 2020-11-05 18:28:39 +01:00
Fabien Potencier 311e8ce4ac minor #3432 Enhancement: Use no_explicit_use_of_code_block_php rule (OskarStark) 
This PR was merged into the 1.x branch.

Discussion
----------

Enhancement: Use no_explicit_use_of_code_block_php rule

Commits
-------

87eb1396 Enhancement: Use no_explicit_use_of_code_block_php rule
 2020-11-05 18:27:08 +01:00
Fabien Potencier 5c5d23d229 minor #3435 Fix small typo in docs (apfelbox) 
This PR was merged into the 2.x branch.

Discussion
----------

Fix small typo in docs

Commits
-------

7139e71c Fix small typo
 2020-11-05 18:26:36 +01:00
Fabien Potencier 824759d7c2 minor #3433 Fix: Typo (OskarStark) 
This PR was merged into the 2.x branch.

Discussion
----------

Fix: Typo

The DOCtor-RST build will be fixed in #3434

Commits
-------

814aa6c6 Fix: Typo
 2020-11-05 18:25:42 +01:00