Commit Graph

2023 Commits

Author SHA1 Message Date
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
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 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
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
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 e5fb21f1dd added deprecation notices for @final classes 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 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
SpacePossum 3aa2e884ae Length filter non-mb_string on 7.x fix. 2017-05-12 10:40:10 +02:00
Fabien Potencier 75f2231a45 fixed code for older versions of PHP 2017-05-11 15:26:49 -07:00
Fabien Potencier d884330572 bumped version to 1.34 2017-05-11 14:48:03 -07:00
Fabien Potencier ccee78ec6c feature #2452 Support PHPUnit 6 for testing extensions (hkdobrev)
This PR was merged into the 1.x branch.

Discussion
----------

Support PHPUnit 6 for testing extensions

When testing a Twig extension via the provided test cases [according to the documentation](https://twig.sensiolabs.org/doc/2.x/advanced.html#testing-an-extension), PHPUnit 6 is not supported.

I think we should force people who haven't upgraded to upgrade to PHPUnit 6 instead of limiting the ones who did.

Also, Twig 2.x runs only on PHP 7. People using Twig 2.x would most likely also test their code on PHP 7. Even though PHPUnit 5 supports PHP 7, I think most people who have updated PHP could update or would have already updated PHPUnit.

Commits
-------

8ebaf8e6 Support PHPUnit 6 for testing extensions
2017-05-11 14:46:15 -07:00
Haralan Dobrev 8ebaf8e644 Support PHPUnit 6 for testing extensions 2017-05-12 00:29:48 +03:00
Fabien Potencier 5c79de3a8e Merge branch '1.x' into 2.x
* 1.x:
  fixed tests
  Fix generating template name in createTemplate() method
  Prepare for php 7.2
  Fix typo in `advanced.rst` file
2017-05-11 13:26:47 -07:00
Fabien Potencier 537db199c2 bug #2462 Prepare for php 7.2 (hboomsma)
This PR was merged into the 1.x branch.

Discussion
----------

Prepare for php 7.2

* allow `|length` of `null`
* allow `|length` of objects not implementing `\Countable`

*To get no errors when running with PHP 7.2 You need to use phpunit
^6.1, otherwise the `each` function, used by phpunit, triggers errors.
You can do so by running phpunit like:
`SYMFONY_PHPUNIT_VERSION=6.1 phpnightly vendor/bin/simple-phpunit`*

Commits
-------

d2b7a01a Prepare for php 7.2
2017-05-11 13:23:40 -07:00
Andrej Hudec a7c8b08270 Fix generating template name in createTemplate() method
Before this change the name for the template was generated randomly based on uniqid(mt_rand()). It generated new file whenever the  template was loaded as string using the `template_from_string`  even the template was the same. The generated file wasn't used anymore.
Now the cache file is generated by the content of template so using the `template_from_string` is faster and doesn't pollute the cache folder with unneeded files.
2017-05-11 12:36:01 +02:00
Hidde Boomsma d2b7a01a18 Prepare for php 7.2
* allow `|length` of `null`
* allow `|length` of objects not implementing `\Countable`

* To get no errors when running with PHP 7.2 You need to use phpunit
^6.1, otherwise the `each` function, used by phpunit, triggers errors.
You can do so by running phpunit like:
`SYMFONY_PHPUNIT_VERSION=6.1 phpnightly vendor/bin/simple-phpunit` *
2017-05-08 09:03:00 +02:00
Fabien Potencier bc717d6250 Merge branch '1.x' into 2.x
* 1.x:
  removed a @final tag
2017-04-26 14:50:33 -04:00
Fabien Potencier a083db55c2 removed a @final tag 2017-04-26 14:47:34 -04:00
Fabien Potencier 880856b233 bumped version to 2.3.3-DEV 2017-04-20 18:13:40 -06:00
Fabien Potencier 85e8372c45 prepared the 2.3.2 release 2017-04-20 18:13:02 -06:00
Fabien Potencier bda3380e6f Merge branch '1.x' into 2.x
* 1.x:
  bumped version to 1.33.3-DEV
  prepared the 1.33.2 release
  fixed edge case in the method cache for Twig attributes
2017-04-20 18:10:40 -06:00
Fabien Potencier ef680be80e bumped version to 1.33.3-DEV 2017-04-20 11:41:13 -06:00
Fabien Potencier dd6ca96227 prepared the 1.33.2 release 2017-04-20 11:39:48 -06:00
Fabien Potencier 413be4167b fixed edge case in the method cache for Twig attributes 2017-04-18 16:52:31 -06:00
Fabien Potencier 4335780853 bumped version to 2.3.2-DEV 2017-04-18 15:50:49 -06:00
Fabien Potencier 437efc4356 prepared the 2.3.1 release 2017-04-18 15:50:11 -06:00
Fabien Potencier 530be06a5a bumped version to 1.33.2-DEV 2017-04-18 15:44:30 -06:00
Fabien Potencier a87f959f4b prepared the 1.33.1 release 2017-04-18 15:43:11 -06:00
Fabien Potencier a601312031 Merge branch '1.x' into 2.x
* 1.x:
  Wrong stdClass class name generates warning
  added more is_object() safegaruds
  Autoescape test addition; collision fix in Array Loader.
  test if is_object before calling method_exists, fixes #2431
  bumped version to 1.33.1-DEV
  prepared the 1.33.0 release
2017-04-18 08:02:34 -06:00
Fabien Potencier dc70f3e826 added more is_object() safegaruds 2017-04-05 16:23:01 -07:00
Fabien Potencier 4a722dd02f bug #2433 Fix #2431 (mpdude)
This PR was merged into the 1.x branch.

Discussion
----------

Fix #2431

See title

Commits
-------

a5c2da6d test if is_object before calling method_exists, fixes #2431
2017-04-05 16:21:29 -07:00
dave-newson da82b41ac2 Autoescape test addition; collision fix in Array Loader. 2017-04-05 16:19:30 -07:00
Matthias Pigulla a5c2da6de0 test if is_object before calling method_exists, fixes #2431 2017-03-24 15:59:34 +01:00
Fabien Potencier 84dea3134b bumped version to 2.3.1-DEV 2017-03-22 08:42:21 -07:00
Fabien Potencier 9718186a5d prepared the 2.3.0 release 2017-03-22 08:41:51 -07:00
Fabien Potencier c622995d6d bumped version to 1.33.1-DEV 2017-03-22 08:40:48 -07:00
Fabien Potencier 05cf49921b prepared the 1.33.0 release 2017-03-22 08:40:09 -07:00
Fabien Potencier 3a4a9fea63 removed PHP 5.2 condition 2017-03-22 08:25:02 -07:00
Fabien Potencier c019689647 Merge branch '1.X' into 2.x
* 1.X:
  fixed PHP 5.2 compat
2017-03-22 08:24:50 -07:00
Fabien Potencier 755b101ff5 fixed PHP 5.2 compat 2017-03-22 08:24:38 -07:00