aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--phpBB/composer.json42
-rw-r--r--phpBB/composer.lock214
-rw-r--r--phpBB/phpbb/template/twig/loader.php10
-rw-r--r--tests/di/create_container_test.php2
-rw-r--r--tests/text_formatter/s9e/default_formatting_test.php2
5 files changed, 142 insertions, 128 deletions
diff --git a/phpBB/composer.json b/phpBB/composer.json
index e6de5eab2e..ca6eb449bb 100644
--- a/phpBB/composer.json
+++ b/phpBB/composer.json
@@ -30,24 +30,24 @@
"google/recaptcha": "~1.1",
"guzzlehttp/guzzle": "~5.3",
"lusitanian/oauth": "^0.8.1",
- "marc1706/fast-image-size": "~1.1",
- "paragonie/random_compat": "^1.2",
- "patchwork/utf8": "1.1.*",
- "s9e/text-formatter": "~0.6",
- "symfony/config": "2.8.*",
- "symfony/console": "2.8.*",
- "symfony/debug": "2.8.*",
- "symfony/dependency-injection": "2.8.*",
- "symfony/event-dispatcher": "2.8.*",
- "symfony/filesystem": "2.8.*",
- "symfony/finder": "2.8.*",
- "symfony/http-foundation": "2.8.*",
- "symfony/http-kernel": "2.8.*",
- "symfony/proxy-manager-bridge": "2.8.*",
- "symfony/routing": "2.8.*",
- "symfony/twig-bridge": "2.8.*",
- "symfony/yaml": "2.8.*",
- "twig/twig": "1.*"
+ "marc1706/fast-image-size": "^1.1",
+ "paragonie/random_compat": "^2.0",
+ "patchwork/utf8": "^1.1",
+ "s9e/text-formatter": "~0.8.0",
+ "symfony/config": "^2.8",
+ "symfony/console": "^2.8",
+ "symfony/debug": "^2.8",
+ "symfony/dependency-injection": "^2.8",
+ "symfony/event-dispatcher": "^2.8",
+ "symfony/filesystem": "^2.8",
+ "symfony/finder": "^2.8",
+ "symfony/http-foundation": "^2.8",
+ "symfony/http-kernel": "^2.8",
+ "symfony/proxy-manager-bridge": "^2.8",
+ "symfony/routing": "^2.8",
+ "symfony/twig-bridge": "^2.8",
+ "symfony/yaml": "^2.8",
+ "twig/twig": "^1.0"
},
"require-dev": {
"fabpot/goutte": "~2.0",
@@ -58,9 +58,9 @@
"phpunit/phpunit": "4.1.*",
"sami/sami": "1.*",
"squizlabs/php_codesniffer": "2.*",
- "symfony/browser-kit": "2.8.*",
- "symfony/css-selector": "2.8.*",
- "symfony/dom-crawler": "2.8.*"
+ "symfony/browser-kit": "^2.8",
+ "symfony/css-selector": "^2.8",
+ "symfony/dom-crawler": "^2.8"
},
"extra": {
"branch-alias": {
diff --git a/phpBB/composer.lock b/phpBB/composer.lock
index f5d025a04b..9e698f939f 100644
--- a/phpBB/composer.lock
+++ b/phpBB/composer.lock
@@ -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": "5426763a1b0cea586211be11218ec457",
- "content-hash": "b6de2d81609b99acc0d3aaf0ee4cc886",
+ "hash": "f8c36b90de055ba0b43285a066e66805",
+ "content-hash": "1968761eb0667a7c4745caaf65992fe3",
"packages": [
{
"name": "bantu/ini-get-wrapper",
@@ -460,16 +460,16 @@
},
{
"name": "paragonie/random_compat",
- "version": "v1.4.1",
+ "version": "v2.0.2",
"source": {
"type": "git",
"url": "https://github.com/paragonie/random_compat.git",
- "reference": "c7e26a21ba357863de030f0b9e701c7d04593774"
+ "reference": "088c04e2f261c33bed6ca5245491cfca69195ccf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/paragonie/random_compat/zipball/c7e26a21ba357863de030f0b9e701c7d04593774",
- "reference": "c7e26a21ba357863de030f0b9e701c7d04593774",
+ "url": "https://api.github.com/repos/paragonie/random_compat/zipball/088c04e2f261c33bed6ca5245491cfca69195ccf",
+ "reference": "088c04e2f261c33bed6ca5245491cfca69195ccf",
"shasum": ""
},
"require": {
@@ -504,20 +504,20 @@
"pseudorandom",
"random"
],
- "time": "2016-03-18 20:34:03"
+ "time": "2016-04-03 06:00:07"
},
{
"name": "patchwork/utf8",
- "version": "v1.1.31",
+ "version": "v1.3.1",
"source": {
"type": "git",
"url": "https://github.com/tchwork/utf8.git",
- "reference": "84da29ef77c422d83126534cb5bb03ba6e20f319"
+ "reference": "30ec6451aec7d2536f0af8fe535f70c764f2c47a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/tchwork/utf8/zipball/84da29ef77c422d83126534cb5bb03ba6e20f319",
- "reference": "84da29ef77c422d83126534cb5bb03ba6e20f319",
+ "url": "https://api.github.com/repos/tchwork/utf8/zipball/30ec6451aec7d2536f0af8fe535f70c764f2c47a",
+ "reference": "30ec6451aec7d2536f0af8fe535f70c764f2c47a",
"shasum": ""
},
"require": {
@@ -527,15 +527,23 @@
"suggest": {
"ext-iconv": "Use iconv for best performance",
"ext-intl": "Use Intl for best performance",
- "ext-mbstring": "Use Mbstring for best performance"
+ "ext-mbstring": "Use Mbstring for best performance",
+ "ext-wfio": "Use WFIO for UTF-8 filesystem access on Windows"
},
"type": "library",
- "autoload": {
- "psr-0": {
- "Patchwork": "class/",
- "Normalizer": "class/"
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.3-dev"
}
},
+ "autoload": {
+ "psr-4": {
+ "Patchwork\\": "src/Patchwork/"
+ },
+ "classmap": [
+ "src/Normalizer.php"
+ ]
+ },
"notification-url": "https://packagist.org/downloads/",
"license": [
"(Apache-2.0 or GPL-2.0)"
@@ -555,7 +563,7 @@
"utf-8",
"utf8"
],
- "time": "2015-12-15 15:29:47"
+ "time": "2016-05-18 13:57:10"
},
{
"name": "psr/log",
@@ -641,16 +649,16 @@
},
{
"name": "s9e/text-formatter",
- "version": "0.6.2",
+ "version": "0.8.1",
"source": {
"type": "git",
"url": "https://github.com/s9e/TextFormatter.git",
- "reference": "99d6b5799387dddfdd00b5a76bb83a15dda586e3"
+ "reference": "93f0bc0a1ad829b90b5482c3d2bfc35ee4cfaacf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/99d6b5799387dddfdd00b5a76bb83a15dda586e3",
- "reference": "99d6b5799387dddfdd00b5a76bb83a15dda586e3",
+ "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/93f0bc0a1ad829b90b5482c3d2bfc35ee4cfaacf",
+ "reference": "93f0bc0a1ad829b90b5482c3d2bfc35ee4cfaacf",
"shasum": ""
},
"require": {
@@ -697,20 +705,20 @@
"parser",
"shortcodes"
],
- "time": "2016-08-09 14:16:45"
+ "time": "2016-10-09 23:40:32"
},
{
"name": "symfony/config",
- "version": "v2.8.9",
+ "version": "v2.8.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/config.git",
- "reference": "4275ef5b59f18959df0eee3991e9ca0cc208ffd4"
+ "reference": "005bf10c156335ede2e89fb9a9ee10a0b742bc84"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/config/zipball/4275ef5b59f18959df0eee3991e9ca0cc208ffd4",
- "reference": "4275ef5b59f18959df0eee3991e9ca0cc208ffd4",
+ "url": "https://api.github.com/repos/symfony/config/zipball/005bf10c156335ede2e89fb9a9ee10a0b742bc84",
+ "reference": "005bf10c156335ede2e89fb9a9ee10a0b742bc84",
"shasum": ""
},
"require": {
@@ -750,20 +758,20 @@
],
"description": "Symfony Config Component",
"homepage": "https://symfony.com",
- "time": "2016-07-26 08:02:44"
+ "time": "2016-08-16 14:56:08"
},
{
"name": "symfony/console",
- "version": "v2.8.9",
+ "version": "v2.8.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "36e62335caca8a6e909c5c5bac4a8128149911c9"
+ "reference": "3d3e4fa5f0614c8e45220e5de80332322e33bd90"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/36e62335caca8a6e909c5c5bac4a8128149911c9",
- "reference": "36e62335caca8a6e909c5c5bac4a8128149911c9",
+ "url": "https://api.github.com/repos/symfony/console/zipball/3d3e4fa5f0614c8e45220e5de80332322e33bd90",
+ "reference": "3d3e4fa5f0614c8e45220e5de80332322e33bd90",
"shasum": ""
},
"require": {
@@ -810,20 +818,20 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
- "time": "2016-07-30 07:20:35"
+ "time": "2016-09-06 10:55:00"
},
{
"name": "symfony/debug",
- "version": "v2.8.9",
+ "version": "v2.8.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/debug.git",
- "reference": "f7c5256f43debdabec79146a5db226fd15aedbea"
+ "reference": "8c29235936a47473af16fb91c7c4b7b193c5693c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/debug/zipball/f7c5256f43debdabec79146a5db226fd15aedbea",
- "reference": "f7c5256f43debdabec79146a5db226fd15aedbea",
+ "url": "https://api.github.com/repos/symfony/debug/zipball/8c29235936a47473af16fb91c7c4b7b193c5693c",
+ "reference": "8c29235936a47473af16fb91c7c4b7b193c5693c",
"shasum": ""
},
"require": {
@@ -867,20 +875,20 @@
],
"description": "Symfony Debug Component",
"homepage": "https://symfony.com",
- "time": "2016-07-30 07:20:35"
+ "time": "2016-09-06 10:55:00"
},
{
"name": "symfony/dependency-injection",
- "version": "v2.8.9",
+ "version": "v2.8.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/dependency-injection.git",
- "reference": "f2b5a00d176f6a201dc430375c0ef37706ea3d12"
+ "reference": "0a732a9cafc30e54077967da4d019e1d618a8cb9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/f2b5a00d176f6a201dc430375c0ef37706ea3d12",
- "reference": "f2b5a00d176f6a201dc430375c0ef37706ea3d12",
+ "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/0a732a9cafc30e54077967da4d019e1d618a8cb9",
+ "reference": "0a732a9cafc30e54077967da4d019e1d618a8cb9",
"shasum": ""
},
"require": {
@@ -930,11 +938,11 @@
],
"description": "Symfony DependencyInjection Component",
"homepage": "https://symfony.com",
- "time": "2016-07-30 07:20:35"
+ "time": "2016-09-06 23:19:39"
},
{
"name": "symfony/event-dispatcher",
- "version": "v2.8.9",
+ "version": "v2.8.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
@@ -994,16 +1002,16 @@
},
{
"name": "symfony/filesystem",
- "version": "v2.8.9",
+ "version": "v2.8.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
- "reference": "ab4c3f085c8f5a56536845bf985c4cef30bf75fd"
+ "reference": "44b499521defddf2eae17a18c811bbdae4f98bdf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/filesystem/zipball/ab4c3f085c8f5a56536845bf985c4cef30bf75fd",
- "reference": "ab4c3f085c8f5a56536845bf985c4cef30bf75fd",
+ "url": "https://api.github.com/repos/symfony/filesystem/zipball/44b499521defddf2eae17a18c811bbdae4f98bdf",
+ "reference": "44b499521defddf2eae17a18c811bbdae4f98bdf",
"shasum": ""
},
"require": {
@@ -1039,20 +1047,20 @@
],
"description": "Symfony Filesystem Component",
"homepage": "https://symfony.com",
- "time": "2016-07-20 05:41:28"
+ "time": "2016-09-06 10:55:00"
},
{
"name": "symfony/finder",
- "version": "v2.8.9",
+ "version": "v2.8.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
- "reference": "60804d88691e4a73bbbb3035eb1d9f075c5c2c10"
+ "reference": "bec5533e6ed650547d6ec8de4b541dc9929066f7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/60804d88691e4a73bbbb3035eb1d9f075c5c2c10",
- "reference": "60804d88691e4a73bbbb3035eb1d9f075c5c2c10",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/bec5533e6ed650547d6ec8de4b541dc9929066f7",
+ "reference": "bec5533e6ed650547d6ec8de4b541dc9929066f7",
"shasum": ""
},
"require": {
@@ -1088,20 +1096,20 @@
],
"description": "Symfony Finder Component",
"homepage": "https://symfony.com",
- "time": "2016-07-26 08:02:44"
+ "time": "2016-08-26 11:57:43"
},
{
"name": "symfony/http-foundation",
- "version": "v2.8.9",
+ "version": "v2.8.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
- "reference": "f20bea598906c990eebe3c70a63ca5ed18cdbc11"
+ "reference": "1d4ab8de2215e44e57fddc1e6b5d122546769e7d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-foundation/zipball/f20bea598906c990eebe3c70a63ca5ed18cdbc11",
- "reference": "f20bea598906c990eebe3c70a63ca5ed18cdbc11",
+ "url": "https://api.github.com/repos/symfony/http-foundation/zipball/1d4ab8de2215e44e57fddc1e6b5d122546769e7d",
+ "reference": "1d4ab8de2215e44e57fddc1e6b5d122546769e7d",
"shasum": ""
},
"require": {
@@ -1143,20 +1151,20 @@
],
"description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com",
- "time": "2016-07-30 07:20:35"
+ "time": "2016-09-06 10:55:00"
},
{
"name": "symfony/http-kernel",
- "version": "v2.8.9",
+ "version": "v2.8.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
- "reference": "c4bcdce4fc1f4ec1a20264fc45802a2814b42c5f"
+ "reference": "a47004349e9216ab98a8019616a66e2d5c32b0ca"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-kernel/zipball/c4bcdce4fc1f4ec1a20264fc45802a2814b42c5f",
- "reference": "c4bcdce4fc1f4ec1a20264fc45802a2814b42c5f",
+ "url": "https://api.github.com/repos/symfony/http-kernel/zipball/a47004349e9216ab98a8019616a66e2d5c32b0ca",
+ "reference": "a47004349e9216ab98a8019616a66e2d5c32b0ca",
"shasum": ""
},
"require": {
@@ -1225,7 +1233,7 @@
],
"description": "Symfony HttpKernel Component",
"homepage": "https://symfony.com",
- "time": "2016-07-30 08:48:39"
+ "time": "2016-09-07 02:02:58"
},
{
"name": "symfony/polyfill-mbstring",
@@ -1402,7 +1410,7 @@
},
{
"name": "symfony/proxy-manager-bridge",
- "version": "v2.8.9",
+ "version": "v2.8.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/proxy-manager-bridge.git",
@@ -1456,16 +1464,16 @@
},
{
"name": "symfony/routing",
- "version": "v2.8.9",
+ "version": "v2.8.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
- "reference": "cdd298b1d45b9882de0905856e89171bf487c6d5"
+ "reference": "6cee3ed22c778a7410119a3d51a20f60252a156c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/routing/zipball/cdd298b1d45b9882de0905856e89171bf487c6d5",
- "reference": "cdd298b1d45b9882de0905856e89171bf487c6d5",
+ "url": "https://api.github.com/repos/symfony/routing/zipball/6cee3ed22c778a7410119a3d51a20f60252a156c",
+ "reference": "6cee3ed22c778a7410119a3d51a20f60252a156c",
"shasum": ""
},
"require": {
@@ -1527,20 +1535,20 @@
"uri",
"url"
],
- "time": "2016-06-29 05:29:29"
+ "time": "2016-08-16 14:56:08"
},
{
"name": "symfony/twig-bridge",
- "version": "v2.8.9",
+ "version": "v2.8.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/twig-bridge.git",
- "reference": "8e7aafdd037e0a12be436e863bc9695f6d65518b"
+ "reference": "5e9679f7085e99adb5248e07b4677494b8f884b5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/8e7aafdd037e0a12be436e863bc9695f6d65518b",
- "reference": "8e7aafdd037e0a12be436e863bc9695f6d65518b",
+ "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/5e9679f7085e99adb5248e07b4677494b8f884b5",
+ "reference": "5e9679f7085e99adb5248e07b4677494b8f884b5",
"shasum": ""
},
"require": {
@@ -1608,20 +1616,20 @@
],
"description": "Symfony Twig Bridge",
"homepage": "https://symfony.com",
- "time": "2016-07-30 07:20:35"
+ "time": "2016-09-06 10:55:00"
},
{
"name": "symfony/yaml",
- "version": "v2.8.9",
+ "version": "v2.8.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
- "reference": "0ceab136f43ed9d3e97b3eea32a7855dc50c121d"
+ "reference": "e7540734bad981fe59f8ef14b6fc194ae9df8d9c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/yaml/zipball/0ceab136f43ed9d3e97b3eea32a7855dc50c121d",
- "reference": "0ceab136f43ed9d3e97b3eea32a7855dc50c121d",
+ "url": "https://api.github.com/repos/symfony/yaml/zipball/e7540734bad981fe59f8ef14b6fc194ae9df8d9c",
+ "reference": "e7540734bad981fe59f8ef14b6fc194ae9df8d9c",
"shasum": ""
},
"require": {
@@ -1657,20 +1665,20 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
- "time": "2016-07-17 09:06:15"
+ "time": "2016-09-02 01:57:56"
},
{
"name": "twig/twig",
- "version": "v1.24.1",
+ "version": "v1.26.0",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
- "reference": "3566d311a92aae4deec6e48682dc5a4528c4a512"
+ "reference": "81c2b5fd36581370c7731387f05dcdb577050513"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/twigphp/Twig/zipball/3566d311a92aae4deec6e48682dc5a4528c4a512",
- "reference": "3566d311a92aae4deec6e48682dc5a4528c4a512",
+ "url": "https://api.github.com/repos/twigphp/Twig/zipball/81c2b5fd36581370c7731387f05dcdb577050513",
+ "reference": "81c2b5fd36581370c7731387f05dcdb577050513",
"shasum": ""
},
"require": {
@@ -1683,7 +1691,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.24-dev"
+ "dev-master": "1.26-dev"
}
},
"autoload": {
@@ -1718,7 +1726,7 @@
"keywords": [
"templating"
],
- "time": "2016-05-30 09:11:59"
+ "time": "2016-10-02 16:19:13"
},
{
"name": "zendframework/zend-code",
@@ -2624,9 +2632,7 @@
"authors": [
{
"name": "Fabien Potencier",
- "email": "fabien@symfony.com",
- "homepage": "http://fabien.potencier.org",
- "role": "Lead Developer"
+ "email": "fabien@symfony.com"
}
],
"description": "Pimple is a simple Dependency Injection Container for PHP 5.3",
@@ -3095,16 +3101,16 @@
},
{
"name": "symfony/browser-kit",
- "version": "v2.8.9",
+ "version": "v2.8.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/browser-kit.git",
- "reference": "67edaa4e89c76acd15a25a0b13728172341344c5"
+ "reference": "165bf6d1e72cd72f2fe170a070aa2a1f17f2d744"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/browser-kit/zipball/67edaa4e89c76acd15a25a0b13728172341344c5",
- "reference": "67edaa4e89c76acd15a25a0b13728172341344c5",
+ "url": "https://api.github.com/repos/symfony/browser-kit/zipball/165bf6d1e72cd72f2fe170a070aa2a1f17f2d744",
+ "reference": "165bf6d1e72cd72f2fe170a070aa2a1f17f2d744",
"shasum": ""
},
"require": {
@@ -3148,20 +3154,20 @@
],
"description": "Symfony BrowserKit Component",
"homepage": "https://symfony.com",
- "time": "2016-07-26 08:02:44"
+ "time": "2016-09-06 10:55:00"
},
{
"name": "symfony/css-selector",
- "version": "v2.8.9",
+ "version": "v2.8.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
- "reference": "9da4c615ba303850986e0480cc472bf704cfdb64"
+ "reference": "71c8c3a04c126300c37089b1baa7c6322dfb845f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/css-selector/zipball/9da4c615ba303850986e0480cc472bf704cfdb64",
- "reference": "9da4c615ba303850986e0480cc472bf704cfdb64",
+ "url": "https://api.github.com/repos/symfony/css-selector/zipball/71c8c3a04c126300c37089b1baa7c6322dfb845f",
+ "reference": "71c8c3a04c126300c37089b1baa7c6322dfb845f",
"shasum": ""
},
"require": {
@@ -3201,11 +3207,11 @@
],
"description": "Symfony CssSelector Component",
"homepage": "https://symfony.com",
- "time": "2016-06-29 05:31:50"
+ "time": "2016-09-06 10:55:00"
},
{
"name": "symfony/dom-crawler",
- "version": "v2.8.9",
+ "version": "v2.8.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/dom-crawler.git",
@@ -3261,16 +3267,16 @@
},
{
"name": "symfony/process",
- "version": "v2.8.9",
+ "version": "v2.8.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
- "reference": "d20332e43e8774ff8870b394f3dd6020cc7f8e0c"
+ "reference": "05a03ed27073638658cab9405d99a67dd1014987"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/d20332e43e8774ff8870b394f3dd6020cc7f8e0c",
- "reference": "d20332e43e8774ff8870b394f3dd6020cc7f8e0c",
+ "url": "https://api.github.com/repos/symfony/process/zipball/05a03ed27073638658cab9405d99a67dd1014987",
+ "reference": "05a03ed27073638658cab9405d99a67dd1014987",
"shasum": ""
},
"require": {
@@ -3306,7 +3312,7 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
- "time": "2016-07-28 11:13:19"
+ "time": "2016-09-06 10:55:00"
}
],
"aliases": [],
diff --git a/phpBB/phpbb/template/twig/loader.php b/phpBB/phpbb/template/twig/loader.php
index 8b12188a77..d2b42852ce 100644
--- a/phpBB/phpbb/template/twig/loader.php
+++ b/phpBB/phpbb/template/twig/loader.php
@@ -101,6 +101,16 @@ class loader extends \Twig_Loader_Filesystem
}
/**
+ * Adds a realpath call to fix a BC break in Twig 1.26 (https://github.com/twigphp/Twig/issues/2145)
+ *
+ * {@inheritdoc}
+ */
+ public function addPath($path, $namespace = self::MAIN_NAMESPACE)
+ {
+ return parent::addPath($this->filesystem->realpath($path), $namespace);
+ }
+
+ /**
* Find the template
*
* Override for Twig_Loader_Filesystem::findTemplate to add support
diff --git a/tests/di/create_container_test.php b/tests/di/create_container_test.php
index 4dd0583ebe..aba7a3560b 100644
--- a/tests/di/create_container_test.php
+++ b/tests/di/create_container_test.php
@@ -73,8 +73,6 @@ namespace
// Checks the construction of a dumped container
$container = $this->builder->get_container();
$this->assertInstanceOf('phpbb_cache_container', $container);
- $this->assertFalse($container->isFrozen());
- $container->getParameterBag(); // needed, otherwise the container is not marked as frozen
$this->assertTrue($container->isFrozen());
}
diff --git a/tests/text_formatter/s9e/default_formatting_test.php b/tests/text_formatter/s9e/default_formatting_test.php
index a70528aba3..e25c3246b5 100644
--- a/tests/text_formatter/s9e/default_formatting_test.php
+++ b/tests/text_formatter/s9e/default_formatting_test.php
@@ -298,7 +298,7 @@ class phpbb_textformatter_s9e_default_formatting_test extends phpbb_test_case
),
array(
"Emoji: \xF0\x9F\x98\x80",
- 'Emoji: <img alt="' . "\xF0\x9F\x98\x80" . '" class="smilies" draggable="false" width="18" height="18" src="//twemoji.maxcdn.com/svg/1f600.svg">'
+ 'Emoji: <img alt="' . "\xF0\x9F\x98\x80" . '" class="smilies" draggable="false" width="18" height="18" src="//cdn.jsdelivr.net/emojione/assets/svg/1f600.svg">'
),
array(
"Emoji: \xF0\x9F\x98\x80",
generated by cgit v1.2.1 (git 2.21.0) at 2025-06-24 16:27:46 +0000