diff --git a/build/build.xml b/build/build.xml
index 8f4089c74f..5d143886af 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -382,6 +382,12 @@
+
+
+
+
+
+
diff --git a/phpBB/composer.json b/phpBB/composer.json
index c6fcb281b9..4d31eefa2b 100644
--- a/phpBB/composer.json
+++ b/phpBB/composer.json
@@ -34,6 +34,7 @@
"symfony/event-dispatcher": "2.5.*",
"symfony/http-kernel": "2.5.*",
"symfony/routing": "2.5.*",
+ "symfony/twig-bridge": "2.5.*",
"symfony/yaml": "2.5.*",
"twig/twig": "1.13.*"
},
diff --git a/phpBB/composer.lock b/phpBB/composer.lock
index 03c5b4a05f..62e7c83272 100644
--- a/phpBB/composer.lock
+++ b/phpBB/composer.lock
@@ -3,7 +3,7 @@
"This file locks the dependencies of your project to a known state",
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
],
- "hash": "3c4d83fc3d00d6d76787dbb1d89ee405",
+ "hash": "2faf4ba24774c0d51cff4b78d4a81a68",
"packages": [
{
"name": "lusitanian/oauth",
@@ -673,6 +673,194 @@
],
"time": "2014-09-22 15:28:36"
},
+ {
+ "name": "symfony/security-core",
+ "version": "v2.5.6",
+ "target-dir": "Symfony/Component/Security/Core",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/security-core.git",
+ "reference": "fc79ba84f7db4a11d8313c87e8845096278d4144"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/security-core/zipball/fc79ba84f7db4a11d8313c87e8845096278d4144",
+ "reference": "fc79ba84f7db4a11d8313c87e8845096278d4144",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3"
+ },
+ "require-dev": {
+ "ircmaxell/password-compat": "1.0.*",
+ "psr/log": "~1.0",
+ "symfony/event-dispatcher": "~2.1",
+ "symfony/expression-language": "~2.4",
+ "symfony/http-foundation": "~2.4",
+ "symfony/validator": "~2.5"
+ },
+ "suggest": {
+ "ircmaxell/password-compat": "For using the BCrypt password encoder in PHP <5.5",
+ "symfony/event-dispatcher": "",
+ "symfony/expression-language": "For using the expression voter",
+ "symfony/http-foundation": "",
+ "symfony/validator": "For using the user password constraint"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.5-dev"
+ }
+ },
+ "autoload": {
+ "psr-0": {
+ "Symfony\\Component\\Security\\Core\\": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Symfony Community",
+ "homepage": "http://symfony.com/contributors"
+ },
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ }
+ ],
+ "description": "Symfony Security Component - Core Library",
+ "homepage": "http://symfony.com",
+ "time": "2014-09-28 15:22:14"
+ },
+ {
+ "name": "symfony/security-csrf",
+ "version": "v2.5.6",
+ "target-dir": "Symfony/Component/Security/Csrf",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/security-csrf.git",
+ "reference": "08711832eb9c7b08b513318357391693411e9478"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/security-csrf/zipball/08711832eb9c7b08b513318357391693411e9478",
+ "reference": "08711832eb9c7b08b513318357391693411e9478",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3",
+ "symfony/security-core": "~2.4"
+ },
+ "require-dev": {
+ "symfony/http-foundation": "~2.1"
+ },
+ "suggest": {
+ "symfony/http-foundation": "For using the class SessionTokenStorage."
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.5-dev"
+ }
+ },
+ "autoload": {
+ "psr-0": {
+ "Symfony\\Component\\Security\\Csrf\\": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Symfony Community",
+ "homepage": "http://symfony.com/contributors"
+ },
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ }
+ ],
+ "description": "Symfony Security Component - CSRF Library",
+ "homepage": "http://symfony.com",
+ "time": "2014-05-12 09:28:39"
+ },
+ {
+ "name": "symfony/twig-bridge",
+ "version": "v2.5.6",
+ "target-dir": "Symfony/Bridge/Twig",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/TwigBridge.git",
+ "reference": "8850738d9f51436494f87d1e4669f4e870a5fe83"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/TwigBridge/zipball/8850738d9f51436494f87d1e4669f4e870a5fe83",
+ "reference": "8850738d9f51436494f87d1e4669f4e870a5fe83",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3",
+ "symfony/security-csrf": "~2.4",
+ "twig/twig": "~1.12"
+ },
+ "require-dev": {
+ "symfony/console": "~2.2",
+ "symfony/expression-language": "~2.4",
+ "symfony/form": "~2.5,<2.6.0",
+ "symfony/http-kernel": "~2.2",
+ "symfony/routing": "~2.2",
+ "symfony/security": "~2.4",
+ "symfony/stopwatch": "~2.2",
+ "symfony/templating": "~2.1",
+ "symfony/translation": "~2.2",
+ "symfony/yaml": "~2.0"
+ },
+ "suggest": {
+ "symfony/expression-language": "For using the ExpressionExtension",
+ "symfony/form": "For using the FormExtension",
+ "symfony/http-kernel": "For using the HttpKernelExtension",
+ "symfony/routing": "For using the RoutingExtension",
+ "symfony/security": "For using the SecurityExtension",
+ "symfony/stopwatch": "For using the StopwatchExtension",
+ "symfony/templating": "For using the TwigEngine",
+ "symfony/translation": "For using the TranslationExtension",
+ "symfony/yaml": "For using the YamlExtension"
+ },
+ "type": "symfony-bridge",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.5-dev"
+ }
+ },
+ "autoload": {
+ "psr-0": {
+ "Symfony\\Bridge\\Twig\\": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Symfony Community",
+ "homepage": "http://symfony.com/contributors"
+ },
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ }
+ ],
+ "description": "Symfony Twig Bridge",
+ "homepage": "http://symfony.com",
+ "time": "2014-10-24 05:49:22"
+ },
{
"name": "symfony/yaml",
"version": "v2.5.5",
@@ -1159,7 +1347,8 @@
"authors": [
{
"name": "Michiel Rook",
- "email": "mrook@php.net"
+ "email": "mrook@php.net",
+ "role": "Lead"
},
{
"name": "Phing Community",
@@ -2309,17 +2498,11 @@
"time": "2014-09-23 05:25:11"
}
],
- "aliases": [
-
- ],
+ "aliases": [],
"minimum-stability": "stable",
- "stability-flags": [
-
- ],
+ "stability-flags": [],
"platform": {
"php": ">=5.3.3"
},
- "platform-dev": [
-
- ]
+ "platform-dev": []
}
diff --git a/phpBB/config/twig.yml b/phpBB/config/twig.yml
index eb3e6c0924..0745d8b47e 100644
--- a/phpBB/config/twig.yml
+++ b/phpBB/config/twig.yml
@@ -34,3 +34,10 @@ services:
- @user
tags:
- { name: twig.extension }
+
+ template.twig.extensions.routing:
+ class: Symfony\Bridge\Twig\Extension\RoutingExtension
+ arguments:
+ - @router
+ tags:
+ - { name: twig.extension }