Commit Graph

3283 Commits

Author SHA1 Message Date
Fabien Potencier 53cfceabdf bug #2513 Fix deprecation when using Twig_Profiler_Dumper_Html (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Fix deprecation when using Twig_Profiler_Dumper_Html

Commits
-------

aebec7d8 fixed deprecation when using Twig_Profiler_Dumper_Html
2017-06-12 09:56:04 -07:00
Fabien Potencier aebec7d890 fixed deprecation when using Twig_Profiler_Dumper_Html 2017-06-12 09:49:15 -07:00
Fabien Potencier c84106f2ee minor #2512 Issue in documentation for twig number formatter (simsim2006)
This PR was submitted for the 2.x branch but it was merged into the 1.x branch instead (closes #2512).

Discussion
----------

Issue in documentation for twig number formatter

The explaination below my change is correct. Just the output is not correct

Commits
-------

54f0f7ae Create number_format.rst
2017-06-12 08:07:51 -07:00
simsim2006 54f0f7ae1c Create number_format.rst 2017-06-12 08:07:51 -07:00
Fabien Potencier d54355e9e1 bug #2509 Add support for runtime loaders to IntegrationTestCase (emodric)
This PR was merged into the 1.x branch.

Discussion
----------

Add support for runtime loaders to IntegrationTestCase

Adds the ability to provide runtime loaders in `IntegrationTestCase`. Otherwise, there's no way to test extensions that use them.

Fixes #2492

Commits
-------

ff96b34a Add support for runtime loaders to IntegrationTestCase
2017-06-09 08:14:30 -07:00
Edi Modrić ff96b34a62 Add support for runtime loaders to IntegrationTestCase 2017-06-09 10:04:55 +02:00
Fabien Potencier b3cb3d22d7 bumped version to 1.34.4-DEV 2017-06-07 11:45:59 -07:00
Fabien Potencier 451c6f4197 prepared the 1.34.3 release v1.34.3 2017-06-07 11:45:17 -07:00
Fabien Potencier a9fe0a9166 bug #2507 Move class_exists() at the bottom of files (nicolas-grekas)
This PR was merged into the 1.x branch.

Discussion
----------

Move class_exists() at the bottom of files

Fixes #2503
Closes #2506

Commits
-------

95e912b0 Move class_exists() at the bottom of files
2017-06-07 09:29:28 -07:00
Nicolas Grekas 95e912b002 Move class_exists() at the bottom of files 2017-06-07 17:54:42 +02:00
Fabien Potencier c071a2e36c bumped version to 1.34.3-DEV 2017-06-05 20:57:21 -07:00
Fabien Potencier 55e4beb721 prepared the 1.34.2 release v1.34.2 2017-06-05 20:56:50 -07:00
Fabien Potencier e92a13aae9 replaced require with class_exists 2017-06-05 17:04:19 -07:00
Fabien Potencier 84631789a2 bug #2502 Use class_exists instead of require (ogizanagi)
This PR was merged into the 1.x branch.

Discussion
----------

Use class_exists instead of require

I think this is required for https://github.com/symfony/symfony/pull/23073 to pass. It's probably very similar to https://github.com/symfony/symfony/pull/22657.

A simple reproducer:

```php
<?php

use Twig\Node\Node;

require_once __DIR__ . '/vendor/autoload.php';

new Node();
new \Twig_Node();
```

[Without this patch](https://travis-ci.org/symfony/symfony/jobs/239712676#L2100):

```php
PHP Fatal error:  Cannot declare class Twig_Node, because the name is already in use in vendor/twig/twig/lib/Twig/Node.php on line 20
```

With, everything works fine, whatever the two calls order.

Commits
-------

2c174e40 Use class_exists instead of require
2017-06-05 16:59:01 -07:00
Maxime Steinhausser 2c174e4015 Use class_exists instead of require 2017-06-05 23:42:50 +02:00
Fabien Potencier 1af645d539 bumped version to 1.34.2-DEV 2017-06-05 11:26:06 -07:00
Fabien Potencier 5c0f990d44 prepared the 1.34.1 release v1.34.1 2017-06-05 11:25:10 -07:00
Fabien Potencier ef183c1c92 updated CHANGELOG 2017-06-05 11:24:34 -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 8bc1c950cd added missing entries in CHANGELOG 2017-06-05 10:23:40 -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 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 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 04ef7a11b7 reverted renaming of Twig\Environment to Twig\Twig 2017-05-31 13:18:51 -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
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 71af32b306 Add namespaced aliases 2017-05-24 10:12:32 +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 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 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