makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'ticket/16224-3.3.x' into ticket/16224-master

Browse source
This commit is contained in:
Marc Alexander 2019-12-12 18:14:12 +01:00
commit d17c4a12e5
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 34 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
phpBB/composer.lock generated
View file

@ -38,16 +38,16 @@
}, },
{ {
"name": "composer/ca-bundle", "name": "composer/ca-bundle",
"version": "1.2.4", "version": "1.2.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/composer/ca-bundle.git", "url": "https://github.com/composer/ca-bundle.git",
"reference": "10bb96592168a0f8e8f6dcde3532d9fa50b0b527" "reference": "62e8fc2dc550e5d6d8c9360c7721662670f58149"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/composer/ca-bundle/zipball/10bb96592168a0f8e8f6dcde3532d9fa50b0b527", "url": "https://api.github.com/repos/composer/ca-bundle/zipball/62e8fc2dc550e5d6d8c9360c7721662670f58149",
"reference": "10bb96592168a0f8e8f6dcde3532d9fa50b0b527", "reference": "62e8fc2dc550e5d6d8c9360c7721662670f58149",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -58,7 +58,7 @@
"require-dev": { "require-dev": {
"phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 8", "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 8",
"psr/log": "^1.0", "psr/log": "^1.0",
"symfony/process": "^2.5 || ^3.0 || ^4.0" "symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
@ -90,7 +90,7 @@
"ssl", "ssl",
"tls" "tls"
], ],
"time": "2019-08-30T08:44:50+00:00" "time": "2019-12-11T14:44:42+00:00"
}, },
{ {
"name": "composer/composer", "name": "composer/composer",
@ -509,16 +509,16 @@
}, },
{ {
"name": "guzzlehttp/guzzle", "name": "guzzlehttp/guzzle",
"version": "6.4.1", "version": "6.5.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/guzzle/guzzle.git", "url": "https://github.com/guzzle/guzzle.git",
"reference": "0895c932405407fd3a7368b6910c09a24d26db11" "reference": "dbc2bc3a293ed6b1ae08a3651e2bfd213d19b6a5"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/0895c932405407fd3a7368b6910c09a24d26db11", "url": "https://api.github.com/repos/guzzle/guzzle/zipball/dbc2bc3a293ed6b1ae08a3651e2bfd213d19b6a5",
"reference": "0895c932405407fd3a7368b6910c09a24d26db11", "reference": "dbc2bc3a293ed6b1ae08a3651e2bfd213d19b6a5",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -533,12 +533,13 @@
"psr/log": "^1.1" "psr/log": "^1.1"
}, },
"suggest": { "suggest": {
"ext-intl": "Required for Internationalized Domain Name (IDN) support",
"psr/log": "Required for using the Log middleware" "psr/log": "Required for using the Log middleware"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "6.3-dev" "dev-master": "6.5-dev"
} }
}, },
"autoload": { "autoload": {
@ -571,7 +572,7 @@
"rest", "rest",
"web service" "web service"
], ],
"time": "2019-10-23T15:58:00+00:00" "time": "2019-12-07T18:20:45+00:00"
}, },
{ {
"name": "guzzlehttp/promises", "name": "guzzlehttp/promises",
@ -830,16 +831,16 @@
}, },
{ {
"name": "marc1706/fast-image-size", "name": "marc1706/fast-image-size",
"version": "v1.1.5", "version": "v1.1.6",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/marc1706/fast-image-size.git", "url": "https://github.com/marc1706/fast-image-size.git",
"reference": "519b90abdba7e3d54b4dc710d72a2e070fca0984" "reference": "3a3a2b036be20f43fa06ce00dfa754df503e6684"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/marc1706/fast-image-size/zipball/519b90abdba7e3d54b4dc710d72a2e070fca0984", "url": "https://api.github.com/repos/marc1706/fast-image-size/zipball/3a3a2b036be20f43fa06ce00dfa754df503e6684",
"reference": "519b90abdba7e3d54b4dc710d72a2e070fca0984", "reference": "3a3a2b036be20f43fa06ce00dfa754df503e6684",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -883,7 +884,7 @@
"php", "php",
"size" "size"
], ],
"time": "2019-10-03T15:00:04+00:00" "time": "2019-12-07T08:02:07+00:00"
}, },
{ {
"name": "ocramius/package-versions", "name": "ocramius/package-versions",
@ -2747,24 +2748,27 @@
}, },
{ {
"name": "zendframework/zend-code", "name": "zendframework/zend-code",
"version": "3.4.0", "version": "3.4.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/zendframework/zend-code.git", "url": "https://github.com/zendframework/zend-code.git",
"reference": "46feaeecea14161734b56c1ace74f28cb329f194" "reference": "268040548f92c2bfcba164421c1add2ba43abaaa"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zendframework/zend-code/zipball/46feaeecea14161734b56c1ace74f28cb329f194", "url": "https://api.github.com/repos/zendframework/zend-code/zipball/268040548f92c2bfcba164421c1add2ba43abaaa",
"reference": "46feaeecea14161734b56c1ace74f28cb329f194", "reference": "268040548f92c2bfcba164421c1add2ba43abaaa",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^7.1", "php": "^7.1",
"zendframework/zend-eventmanager": "^2.6 || ^3.0" "zendframework/zend-eventmanager": "^2.6 || ^3.0"
}, },
"conflict": {
"phpspec/prophecy": "<1.9.0"
},
"require-dev": { "require-dev": {
"doctrine/annotations": "^1.0", "doctrine/annotations": "^1.7",
"ext-phar": "*", "ext-phar": "*",
"phpunit/phpunit": "^7.5.16 || ^8.4", "phpunit/phpunit": "^7.5.16 || ^8.4",
"zendframework/zend-coding-standard": "^1.0", "zendframework/zend-coding-standard": "^1.0",
@ -2778,7 +2782,8 @@
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "3.4.x-dev", "dev-master": "3.4.x-dev",
"dev-develop": "3.5.x-dev" "dev-develop": "3.5.x-dev",
"dev-dev-4.0": "4.0.x-dev"
} }
}, },
"autoload": { "autoload": {
@ -2796,7 +2801,7 @@
"code", "code",
"zf" "zf"
], ],
"time": "2019-10-05T23:18:22+00:00" "time": "2019-12-10T19:21:15+00:00"
}, },
{ {
"name": "zendframework/zend-eventmanager", "name": "zendframework/zend-eventmanager",
@ -3839,16 +3844,16 @@
}, },
{ {
"name": "phpunit/phpunit", "name": "phpunit/phpunit",
"version": "7.5.17", "version": "7.5.18",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git", "url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "4c92a15296e58191a4cd74cff3b34fc8e374174a" "reference": "fcf6c4bfafaadc07785528b06385cce88935474d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/4c92a15296e58191a4cd74cff3b34fc8e374174a", "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fcf6c4bfafaadc07785528b06385cce88935474d",
"reference": "4c92a15296e58191a4cd74cff3b34fc8e374174a", "reference": "fcf6c4bfafaadc07785528b06385cce88935474d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -3919,7 +3924,7 @@
"testing", "testing",
"xunit" "xunit"
], ],
"time": "2019-10-28T10:37:36+00:00" "time": "2019-12-06T05:14:37+00:00"
}, },
{ {
"name": "sebastian/code-unit-reverse-lookup", "name": "sebastian/code-unit-reverse-lookup",