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

Merge branch '3.2.x'

Browse Source 
* 3.2.x:
  [ticket/13616] Fix CS + constant in the core extension
  [ticket/13616] Fix UI tests
  [ticket/13616] Cleanup globals after installing the board in func tests
  [ticket/13616] Updates direct call to twig environment constructor
  [ticket/13616] Uses a php 5.4 compatible version
  [ticket/13616] Uses symfony/proxy-manager-bridge to lazy load twig lexer

Conflicts:
	phpBB/composer.lock
This commit is contained in:
Máté Bartus
2016-04-13 10:14:47 +02:00
parent 94853ba2dd 4c257d47a6
commit 13a3e99848
23 changed files with 357 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/composer.json
View File

@@ -43,6 +43,7 @@
"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.*",
@@ -64,5 +65,10 @@
"branch-alias": {
"dev-master": "3.3.x-dev"
}
},
"config": {
"platform": {
"php": "5.4"
}
}
}