Commit Graph

3301 Commits

Author SHA1 Message Date
Fabien Potencier 90a07d166d simplified tests as min version if now 5.3.3 2017-08-16 08:30:52 +02:00
Fabien Potencier 02042e5126 feature #2519 Added RuntimeExtensionInterface (lyrixx)
This PR was merged into the 1.x branch.

Discussion
----------

Added RuntimeExtensionInterface

Commits
-------

6f08f574 Added RuntimeExtensionInterface
2017-08-16 08:19:23 +02:00
Fabien Potencier 16bfb101f0 bumped version to 1.35 2017-08-16 08:18:33 +02:00
Fabien Potencier 73ab3a1215 minor #2536 show how to use a variable as hash map key (tolry)
This PR was submitted for the 2.x branch but it was squashed and merged into the 1.x branch instead (closes #2536).

Discussion
----------

show how to use a variable as hash map key

currently the documentation does not explain how it's possible to use a variable as key in a hash map

Commits
-------

ef6c9505 show how to use a variable as hash map key
2017-08-02 20:11:46 +02:00
Tobias Olry ef6c950505 show how to use a variable as hash map key 2017-08-02 20:11:29 +02:00
Grégoire Pineau 6f08f5745c Added RuntimeExtensionInterface 2017-07-22 11:19:18 +02:00
Fabien Potencier 6e17134b1a updated CHANGELOG 2017-07-22 09:30:43 +02:00
Fabien Potencier d632fd3c33 feature #2530 Throw exception on circular reference detection (yceruto)
This PR was merged into the 1.x branch.

Discussion
----------

Throw exception on circular reference detection

Out-the-box this isn't common... but into Symfony framework this kind of issue can happen frequently when we're overriding a template from third-party bundle (see main issue https://github.com/symfony/symfony/issues/17557)

```twig
{# app/Resources/AcmeBlogBundle/views/Blog/index.html.twig #}
{% extends '@AcmeBlog/Blog/index.html.twig' %}

{% block title 'New Title' %}
```

This exception avoids inifite loop or maximum execution time for this case, by detecting a recursive loading when a template extends from itself, thinking to override the parent template which has the same namespace + template name.

Commits
-------

074e1fbe Throw exception on circular reference detection
2017-07-22 09:30:00 +02:00
Yonel Ceruto 074e1fbe35 Throw exception on circular reference detection 2017-07-21 12:13:25 -04:00
Fabien Potencier e26c4aa298 minor #2531 Update .travis.yml to deal with missing xdebug config (SpacePossum)
This PR was submitted for the 2.x branch but it was merged into the 1.x branch instead (closes #2531).

Discussion
----------

Update .travis.yml to deal with missing xdebug config

lets see if this fixes the nightly test

Commits
-------

1097685b Update .travis.yml
2017-07-20 19:25:08 +02:00
SpacePossum 1097685be0 Update .travis.yml 2017-07-20 19:25:08 +02:00
Fabien Potencier f1703ea411 bumped version to 1.34.5-DEV 2017-07-04 16:20:04 +03:00
Fabien Potencier f878bab48e prepared the 1.34.4 release v1.34.4 2017-07-04 16:19:31 +03:00
Fabien Potencier 64c1a6089f updated CHANGELOG 2017-07-04 16:18:18 +03:00
Fabien Potencier 8c9bb921ea minor #2515 Update internals.rst (pribilinskiy)
This PR was submitted for the 2.x branch but it was merged into the 1.x branch instead (closes #2515).

Discussion
----------

Update internals.rst

Missing an opening paren

Commits
-------

b8967bd3 Update internals.rst
2017-06-16 06:42:12 -07:00
Steven Pribilinskiy b8967bd371 Update internals.rst
Missing an opening paren
2017-06-16 06:42:12 -07:00
Fabien Potencier 821fd61cfc minor #2493 Update .php_cs.dist (SpacePossum)
This PR was merged into the 1.x branch.

Discussion
----------

Update .php_cs.dist

following https://github.com/twigphp/Twig/pull/2490#discussion_r119097107
:)

Commits
-------

8539a18f Update .php_cs.dist
2017-06-12 09:58:36 -07:00
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
SpacePossum 8539a18f8a Update .php_cs.dist 2017-05-30 19:25:17 +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