Commit Graph

3362 Commits

Author SHA1 Message Date
Fabien Potencier 64349bcf49 removed dev deps in composer.json 2018-03-19 18:18:16 +01:00
Fabien Potencier 4d9dc79516 bug #2659 [v1] Fixed counting children of SimpleXMLElement object (webimpress)
This PR was merged into the 1.x branch.

Discussion
----------

[v1] Fixed counting children of SimpleXMLElement object

It works correctly in v1.32 and since v1.33 it is not working correctly.
See: https://github.com/twigphp/Twig/compare/v1.32.0...v1.33.0#diff-d7378002f67a61c458c1de0468eef74fR1265

Test code:
```php
$xml = new SimpleXMLElement('<?xml version="1.0" encoding="UTF-8"?><doc><elem/><elem/></doc>');

var_dump($xml instanceof \Countable);
echo 'Count: ' . count($xml), PHP_EOL;
echo 'Strlen: ' . strlen($xml), PHP_EOL;
echo 'MB Strlen: ' . mb_strlen($xml), PHP_EOL;
```

Results:
```
bool(false)
Count: 2
Strlen: 0
MB Strlen: 0
```

https://3v4l.org/VvUXG

Commits
-------

4a23bdc3 Fixed counting children of SimpleXMLElement object
2018-03-14 08:27:12 -07:00
webimpress 4a23bdc345 Fixed counting children of SimpleXMLElement object 2018-03-14 10:16:52 +00:00
Fabien Potencier 981c4d8ca0 bug #2652 Add missing else clause to avoid infinite loops (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Add missing else clause to avoid infinite loops

Commits
-------

de2be6a0 added missing else clause to avoid infinite loops
2018-03-04 18:08:10 -08:00
Fabien Potencier de2be6a0ee added missing else clause to avoid infinite loops 2018-03-04 18:07:35 -08:00
Fabien Potencier ab6c99e707 bug #2651 Fix .. (range operator) in sandbox policy (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Fix .. (range operator) in sandbox policy

Closes #2630

Commits
-------

6f45fcf5 fixed .. (range operator) in sandbox policy
2018-03-04 17:57:12 -08:00
Fabien Potencier 6f45fcf519 fixed .. (range operator) in sandbox policy 2018-03-04 10:12:13 -08:00
Fabien Potencier bf7bbf1e93 fixed version 2018-03-03 08:24:39 -08:00
Fabien Potencier fe4a5e846c bumped version to 1.35.3-DEV 2018-03-03 08:22:00 -08:00
Fabien Potencier 9c24f2cd39 prepared the 1.35.2 release v1.35.2 2018-03-03 08:21:29 -08:00
Fabien Potencier 1278ca96af bug #2647 Fix profiler unicity when several ones are registered (fabpot)
This PR was squashed before being merged into the 1.x branch (closes #2647).

Discussion
----------

Fix profiler unicity when several ones are registered

Closes #2627, closes #2643, alternative to #2645

What happens is that both Twig and Symfony register a Twig profiler. Unfortunately, the current code does assign the same variable for both profiler, which means that trying to close it twice does not work.

Commits
-------

0ee096f0 fixed test
7b2bdbe3 fixed profiler unicity when several ones are registered
2018-03-03 08:18:26 -08:00
Fabien Potencier 0ee096f092 fixed test 2018-03-03 07:53:48 -08:00
Fabien Potencier 7b2bdbe351 fixed profiler unicity when several ones are registered 2018-03-03 07:49:53 -08:00
Fabien Potencier caf2caa8f4 fixed CS 2018-03-02 13:09:41 -08:00
Fabien Potencier b047676503 minor #2639 Switch the PHP ext jobs to a whitelist rather than a blacklist (stof)
This PR was merged into the 1.x branch.

Discussion
----------

Switch the PHP ext jobs to a whitelist rather than a blacklist

Any new PHP version added in the future will be a PHP 7.x one, not a 5.x one, and so should not have a job for the extension.

the whitelist is already shorter than the blacklist today (3 whitelisted vs 4 blacklisted before, as PHP 5.3 is already handled separately due to precise anyway)

Commits
-------

738f17bb Switch the PHP ext jobs to a whitelist rather than a blacklist
2018-03-02 13:05:33 -08:00
Christophe Coevoet 738f17bb45 Switch the PHP ext jobs to a whitelist rather than a blacklist
Any new PHP version added in the future will be a PHP 7.x one, not a 5.x one, and so should not have a job for the extension.
2018-03-02 19:08:25 +01:00
Fabien Potencier 067ade15e6 bumped version to 1.35.2-DEV 2018-03-02 10:07:31 -08:00
Fabien Potencier ffda54d85c prepared the 1.35.1 release v1.35.1 2018-03-02 10:06:27 -08:00
Fabien Potencier 277b400158 bug #2637 Fix C ext (fabpot)
This PR was squashed before being merged into the 1.x branch (closes #2637).

Discussion
----------

Fix C ext

Commits
-------

bffc117f simplified code
a0c24242 fixed C ext
64e85689 fixed Travis config
2018-03-02 10:04:32 -08:00
Fabien Potencier bffc117f53 simplified code 2018-03-02 09:54:18 -08:00
Fabien Potencier a0c24242de fixed C ext 2018-03-02 09:53:02 -08:00
Fabien Potencier 64e856892b fixed Travis config 2018-03-02 09:53:02 -08:00
Fabien Potencier bf34cadf0f updated CHANGELOG 2018-03-02 08:56:04 -08:00
Fabien Potencier 1445246d8e added missing test 2018-03-02 06:04:04 -08:00
Fabien Potencier 9e7db77331 bug #2411 Exception for use of "===" instead of "same as" (sgotre)
This PR was squashed before being merged into the 1.x branch (closes #2411).

Discussion
----------

Exception for use of "===" instead of "same as"

As mentioned in #2358
Hope this is the right location for this Exception

Commits
-------

194d51a4 Exception for use of "===" instead of "same as"
2018-03-02 06:02:21 -08:00
sgotre 194d51a4a8 Exception for use of "===" instead of "same as" 2018-03-02 06:02:16 -08:00
Fabien Potencier e8555dc8ee minor #2633 Update .travis.yml to test on PHP 7.2 (gmponos)
This PR was submitted for the 2.x branch but it was merged into the 1.x branch instead (closes #2633).

Discussion
----------

Update .travis.yml to test on PHP 7.2

Commits
-------

8e7527ec Update .travis.yml
2018-02-28 08:23:15 -08:00
Mponos George 8e7527ec97 Update .travis.yml 2018-02-28 08:23:05 -08:00
Fabien Potencier 8a7fba9560 bug #2624 Fix possible array to string conversion concealing actual error (finwe)
This PR was merged into the 1.x branch.

Discussion
----------

Fix possible array to string conversion concealing actual error

This is a 1.x branch backport of #2613

Commits
-------

7ba3b5a5 Fix possible array to string conversion concealing actual error
2018-02-07 20:24:52 +01:00
Fabien Potencier f2e5f4080c bug #2621 Make variable names deterministic (lstrojny)
This PR was merged into the 1.x branch.

Discussion
----------

Make variable names deterministic

Variables should be deterministic to support reproducible builds as outlined in https://github.com/symfony/symfony/issues/25958

Commits
-------

6ab5fe9b Make variable names deterministic
2018-02-07 20:22:14 +01:00
Matěj Humpál 7ba3b5a589 Fix possible array to string conversion concealing actual error 2018-02-07 15:47:38 +01:00
Lars Strojny 6ab5fe9b8f Make variable names deterministic 2018-01-31 18:04:41 +01:00
Fabien Potencier e923101942 bug #2600 Be able to count on iterator (scuben)
This PR was merged into the 1.x branch.

Discussion
----------

Be able to count on iterator

This PR allows to count on `\Traversable` Objects. Not sure if I made the change to the correct branch. Tell me please if I should target 2.x or master.

Commits
-------

be2c32cc Be able to count on iterator
2018-01-30 17:11:48 +01:00
ARTACK WebLab be2c32cc1c Be able to count on iterator 2018-01-30 17:04:01 +01:00
Fabien Potencier f93530b440 made it clear that placeholders are free-forms for the replace filter 2018-01-30 08:01:42 +01:00
Fabien Potencier 1040696c52 minor #2612 English tweak contents -> content (weaverryan)
This PR was merged into the 1.x branch.

Discussion
----------

English tweak contents -> content

The most minor PR ever :).

Made to the 1.x branch, also applies to 2.x obviously.

Commits
-------

19e3fb8c contents -> content
2018-01-30 07:52:44 +01:00
Fabien Potencier 75baf9f897 minor #2611 Update license year (m1guelpf)
This PR was submitted for the 2.x branch but it was merged into the 1.x branch instead (closes #2611).

Discussion
----------

Update license year

TO DO:

- [x] Wait to the next year (100% done, depends on timezone)
- [ ] Merge!

:octocat:

Commits
-------

012ca796 Update license year
2018-01-07 18:54:25 +01:00
Miguel Piedrafita 012ca796bf Update license year 2018-01-07 18:54:25 +01:00
Ryan Weaver 19e3fb8c1a contents -> content 2018-01-03 15:09:52 -05:00
Fabien Potencier b36e3eb452 minor #2598 Update advanced.rst (pfwd)
This PR was submitted for the 2.x branch but it was merged into the 1.x branch instead (closes #2598).

Discussion
----------

Update advanced.rst

I noticed that the rot13Provider wasn't called correctly as it was trying to access a local variable instead of calling $this

Commits
-------

b42fd643 Update advanced.rst
2017-12-07 07:56:46 -08:00
Peter Fisher b42fd6435e Update advanced.rst
I noticed that the rot13Provider wasn't called correctly as it was trying to access a local variable instead of calling $this
2017-12-07 07:56:46 -08:00
Fabien Potencier 5322c9b4ca updated CHANGELOG 2017-11-12 10:47:15 -08:00
Fabien Potencier 9c2b1dc528 bug #2586 Environment::resolveTemplate now accepts instances of TemplateWrapper (victorwelling)
This PR was submitted for the 2.x branch but it was merged into the 1.x branch instead (closes #2586).

Discussion
----------

Environment::resolveTemplate now accepts instances of TemplateWrapper

The [documentation on the include function](https://twig.symfony.com/doc/2.x/functions/include.html) states (on the template expression):
> And if the expression evaluates to a Twig_Template or a Twig_TemplateWrapper instance, Twig will use it directly […]

This is currently broken, as `twig_include` [relies on `resolveTemplate`](https://github.com/twigphp/Twig/blob/31b577863b5ae8d19e2cefd174e95a433f16491f/lib/Twig/Extension/Core.php#L1304), which doesn't handle instances of `TemplateWrapper`. This PR fixes that.

For the sake of completeness: the `include` tag doesn't have this problem, as it relies on the `loadTemplate` method of the `Template` class which _does_ handle this case.

Commits
-------

78a4f2fb Environment::resolveTemplate now accepts instances of TemplateWrapper
2017-11-12 10:30:56 -08:00
Victor Welling 78a4f2fb59 Environment::resolveTemplate now accepts instances of TemplateWrapper 2017-11-12 10:30:50 -08:00
Fabien Potencier acfa0311e7 minor #2562 Change typo in documentation (uthopiko)
This PR was submitted for the master branch but it was merged into the 1.x branch instead (closes #2562).

Discussion
----------

Change typo in documentation

In example of use for test_iterable function there is a typo

Commits
-------

8607f13d Change typo in documentation
2017-11-12 10:27:33 -08:00
Asier Ramos 8607f13db7 Change typo in documentation
In example of use for test_iterable function there is a typo
2017-11-12 10:27:33 -08:00
Fabien Potencier 7014fda0af minor #2570 fix grammar (redbrickone)
This PR was submitted for the 2.x branch but it was merged into the 1.x branch instead (closes #2570).

Discussion
----------

fix grammar

Commits
-------

d4309898 fix grammar
2017-11-12 10:24:46 -08:00
Chris Wright d430989818 fix grammar 2017-11-12 10:24:45 -08:00
Fabien Potencier 2610f2e128 minor #2582 Fix PHP 5.3 Travis build (c960657)
This PR was merged into the 1.x branch.

Discussion
----------

Fix PHP 5.3 Travis build

PHP 5.3 is only supported on Debian Precise.

Commits
-------

3a45bd48 Fix PHP 5.3 build
2017-11-07 13:50:11 -08:00
Christian Schmidt 3a45bd48cf Fix PHP 5.3 build 2017-11-07 22:28:59 +01:00