1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-14 04:30:29 +01:00

Merge branch 'prep-release-3.2.3' into 3.2.x

This commit is contained in:
Marc Alexander 2018-09-09 12:00:28 +01:00
commit 2c9d49bf09
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
7 changed files with 193 additions and 141 deletions

View File

@ -3,7 +3,7 @@
<project name="phpBB" description="The phpBB forum software" default="all" basedir="../">
<!-- a few settings for the build -->
<property name="newversion" value="3.2.4-dev" />
<property name="prevversion" value="3.2.3-RC2" />
<property name="prevversion" value="3.2.3" />
<property name="olderversions" value="3.0.14, 3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.4, 3.1.5, 3.1.6, 3.1.7, 3.1.7-pl1, 3.1.8, 3.1.9, 3.1.10, 3.1.11, 3.1.12, 3.2.0-a1, 3.2.0-a2, 3.2.0-b1, 3.2.0-b2, 3.2.0-RC1, 3.2.0-RC2, 3.2.0, 3.2.1, 3.2.2" />
<!-- no configuration should be needed beyond this point -->

276
phpBB/composer.lock generated
View File

@ -84,16 +84,16 @@
},
{
"name": "guzzlehttp/guzzle",
"version": "5.3.2",
"version": "5.3.3",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle.git",
"reference": "f9acb4761844317e626a32259205bec1f1bc60d2"
"reference": "93bbdb30d59be6cd9839495306c65f2907370eb9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/f9acb4761844317e626a32259205bec1f1bc60d2",
"reference": "f9acb4761844317e626a32259205bec1f1bc60d2",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/93bbdb30d59be6cd9839495306c65f2907370eb9",
"reference": "93bbdb30d59be6cd9839495306c65f2907370eb9",
"shasum": ""
},
"require": {
@ -133,20 +133,20 @@
"rest",
"web service"
],
"time": "2018-01-15 07:18:01"
"time": "2018-07-31 13:33:10"
},
{
"name": "guzzlehttp/ringphp",
"version": "1.1.0",
"version": "1.1.1",
"source": {
"type": "git",
"url": "https://github.com/guzzle/RingPHP.git",
"reference": "dbbb91d7f6c191e5e405e900e3102ac7f261bc0b"
"reference": "5e2a174052995663dd68e6b5ad838afd47dd615b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/RingPHP/zipball/dbbb91d7f6c191e5e405e900e3102ac7f261bc0b",
"reference": "dbbb91d7f6c191e5e405e900e3102ac7f261bc0b",
"url": "https://api.github.com/repos/guzzle/RingPHP/zipball/5e2a174052995663dd68e6b5ad838afd47dd615b",
"reference": "5e2a174052995663dd68e6b5ad838afd47dd615b",
"shasum": ""
},
"require": {
@ -184,7 +184,7 @@
}
],
"description": "Provides a simple API and specification that abstracts away the details of HTTP into a single PHP function.",
"time": "2015-05-20 03:37:09"
"time": "2018-07-31 13:22:33"
},
{
"name": "guzzlehttp/streams",
@ -343,7 +343,7 @@
"oauth",
"security"
],
"time": "2018-02-14 22:37:14"
"time": "2016-07-12 22:15:00"
},
{
"name": "marc1706/fast-image-size",
@ -506,7 +506,7 @@
"pseudorandom",
"random"
],
"time": "2018-04-04 21:48:54"
"time": "2017-03-13 16:22:52"
},
{
"name": "patchwork/utf8",
@ -727,16 +727,16 @@
},
{
"name": "symfony/config",
"version": "v2.8.42",
"version": "v2.8.44",
"source": {
"type": "git",
"url": "https://github.com/symfony/config.git",
"reference": "93bdf96d0e3c9b29740bf9050e7a996b443c8436"
"reference": "06c0be4cdd8363f3ec8d592c9a4d1b981d5052af"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/config/zipball/93bdf96d0e3c9b29740bf9050e7a996b443c8436",
"reference": "93bdf96d0e3c9b29740bf9050e7a996b443c8436",
"url": "https://api.github.com/repos/symfony/config/zipball/06c0be4cdd8363f3ec8d592c9a4d1b981d5052af",
"reference": "06c0be4cdd8363f3ec8d592c9a4d1b981d5052af",
"shasum": ""
},
"require": {
@ -780,20 +780,20 @@
],
"description": "Symfony Config Component",
"homepage": "https://symfony.com",
"time": "2018-05-01 22:52:40"
"time": "2018-07-26 11:13:39"
},
{
"name": "symfony/console",
"version": "v2.8.42",
"version": "v2.8.44",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
"reference": "e8e59b74ad1274714dad2748349b55e3e6e630c7"
"reference": "0c1fcbb9afb5cff992c982ff99c0434f0146dcfc"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/e8e59b74ad1274714dad2748349b55e3e6e630c7",
"reference": "e8e59b74ad1274714dad2748349b55e3e6e630c7",
"url": "https://api.github.com/repos/symfony/console/zipball/0c1fcbb9afb5cff992c982ff99c0434f0146dcfc",
"reference": "0c1fcbb9afb5cff992c982ff99c0434f0146dcfc",
"shasum": ""
},
"require": {
@ -841,20 +841,20 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
"time": "2018-05-15 21:17:45"
"time": "2018-07-26 11:13:39"
},
{
"name": "symfony/debug",
"version": "v2.8.42",
"version": "v2.8.44",
"source": {
"type": "git",
"url": "https://github.com/symfony/debug.git",
"reference": "a26ddce7fe4e884097d72435653bc7e703411f26"
"reference": "d985c8546da49c4727e27dae82bcf783ee2c5af0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/debug/zipball/a26ddce7fe4e884097d72435653bc7e703411f26",
"reference": "a26ddce7fe4e884097d72435653bc7e703411f26",
"url": "https://api.github.com/repos/symfony/debug/zipball/d985c8546da49c4727e27dae82bcf783ee2c5af0",
"reference": "d985c8546da49c4727e27dae82bcf783ee2c5af0",
"shasum": ""
},
"require": {
@ -898,20 +898,20 @@
],
"description": "Symfony Debug Component",
"homepage": "https://symfony.com",
"time": "2018-06-22 15:01:26"
"time": "2018-07-26 11:13:39"
},
{
"name": "symfony/dependency-injection",
"version": "v2.8.42",
"version": "v2.8.44",
"source": {
"type": "git",
"url": "https://github.com/symfony/dependency-injection.git",
"reference": "0f42a0827d99a867ffd279ae083e7daf1fe42cb7"
"reference": "ad2446d39d11c3daaa7f147d957941a187e47357"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/dependency-injection/zipball/0f42a0827d99a867ffd279ae083e7daf1fe42cb7",
"reference": "0f42a0827d99a867ffd279ae083e7daf1fe42cb7",
"url": "https://api.github.com/repos/symfony/dependency-injection/zipball/ad2446d39d11c3daaa7f147d957941a187e47357",
"reference": "ad2446d39d11c3daaa7f147d957941a187e47357",
"shasum": ""
},
"require": {
@ -961,20 +961,20 @@
],
"description": "Symfony DependencyInjection Component",
"homepage": "https://symfony.com",
"time": "2018-05-25 13:50:34"
"time": "2018-07-26 11:13:39"
},
{
"name": "symfony/event-dispatcher",
"version": "v2.8.42",
"version": "v2.8.44",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
"reference": "9b69aad7d4c086dc94ebade2d5eb9145da5dac8c"
"reference": "84ae343f39947aa084426ed1138bb96bf94d1f12"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/9b69aad7d4c086dc94ebade2d5eb9145da5dac8c",
"reference": "9b69aad7d4c086dc94ebade2d5eb9145da5dac8c",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/84ae343f39947aa084426ed1138bb96bf94d1f12",
"reference": "84ae343f39947aa084426ed1138bb96bf94d1f12",
"shasum": ""
},
"require": {
@ -1021,20 +1021,20 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
"time": "2018-04-06 07:35:03"
"time": "2018-07-26 09:03:18"
},
{
"name": "symfony/filesystem",
"version": "v2.8.42",
"version": "v2.8.44",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
"reference": "0f685c099aca7ba86bcc31850186dbfe84a4a8a1"
"reference": "2d6a4deccdfa2e4e9f113138b93457b2d0886c15"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/0f685c099aca7ba86bcc31850186dbfe84a4a8a1",
"reference": "0f685c099aca7ba86bcc31850186dbfe84a4a8a1",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/2d6a4deccdfa2e4e9f113138b93457b2d0886c15",
"reference": "2d6a4deccdfa2e4e9f113138b93457b2d0886c15",
"shasum": ""
},
"require": {
@ -1071,20 +1071,20 @@
],
"description": "Symfony Filesystem Component",
"homepage": "https://symfony.com",
"time": "2018-06-21 09:24:14"
"time": "2018-07-26 11:13:39"
},
{
"name": "symfony/finder",
"version": "v2.8.42",
"version": "v2.8.44",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
"reference": "995cd7c28a0778cece02e2133b4d813dc509dfc3"
"reference": "f0de0b51913eb2caab7dfed6413b87e14fca780e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/finder/zipball/995cd7c28a0778cece02e2133b4d813dc509dfc3",
"reference": "995cd7c28a0778cece02e2133b4d813dc509dfc3",
"url": "https://api.github.com/repos/symfony/finder/zipball/f0de0b51913eb2caab7dfed6413b87e14fca780e",
"reference": "f0de0b51913eb2caab7dfed6413b87e14fca780e",
"shasum": ""
},
"require": {
@ -1120,20 +1120,20 @@
],
"description": "Symfony Finder Component",
"homepage": "https://symfony.com",
"time": "2018-06-19 11:07:17"
"time": "2018-07-26 11:13:39"
},
{
"name": "symfony/http-foundation",
"version": "v2.8.42",
"version": "v2.8.44",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
"reference": "f0332229bfecb3c3d3c983f2139f39dd73d2723a"
"reference": "10f660d43087b2198c3789bebbd587d20ec6e956"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/f0332229bfecb3c3d3c983f2139f39dd73d2723a",
"reference": "f0332229bfecb3c3d3c983f2139f39dd73d2723a",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/10f660d43087b2198c3789bebbd587d20ec6e956",
"reference": "10f660d43087b2198c3789bebbd587d20ec6e956",
"shasum": ""
},
"require": {
@ -1175,20 +1175,20 @@
],
"description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com",
"time": "2018-06-19 14:38:49"
"time": "2018-08-01 13:47:49"
},
{
"name": "symfony/http-kernel",
"version": "v2.8.42",
"version": "v2.8.44",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
"reference": "5f01e7b4a82458906e81231993abe1fbb7b25fbc"
"reference": "3ee21e3eb52327514d1fc754d1e0c9c85bceeb3a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/5f01e7b4a82458906e81231993abe1fbb7b25fbc",
"reference": "5f01e7b4a82458906e81231993abe1fbb7b25fbc",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/3ee21e3eb52327514d1fc754d1e0c9c85bceeb3a",
"reference": "3ee21e3eb52327514d1fc754d1e0c9c85bceeb3a",
"shasum": ""
},
"require": {
@ -1259,29 +1259,32 @@
],
"description": "Symfony HttpKernel Component",
"homepage": "https://symfony.com",
"time": "2018-06-25 12:01:56"
"time": "2018-08-01 14:12:31"
},
{
"name": "symfony/polyfill-ctype",
"version": "v1.8.0",
"version": "v1.9.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
"reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae"
"reference": "e3d826245268269cd66f8326bd8bc066687b4a19"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/7cc359f1b7b80fc25ed7796be7d96adc9b354bae",
"reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae",
"url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e3d826245268269cd66f8326bd8bc066687b4a19",
"reference": "e3d826245268269cd66f8326bd8bc066687b4a19",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"suggest": {
"ext-ctype": "For best performance"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.8-dev"
"dev-master": "1.9-dev"
}
},
"autoload": {
@ -1314,20 +1317,20 @@
"polyfill",
"portable"
],
"time": "2018-04-30 19:57:29"
"time": "2018-08-06 14:22:27"
},
{
"name": "symfony/polyfill-mbstring",
"version": "v1.8.0",
"version": "v1.9.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
"reference": "3296adf6a6454a050679cde90f95350ad604b171"
"reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/3296adf6a6454a050679cde90f95350ad604b171",
"reference": "3296adf6a6454a050679cde90f95350ad604b171",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/d0cd638f4634c16d8df4508e847f14e9e43168b8",
"reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8",
"shasum": ""
},
"require": {
@ -1339,7 +1342,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.8-dev"
"dev-master": "1.9-dev"
}
},
"autoload": {
@ -1373,20 +1376,20 @@
"portable",
"shim"
],
"time": "2018-04-26 10:06:28"
"time": "2018-08-06 14:22:27"
},
{
"name": "symfony/polyfill-php54",
"version": "v1.8.0",
"version": "v1.9.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php54.git",
"reference": "6c3a2b84c6025e4ea3f6a19feac35408c64b22e1"
"reference": "412977e090c6a8472dc39d50d1beb7d59495a965"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php54/zipball/6c3a2b84c6025e4ea3f6a19feac35408c64b22e1",
"reference": "6c3a2b84c6025e4ea3f6a19feac35408c64b22e1",
"url": "https://api.github.com/repos/symfony/polyfill-php54/zipball/412977e090c6a8472dc39d50d1beb7d59495a965",
"reference": "412977e090c6a8472dc39d50d1beb7d59495a965",
"shasum": ""
},
"require": {
@ -1395,7 +1398,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.8-dev"
"dev-master": "1.9-dev"
}
},
"autoload": {
@ -1431,20 +1434,20 @@
"portable",
"shim"
],
"time": "2018-04-26 10:06:28"
"time": "2018-08-06 14:22:27"
},
{
"name": "symfony/polyfill-php55",
"version": "v1.8.0",
"version": "v1.9.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php55.git",
"reference": "a39456128377a85f2c5707fcae458678560cba46"
"reference": "578b8528da843de0fc65ec395900fa3181f2ead7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/a39456128377a85f2c5707fcae458678560cba46",
"reference": "a39456128377a85f2c5707fcae458678560cba46",
"url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/578b8528da843de0fc65ec395900fa3181f2ead7",
"reference": "578b8528da843de0fc65ec395900fa3181f2ead7",
"shasum": ""
},
"require": {
@ -1454,7 +1457,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.8-dev"
"dev-master": "1.9-dev"
}
},
"autoload": {
@ -1487,20 +1490,20 @@
"portable",
"shim"
],
"time": "2018-04-26 10:06:28"
"time": "2018-08-06 14:22:27"
},
{
"name": "symfony/proxy-manager-bridge",
"version": "v2.8.42",
"version": "v2.8.44",
"source": {
"type": "git",
"url": "https://github.com/symfony/proxy-manager-bridge.git",
"reference": "d73283cfe025d73c70551c45d22c54bd43c2c53b"
"reference": "0fd7ab039e26a33c5e3d1e00642bc83412c0896a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/proxy-manager-bridge/zipball/d73283cfe025d73c70551c45d22c54bd43c2c53b",
"reference": "d73283cfe025d73c70551c45d22c54bd43c2c53b",
"url": "https://api.github.com/repos/symfony/proxy-manager-bridge/zipball/0fd7ab039e26a33c5e3d1e00642bc83412c0896a",
"reference": "0fd7ab039e26a33c5e3d1e00642bc83412c0896a",
"shasum": ""
},
"require": {
@ -1541,20 +1544,20 @@
],
"description": "Symfony ProxyManager Bridge",
"homepage": "https://symfony.com",
"time": "2018-01-03 07:36:31"
"time": "2018-07-26 09:03:18"
},
{
"name": "symfony/routing",
"version": "v2.8.42",
"version": "v2.8.44",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
"reference": "39064bae264907e48fe4e8ad5141f6dc6a3932fb"
"reference": "e26f791e8669603e9dc0a601e75a50f914eaa144"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/routing/zipball/39064bae264907e48fe4e8ad5141f6dc6a3932fb",
"reference": "39064bae264907e48fe4e8ad5141f6dc6a3932fb",
"url": "https://api.github.com/repos/symfony/routing/zipball/e26f791e8669603e9dc0a601e75a50f914eaa144",
"reference": "e26f791e8669603e9dc0a601e75a50f914eaa144",
"shasum": ""
},
"require": {
@ -1615,20 +1618,20 @@
"uri",
"url"
],
"time": "2018-06-19 09:52:17"
"time": "2018-07-26 11:13:39"
},
{
"name": "symfony/twig-bridge",
"version": "v2.8.42",
"version": "v2.8.44",
"source": {
"type": "git",
"url": "https://github.com/symfony/twig-bridge.git",
"reference": "f56824eed503d9bb65600a262fdb46571672c257"
"reference": "2bb814a4554a7188275be36503dc27c0dd12cd2f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/twig-bridge/zipball/f56824eed503d9bb65600a262fdb46571672c257",
"reference": "f56824eed503d9bb65600a262fdb46571672c257",
"url": "https://api.github.com/repos/symfony/twig-bridge/zipball/2bb814a4554a7188275be36503dc27c0dd12cd2f",
"reference": "2bb814a4554a7188275be36503dc27c0dd12cd2f",
"shasum": ""
},
"require": {
@ -1700,20 +1703,20 @@
],
"description": "Symfony Twig Bridge",
"homepage": "https://symfony.com",
"time": "2018-05-17 10:20:34"
"time": "2018-07-26 11:13:39"
},
{
"name": "symfony/yaml",
"version": "v2.8.42",
"version": "v2.8.44",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
"reference": "51356b7a2ff7c9fd06b2f1681cc463bb62b5c1ff"
"reference": "fbf876678e29dc634430dcf0096e216eb0004467"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/yaml/zipball/51356b7a2ff7c9fd06b2f1681cc463bb62b5c1ff",
"reference": "51356b7a2ff7c9fd06b2f1681cc463bb62b5c1ff",
"url": "https://api.github.com/repos/symfony/yaml/zipball/fbf876678e29dc634430dcf0096e216eb0004467",
"reference": "fbf876678e29dc634430dcf0096e216eb0004467",
"shasum": ""
},
"require": {
@ -1750,24 +1753,25 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
"time": "2018-05-01 22:52:40"
"time": "2018-07-26 09:03:18"
},
{
"name": "twig/twig",
"version": "v1.35.3",
"version": "v1.35.4",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
"reference": "b48680b6eb7d16b5025b9bfc4108d86f6b8af86f"
"reference": "7e081e98378a1e78c29cc9eba4aefa5d78a05d2a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/b48680b6eb7d16b5025b9bfc4108d86f6b8af86f",
"reference": "b48680b6eb7d16b5025b9bfc4108d86f6b8af86f",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/7e081e98378a1e78c29cc9eba4aefa5d78a05d2a",
"reference": "7e081e98378a1e78c29cc9eba4aefa5d78a05d2a",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
"php": ">=5.3.3",
"symfony/polyfill-ctype": "^1.8"
},
"require-dev": {
"psr/container": "^1.0",
@ -1806,16 +1810,16 @@
},
{
"name": "Twig Team",
"homepage": "http://twig.sensiolabs.org/contributors",
"homepage": "https://twig.symfony.com/contributors",
"role": "Contributors"
}
],
"description": "Twig, the flexible, fast, and secure template language for PHP",
"homepage": "http://twig.sensiolabs.org",
"homepage": "https://twig.symfony.com",
"keywords": [
"templating"
],
"time": "2018-03-20 04:25:58"
"time": "2018-07-13 07:12:17"
},
{
"name": "zendframework/zend-code",
@ -2357,16 +2361,16 @@
},
{
"name": "phpspec/prophecy",
"version": "1.7.6",
"version": "1.8.0",
"source": {
"type": "git",
"url": "https://github.com/phpspec/prophecy.git",
"reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712"
"reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpspec/prophecy/zipball/33a7e3c4fda54e912ff6338c48823bd5c0f0b712",
"reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712",
"url": "https://api.github.com/repos/phpspec/prophecy/zipball/4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
"reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
"shasum": ""
},
"require": {
@ -2378,12 +2382,12 @@
},
"require-dev": {
"phpspec/phpspec": "^2.5|^3.2",
"phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5"
"phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.7.x-dev"
"dev-master": "1.8.x-dev"
}
},
"autoload": {
@ -2416,7 +2420,7 @@
"spy",
"stub"
],
"time": "2018-04-18 13:57:24"
"time": "2018-08-05 17:53:17"
},
{
"name": "phpunit/dbunit",
@ -3410,16 +3414,16 @@
},
{
"name": "symfony/browser-kit",
"version": "v2.8.42",
"version": "v2.8.44",
"source": {
"type": "git",
"url": "https://github.com/symfony/browser-kit.git",
"reference": "11ccc2ebefba78c1bb0a2d2d2dd4b4e09a5fba02"
"reference": "fe44362c97307e7935996cb09d320fcc22619656"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/browser-kit/zipball/11ccc2ebefba78c1bb0a2d2d2dd4b4e09a5fba02",
"reference": "11ccc2ebefba78c1bb0a2d2d2dd4b4e09a5fba02",
"url": "https://api.github.com/repos/symfony/browser-kit/zipball/fe44362c97307e7935996cb09d320fcc22619656",
"reference": "fe44362c97307e7935996cb09d320fcc22619656",
"shasum": ""
},
"require": {
@ -3463,20 +3467,20 @@
],
"description": "Symfony BrowserKit Component",
"homepage": "https://symfony.com",
"time": "2018-03-19 21:11:56"
"time": "2018-07-26 09:03:18"
},
{
"name": "symfony/css-selector",
"version": "v2.8.42",
"version": "v2.8.44",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
"reference": "3cdc270724e4666006118283c700a4d7f9cbe264"
"reference": "294611f3a0d265bcf049e2da62cb4f712e3ed927"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/css-selector/zipball/3cdc270724e4666006118283c700a4d7f9cbe264",
"reference": "3cdc270724e4666006118283c700a4d7f9cbe264",
"url": "https://api.github.com/repos/symfony/css-selector/zipball/294611f3a0d265bcf049e2da62cb4f712e3ed927",
"reference": "294611f3a0d265bcf049e2da62cb4f712e3ed927",
"shasum": ""
},
"require": {
@ -3516,20 +3520,20 @@
],
"description": "Symfony CssSelector Component",
"homepage": "https://symfony.com",
"time": "2018-03-10 18:19:36"
"time": "2018-07-26 09:03:18"
},
{
"name": "symfony/dom-crawler",
"version": "v2.8.42",
"version": "v2.8.44",
"source": {
"type": "git",
"url": "https://github.com/symfony/dom-crawler.git",
"reference": "a01b1fa5322847d1d51aa61f74c86b438c2f34e8"
"reference": "2fd6513f2dd3b08446da420070084db376c0134c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/dom-crawler/zipball/a01b1fa5322847d1d51aa61f74c86b438c2f34e8",
"reference": "a01b1fa5322847d1d51aa61f74c86b438c2f34e8",
"url": "https://api.github.com/repos/symfony/dom-crawler/zipball/2fd6513f2dd3b08446da420070084db376c0134c",
"reference": "2fd6513f2dd3b08446da420070084db376c0134c",
"shasum": ""
},
"require": {
@ -3573,20 +3577,20 @@
],
"description": "Symfony DomCrawler Component",
"homepage": "https://symfony.com",
"time": "2018-05-01 22:52:40"
"time": "2018-07-24 10:05:38"
},
{
"name": "symfony/process",
"version": "v2.8.42",
"version": "v2.8.44",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
"reference": "542d88b350c42750fdc14e73860ee96dd423e95d"
"reference": "cc83afdb5ac99147806b3bb65a3ff1227664f596"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/542d88b350c42750fdc14e73860ee96dd423e95d",
"reference": "542d88b350c42750fdc14e73860ee96dd423e95d",
"url": "https://api.github.com/repos/symfony/process/zipball/cc83afdb5ac99147806b3bb65a3ff1227664f596",
"reference": "cc83afdb5ac99147806b3bb65a3ff1227664f596",
"shasum": ""
},
"require": {
@ -3622,7 +3626,7 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
"time": "2018-05-27 07:40:52"
"time": "2018-07-26 11:13:39"
}
],
"aliases": [],

View File

@ -50,6 +50,7 @@
<ol>
<li><a href="#changelog">Changelog</a>
<ul>
<li><a href="#v323rc2">Changes since 3.2.3-RC2</a></li>
<li><a href="#v323rc1">Changes since 3.2.3-RC1</a></li>
<li><a href="#v322">Changes since 3.2.2</a></li>
<li><a href="#v321">Changes since 3.2.1</a></li>
@ -130,6 +131,16 @@
<div class="inner">
<div class="content">
<a name="v323rc2"></a><h3>Changes since 3.2.3-RC2</h3>
<h4>Bug</h4>
<ul>
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15504">PHPBB3-15504</a>] - phpBB Debug warning in 3.2.2</li>
</ul>
<h4>Improvement</h4>
<ul>
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15740">PHPBB3-15740</a>] - Terms &amp; Privavy hardcoded</li>
</ul>
<a name="v323rc1"></a><h3>Changes since 3.2.3-RC1</h3>
<h4>Bug</h4>
<ul>

View File

@ -23,7 +23,7 @@ if (php_sapi_name() !== 'cli')
define('IN_PHPBB', true);
define('IN_INSTALL', true);
define('PHPBB_ENVIRONMENT', 'production');
define('PHPBB_VERSION', '3.2.3-RC2');
define('PHPBB_VERSION', '3.2.3');
$phpbb_root_path = __DIR__ . '/../';
$phpEx = substr(strrchr(__FILE__, '.'), 1);

View File

@ -0,0 +1,37 @@
<?php
/**
*
* This file is part of the phpBB Forum Software package.
*
* @copyright (c) phpBB Limited <https://www.phpbb.com>
* @license GNU General Public License, version 2 (GPL-2.0)
*
* For full copyright and license information, please see
* the docs/CREDITS.txt file.
*
*/
namespace phpbb\db\migration\data\v32x;
class v323 extends \phpbb\db\migration\migration
{
public function effectively_installed()
{
return phpbb_version_compare($this->config['version'], '3.2.3', '>=');
}
static public function depends_on()
{
return array(
'\phpbb\db\migration\data\v32x\v323rc2',
);
}
public function update_data()
{
return array(
array('config.update', array('version', '3.2.3')),
);
}
}

View File

@ -19,11 +19,11 @@
<!-- EVENT overall_footer_copyright_append -->
<p class="footer-row">
<a class="footer-link" href="{{ U_PRIVACY }}" title="{{ lang('PRIVACY_LINK') }}" role="menuitem">
<span class="footer-link-text">Privacy</span>
<span class="footer-link-text">{{ lang('PRIVACY_LINK') }}</span>
</a>
|
<a class="footer-link" href="{{ U_TERMS_USE }}" title="{{ lang('TERMS_LINK') }}" role="menuitem">
<span class="footer-link-text">Terms</span>
<span class="footer-link-text">{{ lang('TERMS_LINK') }}</span>
</a>
</p>
<!-- IF DEBUG_OUTPUT -->

View File

@ -364,7 +364,7 @@ class phpbb_template_template_test extends phpbb_template_template_test_case
array(),
array(),
array(),
"Value'\n1 O'Clock\nValue\\x27\n1\\x20O\\x27Clock",
"Value'\n1 O'Clock\nValue\\u0027\n1\\u0020O\\u0027Clock",
array('VARIABLE' => "Value'", '1_VARIABLE' => "1 O'Clock"),
),
array(