Commit Graph

3664 Commits

Author SHA1 Message Date
Fabien Potencier 86258ae849 Merge branch '1.x' into 2.x
* 1.x:
  Use class_exists instead of require to play nice with inlining
2017-06-05 11:19:32 -07:00
Fabien Potencier 23e64af69c bug #2501 Use class_exists instead of require to play nice with inlining (nicolas-grekas)
This PR was merged into the 1.x branch.

Discussion
----------

Use class_exists instead of require to play nice with inlining

Should fix #2495

Commits
-------

dfe0dc2b Use class_exists instead of require to play nice with inlining
2017-06-05 11:19:11 -07:00
Nicolas Grekas dfe0dc2b58 Use class_exists instead of require to play nice with inlining 2017-06-05 20:12:18 +02:00
Fabien Potencier 976afb63a2 bumped version to 2.4.1-DEV 2017-06-05 10:25:17 -07:00
Fabien Potencier e3bdc12cba prepared the 2.4.0 release v2.4.0 2017-06-05 10:24:44 -07:00
Fabien Potencier b0f4399ab0 updated CHANGELOG 2017-06-05 10:24:14 -07:00
Fabien Potencier 7df393fb7d Merge branch '1.x' into 2.x
* 1.x:
  added missing entries in CHANGELOG
2017-06-05 10:23:50 -07:00
Fabien Potencier 8bc1c950cd added missing entries in CHANGELOG 2017-06-05 10:23:40 -07:00
Fabien Potencier e3eaa1737e Merge branch '1.x' into 2.x
* 1.x:
  bumped version to 1.34.1-DEV
  prepared the 1.34.0 release
  [Doc] Fixed documentation about 'Definition vs Runtime'
2017-06-05 10:18:54 -07:00
Fabien Potencier 1cb696c6ea bumped version to 1.34.1-DEV 2017-06-05 10:17:28 -07:00
Fabien Potencier b38636760c prepared the 1.34.0 release v1.34.0 2017-06-05 10:16:52 -07:00
Fabien Potencier d85c17e0dc bug #2500 Remove alias duplicate (nicolas-grekas)
This PR was merged into the 2.x branch.

Discussion
----------

Remove alias duplicate

Fixes #2499

Commits
-------

6674cfc4 Remove alias duplicate
2017-06-04 17:08:38 -07:00
Nicolas Grekas 6674cfc492 Remove alias duplicate 2017-06-04 22:09:17 +02:00
Fabien Potencier 3c132d066a minor #2496 [Doc] Fixed documentation about 'Definition vs Runtime' (lyrixx)
This PR was merged into the 1.x branch.

Discussion
----------

[Doc] Fixed documentation about 'Definition vs Runtime'

Commits
-------

c0b5eb9f [Doc] Fixed documentation about 'Definition vs Runtime'
2017-06-02 07:37:47 -07:00
Grégoire Pineau c0b5eb9f03 [Doc] Fixed documentation about 'Definition vs Runtime' 2017-06-02 16:26:53 +02:00
Fabien Potencier ca67cda8d0 Merge branch '1.x' into 2.x
* 1.x:
  Fix Twig\Environment alias
2017-06-01 06:51:40 -07:00
Fabien Potencier f6e0000499 minor #2494 Fix Twig\Environment alias (nicolas-grekas)
This PR was merged into the 1.x branch.

Discussion
----------

Fix Twig\Environment alias

Commits
-------

8e03fa3e Fix Twig\Environment alias
2017-06-01 06:51:30 -07:00
Nicolas Grekas 8e03fa3e1c Fix Twig\Environment alias 2017-06-01 06:42:27 +02:00
Fabien Potencier c4ac663192 Merge branch '1.x' into 2.x
* 1.x:
  reverted renaming of Twig\Environment to Twig\Twig
2017-05-31 13:19:02 -07:00
Fabien Potencier 04ef7a11b7 reverted renaming of Twig\Environment to Twig\Twig 2017-05-31 13:18:51 -07:00
Fabien Potencier 0b6c19d816 fixed bad merge 2017-05-31 11:12:45 -07:00
Fabien Potencier c99d5394ba bug #2491 [2.x] Allow using namespaced aliases as extension names (nicolas-grekas)
This PR was merged into the 2.x branch.

Discussion
----------

[2.x] Allow using namespaced aliases as extension names

Commits
-------

08a88400 [2.x] Allow using namespaced aliases as extension names
2017-05-31 10:37:26 -07:00
Fabien Potencier f783be6e85 Merge branch '1.x' into 2.x
* 1.x:
  [1.x] Allow using namespaced aliases as extension names
2017-05-31 10:36:08 -07:00
Fabien Potencier aad17a1a35 bug #2490 [1.x] Allow using namespaced aliases as extension names (nicolas-grekas)
This PR was merged into the 1.x branch.

Discussion
----------

[1.x] Allow using namespaced aliases as extension names

Commits
-------

c9a2f3db [1.x] Allow using namespaced aliases as extension names
2017-05-31 10:34:55 -07:00
Nicolas Grekas c9a2f3db8b [1.x] Allow using namespaced aliases as extension names 2017-05-31 14:35:57 +02:00
Nicolas Grekas 08a8840084 [2.x] Allow using namespaced aliases as extension names 2017-05-30 13:00:58 +02:00
Fabien Potencier 9cfb0f565c updated CHANGELOG 2017-05-25 15:41:27 -07:00
Fabien Potencier a887fc9119 feature #2486 [2.x] Add namespaced aliases (nicolas-grekas)
This PR was merged into the 2.x branch.

Discussion
----------

[2.x] Add namespaced aliases

The 2.x-only part of #2484

Commits
-------

71265c40 [2.x] Add namespaced aliases
2017-05-25 15:40:35 -07:00
Fabien Potencier fd98722d15 Merge branch '1.x' into 2.x
* 1.x:
  Add the aliases
  Add namespaced aliases
2017-05-25 15:39:31 -07:00
Fabien Potencier 460712d35e feature #2484 Add namespaced aliases (nicolas-grekas)
This PR was squashed before being merged into the 1.x branch (closes #2484).

Discussion
----------

Add namespaced aliases

Commits
-------

5420a5e3 Add the aliases
71af32b3 Add namespaced aliases
2017-05-25 15:35:04 -07:00
Nicolas Grekas 5420a5e3f8 Add the aliases 2017-05-25 08:32:07 +02:00
Nicolas Grekas 71265c4000 [2.x] Add namespaced aliases 2017-05-25 08:29:23 +02:00
Fabien Potencier 11eac8ae2c bug #2483 Fix @final-related deprecations (nicolas-grekas)
This PR was merged into the 2.x branch.

Discussion
----------

Fix `@final`-related deprecations

The run-time notices make Symfony fail because the check should exclude e.g. `Twig_SimpleFilter`.
But IMHO, we may not really need these run-time checks, if we say that relying on the DebugClassLoader + CHANGELOG in enough (which we did in the past).

Commits
-------

635b9e59 Fix `@final`-related deprecations
2017-05-24 16:23:32 +02:00
Nicolas Grekas 635b9e592b Fix @final-related deprecations 2017-05-24 15:40:42 +02:00
Nicolas Grekas 71af32b306 Add namespaced aliases 2017-05-24 10:12:32 +02:00
Fabien Potencier af7120b061 feature #2481 Mark Twig_Node_Module as final via an annotation (will be final in 3.0) (fabpot)
This PR was squashed before being merged into the 2.x branch (closes #2481).

Discussion
----------

Mark Twig_Node_Module as final via an annotation (will be final in 3.0)

Commits
-------

e5fb21f1 added deprecation notices for @final classes
93929e1d added @final classes in the deprecated document
3810368b marked Twig_Node_Module as final via an annotation (will be final in 3.0)
2017-05-24 07:59:35 +02:00
Fabien Potencier e5fb21f1dd added deprecation notices for @final classes 2017-05-22 08:18:37 +02:00
Fabien Potencier 93929e1ddd added @final classes in the deprecated document 2017-05-22 08:18:37 +02:00
Fabien Potencier 3810368b3b marked Twig_Node_Module as final via an annotation (will be final in 3.0) 2017-05-22 08:18:37 +02:00
Fabien Potencier fa1a84ec0b Merge branch '1.x' into 2.x
* 1.x:
  reworded docs
  Update number_format.rst
  fixed tests for PHP 7.2
  dropped support for HHVM
2017-05-22 08:17:55 +02:00
Fabien Potencier eb58c61536 reworded docs 2017-05-22 07:52:05 +02:00
Fabien Potencier 4e019d4854 minor #2473 Update number_format.rst (DarkBee)
This PR was submitted for the 2.x branch but it was merged into the 1.x branch instead (closes #2473).

Discussion
----------

Update number_format.rst

Added warning when trying to format negative numbers at literal

Commits
-------

40fdb9e3 Update number_format.rst
2017-05-22 07:50:40 +02:00
DarkBee 40fdb9e3e5 Update number_format.rst 2017-05-22 07:50:40 +02:00
Fabien Potencier c6bd2df147 feature #2478 Drop support for HHVM (fabpot)
This PR was squashed before being merged into the 1.x branch (closes #2478).

Discussion
----------

Drop support for HHVM

Commits
-------

b6a4895e fixed tests for PHP 7.2
6ff8d6f4 dropped support for HHVM
2017-05-22 07:48:34 +02:00
Fabien Potencier b6a4895ea8 fixed tests for PHP 7.2 2017-05-22 07:43:40 +02:00
Fabien Potencier 6ff8d6f4e2 dropped support for HHVM 2017-05-22 07:24:53 +02:00
Fabien Potencier 0dbc6b87dc Merge branch '1.x' into 2.x
* 1.x:
  Length filter non-mb_string on 7.x fix.
  fixed code for older versions of PHP
  bumped version to 1.34
  Support PHPUnit 6 for testing extensions
  added PHP 7.2 to the test matrix
2017-05-12 06:59:34 -07:00
Fabien Potencier 860f80178b minor #2469 Length filter non-mb_string on 7.x fix. (SpacePossum)
This PR was merged into the 1.x branch.

Discussion
----------

Length filter non-mb_string on 7.x fix.

follow up on https://github.com/twigphp/Twig/pull/2462
after https://github.com/twigphp/Twig/issues/2464#issuecomment-301014241

Commits
-------

3aa2e884 Length filter non-mb_string on 7.x fix.
2017-05-12 06:54:14 -07:00
Fabien Potencier 97d741ab60 minor #2467 added PHP 7.2 to the test matrix (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

added PHP 7.2 to the test matrix

Commits
-------

0768f10b added PHP 7.2 to the test matrix
2017-05-12 06:52:17 -07:00
Fabien Potencier ad599308e0 feature #2468 Fix code for older versions of PHP (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Fix code for older versions of PHP

Commits
-------

75f2231a fixed code for older versions of PHP
2017-05-12 06:50:32 -07:00