aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2016-11-03 21:36:12 +0100
committerMarc Alexander <admin@m-a-styles.de>2016-11-03 21:36:12 +0100
commit4d07f8a13423529d4559d6579f98305ee471ee84 (patch)
tree3fa97d37a3803e499a0d3c82bf3da6cff09a2975 /phpBB
parent094ac6b60fbe9e0d7e1042a919f7a5e5602a759a (diff)
downloadforums-4d07f8a13423529d4559d6579f98305ee471ee84.tar
forums-4d07f8a13423529d4559d6579f98305ee471ee84.tar.gz
forums-4d07f8a13423529d4559d6579f98305ee471ee84.tar.bz2
forums-4d07f8a13423529d4559d6579f98305ee471ee84.tar.xz
forums-4d07f8a13423529d4559d6579f98305ee471ee84.zip
[ticket/14716] Update dependencies to latest versions
This addresses some issues with symfony that resulted in issues when open_basedir restrictions were enabled, as well as issues with JPEG images in fast-image-size. The phpBB class extending the twig lexer also had to be modified to ensure compatibility after BC was broken by the PR https://github.com/twigphp/Twig/pull/2182 for twig 1.27. PHPBB3-14716
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/composer.lock260
-rw-r--r--phpBB/phpbb/template/twig/lexer.php7
2 files changed, 142 insertions, 125 deletions
diff --git a/phpBB/composer.lock b/phpBB/composer.lock
index 175aa6f7d3..158a4e24a9 100644
--- a/phpBB/composer.lock
+++ b/phpBB/composer.lock
@@ -346,16 +346,16 @@
},
{
"name": "marc1706/fast-image-size",
- "version": "v1.1.1",
+ "version": "v1.1.2",
"source": {
"type": "git",
"url": "https://github.com/marc1706/fast-image-size.git",
- "reference": "50ae9b13f862b0c7c6c9df057c396ea32837733a"
+ "reference": "8bb644f8f767c5763acd61140045a78d10e1eb06"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/marc1706/fast-image-size/zipball/50ae9b13f862b0c7c6c9df057c396ea32837733a",
- "reference": "50ae9b13f862b0c7c6c9df057c396ea32837733a",
+ "url": "https://api.github.com/repos/marc1706/fast-image-size/zipball/8bb644f8f767c5763acd61140045a78d10e1eb06",
+ "reference": "8bb644f8f767c5763acd61140045a78d10e1eb06",
"shasum": ""
},
"require": {
@@ -393,7 +393,7 @@
"php",
"size"
],
- "time": "2016-06-08 18:14:49"
+ "time": "2016-10-30 19:00:39"
},
{
"name": "ocramius/proxy-manager",
@@ -460,16 +460,16 @@
},
{
"name": "paragonie/random_compat",
- "version": "v2.0.2",
+ "version": "v2.0.3",
"source": {
"type": "git",
"url": "https://github.com/paragonie/random_compat.git",
- "reference": "088c04e2f261c33bed6ca5245491cfca69195ccf"
+ "reference": "c0125896dbb151380ab47e96c621741e79623beb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/paragonie/random_compat/zipball/088c04e2f261c33bed6ca5245491cfca69195ccf",
- "reference": "088c04e2f261c33bed6ca5245491cfca69195ccf",
+ "url": "https://api.github.com/repos/paragonie/random_compat/zipball/c0125896dbb151380ab47e96c621741e79623beb",
+ "reference": "c0125896dbb151380ab47e96c621741e79623beb",
"shasum": ""
},
"require": {
@@ -504,7 +504,7 @@
"pseudorandom",
"random"
],
- "time": "2016-04-03 06:00:07"
+ "time": "2016-10-17 15:23:22"
},
{
"name": "patchwork/utf8",
@@ -567,22 +567,30 @@
},
{
"name": "psr/log",
- "version": "1.0.0",
+ "version": "1.0.2",
"source": {
"type": "git",
"url": "https://github.com/php-fig/log.git",
- "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b"
+ "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b",
- "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b",
+ "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
+ "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
"shasum": ""
},
+ "require": {
+ "php": ">=5.3.0"
+ },
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ },
"autoload": {
- "psr-0": {
- "Psr\\Log\\": ""
+ "psr-4": {
+ "Psr\\Log\\": "Psr/Log/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -596,12 +604,13 @@
}
],
"description": "Common interface for logging libraries",
+ "homepage": "https://github.com/php-fig/log",
"keywords": [
"log",
"psr",
"psr-3"
],
- "time": "2012-12-21 11:40:51"
+ "time": "2016-10-10 12:19:37"
},
{
"name": "react/promise",
@@ -709,16 +718,16 @@
},
{
"name": "symfony/config",
- "version": "v2.8.11",
+ "version": "v2.8.13",
"source": {
"type": "git",
"url": "https://github.com/symfony/config.git",
- "reference": "005bf10c156335ede2e89fb9a9ee10a0b742bc84"
+ "reference": "f8b1922bbda9d2ac86aecd649399040bce849fde"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/config/zipball/005bf10c156335ede2e89fb9a9ee10a0b742bc84",
- "reference": "005bf10c156335ede2e89fb9a9ee10a0b742bc84",
+ "url": "https://api.github.com/repos/symfony/config/zipball/f8b1922bbda9d2ac86aecd649399040bce849fde",
+ "reference": "f8b1922bbda9d2ac86aecd649399040bce849fde",
"shasum": ""
},
"require": {
@@ -758,24 +767,25 @@
],
"description": "Symfony Config Component",
"homepage": "https://symfony.com",
- "time": "2016-08-16 14:56:08"
+ "time": "2016-09-14 20:31:12"
},
{
"name": "symfony/console",
- "version": "v2.8.11",
+ "version": "v2.8.13",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "3d3e4fa5f0614c8e45220e5de80332322e33bd90"
+ "reference": "7350016c8abcab897046f1aead2b766b84d3eff8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/3d3e4fa5f0614c8e45220e5de80332322e33bd90",
- "reference": "3d3e4fa5f0614c8e45220e5de80332322e33bd90",
+ "url": "https://api.github.com/repos/symfony/console/zipball/7350016c8abcab897046f1aead2b766b84d3eff8",
+ "reference": "7350016c8abcab897046f1aead2b766b84d3eff8",
"shasum": ""
},
"require": {
"php": ">=5.3.9",
+ "symfony/debug": "~2.7,>=2.7.2|~3.0.0",
"symfony/polyfill-mbstring": "~1.0"
},
"require-dev": {
@@ -818,11 +828,11 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
- "time": "2016-09-06 10:55:00"
+ "time": "2016-10-06 01:43:09"
},
{
"name": "symfony/debug",
- "version": "v2.8.11",
+ "version": "v2.8.13",
"source": {
"type": "git",
"url": "https://github.com/symfony/debug.git",
@@ -879,16 +889,16 @@
},
{
"name": "symfony/dependency-injection",
- "version": "v2.8.11",
+ "version": "v2.8.13",
"source": {
"type": "git",
"url": "https://github.com/symfony/dependency-injection.git",
- "reference": "0a732a9cafc30e54077967da4d019e1d618a8cb9"
+ "reference": "3d61c765daa1a5832f1d7c767f48886b8d8ea64c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/0a732a9cafc30e54077967da4d019e1d618a8cb9",
- "reference": "0a732a9cafc30e54077967da4d019e1d618a8cb9",
+ "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/3d61c765daa1a5832f1d7c767f48886b8d8ea64c",
+ "reference": "3d61c765daa1a5832f1d7c767f48886b8d8ea64c",
"shasum": ""
},
"require": {
@@ -938,20 +948,20 @@
],
"description": "Symfony DependencyInjection Component",
"homepage": "https://symfony.com",
- "time": "2016-09-06 23:19:39"
+ "time": "2016-10-24 15:52:36"
},
{
"name": "symfony/event-dispatcher",
- "version": "v2.8.11",
+ "version": "v2.8.13",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
- "reference": "889983a79a043dfda68f38c38b6dba092dd49cd8"
+ "reference": "25c576abd4e0f212e678fe8b2bd9a9a98c7ea934"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/889983a79a043dfda68f38c38b6dba092dd49cd8",
- "reference": "889983a79a043dfda68f38c38b6dba092dd49cd8",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/25c576abd4e0f212e678fe8b2bd9a9a98c7ea934",
+ "reference": "25c576abd4e0f212e678fe8b2bd9a9a98c7ea934",
"shasum": ""
},
"require": {
@@ -998,20 +1008,20 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
- "time": "2016-07-28 16:56:28"
+ "time": "2016-10-13 01:43:15"
},
{
"name": "symfony/filesystem",
- "version": "v2.8.11",
+ "version": "v2.8.13",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
- "reference": "44b499521defddf2eae17a18c811bbdae4f98bdf"
+ "reference": "a3784111af9f95f102b6411548376e1ae7c93898"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/filesystem/zipball/44b499521defddf2eae17a18c811bbdae4f98bdf",
- "reference": "44b499521defddf2eae17a18c811bbdae4f98bdf",
+ "url": "https://api.github.com/repos/symfony/filesystem/zipball/a3784111af9f95f102b6411548376e1ae7c93898",
+ "reference": "a3784111af9f95f102b6411548376e1ae7c93898",
"shasum": ""
},
"require": {
@@ -1047,20 +1057,20 @@
],
"description": "Symfony Filesystem Component",
"homepage": "https://symfony.com",
- "time": "2016-09-06 10:55:00"
+ "time": "2016-10-18 04:28:30"
},
{
"name": "symfony/finder",
- "version": "v2.8.11",
+ "version": "v2.8.13",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
- "reference": "bec5533e6ed650547d6ec8de4b541dc9929066f7"
+ "reference": "bc24c8f5674c6f6841f2856b70e5d60784be5691"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/bec5533e6ed650547d6ec8de4b541dc9929066f7",
- "reference": "bec5533e6ed650547d6ec8de4b541dc9929066f7",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/bc24c8f5674c6f6841f2856b70e5d60784be5691",
+ "reference": "bc24c8f5674c6f6841f2856b70e5d60784be5691",
"shasum": ""
},
"require": {
@@ -1096,20 +1106,20 @@
],
"description": "Symfony Finder Component",
"homepage": "https://symfony.com",
- "time": "2016-08-26 11:57:43"
+ "time": "2016-09-28 00:10:16"
},
{
"name": "symfony/http-foundation",
- "version": "v2.8.11",
+ "version": "v2.8.13",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
- "reference": "1d4ab8de2215e44e57fddc1e6b5d122546769e7d"
+ "reference": "a6e6c34d337f3c74c39b29c5f54d33023de8897c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-foundation/zipball/1d4ab8de2215e44e57fddc1e6b5d122546769e7d",
- "reference": "1d4ab8de2215e44e57fddc1e6b5d122546769e7d",
+ "url": "https://api.github.com/repos/symfony/http-foundation/zipball/a6e6c34d337f3c74c39b29c5f54d33023de8897c",
+ "reference": "a6e6c34d337f3c74c39b29c5f54d33023de8897c",
"shasum": ""
},
"require": {
@@ -1151,20 +1161,20 @@
],
"description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com",
- "time": "2016-09-06 10:55:00"
+ "time": "2016-10-24 15:52:36"
},
{
"name": "symfony/http-kernel",
- "version": "v2.8.11",
+ "version": "v2.8.13",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
- "reference": "a47004349e9216ab98a8019616a66e2d5c32b0ca"
+ "reference": "ba7249f746da1544512c942c50ef3bc4026296e6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-kernel/zipball/a47004349e9216ab98a8019616a66e2d5c32b0ca",
- "reference": "a47004349e9216ab98a8019616a66e2d5c32b0ca",
+ "url": "https://api.github.com/repos/symfony/http-kernel/zipball/ba7249f746da1544512c942c50ef3bc4026296e6",
+ "reference": "ba7249f746da1544512c942c50ef3bc4026296e6",
"shasum": ""
},
"require": {
@@ -1172,7 +1182,7 @@
"psr/log": "~1.0",
"symfony/debug": "~2.6,>=2.6.2",
"symfony/event-dispatcher": "~2.6,>=2.6.7|~3.0.0",
- "symfony/http-foundation": "~2.7.15|~2.8.8|~3.0.8"
+ "symfony/http-foundation": "~2.7.20|~2.8.13|~3.1.6"
},
"conflict": {
"symfony/config": "<2.7"
@@ -1233,7 +1243,7 @@
],
"description": "Symfony HttpKernel Component",
"homepage": "https://symfony.com",
- "time": "2016-09-07 02:02:58"
+ "time": "2016-10-27 02:18:22"
},
{
"name": "symfony/polyfill-mbstring",
@@ -1410,16 +1420,16 @@
},
{
"name": "symfony/proxy-manager-bridge",
- "version": "v2.8.11",
+ "version": "v2.8.13",
"source": {
"type": "git",
"url": "https://github.com/symfony/proxy-manager-bridge.git",
- "reference": "ceb78e0773587479b96ff8afd6ac860b4e43f4d8"
+ "reference": "69922100cdfe37bc9c0429cab5bd523e861e562e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/proxy-manager-bridge/zipball/ceb78e0773587479b96ff8afd6ac860b4e43f4d8",
- "reference": "ceb78e0773587479b96ff8afd6ac860b4e43f4d8",
+ "url": "https://api.github.com/repos/symfony/proxy-manager-bridge/zipball/69922100cdfe37bc9c0429cab5bd523e861e562e",
+ "reference": "69922100cdfe37bc9c0429cab5bd523e861e562e",
"shasum": ""
},
"require": {
@@ -1460,11 +1470,11 @@
],
"description": "Symfony ProxyManager Bridge",
"homepage": "https://symfony.com",
- "time": "2016-07-19 10:40:24"
+ "time": "2016-10-03 15:49:46"
},
{
"name": "symfony/routing",
- "version": "v2.8.11",
+ "version": "v2.8.13",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
@@ -1539,21 +1549,21 @@
},
{
"name": "symfony/twig-bridge",
- "version": "v2.8.11",
+ "version": "v2.8.13",
"source": {
"type": "git",
"url": "https://github.com/symfony/twig-bridge.git",
- "reference": "5e9679f7085e99adb5248e07b4677494b8f884b5"
+ "reference": "b9df700554a19c9c00c662f2cd9fb3f03c0d4bcf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/5e9679f7085e99adb5248e07b4677494b8f884b5",
- "reference": "5e9679f7085e99adb5248e07b4677494b8f884b5",
+ "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/b9df700554a19c9c00c662f2cd9fb3f03c0d4bcf",
+ "reference": "b9df700554a19c9c00c662f2cd9fb3f03c0d4bcf",
"shasum": ""
},
"require": {
"php": ">=5.3.9",
- "twig/twig": "~1.23|~2.0"
+ "twig/twig": "~1.27|~2.0"
},
"require-dev": {
"symfony/asset": "~2.7|~3.0.0",
@@ -1616,20 +1626,20 @@
],
"description": "Symfony Twig Bridge",
"homepage": "https://symfony.com",
- "time": "2016-09-06 10:55:00"
+ "time": "2016-10-24 15:52:36"
},
{
"name": "symfony/yaml",
- "version": "v2.8.11",
+ "version": "v2.8.13",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
- "reference": "e7540734bad981fe59f8ef14b6fc194ae9df8d9c"
+ "reference": "396784cd06b91f3db576f248f2402d547a077787"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/yaml/zipball/e7540734bad981fe59f8ef14b6fc194ae9df8d9c",
- "reference": "e7540734bad981fe59f8ef14b6fc194ae9df8d9c",
+ "url": "https://api.github.com/repos/symfony/yaml/zipball/396784cd06b91f3db576f248f2402d547a077787",
+ "reference": "396784cd06b91f3db576f248f2402d547a077787",
"shasum": ""
},
"require": {
@@ -1665,20 +1675,20 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
- "time": "2016-09-02 01:57:56"
+ "time": "2016-10-21 20:59:10"
},
{
"name": "twig/twig",
- "version": "v1.26.0",
+ "version": "v1.27.0",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
- "reference": "81c2b5fd36581370c7731387f05dcdb577050513"
+ "reference": "3c6c0033fd3b5679c6e1cb60f4f9766c2b424d97"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/twigphp/Twig/zipball/81c2b5fd36581370c7731387f05dcdb577050513",
- "reference": "81c2b5fd36581370c7731387f05dcdb577050513",
+ "url": "https://api.github.com/repos/twigphp/Twig/zipball/3c6c0033fd3b5679c6e1cb60f4f9766c2b424d97",
+ "reference": "3c6c0033fd3b5679c6e1cb60f4f9766c2b424d97",
"shasum": ""
},
"require": {
@@ -1691,7 +1701,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.26-dev"
+ "dev-master": "1.27-dev"
}
},
"autoload": {
@@ -1726,7 +1736,7 @@
"keywords": [
"templating"
],
- "time": "2016-10-02 16:19:13"
+ "time": "2016-10-25 19:17:17"
},
{
"name": "zendframework/zend-code",
@@ -1935,16 +1945,16 @@
},
{
"name": "facebook/webdriver",
- "version": "1.1.2",
+ "version": "1.1.3",
"source": {
"type": "git",
"url": "https://github.com/facebook/php-webdriver.git",
- "reference": "0b889d7de7461439f8a3bbcca46e0f696cb27986"
+ "reference": "b7186fb1bcfda956d237f59face250d06ef47253"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/facebook/php-webdriver/zipball/0b889d7de7461439f8a3bbcca46e0f696cb27986",
- "reference": "0b889d7de7461439f8a3bbcca46e0f696cb27986",
+ "url": "https://api.github.com/repos/facebook/php-webdriver/zipball/b7186fb1bcfda956d237f59face250d06ef47253",
+ "reference": "b7186fb1bcfda956d237f59face250d06ef47253",
"shasum": ""
},
"require": {
@@ -1952,7 +1962,9 @@
"php": ">=5.3.19"
},
"require-dev": {
- "phpunit/phpunit": "4.6.*"
+ "friendsofphp/php-cs-fixer": "^1.11",
+ "phpunit/phpunit": "4.6.* || ~5.0",
+ "squizlabs/php_codesniffer": "^2.6"
},
"suggest": {
"phpdocumentor/phpdocumentor": "2.*"
@@ -1975,26 +1987,26 @@
"selenium",
"webdriver"
],
- "time": "2016-06-04 00:02:34"
+ "time": "2016-08-10 00:44:08"
},
{
"name": "laravel/homestead",
- "version": "v2.2.1",
+ "version": "v2.2.2",
"source": {
"type": "git",
"url": "https://github.com/laravel/homestead.git",
- "reference": "5008339af93bbb73efee53cbef9374c5d443c708"
+ "reference": "f4e45f895d8707042c2d0698627d33c484e7c6ba"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/homestead/zipball/5008339af93bbb73efee53cbef9374c5d443c708",
- "reference": "5008339af93bbb73efee53cbef9374c5d443c708",
+ "url": "https://api.github.com/repos/laravel/homestead/zipball/f4e45f895d8707042c2d0698627d33c484e7c6ba",
+ "reference": "f4e45f895d8707042c2d0698627d33c484e7c6ba",
"shasum": ""
},
"require": {
"php": ">=5.4",
- "symfony/console": "~2.0",
- "symfony/process": "~2.0"
+ "symfony/console": "~2.0 || ~3.0",
+ "symfony/process": "~2.0 || ~3.0"
},
"bin": [
"homestead"
@@ -2016,20 +2028,20 @@
}
],
"description": "A virtual machine for web artisans.",
- "time": "2016-01-05 19:19:26"
+ "time": "2016-09-17 04:42:33"
},
{
"name": "michelf/php-markdown",
- "version": "1.6.0",
+ "version": "1.7.0",
"source": {
"type": "git",
"url": "https://github.com/michelf/php-markdown.git",
- "reference": "156e56ee036505ec637d761ee62dc425d807183c"
+ "reference": "1f51cc520948f66cd2af8cbc45a5ee175e774220"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/michelf/php-markdown/zipball/156e56ee036505ec637d761ee62dc425d807183c",
- "reference": "156e56ee036505ec637d761ee62dc425d807183c",
+ "url": "https://api.github.com/repos/michelf/php-markdown/zipball/1f51cc520948f66cd2af8cbc45a5ee175e774220",
+ "reference": "1f51cc520948f66cd2af8cbc45a5ee175e774220",
"shasum": ""
},
"require": {
@@ -2067,7 +2079,7 @@
"keywords": [
"markdown"
],
- "time": "2015-12-24 01:37:31"
+ "time": "2016-10-29 18:58:20"
},
{
"name": "nikic/php-parser",
@@ -2818,23 +2830,23 @@
},
{
"name": "sebastian/environment",
- "version": "1.3.7",
+ "version": "1.3.8",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/environment.git",
- "reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716"
+ "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/4e8f0da10ac5802913afc151413bc8c53b6c2716",
- "reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716",
+ "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/be2c607e43ce4c89ecd60e75c6a85c126e754aea",
+ "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": "^5.3.3 || ^7.0"
},
"require-dev": {
- "phpunit/phpunit": "~4.4"
+ "phpunit/phpunit": "^4.8 || ^5.0"
},
"type": "library",
"extra": {
@@ -2864,7 +2876,7 @@
"environment",
"hhvm"
],
- "time": "2016-05-17 03:18:57"
+ "time": "2016-08-18 05:49:44"
},
{
"name": "sebastian/exporter",
@@ -3023,16 +3035,16 @@
},
{
"name": "squizlabs/php_codesniffer",
- "version": "2.6.2",
+ "version": "2.7.0",
"source": {
"type": "git",
"url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
- "reference": "4edb770cb853def6e60c93abb088ad5ac2010c83"
+ "reference": "571e27b6348e5b3a637b2abc82ac0d01e6d7bbed"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/4edb770cb853def6e60c93abb088ad5ac2010c83",
- "reference": "4edb770cb853def6e60c93abb088ad5ac2010c83",
+ "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/571e27b6348e5b3a637b2abc82ac0d01e6d7bbed",
+ "reference": "571e27b6348e5b3a637b2abc82ac0d01e6d7bbed",
"shasum": ""
},
"require": {
@@ -3097,11 +3109,11 @@
"phpcs",
"standards"
],
- "time": "2016-07-13 23:29:13"
+ "time": "2016-09-01 23:53:02"
},
{
"name": "symfony/browser-kit",
- "version": "v2.8.11",
+ "version": "v2.8.13",
"source": {
"type": "git",
"url": "https://github.com/symfony/browser-kit.git",
@@ -3158,7 +3170,7 @@
},
{
"name": "symfony/css-selector",
- "version": "v2.8.11",
+ "version": "v2.8.13",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
@@ -3211,16 +3223,16 @@
},
{
"name": "symfony/dom-crawler",
- "version": "v2.8.11",
+ "version": "v2.8.13",
"source": {
"type": "git",
"url": "https://github.com/symfony/dom-crawler.git",
- "reference": "aac03b7ea2a7adff10a3599d614e79e6101230ab"
+ "reference": "a94f3fe6f179d6453e5ed8188cf4bfdf933d85f4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/aac03b7ea2a7adff10a3599d614e79e6101230ab",
- "reference": "aac03b7ea2a7adff10a3599d614e79e6101230ab",
+ "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/a94f3fe6f179d6453e5ed8188cf4bfdf933d85f4",
+ "reference": "a94f3fe6f179d6453e5ed8188cf4bfdf933d85f4",
"shasum": ""
},
"require": {
@@ -3263,20 +3275,20 @@
],
"description": "Symfony DomCrawler Component",
"homepage": "https://symfony.com",
- "time": "2016-07-30 07:20:35"
+ "time": "2016-10-18 15:35:45"
},
{
"name": "symfony/process",
- "version": "v2.8.11",
+ "version": "v2.8.13",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
- "reference": "05a03ed27073638658cab9405d99a67dd1014987"
+ "reference": "024de37f8a6b9e5e8244d9eb3fcf3e467dd2a93f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/05a03ed27073638658cab9405d99a67dd1014987",
- "reference": "05a03ed27073638658cab9405d99a67dd1014987",
+ "url": "https://api.github.com/repos/symfony/process/zipball/024de37f8a6b9e5e8244d9eb3fcf3e467dd2a93f",
+ "reference": "024de37f8a6b9e5e8244d9eb3fcf3e467dd2a93f",
"shasum": ""
},
"require": {
@@ -3312,7 +3324,7 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
- "time": "2016-09-06 10:55:00"
+ "time": "2016-09-29 14:03:54"
}
],
"aliases": [],
diff --git a/phpBB/phpbb/template/twig/lexer.php b/phpBB/phpbb/template/twig/lexer.php
index f1542109a4..de03aec04b 100644
--- a/phpBB/phpbb/template/twig/lexer.php
+++ b/phpBB/phpbb/template/twig/lexer.php
@@ -22,6 +22,11 @@ class lexer extends \Twig_Lexer
public function tokenize($code, $filename = null)
{
+ if ($code instanceof \Twig_Source)
+ {
+ $filename = $code->getName();
+ $code = $code->getCode();
+ }
// Our phpBB tags
// Commented out tokens are handled separately from the main replace
$phpbb_tags = array(
@@ -125,7 +130,7 @@ class lexer extends \Twig_Lexer
// Appends any filters
$code = preg_replace('#{([a-zA-Z0-9_\.]+)(\|[^}]+?)?}#', '{{ $1$2 }}', $code);
- return parent::tokenize($code, $filename);
+ return parent::tokenize(new \Twig_Source($code, $filename));
}
/**
generated by cgit v1.2.1 (git 2.21.0) at 2025-05-10 22:41:49 +0000