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
7,732 Commits 29 Branches 275 Tags
stringable-array-keys-subclasses
Commit Graph

7732 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jannik 7139e71c99 Fix small typo 2020-11-05 14:29:41 +01:00
Oskar Stark 814aa6c6b0 Fix: Typo 2020-11-05 14:19:53 +01:00
Oskar Stark fdafd40626 Enhancement: Use GithubActions instead of Travis for tests 2020-11-05 14:17:52 +01:00
Fabien Potencier 7685eb905a minor #3434 Fix: DOCtor-RST build (OskarStark) 
This PR was merged into the 2.x branch.

Discussion
----------

Fix: DOCtor-RST build

Commits
-------

5ceda707 Fix: DOCtor-RST build
 2020-11-05 14:12:46 +01:00
Oskar Stark 5ceda707ed Fix: DOCtor-RST build 2020-11-05 13:57:55 +01:00
Oskar Stark 87eb1396ba Enhancement: Use no_explicit_use_of_code_block_php rule 2020-11-05 13:36:29 +01:00
Fabien Potencier 7a6f3eb534 Merge branch '1.x' into 2.x 
* 1.x:
  Fix: Highlighting
 2020-11-05 13:36:28 +01:00
Fabien Potencier 22cdd19189 minor #3431 Fix: Highlighting (OskarStark) 
This PR was merged into the 1.x branch.

Discussion
----------

Fix: Highlighting

Commits
-------

0df7ddcf Fix: Highlighting
 2020-11-05 13:36:13 +01:00
Fabien Potencier c2a264a91d Merge branch '1.x' into 2.x 
* 1.x:
  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 1.44.2-DEV
  Prepare the 1.44.1 release
 2020-11-05 13:31:01 +01:00
Oskar Stark 0df7ddcf4f Fix: Highlighting 2020-11-05 13:18:52 +01:00
Fabien Potencier 960e3e1fa3 minor #3430 Enhancement: Introduce DOCtor-RST config + Sphinx build + GithubActions (OskarStark) 
This PR was squashed before being merged into the 1.x branch.

Discussion
----------

Enhancement: Introduce DOCtor-RST config + Sphinx build + GithubActions

Commits
-------

c9328ad6 Enhancement: Introduce DOCtor-RST config + Sphinx build + GithubActions
 2020-11-05 13:09:12 +01:00
Oskar Stark c9328ad613 Enhancement: Introduce DOCtor-RST config + Sphinx build + GithubActions 2020-11-05 13:09:07 +01:00
Fabien Potencier da30f5d939 minor #3429 Enhancement: Use GithubActions instead of Travis for tests (OskarStark) 
This PR was merged into the 1.x branch.

Discussion
----------

Enhancement: Use GithubActions instead of Travis for tests

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

Commits
-------

4438d4c1 Enhancement: Use GithubActions instead of Travis for tests
 2020-11-05 13:06:13 +01:00
Oskar Stark 4438d4c1bb Enhancement: Use GithubActions instead of Travis for tests 2020-11-05 13:04:03 +01:00
Fabien Potencier 10ebf0c4d3 bug #3425 Fix odd not working for negative numbers (harrybournis) 
This PR was submitted for the 3.x branch but it was merged into the 1.x branch instead.

Discussion
----------

Fix `odd` not working for negative numbers

Fixes https://github.com/twigphp/Twig/issues/3424

Commits
-------

53a3ccd2 Fix `odd` not working for negative numbers
 2020-11-05 11:55:51 +01:00
Harry Bournis 53a3ccd2d2 Fix odd not working for negative numbers 2020-11-05 11:55:45 +01:00
Fabien Potencier 39a7b8fbb1 Bump version to 3.1.2-DEV 2020-10-27 20:29:24 +01:00
Fabien Potencier b02fa41f37 Prepare the 3.1.1 release v3.1.1 2020-10-27 20:28:23 +01:00
Fabien Potencier 3c577ab132 Update CHANGELOG 2020-10-27 20:28:04 +01:00
Fabien Potencier b163c7f716 Bump version to 2.14.2-DEV 2020-10-27 20:26:34 +01:00
Fabien Potencier 5eb9ac5dfd Prepare the 2.14.1 release v2.14.1 2020-10-27 20:25:29 +01:00
Fabien Potencier 35d744b851 Update CHANGELOG 2020-10-27 20:24:57 +01:00
Fabien Potencier cb4cd888ca Bump version to 1.44.2-DEV 2020-10-27 20:23:26 +01:00
Fabien Potencier 04b15d4c0b Prepare the 1.44.1 release v1.44.1 2020-10-27 20:22:48 +01:00
Fabien Potencier 1327db55e9 Merge branch '2.x' into 3.x 
* 2.x:
  Update format_time.rst
  Fix "include(template_from_string())"
  Fix PHPUnit config
 2020-10-27 15:15:09 +01:00
Fabien Potencier 497f027cd4 Merge branch '1.x' into 2.x 
* 1.x:
  Fix "include(template_from_string())"
  Fix PHPUnit config
 2020-10-27 15:14:55 +01:00
Fabien Potencier 9fb2deee6e bug #3413 Fix "include(template_from_string())" when not using a sandbox (fabpot) 
This PR was squashed before being merged into the 1.x branch.

Discussion
----------

Fix "include(template_from_string())" when not using a sandbox

Closed #3411

Commits
-------

df9c9f21 Fix "include(template_from_string())"
3d91e335 Fix PHPUnit config
 2020-10-27 15:14:35 +01:00