mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-11 08:53:05 +02:00
Merge branch '3.2.x'
* 3.2.x: [ticket/14867] Revert back to twig 1.26.* and update dependencies
This commit is contained in:
Tristan Darricau
@ -47,7 +47,7 @@
|
||||
"symfony/routing": "~3.1",
|
||||
"symfony/twig-bridge": "~3.1",
|
||||
"symfony/yaml": "~3.1",
|
||||
"twig/twig": "^1.0"
|
||||
"twig/twig": "^1.0,<1.27"
|
||||
},
|
||||
"require-dev": {
|
||||
"fabpot/goutte": "~3.1",
|
||||
|
||||
235
phpBB/composer.lock
generated
235
phpBB/composer.lock
generated
@ -4,8 +4,8 @@
|
||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
|
||||
"This file is @generated automatically"
|
||||
],
|
||||
"hash": "bbc34cdff4e65545c1158fa22a2394f4",
|
||||
"content-hash": "6e531eec9a1f77c63583b3ef3ae95d26",
|
||||
"hash": "6ac33bab3db283f1c476992748c5d836",
|
||||
"content-hash": "7343eff6227af3c6378a368ba55ac680",
|
||||
"packages": [
|
||||
{
|
||||
"name": "bantu/ini-get-wrapper",
|
||||
@ -146,16 +146,16 @@
|
||||
},
|
||||
{
|
||||
"name": "guzzlehttp/promises",
|
||||
"version": "1.2.0",
|
||||
"version": "1.3.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/guzzle/promises.git",
|
||||
"reference": "c10d860e2a9595f8883527fa0021c7da9e65f579"
|
||||
"reference": "2693c101803ca78b27972d84081d027fca790a1e"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/guzzle/promises/zipball/c10d860e2a9595f8883527fa0021c7da9e65f579",
|
||||
"reference": "c10d860e2a9595f8883527fa0021c7da9e65f579",
|
||||
"url": "https://api.github.com/repos/guzzle/promises/zipball/2693c101803ca78b27972d84081d027fca790a1e",
|
||||
"reference": "2693c101803ca78b27972d84081d027fca790a1e",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -193,7 +193,7 @@
|
||||
"keywords": [
|
||||
"promise"
|
||||
],
|
||||
"time": "2016-05-18 16:56:05"
|
||||
"time": "2016-11-18 17:47:58"
|
||||
},
|
||||
{
|
||||
"name": "guzzlehttp/psr7",
|
||||
@ -640,16 +640,16 @@
|
||||
},
|
||||
{
|
||||
"name": "s9e/text-formatter",
|
||||
"version": "0.8.3",
|
||||
"version": "0.8.4",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/s9e/TextFormatter.git",
|
||||
"reference": "34668fccbe259fbca0331e7a34409c4502ee71bd"
|
||||
"reference": "919fd772aae4dd889618da1cb18ae746f2a14bb6"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/s9e/TextFormatter/zipball/34668fccbe259fbca0331e7a34409c4502ee71bd",
|
||||
"reference": "34668fccbe259fbca0331e7a34409c4502ee71bd",
|
||||
"url": "https://api.github.com/repos/s9e/TextFormatter/zipball/919fd772aae4dd889618da1cb18ae746f2a14bb6",
|
||||
"reference": "919fd772aae4dd889618da1cb18ae746f2a14bb6",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -696,20 +696,20 @@
|
||||
"parser",
|
||||
"shortcodes"
|
||||
],
|
||||
"time": "2016-11-02 08:14:58"
|
||||
"time": "2016-11-22 20:10:24"
|
||||
},
|
||||
{
|
||||
"name": "symfony/config",
|
||||
"version": "v3.1.6",
|
||||
"version": "v3.1.7",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/config.git",
|
||||
"reference": "949e7e846743a7f9e46dc50eb639d5fde1f53341"
|
||||
"reference": "ab4fa32ffe6e625f9b7444e5e8d4702a0bc3ad7a"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/config/zipball/949e7e846743a7f9e46dc50eb639d5fde1f53341",
|
||||
"reference": "949e7e846743a7f9e46dc50eb639d5fde1f53341",
|
||||
"url": "https://api.github.com/repos/symfony/config/zipball/ab4fa32ffe6e625f9b7444e5e8d4702a0bc3ad7a",
|
||||
"reference": "ab4fa32ffe6e625f9b7444e5e8d4702a0bc3ad7a",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -749,20 +749,20 @@
|
||||
],
|
||||
"description": "Symfony Config Component",
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2016-09-25 08:27:07"
|
||||
"time": "2016-11-03 08:04:31"
|
||||
},
|
||||
{
|
||||
"name": "symfony/console",
|
||||
"version": "v3.1.6",
|
||||
"version": "v3.1.7",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/console.git",
|
||||
"reference": "c99da1119ae61e15de0e4829196b9fba6f73d065"
|
||||
"reference": "5be36e1f3ac7ecbe7e34fb641480ad8497b83aa6"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/console/zipball/c99da1119ae61e15de0e4829196b9fba6f73d065",
|
||||
"reference": "c99da1119ae61e15de0e4829196b9fba6f73d065",
|
||||
"url": "https://api.github.com/repos/symfony/console/zipball/5be36e1f3ac7ecbe7e34fb641480ad8497b83aa6",
|
||||
"reference": "5be36e1f3ac7ecbe7e34fb641480ad8497b83aa6",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -810,20 +810,20 @@
|
||||
],
|
||||
"description": "Symfony Console Component",
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2016-10-06 01:44:51"
|
||||
"time": "2016-11-16 22:17:09"
|
||||
},
|
||||
{
|
||||
"name": "symfony/debug",
|
||||
"version": "v3.1.6",
|
||||
"version": "v3.1.7",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/debug.git",
|
||||
"reference": "e2b3f74a67fc928adc3c1b9027f73e1bc01190a8"
|
||||
"reference": "c058661c32f5b462722e36d120905940089cbd9a"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/debug/zipball/e2b3f74a67fc928adc3c1b9027f73e1bc01190a8",
|
||||
"reference": "e2b3f74a67fc928adc3c1b9027f73e1bc01190a8",
|
||||
"url": "https://api.github.com/repos/symfony/debug/zipball/c058661c32f5b462722e36d120905940089cbd9a",
|
||||
"reference": "c058661c32f5b462722e36d120905940089cbd9a",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -867,20 +867,20 @@
|
||||
],
|
||||
"description": "Symfony Debug Component",
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2016-09-06 11:02:40"
|
||||
"time": "2016-11-15 12:55:20"
|
||||
},
|
||||
{
|
||||
"name": "symfony/dependency-injection",
|
||||
"version": "v3.1.6",
|
||||
"version": "v3.1.7",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/dependency-injection.git",
|
||||
"reference": "c578891216090069cd6d2e573402e13e39b3ad5c"
|
||||
"reference": "87598e21bb9020bd9ccd6df6936b9c369c72775d"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/dependency-injection/zipball/c578891216090069cd6d2e573402e13e39b3ad5c",
|
||||
"reference": "c578891216090069cd6d2e573402e13e39b3ad5c",
|
||||
"url": "https://api.github.com/repos/symfony/dependency-injection/zipball/87598e21bb9020bd9ccd6df6936b9c369c72775d",
|
||||
"reference": "87598e21bb9020bd9ccd6df6936b9c369c72775d",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -927,11 +927,11 @@
|
||||
],
|
||||
"description": "Symfony DependencyInjection Component",
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2016-10-24 15:52:44"
|
||||
"time": "2016-11-18 21:15:08"
|
||||
},
|
||||
{
|
||||
"name": "symfony/event-dispatcher",
|
||||
"version": "v3.1.6",
|
||||
"version": "v3.1.7",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/event-dispatcher.git",
|
||||
@ -991,7 +991,7 @@
|
||||
},
|
||||
{
|
||||
"name": "symfony/filesystem",
|
||||
"version": "v3.1.6",
|
||||
"version": "v3.1.7",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/filesystem.git",
|
||||
@ -1040,16 +1040,16 @@
|
||||
},
|
||||
{
|
||||
"name": "symfony/finder",
|
||||
"version": "v3.1.6",
|
||||
"version": "v3.1.7",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/finder.git",
|
||||
"reference": "205b5ffbb518a98ba2ae60a52656c4a31ab00c6f"
|
||||
"reference": "9925935bf7144f9e4d2b976905881b4face036fb"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/finder/zipball/205b5ffbb518a98ba2ae60a52656c4a31ab00c6f",
|
||||
"reference": "205b5ffbb518a98ba2ae60a52656c4a31ab00c6f",
|
||||
"url": "https://api.github.com/repos/symfony/finder/zipball/9925935bf7144f9e4d2b976905881b4face036fb",
|
||||
"reference": "9925935bf7144f9e4d2b976905881b4face036fb",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -1085,20 +1085,20 @@
|
||||
],
|
||||
"description": "Symfony Finder Component",
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2016-09-28 00:11:12"
|
||||
"time": "2016-11-03 08:04:31"
|
||||
},
|
||||
{
|
||||
"name": "symfony/http-foundation",
|
||||
"version": "v3.1.6",
|
||||
"version": "v3.1.7",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/http-foundation.git",
|
||||
"reference": "f21e5a8b88274b7720779aa88f9c02c6d6ec08d7"
|
||||
"reference": "5a4c8099a1547fe451256e056180ad4624177017"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/f21e5a8b88274b7720779aa88f9c02c6d6ec08d7",
|
||||
"reference": "f21e5a8b88274b7720779aa88f9c02c6d6ec08d7",
|
||||
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/5a4c8099a1547fe451256e056180ad4624177017",
|
||||
"reference": "5a4c8099a1547fe451256e056180ad4624177017",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -1138,20 +1138,20 @@
|
||||
],
|
||||
"description": "Symfony HttpFoundation Component",
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2016-10-24 15:52:44"
|
||||
"time": "2016-11-16 22:17:09"
|
||||
},
|
||||
{
|
||||
"name": "symfony/http-kernel",
|
||||
"version": "v3.1.6",
|
||||
"version": "v3.1.7",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/http-kernel.git",
|
||||
"reference": "c235f1b13ba67012e283996a5427f22e2e04be14"
|
||||
"reference": "674ac403c7b3742c2a988a86e3baf9aca2c696a0"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/c235f1b13ba67012e283996a5427f22e2e04be14",
|
||||
"reference": "c235f1b13ba67012e283996a5427f22e2e04be14",
|
||||
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/674ac403c7b3742c2a988a86e3baf9aca2c696a0",
|
||||
"reference": "674ac403c7b3742c2a988a86e3baf9aca2c696a0",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -1220,7 +1220,7 @@
|
||||
],
|
||||
"description": "Symfony HttpKernel Component",
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2016-10-27 02:38:31"
|
||||
"time": "2016-11-21 02:44:20"
|
||||
},
|
||||
{
|
||||
"name": "symfony/polyfill-mbstring",
|
||||
@ -1283,7 +1283,7 @@
|
||||
},
|
||||
{
|
||||
"name": "symfony/proxy-manager-bridge",
|
||||
"version": "v3.1.6",
|
||||
"version": "v3.1.7",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/proxy-manager-bridge.git",
|
||||
@ -1337,7 +1337,7 @@
|
||||
},
|
||||
{
|
||||
"name": "symfony/routing",
|
||||
"version": "v3.1.6",
|
||||
"version": "v3.1.7",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/routing.git",
|
||||
@ -1412,21 +1412,21 @@
|
||||
},
|
||||
{
|
||||
"name": "symfony/twig-bridge",
|
||||
"version": "v3.1.6",
|
||||
"version": "v3.1.5",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/twig-bridge.git",
|
||||
"reference": "a75dfd56d7cf8df1843dcf44a0d6d4ef8b72440c"
|
||||
"reference": "64bebdd119e3626da1c53e44ee5dfb95ad0d7791"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/twig-bridge/zipball/a75dfd56d7cf8df1843dcf44a0d6d4ef8b72440c",
|
||||
"reference": "a75dfd56d7cf8df1843dcf44a0d6d4ef8b72440c",
|
||||
"url": "https://api.github.com/repos/symfony/twig-bridge/zipball/64bebdd119e3626da1c53e44ee5dfb95ad0d7791",
|
||||
"reference": "64bebdd119e3626da1c53e44ee5dfb95ad0d7791",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=5.5.9",
|
||||
"twig/twig": "~1.27|~2.0"
|
||||
"twig/twig": "~1.26|~2.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"symfony/asset": "~2.8|~3.0",
|
||||
@ -1489,20 +1489,20 @@
|
||||
],
|
||||
"description": "Symfony Twig Bridge",
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2016-10-24 15:52:44"
|
||||
"time": "2016-10-03 15:50:10"
|
||||
},
|
||||
{
|
||||
"name": "symfony/yaml",
|
||||
"version": "v3.1.6",
|
||||
"version": "v3.1.7",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/yaml.git",
|
||||
"reference": "7ff51b06c6c3d5cc6686df69004a42c69df09e27"
|
||||
"reference": "9da375317228e54f4ea1b013b30fa47417e84943"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/yaml/zipball/7ff51b06c6c3d5cc6686df69004a42c69df09e27",
|
||||
"reference": "7ff51b06c6c3d5cc6686df69004a42c69df09e27",
|
||||
"url": "https://api.github.com/repos/symfony/yaml/zipball/9da375317228e54f4ea1b013b30fa47417e84943",
|
||||
"reference": "9da375317228e54f4ea1b013b30fa47417e84943",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -1538,20 +1538,20 @@
|
||||
],
|
||||
"description": "Symfony Yaml Component",
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2016-10-24 18:41:13"
|
||||
"time": "2016-11-18 21:05:29"
|
||||
},
|
||||
{
|
||||
"name": "twig/twig",
|
||||
"version": "v1.27.0",
|
||||
"version": "v1.26.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/twigphp/Twig.git",
|
||||
"reference": "3c6c0033fd3b5679c6e1cb60f4f9766c2b424d97"
|
||||
"reference": "a09d8ee17ac1cfea29ed60c83960ad685c6a898d"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/twigphp/Twig/zipball/3c6c0033fd3b5679c6e1cb60f4f9766c2b424d97",
|
||||
"reference": "3c6c0033fd3b5679c6e1cb60f4f9766c2b424d97",
|
||||
"url": "https://api.github.com/repos/twigphp/Twig/zipball/a09d8ee17ac1cfea29ed60c83960ad685c6a898d",
|
||||
"reference": "a09d8ee17ac1cfea29ed60c83960ad685c6a898d",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -1564,7 +1564,7 @@
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "1.27-dev"
|
||||
"dev-master": "1.26-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
@ -1599,7 +1599,7 @@
|
||||
"keywords": [
|
||||
"templating"
|
||||
],
|
||||
"time": "2016-10-25 19:17:17"
|
||||
"time": "2016-10-05 18:57:41"
|
||||
},
|
||||
{
|
||||
"name": "zendframework/zend-code",
|
||||
@ -1765,16 +1765,16 @@
|
||||
},
|
||||
{
|
||||
"name": "fabpot/goutte",
|
||||
"version": "v3.1.2",
|
||||
"version": "v3.2.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/FriendsOfPHP/Goutte.git",
|
||||
"reference": "3cbc6ed222422a28400e470050f14928a153207e"
|
||||
"reference": "8cc89de5e71daf84051859616891d3320d88a9e8"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/FriendsOfPHP/Goutte/zipball/3cbc6ed222422a28400e470050f14928a153207e",
|
||||
"reference": "3cbc6ed222422a28400e470050f14928a153207e",
|
||||
"url": "https://api.github.com/repos/FriendsOfPHP/Goutte/zipball/8cc89de5e71daf84051859616891d3320d88a9e8",
|
||||
"reference": "8cc89de5e71daf84051859616891d3320d88a9e8",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -1787,7 +1787,7 @@
|
||||
"type": "application",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.1-dev"
|
||||
"dev-master": "3.2-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
@ -1810,7 +1810,7 @@
|
||||
"keywords": [
|
||||
"scraper"
|
||||
],
|
||||
"time": "2015-11-05 12:58:44"
|
||||
"time": "2016-11-15 16:27:29"
|
||||
},
|
||||
{
|
||||
"name": "facebook/webdriver",
|
||||
@ -2105,16 +2105,16 @@
|
||||
},
|
||||
{
|
||||
"name": "phpspec/prophecy",
|
||||
"version": "v1.6.1",
|
||||
"version": "v1.6.2",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/phpspec/prophecy.git",
|
||||
"reference": "58a8137754bc24b25740d4281399a4a3596058e0"
|
||||
"reference": "6c52c2722f8460122f96f86346600e1077ce22cb"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/phpspec/prophecy/zipball/58a8137754bc24b25740d4281399a4a3596058e0",
|
||||
"reference": "58a8137754bc24b25740d4281399a4a3596058e0",
|
||||
"url": "https://api.github.com/repos/phpspec/prophecy/zipball/6c52c2722f8460122f96f86346600e1077ce22cb",
|
||||
"reference": "6c52c2722f8460122f96f86346600e1077ce22cb",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -2122,10 +2122,11 @@
|
||||
"php": "^5.3|^7.0",
|
||||
"phpdocumentor/reflection-docblock": "^2.0|^3.0.2",
|
||||
"sebastian/comparator": "^1.1",
|
||||
"sebastian/recursion-context": "^1.0"
|
||||
"sebastian/recursion-context": "^1.0|^2.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"phpspec/phpspec": "^2.0"
|
||||
"phpspec/phpspec": "^2.0",
|
||||
"phpunit/phpunit": "^4.8 || ^5.6.5"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
@ -2163,7 +2164,7 @@
|
||||
"spy",
|
||||
"stub"
|
||||
],
|
||||
"time": "2016-06-07 08:13:47"
|
||||
"time": "2016-11-21 14:58:47"
|
||||
},
|
||||
{
|
||||
"name": "phpunit/dbunit",
|
||||
@ -2416,16 +2417,16 @@
|
||||
},
|
||||
{
|
||||
"name": "phpunit/php-token-stream",
|
||||
"version": "1.4.8",
|
||||
"version": "1.4.9",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/sebastianbergmann/php-token-stream.git",
|
||||
"reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da"
|
||||
"reference": "3b402f65a4cc90abf6e1104e388b896ce209631b"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
|
||||
"reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3b402f65a4cc90abf6e1104e388b896ce209631b",
|
||||
"reference": "3b402f65a4cc90abf6e1104e388b896ce209631b",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -2461,20 +2462,20 @@
|
||||
"keywords": [
|
||||
"tokenizer"
|
||||
],
|
||||
"time": "2015-09-15 10:49:45"
|
||||
"time": "2016-11-15 14:06:22"
|
||||
},
|
||||
{
|
||||
"name": "phpunit/phpunit",
|
||||
"version": "4.8.28",
|
||||
"version": "4.8.29",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/sebastianbergmann/phpunit.git",
|
||||
"reference": "558a3a0d28b4cb7e4a593a4fbd2220e787076225"
|
||||
"reference": "f19d481b468b76a7fb55eb2b772ed487e484891e"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/558a3a0d28b4cb7e4a593a4fbd2220e787076225",
|
||||
"reference": "558a3a0d28b4cb7e4a593a4fbd2220e787076225",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f19d481b468b76a7fb55eb2b772ed487e484891e",
|
||||
"reference": "f19d481b468b76a7fb55eb2b772ed487e484891e",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -2490,7 +2491,7 @@
|
||||
"phpunit/php-text-template": "~1.2",
|
||||
"phpunit/php-timer": "^1.0.6",
|
||||
"phpunit/phpunit-mock-objects": "~2.3",
|
||||
"sebastian/comparator": "~1.1",
|
||||
"sebastian/comparator": "~1.2.2",
|
||||
"sebastian/diff": "~1.2",
|
||||
"sebastian/environment": "~1.3",
|
||||
"sebastian/exporter": "~1.2",
|
||||
@ -2533,7 +2534,7 @@
|
||||
"testing",
|
||||
"xunit"
|
||||
],
|
||||
"time": "2016-11-14 06:25:28"
|
||||
"time": "2016-11-20 10:35:28"
|
||||
},
|
||||
{
|
||||
"name": "phpunit/phpunit-mock-objects",
|
||||
@ -2593,22 +2594,22 @@
|
||||
},
|
||||
{
|
||||
"name": "sebastian/comparator",
|
||||
"version": "1.2.0",
|
||||
"version": "1.2.2",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/sebastianbergmann/comparator.git",
|
||||
"reference": "937efb279bd37a375bcadf584dec0726f84dbf22"
|
||||
"reference": "6a1ed12e8b2409076ab22e3897126211ff8b1f7f"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/937efb279bd37a375bcadf584dec0726f84dbf22",
|
||||
"reference": "937efb279bd37a375bcadf584dec0726f84dbf22",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/6a1ed12e8b2409076ab22e3897126211ff8b1f7f",
|
||||
"reference": "6a1ed12e8b2409076ab22e3897126211ff8b1f7f",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=5.3.3",
|
||||
"sebastian/diff": "~1.2",
|
||||
"sebastian/exporter": "~1.2"
|
||||
"sebastian/exporter": "~1.2 || ~2.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"phpunit/phpunit": "~4.4"
|
||||
@ -2653,7 +2654,7 @@
|
||||
"compare",
|
||||
"equality"
|
||||
],
|
||||
"time": "2015-07-26 15:48:44"
|
||||
"time": "2016-11-19 09:18:40"
|
||||
},
|
||||
{
|
||||
"name": "sebastian/diff",
|
||||
@ -3043,7 +3044,7 @@
|
||||
},
|
||||
{
|
||||
"name": "symfony/browser-kit",
|
||||
"version": "v3.1.6",
|
||||
"version": "v3.1.7",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/browser-kit.git",
|
||||
@ -3100,16 +3101,16 @@
|
||||
},
|
||||
{
|
||||
"name": "symfony/css-selector",
|
||||
"version": "v3.1.6",
|
||||
"version": "v3.1.7",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/css-selector.git",
|
||||
"reference": "ca809c64072e0fe61c1c7fb3c76cdc32265042ac"
|
||||
"reference": "a37b3359566415a91cba55a2d95820b3fa1a9658"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/css-selector/zipball/ca809c64072e0fe61c1c7fb3c76cdc32265042ac",
|
||||
"reference": "ca809c64072e0fe61c1c7fb3c76cdc32265042ac",
|
||||
"url": "https://api.github.com/repos/symfony/css-selector/zipball/a37b3359566415a91cba55a2d95820b3fa1a9658",
|
||||
"reference": "a37b3359566415a91cba55a2d95820b3fa1a9658",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -3149,20 +3150,20 @@
|
||||
],
|
||||
"description": "Symfony CssSelector Component",
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2016-09-06 11:02:40"
|
||||
"time": "2016-11-03 08:04:31"
|
||||
},
|
||||
{
|
||||
"name": "symfony/dom-crawler",
|
||||
"version": "v3.1.6",
|
||||
"version": "v3.1.7",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/dom-crawler.git",
|
||||
"reference": "59eee3c76eb89f21857798620ebdad7a05ad14f4"
|
||||
"reference": "1eb3b4d216e8db117218dd2bb7d23dfe67bdf518"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/dom-crawler/zipball/59eee3c76eb89f21857798620ebdad7a05ad14f4",
|
||||
"reference": "59eee3c76eb89f21857798620ebdad7a05ad14f4",
|
||||
"url": "https://api.github.com/repos/symfony/dom-crawler/zipball/1eb3b4d216e8db117218dd2bb7d23dfe67bdf518",
|
||||
"reference": "1eb3b4d216e8db117218dd2bb7d23dfe67bdf518",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -3205,11 +3206,11 @@
|
||||
],
|
||||
"description": "Symfony DomCrawler Component",
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2016-10-18 15:46:07"
|
||||
"time": "2016-11-14 16:20:02"
|
||||
},
|
||||
{
|
||||
"name": "symfony/process",
|
||||
"version": "v3.1.6",
|
||||
"version": "v3.1.7",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/process.git",
|
||||
@ -3258,20 +3259,20 @@
|
||||
},
|
||||
{
|
||||
"name": "webmozart/assert",
|
||||
"version": "1.1.0",
|
||||
"version": "1.2.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/webmozart/assert.git",
|
||||
"reference": "bb2d123231c095735130cc8f6d31385a44c7b308"
|
||||
"reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/webmozart/assert/zipball/bb2d123231c095735130cc8f6d31385a44c7b308",
|
||||
"reference": "bb2d123231c095735130cc8f6d31385a44c7b308",
|
||||
"url": "https://api.github.com/repos/webmozart/assert/zipball/2db61e59ff05fe5126d152bd0655c9ea113e550f",
|
||||
"reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": "^5.3.3|^7.0"
|
||||
"php": "^5.3.3 || ^7.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"phpunit/phpunit": "^4.6",
|
||||
@ -3280,7 +3281,7 @@
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "1.2-dev"
|
||||
"dev-master": "1.3-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
@ -3304,7 +3305,7 @@
|
||||
"check",
|
||||
"validate"
|
||||
],
|
||||
"time": "2016-08-09 15:02:57"
|
||||
"time": "2016-11-23 20:04:58"
|
||||
}
|
||||
],
|
||||
"aliases": [],
|
||||
|
||||
@ -22,11 +22,6 @@ 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(
|
||||
@ -130,7 +125,7 @@ class lexer extends \Twig_Lexer
|
||||
// Appends any filters
|
||||
$code = preg_replace('#{([a-zA-Z0-9_\.]+)(\|[^}]+?)?}#', '{{ $1$2 }}', $code);
|
||||
|
||||
return parent::tokenize(new \Twig_Source($code, $filename));
|
||||
return parent::tokenize($code, $filename);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user