mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-10 10:44:20 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.2.x'

Browse Source
This commit is contained in:
Marc Alexander
2017-01-02 22:55:25 +01:00
parent 387d76aa09 56314f4c22
commit b5ad21debc
5 changed files with 68 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
phpBB/composer.lock generated
View File

@@ -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": "ea466b63c18f25962d5e2740543e71f2",
"content-hash": "dca7df02f1926577c88439cb709013b6",
"hash": "71da80ba275535787acd4570ccc0627c",
"content-hash": "3de4cd17b0e17d6e273ef2b6e16631ad",
"packages": [
{
"name": "bantu/ini-get-wrapper",
@@ -2027,32 +2027,37 @@
},
{
"name": "phpdocumentor/reflection-docblock",
"version": "3.1.1",
"version": "2.0.4",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
"reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e"
"reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/8331b5efe816ae05461b7ca1e721c01b46bafb3e",
"reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e",
"url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/d68dbdc53dc358a816f00b300704702b2eaff7b8",
"reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8",
"shasum": ""
},
"require": {
"php": ">=5.5",
"phpdocumentor/reflection-common": "^1.0@dev",
"phpdocumentor/type-resolver": "^0.2.0",
"webmozart/assert": "^1.0"
"php": ">=5.3.3"
},
"require-dev": {
"mockery/mockery": "^0.9.4",
"phpunit/phpunit": "^4.4"
"phpunit/phpunit": "~4.0"
},
"suggest": {
"dflydev/markdown": "~1.0",
"erusev/parsedown": "~1.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.0.x-dev"
}
},
"autoload": {
"psr-4": {
"phpDocumentor\\Reflection\\": [
"psr-0": {
"phpDocumentor": [
"src/"
]
}
@@ -2064,11 +2069,10 @@
"authors": [
{
"name": "Mike van Riel",
"email": "me@mikevanriel.com"
"email": "mike.vanriel@naenius.com"
}
],
"description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
"time": "2016-09-30 07:12:33"
"time": "2015-02-03 12:10:50"
},
{
"name": "phpdocumentor/type-resolver",