Commit Graph

3618 Commits

Author SHA1 Message Date
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
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 0768f10b9d added PHP 7.2 to the test matrix 2017-05-11 13:34:27 -07: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 f4adaef9f1 fixed tests 2017-05-11 13:24:58 -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
Fabien Potencier cf93147901 bug #2465 Fix generating template name in createTemplate() method (pulzarraider)
This PR was merged into the 1.x branch.

Discussion
----------

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` function 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 much faster and doesn't pollute the cache folder with unneeded files.

Commits
-------

a7c8b082 Fix generating template name in createTemplate() method
2017-05-11 07:50:20 -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 324ab87d2f minor #2461 Fix typo in advanced.rst file (fre5h)
This PR was submitted for the 2.x branch but it was merged into the 1.x branch instead (closes #2461).

Discussion
----------

Fix typo in `advanced.rst` file

Commits
-------

a264fc62 Fix typo in `advanced.rst` file
2017-05-05 06:59:56 -07:00
Artem Genvald a264fc62e5 Fix typo in advanced.rst file 2017-05-05 06:59:56 -07: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 v2.3.2 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 v1.33.2 2017-04-20 11:39:48 -06:00
Fabien Potencier 0db54be684 bug #2449 fixed edge case in the method cache for Twig attributes (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

fixed edge case in the method cache for Twig attributes

closes #2447

Commits
-------

413be416 fixed edge case in the method cache for Twig attributes
2017-04-20 11:37:13 -06:00
Fabien Potencier 6a8c3f9f9b fixed typo 2017-04-19 10:10:16 -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 v2.3.1 2017-04-18 15:50:11 -06:00
Fabien Potencier 0398cfddf6 Merge branch '1.x' into 2.x
* 1.x:
  bumped version to 1.33.2-DEV
  prepared the 1.33.1 release
  updated CHANGELOG
2017-04-18 15:47:32 -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 v1.33.1 2017-04-18 15:43:11 -06:00
Fabien Potencier 9b417f4212 updated CHANGELOG 2017-04-18 15:38:12 -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 dab65824ec minor #2448 Wrong stdClass class name generates warning (chrisCheeseBurgames)
This PR was submitted for the master branch but it was merged into the 1.x branch instead (closes #2448).

Discussion
----------

Wrong stdClass class name generates warning

Commits
-------

38987c93 Wrong stdClass class name generates warning
2017-04-18 07:54:16 -06:00
Christophe SAUVEUR 38987c9349 Wrong stdClass class name generates warning 2017-04-18 07:53:53 -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
Fabien Potencier cede5f3fbf minor #2434 Autoescape test addition; collision fix in Array Loader. (dave-newson)
This PR was squashed before being merged into the 1.x branch (closes #2434).

Discussion
----------

Autoescape test addition; collision fix in Array Loader.

This PR makes two changes. It was created while testing a third issue that was discovered to be fixed in the latest version.

## Added JS to Autoescape: name test

This adds "index.js.html" to the autoescape:name test, proving the functionality of the JS escape system and the name guessing strategy.

## Fixed collision in Array Loader

While trying to run the above test, it was discovered that the Array Loader uses the content of the template file as the "key" for determining which compiled template to load.
As the above test uses identical content for both HTML and JS templates this led to the compiled HTML template always being loaded.

This change prepends the content with the filename, which vaguely follows the same mechanism as the "options" (which are appended after `getCacheKey` is called).

**This change might be a backwards-incompatible change** depending on your interpretation of how `Loader/Array` is intended to be used.
The class itself states:
> This loader should only be used for unit testing.

The assumption is it's OK for this to occur.

Test cases have been updated to take this key change into account, and an additional test has been added to confirm `Loader/Array` specifically has the capability to resolve two files with the same content to different keys.

Commits
-------

da82b41a Autoescape test addition; collision fix in Array Loader.
2017-04-05 16:19:31 -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 v2.3.0 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 v1.33.0 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
Fabien Potencier f5596be101 Merge branch '1.x' into 2.x
* 1.x:
  updated CHANGELOG
  Call clearstatcache() before calling is_dir().
  bumped version to 1.33
  fixed CHANGELOG
  Make "length" filter and "empty" test consider __toString [Twig 1.x]
2017-03-22 08:12:17 -07:00