makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-25 19:38:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3207 from Nicofuma/ticket/13407

Browse source 
[ticket/13407] Update Symfony to 2.7.*@dev

* Nicofuma/ticket/13407:
  [ticket/13407] Update composer.lock file
  [ticket/13407] Bump minimal version to php 5.3.9
  [ticket/13407] Introduce a request_stack service
  [ticket/13407] Remove the last occurence of pattern in routing files
  [ticket/13407] Update Symfony to 2.7.*@dev
This commit is contained in:
Andreas Fischer 2015-02-04 21:14:01 +01:00
commit e4064ca839
17 changed files with 281 additions and 218 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.travis.yml
View file

@ -2,8 +2,6 @@ language: php
matrix: matrix:
include: include:
- php: 5.3.3
env: DB=mysqli
- php: 5.3 - php: 5.3
env: DB=mysqli # MyISAM env: DB=mysqli # MyISAM
- php: 5.4 - php: 5.4
@ -45,5 +43,5 @@ script:
- travis/check-executable-files.sh $DB $TRAVIS_PHP_VERSION ./ - travis/check-executable-files.sh $DB $TRAVIS_PHP_VERSION ./
- sh -c "if [ '$SLOWTESTS' != '1' ]; then phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml; fi" - sh -c "if [ '$SLOWTESTS' != '1' ]; then phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml; fi"
- sh -c "if [ '$SLOWTESTS' = '1' ]; then phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml --group slow; fi" - sh -c "if [ '$SLOWTESTS' = '1' ]; then phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml --group slow; fi"
- sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.3.3' -a '$DB' = 'mysqli' -a '$TRAVIS_PULL_REQUEST' != 'false' ]; then git-tools/commit-msg-hook-range.sh origin/$TRAVIS_BRANCH..FETCH_HEAD; fi" - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.3' -a '$DB' = 'mysqli' -a '$TRAVIS_PULL_REQUEST' != 'false' ]; then git-tools/commit-msg-hook-range.sh origin/$TRAVIS_BRANCH..FETCH_HEAD; fi"

12
build/build.xml
View file

@ -385,6 +385,18 @@
<delete file="${dir}/vendor/twig/twig/phpunit.xml.dist" /> <delete file="${dir}/vendor/twig/twig/phpunit.xml.dist" />
<delete file="${dir}/vendor/twig/twig/README.markdown" /> <delete file="${dir}/vendor/twig/twig/README.markdown" />
<delete dir="${dir}/vendor/symfony/security-core/Symfony/Bridge/Twig/Tests" />
<delete file="${dir}/vendor/symfony/security-core/Symfony/Bridge/Twig/.gitignore" />
<delete file="${dir}/vendor/symfony/security-core/Symfony/Bridge/Twig/CHANGELOG.md" />
<delete file="${dir}/vendor/symfony/security-core/Symfony/Bridge/Twig/README.md" />
<delete file="${dir}/vendor/symfony/security-core/Symfony/Bridge/Twig/phpunit.xml.dist" />
<delete dir="${dir}/vendor/symfony/security-csrf/Symfony/Bridge/Twig/Tests" />
<delete file="${dir}/vendor/symfony/security-csrf/Symfony/Bridge/Twig/.gitignore" />
<delete file="${dir}/vendor/symfony/security-csrf/Symfony/Bridge/Twig/CHANGELOG.md" />
<delete file="${dir}/vendor/symfony/security-csrf/Symfony/Bridge/Twig/README.md" />
<delete file="${dir}/vendor/symfony/security-csrf/Symfony/Bridge/Twig/phpunit.xml.dist" />
<delete dir="${dir}/vendor/symfony/twig-bridge/Symfony/Bridge/Twig/Tests" /> <delete dir="${dir}/vendor/symfony/twig-bridge/Symfony/Bridge/Twig/Tests" />
<delete file="${dir}/vendor/symfony/twig-bridge/Symfony/Bridge/Twig/.gitignore" /> <delete file="${dir}/vendor/symfony/twig-bridge/Symfony/Bridge/Twig/.gitignore" />
<delete file="${dir}/vendor/symfony/twig-bridge/Symfony/Bridge/Twig/CHANGELOG.md" /> <delete file="${dir}/vendor/symfony/twig-bridge/Symfony/Bridge/Twig/CHANGELOG.md" />

2
phpBB/common.php
View file

@ -12,7 +12,7 @@
*/ */
/** /**
* Minimum Requirement: PHP 5.3.3 * Minimum Requirement: PHP 5.3.9
*/ */
if (!defined('IN_PHPBB')) if (!defined('IN_PHPBB'))

36
phpBB/composer.json
View file

@ -25,17 +25,19 @@
"phpbb/phpbb-core": "self.version" "phpbb/phpbb-core": "self.version"
}, },
"require": { "require": {
"php": ">=5.3.3", "php": ">=5.3.9",
"lusitanian/oauth": "0.2.*", "lusitanian/oauth": "0.2.*",
"patchwork/utf8": "1.1.*", "patchwork/utf8": "1.1.*",
"symfony/config": "2.5.*", "symfony/config": "2.7.*@dev",
"symfony/console": "2.5.*", "symfony/console": "2.7.*@dev",
"symfony/dependency-injection": "2.5.*", "symfony/dependency-injection": "2.7.*@dev",
"symfony/event-dispatcher": "2.5.*", "symfony/event-dispatcher": "2.7.*@dev",
"symfony/http-kernel": "2.5.*", "symfony/http-kernel": "2.7.*@dev",
"symfony/routing": "2.5.*", "symfony/routing": "2.7.*@dev",
"symfony/twig-bridge": "2.5.*", "symfony/security-core": "2.7.*@dev",
"symfony/yaml": "2.5.*", "symfony/security-csrf": "2.7.*@dev",
"symfony/twig-bridge": "2.7.*@dev",
"symfony/yaml": "2.7.*@dev",
"twig/twig": "1.*" "twig/twig": "1.*"
}, },
"require-dev": { "require-dev": {
@ -45,13 +47,13 @@
"phing/phing": "2.4.*", "phing/phing": "2.4.*",
"sami/sami": "1.*", "sami/sami": "1.*",
"squizlabs/php_codesniffer": "1.*", "squizlabs/php_codesniffer": "1.*",
"symfony/browser-kit": "2.5.*", "symfony/browser-kit": "2.7.*@dev",
"symfony/css-selector": "2.5.*", "symfony/css-selector": "2.7.*@dev",
"symfony/debug": "2.5.*", "symfony/debug": "2.7.*@dev",
"symfony/dom-crawler": "2.5.*", "symfony/dom-crawler": "2.7.*@dev",
"symfony/filesystem": "2.5.*", "symfony/filesystem": "2.7.*@dev",
"symfony/finder": "2.5.*", "symfony/finder": "2.7.*@dev",
"symfony/http-foundation": "2.5.*", "symfony/http-foundation": "2.7.*@dev",
"symfony/process": "2.5.*" "symfony/process": "2.7.*@dev"
} }
} }

410
phpBB/composer.lock generated
View file

@ -1,9 +1,10 @@
{ {
"_readme": [ "_readme": [
"This file locks the dependencies of your project to a known state", "This file locks the dependencies of your project to a known state",
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
], ],
"hash": "372e66644eb8d1504f88471de6d6dac6", "hash": "2038bc8bd0fea66b22774ca7bca11a79",
"packages": [ "packages": [
{ {
"name": "lusitanian/oauth", "name": "lusitanian/oauth",
@ -164,27 +165,27 @@
}, },
{ {
"name": "symfony/config", "name": "symfony/config",
"version": "v2.5.5", "version": "2.7.x-dev",
"target-dir": "Symfony/Component/Config", "target-dir": "Symfony/Component/Config",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/Config.git", "url": "https://github.com/symfony/Config.git",
"reference": "0316364bfebc8b080077c731a99f189341476bd7" "reference": "1624dd47e1f4dc89ae4e7ca4a0476325042f8e82"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/Config/zipball/0316364bfebc8b080077c731a99f189341476bd7", "url": "https://api.github.com/repos/symfony/Config/zipball/1624dd47e1f4dc89ae4e7ca4a0476325042f8e82",
"reference": "0316364bfebc8b080077c731a99f189341476bd7", "reference": "1624dd47e1f4dc89ae4e7ca4a0476325042f8e82",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.3", "php": ">=5.3.9",
"symfony/filesystem": "~2.3" "symfony/filesystem": "~2.3|~3.0.0"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.5-dev" "dev-master": "2.7-dev"
} }
}, },
"autoload": { "autoload": {
@ -208,38 +209,40 @@
], ],
"description": "Symfony Config Component", "description": "Symfony Config Component",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2014-09-23 05:25:11" "time": "2015-01-25 04:39:35"
}, },
{ {
"name": "symfony/console", "name": "symfony/console",
"version": "v2.5.5", "version": "2.7.x-dev",
"target-dir": "Symfony/Component/Console", "target-dir": "Symfony/Component/Console",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/Console.git", "url": "https://github.com/symfony/Console.git",
"reference": "ca053eaa031c93afb68a71e4eb1f4168dfd4a661" "reference": "9f041fb5735b0d25d117e77ab8597a8376c74fbd"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/Console/zipball/ca053eaa031c93afb68a71e4eb1f4168dfd4a661", "url": "https://api.github.com/repos/symfony/Console/zipball/9f041fb5735b0d25d117e77ab8597a8376c74fbd",
"reference": "ca053eaa031c93afb68a71e4eb1f4168dfd4a661", "reference": "9f041fb5735b0d25d117e77ab8597a8376c74fbd",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.3" "php": ">=5.3.9"
}, },
"require-dev": { "require-dev": {
"psr/log": "~1.0", "psr/log": "~1.0",
"symfony/event-dispatcher": "~2.1" "symfony/event-dispatcher": "~2.1|~3.0.0",
"symfony/process": "~2.1|~3.0.0"
}, },
"suggest": { "suggest": {
"psr/log": "For using the console logger", "psr/log": "For using the console logger",
"symfony/event-dispatcher": "" "symfony/event-dispatcher": "",
"symfony/process": ""
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.5-dev" "dev-master": "2.7-dev"
} }
}, },
"autoload": { "autoload": {
@ -263,29 +266,34 @@
], ],
"description": "Symfony Console Component", "description": "Symfony Console Component",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2014-09-25 09:53:56" "time": "2015-01-25 05:59:26"
}, },
{ {
"name": "symfony/debug", "name": "symfony/debug",
"version": "v2.5.5", "version": "2.7.x-dev",
"target-dir": "Symfony/Component/Debug", "target-dir": "Symfony/Component/Debug",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/Debug.git", "url": "https://github.com/symfony/Debug.git",
"reference": "4a3dd4ef3fc0cee2fd9faaae12bd7af43afcf648" "reference": "39a94beb5ea7f5f39854e7c8ab8dfda95e831f5d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/Debug/zipball/4a3dd4ef3fc0cee2fd9faaae12bd7af43afcf648", "url": "https://api.github.com/repos/symfony/Debug/zipball/39a94beb5ea7f5f39854e7c8ab8dfda95e831f5d",
"reference": "4a3dd4ef3fc0cee2fd9faaae12bd7af43afcf648", "reference": "39a94beb5ea7f5f39854e7c8ab8dfda95e831f5d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.3" "php": ">=5.3.9",
"psr/log": "~1.0"
},
"conflict": {
"symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
}, },
"require-dev": { "require-dev": {
"symfony/http-foundation": "~2.1", "symfony/class-loader": "~2.2",
"symfony/http-kernel": "~2.1" "symfony/http-foundation": "~2.1|~3.0.0",
"symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2|~3.0.0"
}, },
"suggest": { "suggest": {
"symfony/http-foundation": "", "symfony/http-foundation": "",
@ -294,7 +302,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.5-dev" "dev-master": "2.7-dev"
} }
}, },
"autoload": { "autoload": {
@ -318,30 +326,33 @@
], ],
"description": "Symfony Debug Component", "description": "Symfony Debug Component",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2014-09-28 15:22:14" "time": "2015-01-25 04:39:35"
}, },
{ {
"name": "symfony/dependency-injection", "name": "symfony/dependency-injection",
"version": "v2.5.5", "version": "2.7.x-dev",
"target-dir": "Symfony/Component/DependencyInjection", "target-dir": "Symfony/Component/DependencyInjection",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/DependencyInjection.git", "url": "https://github.com/symfony/DependencyInjection.git",
"reference": "1f01a64c9047909e40700a14ee34e8c446300618" "reference": "acf2e8e27c53b8af7963ca00809ccde1d1e977f4"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/1f01a64c9047909e40700a14ee34e8c446300618", "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/acf2e8e27c53b8af7963ca00809ccde1d1e977f4",
"reference": "1f01a64c9047909e40700a14ee34e8c446300618", "reference": "acf2e8e27c53b8af7963ca00809ccde1d1e977f4",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.3" "php": ">=5.3.9"
},
"conflict": {
"symfony/expression-language": "<2.6"
}, },
"require-dev": { "require-dev": {
"symfony/config": "~2.2", "symfony/config": "~2.2|~3.0.0",
"symfony/expression-language": "~2.4", "symfony/expression-language": "~2.6|~3.0.0",
"symfony/yaml": "~2.0" "symfony/yaml": "~2.1|~3.0.0"
}, },
"suggest": { "suggest": {
"symfony/config": "", "symfony/config": "",
@ -351,7 +362,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.5-dev" "dev-master": "2.7-dev"
} }
}, },
"autoload": { "autoload": {
@ -375,31 +386,32 @@
], ],
"description": "Symfony DependencyInjection Component", "description": "Symfony DependencyInjection Component",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2014-09-27 08:35:39" "time": "2015-01-25 04:39:35"
}, },
{ {
"name": "symfony/event-dispatcher", "name": "symfony/event-dispatcher",
"version": "v2.5.5", "version": "2.7.x-dev",
"target-dir": "Symfony/Component/EventDispatcher", "target-dir": "Symfony/Component/EventDispatcher",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/EventDispatcher.git", "url": "https://github.com/symfony/EventDispatcher.git",
"reference": "f6281337bf5f985f585d1db6a83adb05ce531f46" "reference": "7a26717d431dfb092198d7c55f06788b2de5aaf7"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/f6281337bf5f985f585d1db6a83adb05ce531f46", "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/7a26717d431dfb092198d7c55f06788b2de5aaf7",
"reference": "f6281337bf5f985f585d1db6a83adb05ce531f46", "reference": "7a26717d431dfb092198d7c55f06788b2de5aaf7",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.3" "php": ">=5.3.9"
}, },
"require-dev": { "require-dev": {
"psr/log": "~1.0", "psr/log": "~1.0",
"symfony/config": "~2.0", "symfony/config": "~2.0,>=2.0.5|~3.0.0",
"symfony/dependency-injection": "~2.0,<2.6.0", "symfony/dependency-injection": "~2.6|~3.0.0",
"symfony/stopwatch": "~2.2" "symfony/expression-language": "~2.6|~3.0.0",
"symfony/stopwatch": "~2.3|~3.0.0"
}, },
"suggest": { "suggest": {
"symfony/dependency-injection": "", "symfony/dependency-injection": "",
@ -408,7 +420,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.5-dev" "dev-master": "2.7-dev"
} }
}, },
"autoload": { "autoload": {
@ -432,30 +444,30 @@
], ],
"description": "Symfony EventDispatcher Component", "description": "Symfony EventDispatcher Component",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2014-09-28 15:56:11" "time": "2015-01-16 15:11:56"
}, },
{ {
"name": "symfony/filesystem", "name": "symfony/filesystem",
"version": "v2.5.5", "version": "2.7.x-dev",
"target-dir": "Symfony/Component/Filesystem", "target-dir": "Symfony/Component/Filesystem",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/Filesystem.git", "url": "https://github.com/symfony/Filesystem.git",
"reference": "4e62fab0060a826561c78b665925b37c870c45f5" "reference": "e681ca515e1e668a551b089177867e62e03d7d2d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/Filesystem/zipball/4e62fab0060a826561c78b665925b37c870c45f5", "url": "https://api.github.com/repos/symfony/Filesystem/zipball/e681ca515e1e668a551b089177867e62e03d7d2d",
"reference": "4e62fab0060a826561c78b665925b37c870c45f5", "reference": "e681ca515e1e668a551b089177867e62e03d7d2d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.3" "php": ">=5.3.9"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.5-dev" "dev-master": "2.7-dev"
} }
}, },
"autoload": { "autoload": {
@ -479,33 +491,33 @@
], ],
"description": "Symfony Filesystem Component", "description": "Symfony Filesystem Component",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2014-09-22 09:14:18" "time": "2015-01-09 06:51:41"
}, },
{ {
"name": "symfony/http-foundation", "name": "symfony/http-foundation",
"version": "v2.5.5", "version": "2.7.x-dev",
"target-dir": "Symfony/Component/HttpFoundation", "target-dir": "Symfony/Component/HttpFoundation",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/HttpFoundation.git", "url": "https://github.com/symfony/HttpFoundation.git",
"reference": "650e115af152d7a5e857d01c2cdb9a22809de9b4" "reference": "ee7cee860e05ba4e12c9a8a1775d4e5ae3f790cb"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/650e115af152d7a5e857d01c2cdb9a22809de9b4", "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/ee7cee860e05ba4e12c9a8a1775d4e5ae3f790cb",
"reference": "650e115af152d7a5e857d01c2cdb9a22809de9b4", "reference": "ee7cee860e05ba4e12c9a8a1775d4e5ae3f790cb",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.3" "php": ">=5.3.9"
}, },
"require-dev": { "require-dev": {
"symfony/expression-language": "~2.4" "symfony/expression-language": "~2.4|~3.0.0"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.5-dev" "dev-master": "2.7-dev"
} }
}, },
"autoload": { "autoload": {
@ -532,42 +544,46 @@
], ],
"description": "Symfony HttpFoundation Component", "description": "Symfony HttpFoundation Component",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2014-09-25 09:52:29" "time": "2015-01-25 04:39:35"
}, },
{ {
"name": "symfony/http-kernel", "name": "symfony/http-kernel",
"version": "v2.5.5", "version": "2.7.x-dev",
"target-dir": "Symfony/Component/HttpKernel", "target-dir": "Symfony/Component/HttpKernel",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/HttpKernel.git", "url": "https://github.com/symfony/HttpKernel.git",
"reference": "6a3595611229def14d5e644f060cf372235532ec" "reference": "37c51b8a642385cac387f9f913f47c0137effac7"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/HttpKernel/zipball/6a3595611229def14d5e644f060cf372235532ec", "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/37c51b8a642385cac387f9f913f47c0137effac7",
"reference": "6a3595611229def14d5e644f060cf372235532ec", "reference": "37c51b8a642385cac387f9f913f47c0137effac7",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.3", "php": ">=5.3.9",
"psr/log": "~1.0", "psr/log": "~1.0",
"symfony/debug": "~2.5", "symfony/debug": "~2.6,>=2.6.2|~3.0.0",
"symfony/event-dispatcher": "~2.5", "symfony/event-dispatcher": "~2.5.9|~2.6,>=2.6.2|~3.0.0",
"symfony/http-foundation": "~2.5" "symfony/http-foundation": "~2.5,>=2.5.4|~3.0.0"
}, },
"require-dev": { "require-dev": {
"symfony/browser-kit": "~2.2", "symfony/browser-kit": "~2.3|~3.0.0",
"symfony/class-loader": "~2.1", "symfony/class-loader": "~2.1|~3.0.0",
"symfony/config": "~2.0", "symfony/config": "~2.0,>=2.0.5|~3.0.0",
"symfony/console": "~2.2", "symfony/console": "~2.3|~3.0.0",
"symfony/dependency-injection": "~2.0", "symfony/css-selector": "~2.0,>=2.0.5|~3.0.0",
"symfony/expression-language": "~2.4", "symfony/dependency-injection": "~2.2|~3.0.0",
"symfony/finder": "~2.0", "symfony/dom-crawler": "~2.0,>=2.0.5|~3.0.0",
"symfony/process": "~2.0", "symfony/expression-language": "~2.4|~3.0.0",
"symfony/routing": "~2.2", "symfony/finder": "~2.0,>=2.0.5|~3.0.0",
"symfony/stopwatch": "~2.2", "symfony/process": "~2.0,>=2.0.5|~3.0.0",
"symfony/templating": "~2.2" "symfony/routing": "~2.2|~3.0.0",
"symfony/stopwatch": "~2.3|~3.0.0",
"symfony/templating": "~2.2|~3.0.0",
"symfony/translation": "~2.0,>=2.0.5|~3.0.0",
"symfony/var-dumper": "~2.6|~3.0.0"
}, },
"suggest": { "suggest": {
"symfony/browser-kit": "", "symfony/browser-kit": "",
@ -575,12 +591,13 @@
"symfony/config": "", "symfony/config": "",
"symfony/console": "", "symfony/console": "",
"symfony/dependency-injection": "", "symfony/dependency-injection": "",
"symfony/finder": "" "symfony/finder": "",
"symfony/var-dumper": ""
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.5-dev" "dev-master": "2.7-dev"
} }
}, },
"autoload": { "autoload": {
@ -604,33 +621,34 @@
], ],
"description": "Symfony HttpKernel Component", "description": "Symfony HttpKernel Component",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2014-09-28 17:33:53" "time": "2015-01-25 04:39:35"
}, },
{ {
"name": "symfony/routing", "name": "symfony/routing",
"version": "v2.5.5", "version": "2.7.x-dev",
"target-dir": "Symfony/Component/Routing", "target-dir": "Symfony/Component/Routing",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/Routing.git", "url": "https://github.com/symfony/Routing.git",
"reference": "9bc38fe72e0eff61611e7cd4df3accbce20b1d36" "reference": "0c68965f72d650be4f51f199f5d69469df75aa30"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/Routing/zipball/9bc38fe72e0eff61611e7cd4df3accbce20b1d36", "url": "https://api.github.com/repos/symfony/Routing/zipball/0c68965f72d650be4f51f199f5d69469df75aa30",
"reference": "9bc38fe72e0eff61611e7cd4df3accbce20b1d36", "reference": "0c68965f72d650be4f51f199f5d69469df75aa30",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.3" "php": ">=5.3.9"
}, },
"require-dev": { "require-dev": {
"doctrine/annotations": "~1.0", "doctrine/annotations": "~1.0",
"doctrine/common": "~2.2",
"psr/log": "~1.0", "psr/log": "~1.0",
"symfony/config": "~2.2", "symfony/config": "~2.2|~3.0.0",
"symfony/expression-language": "~2.4", "symfony/expression-language": "~2.4|~3.0.0",
"symfony/http-foundation": "~2.3", "symfony/http-foundation": "~2.3|~3.0.0",
"symfony/yaml": "~2.0" "symfony/yaml": "~2.0,>=2.0.5|~3.0.0"
}, },
"suggest": { "suggest": {
"doctrine/annotations": "For using the annotation loader", "doctrine/annotations": "For using the annotation loader",
@ -641,7 +659,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.5-dev" "dev-master": "2.7-dev"
} }
}, },
"autoload": { "autoload": {
@ -671,33 +689,34 @@
"uri", "uri",
"url" "url"
], ],
"time": "2014-09-22 15:28:36" "time": "2015-01-23 17:16:45"
}, },
{ {
"name": "symfony/security-core", "name": "symfony/security-core",
"version": "v2.5.6", "version": "2.7.x-dev",
"target-dir": "Symfony/Component/Security/Core", "target-dir": "Symfony/Component/Security/Core",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/security-core.git", "url": "https://github.com/symfony/security-core.git",
"reference": "fc79ba84f7db4a11d8313c87e8845096278d4144" "reference": "abe4db6553a89be8c827b7a86dac144e25726cda"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/security-core/zipball/fc79ba84f7db4a11d8313c87e8845096278d4144", "url": "https://api.github.com/repos/symfony/security-core/zipball/abe4db6553a89be8c827b7a86dac144e25726cda",
"reference": "fc79ba84f7db4a11d8313c87e8845096278d4144", "reference": "abe4db6553a89be8c827b7a86dac144e25726cda",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.3" "php": ">=5.3.9"
}, },
"require-dev": { "require-dev": {
"ircmaxell/password-compat": "1.0.*", "ircmaxell/password-compat": "1.0.*",
"psr/log": "~1.0", "psr/log": "~1.0",
"symfony/event-dispatcher": "~2.1", "symfony/event-dispatcher": "~2.1|~3.0.0",
"symfony/expression-language": "~2.4", "symfony/expression-language": "~2.6|~3.0.0",
"symfony/http-foundation": "~2.4", "symfony/http-foundation": "~2.4|~3.0.0",
"symfony/validator": "~2.5" "symfony/translation": "~2.0,>=2.0.5|~3.0.0",
"symfony/validator": "~2.5,>=2.5.5|~3.0.0"
}, },
"suggest": { "suggest": {
"ircmaxell/password-compat": "For using the BCrypt password encoder in PHP <5.5", "ircmaxell/password-compat": "For using the BCrypt password encoder in PHP <5.5",
@ -709,7 +728,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.5-dev" "dev-master": "2.7-dev"
} }
}, },
"autoload": { "autoload": {
@ -733,29 +752,29 @@
], ],
"description": "Symfony Security Component - Core Library", "description": "Symfony Security Component - Core Library",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2014-09-28 15:22:14" "time": "2015-01-25 04:39:35"
}, },
{ {
"name": "symfony/security-csrf", "name": "symfony/security-csrf",
"version": "v2.5.6", "version": "2.7.x-dev",
"target-dir": "Symfony/Component/Security/Csrf", "target-dir": "Symfony/Component/Security/Csrf",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/security-csrf.git", "url": "https://github.com/symfony/security-csrf.git",
"reference": "08711832eb9c7b08b513318357391693411e9478" "reference": "3f875078e322bf1fb6a546a607fe9adaab212f6c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/security-csrf/zipball/08711832eb9c7b08b513318357391693411e9478", "url": "https://api.github.com/repos/symfony/security-csrf/zipball/3f875078e322bf1fb6a546a607fe9adaab212f6c",
"reference": "08711832eb9c7b08b513318357391693411e9478", "reference": "3f875078e322bf1fb6a546a607fe9adaab212f6c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.3", "php": ">=5.3.9",
"symfony/security-core": "~2.4" "symfony/security-core": "~2.4|~3.0.0"
}, },
"require-dev": { "require-dev": {
"symfony/http-foundation": "~2.1" "symfony/http-foundation": "~2.1|~3.0.0"
}, },
"suggest": { "suggest": {
"symfony/http-foundation": "For using the class SessionTokenStorage." "symfony/http-foundation": "For using the class SessionTokenStorage."
@ -763,7 +782,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.5-dev" "dev-master": "2.7-dev"
} }
}, },
"autoload": { "autoload": {
@ -787,42 +806,46 @@
], ],
"description": "Symfony Security Component - CSRF Library", "description": "Symfony Security Component - CSRF Library",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2014-05-12 09:28:39" "time": "2015-01-09 06:51:41"
}, },
{ {
"name": "symfony/twig-bridge", "name": "symfony/twig-bridge",
"version": "v2.5.6", "version": "2.7.x-dev",
"target-dir": "Symfony/Bridge/Twig", "target-dir": "Symfony/Bridge/Twig",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/TwigBridge.git", "url": "https://github.com/symfony/TwigBridge.git",
"reference": "8850738d9f51436494f87d1e4669f4e870a5fe83" "reference": "bd5f5e3cde85eb2dfa074134bc9ac66b30ca6fc7"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/TwigBridge/zipball/8850738d9f51436494f87d1e4669f4e870a5fe83", "url": "https://api.github.com/repos/symfony/TwigBridge/zipball/bd5f5e3cde85eb2dfa074134bc9ac66b30ca6fc7",
"reference": "8850738d9f51436494f87d1e4669f4e870a5fe83", "reference": "bd5f5e3cde85eb2dfa074134bc9ac66b30ca6fc7",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.3", "php": ">=5.3.9",
"symfony/security-csrf": "~2.4", "symfony/security-csrf": "~2.6|~3.0.0",
"twig/twig": "~1.12" "twig/twig": "~1.18"
}, },
"require-dev": { "require-dev": {
"symfony/console": "~2.2", "symfony/console": "~2.4|~3.0.0",
"symfony/expression-language": "~2.4", "symfony/expression-language": "~2.4|~3.0.0",
"symfony/form": "~2.5,<2.6.0", "symfony/finder": "~2.3|~3.0.0",
"symfony/http-kernel": "~2.2", "symfony/form": "~2.6|~3.0.0",
"symfony/routing": "~2.2", "symfony/http-kernel": "~2.3|~3.0.0",
"symfony/security": "~2.4", "symfony/intl": "~2.3|~3.0.0",
"symfony/stopwatch": "~2.2", "symfony/routing": "~2.2|~3.0.0",
"symfony/templating": "~2.1", "symfony/security": "~2.6|~3.0.0",
"symfony/translation": "~2.2", "symfony/stopwatch": "~2.2|~3.0.0",
"symfony/yaml": "~2.0" "symfony/templating": "~2.1|~3.0.0",
"symfony/translation": "~2.2|~3.0.0",
"symfony/var-dumper": "~2.6|~3.0.0",
"symfony/yaml": "~2.0,>=2.0.5|~3.0.0"
}, },
"suggest": { "suggest": {
"symfony/expression-language": "For using the ExpressionExtension", "symfony/expression-language": "For using the ExpressionExtension",
"symfony/finder": "",
"symfony/form": "For using the FormExtension", "symfony/form": "For using the FormExtension",
"symfony/http-kernel": "For using the HttpKernelExtension", "symfony/http-kernel": "For using the HttpKernelExtension",
"symfony/routing": "For using the RoutingExtension", "symfony/routing": "For using the RoutingExtension",
@ -830,12 +853,13 @@
"symfony/stopwatch": "For using the StopwatchExtension", "symfony/stopwatch": "For using the StopwatchExtension",
"symfony/templating": "For using the TwigEngine", "symfony/templating": "For using the TwigEngine",
"symfony/translation": "For using the TranslationExtension", "symfony/translation": "For using the TranslationExtension",
"symfony/var-dumper": "For using the DumpExtension",
"symfony/yaml": "For using the YamlExtension" "symfony/yaml": "For using the YamlExtension"
}, },
"type": "symfony-bridge", "type": "symfony-bridge",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.5-dev" "dev-master": "2.7-dev"
} }
}, },
"autoload": { "autoload": {
@ -859,30 +883,30 @@
], ],
"description": "Symfony Twig Bridge", "description": "Symfony Twig Bridge",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2014-10-24 05:49:22" "time": "2015-02-02 16:43:28"
}, },
{ {
"name": "symfony/yaml", "name": "symfony/yaml",
"version": "v2.5.5", "version": "2.7.x-dev",
"target-dir": "Symfony/Component/Yaml", "target-dir": "Symfony/Component/Yaml",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/Yaml.git", "url": "https://github.com/symfony/Yaml.git",
"reference": "b1dbc53593b98c2d694ebf383660ac9134d30b96" "reference": "02ba3dc638c5d3f0ab3b47ddb74f98c11dcc0c60"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/Yaml/zipball/b1dbc53593b98c2d694ebf383660ac9134d30b96", "url": "https://api.github.com/repos/symfony/Yaml/zipball/02ba3dc638c5d3f0ab3b47ddb74f98c11dcc0c60",
"reference": "b1dbc53593b98c2d694ebf383660ac9134d30b96", "reference": "02ba3dc638c5d3f0ab3b47ddb74f98c11dcc0c60",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.3" "php": ">=5.3.9"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.5-dev" "dev-master": "2.7-dev"
} }
}, },
"autoload": { "autoload": {
@ -906,7 +930,7 @@
], ],
"description": "Symfony Yaml Component", "description": "Symfony Yaml Component",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2014-09-22 09:14:18" "time": "2015-01-25 04:39:35"
}, },
{ {
"name": "twig/twig", "name": "twig/twig",
@ -2251,26 +2275,26 @@
}, },
{ {
"name": "symfony/browser-kit", "name": "symfony/browser-kit",
"version": "v2.5.5", "version": "2.7.x-dev",
"target-dir": "Symfony/Component/BrowserKit", "target-dir": "Symfony/Component/BrowserKit",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/BrowserKit.git", "url": "https://github.com/symfony/BrowserKit.git",
"reference": "0cb9e603b1850c9495bfb96b3c4caf7ea17700d4" "reference": "432c0593d5367b1bb8aa893cb2272172934ad371"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/BrowserKit/zipball/0cb9e603b1850c9495bfb96b3c4caf7ea17700d4", "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/432c0593d5367b1bb8aa893cb2272172934ad371",
"reference": "0cb9e603b1850c9495bfb96b3c4caf7ea17700d4", "reference": "432c0593d5367b1bb8aa893cb2272172934ad371",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.3", "php": ">=5.3.9",
"symfony/dom-crawler": "~2.0" "symfony/dom-crawler": "~2.0,>=2.0.5|~3.0.0"
}, },
"require-dev": { "require-dev": {
"symfony/css-selector": "~2.0", "symfony/css-selector": "~2.0,>=2.0.5|~3.0.0",
"symfony/process": "~2.0" "symfony/process": "~2.0,>=2.0.5|~3.0.0"
}, },
"suggest": { "suggest": {
"symfony/process": "" "symfony/process": ""
@ -2278,7 +2302,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.5-dev" "dev-master": "2.7-dev"
} }
}, },
"autoload": { "autoload": {
@ -2302,30 +2326,30 @@
], ],
"description": "Symfony BrowserKit Component", "description": "Symfony BrowserKit Component",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2014-09-22 09:14:18" "time": "2015-01-09 06:51:41"
}, },
{ {
"name": "symfony/css-selector", "name": "symfony/css-selector",
"version": "v2.5.5", "version": "2.7.x-dev",
"target-dir": "Symfony/Component/CssSelector", "target-dir": "Symfony/Component/CssSelector",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/CssSelector.git", "url": "https://github.com/symfony/CssSelector.git",
"reference": "caf5ecc3face1f22884fb74b8edab65ac5ba9976" "reference": "1f8617c67bef17192d28c0f2dda3a04b632629bb"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/CssSelector/zipball/caf5ecc3face1f22884fb74b8edab65ac5ba9976", "url": "https://api.github.com/repos/symfony/CssSelector/zipball/1f8617c67bef17192d28c0f2dda3a04b632629bb",
"reference": "caf5ecc3face1f22884fb74b8edab65ac5ba9976", "reference": "1f8617c67bef17192d28c0f2dda3a04b632629bb",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.3" "php": ">=5.3.9"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.5-dev" "dev-master": "2.7-dev"
} }
}, },
"autoload": { "autoload": {
@ -2353,28 +2377,28 @@
], ],
"description": "Symfony CssSelector Component", "description": "Symfony CssSelector Component",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2014-09-22 09:14:18" "time": "2015-01-09 06:51:41"
}, },
{ {
"name": "symfony/dom-crawler", "name": "symfony/dom-crawler",
"version": "v2.5.5", "version": "2.7.x-dev",
"target-dir": "Symfony/Component/DomCrawler", "target-dir": "Symfony/Component/DomCrawler",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/DomCrawler.git", "url": "https://github.com/symfony/DomCrawler.git",
"reference": "a2804ec76442a9d0a3bb25f99a7830ba24743e07" "reference": "57ef66b6d806d9d1b9234e27da304ee5d1e54641"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/DomCrawler/zipball/a2804ec76442a9d0a3bb25f99a7830ba24743e07", "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/57ef66b6d806d9d1b9234e27da304ee5d1e54641",
"reference": "a2804ec76442a9d0a3bb25f99a7830ba24743e07", "reference": "57ef66b6d806d9d1b9234e27da304ee5d1e54641",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.3" "php": ">=5.3.9"
}, },
"require-dev": { "require-dev": {
"symfony/css-selector": "~2.0" "symfony/css-selector": "~2.3|~3.0.0"
}, },
"suggest": { "suggest": {
"symfony/css-selector": "" "symfony/css-selector": ""
@ -2382,7 +2406,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.5-dev" "dev-master": "2.7-dev"
} }
}, },
"autoload": { "autoload": {
@ -2406,30 +2430,30 @@
], ],
"description": "Symfony DomCrawler Component", "description": "Symfony DomCrawler Component",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2014-09-22 09:14:18" "time": "2015-01-09 13:24:18"
}, },
{ {
"name": "symfony/finder", "name": "symfony/finder",
"version": "v2.5.5", "version": "2.7.x-dev",
"target-dir": "Symfony/Component/Finder", "target-dir": "Symfony/Component/Finder",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/Finder.git", "url": "https://github.com/symfony/Finder.git",
"reference": "d5033742b9a6206ef6d06e813870bca18e9205df" "reference": "0c737de96a94d14a51738d285ad426a102baac0e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/Finder/zipball/d5033742b9a6206ef6d06e813870bca18e9205df", "url": "https://api.github.com/repos/symfony/Finder/zipball/0c737de96a94d14a51738d285ad426a102baac0e",
"reference": "d5033742b9a6206ef6d06e813870bca18e9205df", "reference": "0c737de96a94d14a51738d285ad426a102baac0e",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.3" "php": ">=5.3.9"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.5-dev" "dev-master": "2.7-dev"
} }
}, },
"autoload": { "autoload": {
@ -2453,30 +2477,30 @@
], ],
"description": "Symfony Finder Component", "description": "Symfony Finder Component",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2014-09-27 08:35:39" "time": "2015-01-09 06:51:41"
}, },
{ {
"name": "symfony/process", "name": "symfony/process",
"version": "v2.5.5", "version": "2.7.x-dev",
"target-dir": "Symfony/Component/Process", "target-dir": "Symfony/Component/Process",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/Process.git", "url": "https://github.com/symfony/Process.git",
"reference": "8a1ec96c4e519cee0fb971ea48a1eb7369dda54b" "reference": "f3ab493718070b936e21b202422466db35c1c298"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/Process/zipball/8a1ec96c4e519cee0fb971ea48a1eb7369dda54b", "url": "https://api.github.com/repos/symfony/Process/zipball/f3ab493718070b936e21b202422466db35c1c298",
"reference": "8a1ec96c4e519cee0fb971ea48a1eb7369dda54b", "reference": "f3ab493718070b936e21b202422466db35c1c298",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.3" "php": ">=5.3.9"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.5-dev" "dev-master": "2.7-dev"
} }
}, },
"autoload": { "autoload": {
@ -2500,14 +2524,34 @@
], ],
"description": "Symfony Process Component", "description": "Symfony Process Component",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2014-09-23 05:25:11" "time": "2015-01-25 04:39:35"
} }
], ],
"aliases": [], "aliases": [],
"minimum-stability": "stable", "minimum-stability": "stable",
"stability-flags": [], "stability-flags": {
"symfony/config": 20,
"symfony/console": 20,
"symfony/dependency-injection": 20,
"symfony/event-dispatcher": 20,
"symfony/http-kernel": 20,
"symfony/routing": 20,
"symfony/security-core": 20,
"symfony/security-csrf": 20,
"symfony/twig-bridge": 20,
"symfony/yaml": 20,
"symfony/browser-kit": 20,
"symfony/css-selector": 20,
"symfony/debug": 20,
"symfony/dom-crawler": 20,
"symfony/filesystem": 20,
"symfony/finder": 20,
"symfony/http-foundation": 20,
"symfony/process": 20
},
"prefer-stable": false,
"platform": { "platform": {
"php": ">=5.3.3" "php": ">=5.3.9"
}, },
"platform-dev": [] "platform-dev": []
} }

7
phpBB/config/default/container/services.yml
View file

@ -112,6 +112,7 @@ services:
arguments: arguments:
- @dispatcher - @dispatcher
- @controller.resolver - @controller.resolver
- @request_stack
log: log:
class: phpbb\log\log class: phpbb\log\log
@ -166,6 +167,9 @@ services:
class: Symfony\Component\HttpKernel\EventListener\RouterListener class: Symfony\Component\HttpKernel\EventListener\RouterListener
arguments: arguments:
- @router - @router
- null
- null
- @request_stack
tags: tags:
- { name: kernel.event_subscriber } - { name: kernel.event_subscriber }
@ -176,6 +180,9 @@ services:
arguments: arguments:
- @request - @request
request_stack:
class: Symfony\Component\HttpFoundation\RequestStack
template: template:
class: phpbb\template\twig\twig class: phpbb\template\twig\twig
arguments: arguments:

2
phpBB/docs/INSTALL.html
View file

@ -141,7 +141,7 @@
<li>Oracle</li> <li>Oracle</li>
</ul> </ul>
</li> </li>
<li><strong>PHP 5.3.3+</strong> with support for the database you intend to use.</li> <li><strong>PHP 5.3.9+</strong> with support for the database you intend to use.</li>
<li>The following PHP modules are required: <li>The following PHP modules are required:
<ul> <ul>
<li>json</li> <li>json</li>

4
phpBB/docs/README.html
View file

@ -261,7 +261,7 @@
<ul> <ul>
<li>Your server type/version, e.g. Apache 2.2.3, IIS 7, Sambar, etc.</li> <li>Your server type/version, e.g. Apache 2.2.3, IIS 7, Sambar, etc.</li>
<li>PHP version and mode of operation, e.g. PHP 5.3.3 as a module, PHP 5.4.0 running as CGI, etc.</li> <li>PHP version and mode of operation, e.g. PHP 5.3.9 as a module, PHP 5.4.0 running as CGI, etc.</li>
<li>DB type/version, e.g. MySQL 5.0.77, PostgreSQL 9.0.6, MSSQL Server 2000 SP1, etc.</li> <li>DB type/version, e.g. MySQL 5.0.77, PostgreSQL 9.0.6, MSSQL Server 2000 SP1, etc.</li>
</ul> </ul>
@ -319,7 +319,7 @@
<div class="content"> <div class="content">
<p>phpBB 3.1.x takes advantage of new features added in PHP 5.3. We recommend that you upgrade to the latest stable release of PHP5 to run phpBB. The minimum version required is PHP 5.3.3.</p> <p>phpBB 3.1.x takes advantage of new features added in PHP 5.3. We recommend that you upgrade to the latest stable release of PHP5 to run phpBB. The minimum version required is PHP 5.3.9.</p>
<p>Please remember that running any application on a development (unstable, e.g. a beta release) version of PHP can lead to strange/unexpected results which may appear to be bugs in the application. Therefore, we recommend you upgrade to the newest stable version of PHP before running phpBB. If you are running a development version of PHP please check any bugs you find on a system running a stable release before submitting.</p> <p>Please remember that running any application on a development (unstable, e.g. a beta release) version of PHP can lead to strange/unexpected results which may appear to be bugs in the application. Therefore, we recommend you upgrade to the newest stable version of PHP before running phpBB. If you are running a development version of PHP please check any bugs you find on a system running a stable release before submitting.</p>

4
phpBB/install/index.php
View file

@ -22,9 +22,9 @@ define('PHPBB_ENVIRONMENT', 'production');
$phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './../'; $phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './../';
$phpEx = substr(strrchr(__FILE__, '.'), 1); $phpEx = substr(strrchr(__FILE__, '.'), 1);
if (version_compare(PHP_VERSION, '5.3.3') < 0) if (version_compare(PHP_VERSION, '5.3.9') < 0)
{ {
die('You are running an unsupported PHP version. Please upgrade to PHP 5.3.3 or higher before trying to install phpBB 3.1'); die('You are running an unsupported PHP version. Please upgrade to PHP 5.3.9 or higher before trying to install phpBB 3.1');
} }
function phpbb_require_updated($path, $optional = false) function phpbb_require_updated($path, $optional = false)

2
phpBB/install/install_install.php
View file

@ -157,7 +157,7 @@ class install_install extends module
// Test the minimum PHP version // Test the minimum PHP version
$php_version = PHP_VERSION; $php_version = PHP_VERSION;
if (version_compare($php_version, '5.3.3') < 0) if (version_compare($php_version, '5.3.9') < 0)
{ {
$result = '<strong style="color:red">' . $lang['NO'] . '</strong>'; $result = '<strong style="color:red">' . $lang['NO'] . '</strong>';
} }

4
phpBB/language/en/install.php
View file

@ -301,10 +301,10 @@ $lang = array_merge($lang, array(
'PHP_REGISTER_GLOBALS_EXPLAIN' => 'phpBB will still run if this setting is enabled, but if possible, it is recommended that register_globals is disabled on your PHP install for security reasons.', 'PHP_REGISTER_GLOBALS_EXPLAIN' => 'phpBB will still run if this setting is enabled, but if possible, it is recommended that register_globals is disabled on your PHP install for security reasons.',
'PHP_SAFE_MODE' => 'Safe mode', 'PHP_SAFE_MODE' => 'Safe mode',
'PHP_SETTINGS' => 'PHP version and settings', 'PHP_SETTINGS' => 'PHP version and settings',
'PHP_SETTINGS_EXPLAIN' => '<strong>Required</strong> - You must be running at least version 5.3.3 of PHP in order to install phpBB. If <var>safe mode</var> is displayed below your PHP installation is running in that mode. This will impose limitations on remote administration and similar features.', 'PHP_SETTINGS_EXPLAIN' => '<strong>Required</strong> - You must be running at least version 5.3.9 of PHP in order to install phpBB. If <var>safe mode</var> is displayed below your PHP installation is running in that mode. This will impose limitations on remote administration and similar features.',
'PHP_URL_FOPEN_SUPPORT' => 'PHP setting <var>allow_url_fopen</var> is enabled', 'PHP_URL_FOPEN_SUPPORT' => 'PHP setting <var>allow_url_fopen</var> is enabled',
'PHP_URL_FOPEN_SUPPORT_EXPLAIN' => '<strong>Optional</strong> - This setting is optional, however certain phpBB functions like off-site avatars will not work properly without it.', 'PHP_URL_FOPEN_SUPPORT_EXPLAIN' => '<strong>Optional</strong> - This setting is optional, however certain phpBB functions like off-site avatars will not work properly without it.',
'PHP_VERSION_REQD' => 'PHP version >= 5.3.3', 'PHP_VERSION_REQD' => 'PHP version >= 5.3.9',
'POST_ID' => 'Post ID', 'POST_ID' => 'Post ID',
'PREFIX_FOUND' => 'A scan of your tables has shown a valid installation using <strong>%s</strong> as table prefix.', 'PREFIX_FOUND' => 'A scan of your tables has shown a valid installation using <strong>%s</strong> as table prefix.',
'PREPROCESS_STEP' => 'Executing pre-processing functions/queries', 'PREPROCESS_STEP' => 'Executing pre-processing functions/queries',

2
phpBB/phpbb/composer.json
View file

@ -22,6 +22,6 @@
"classmap": [""] "classmap": [""]
}, },
"require": { "require": {
"php": ">=5.3.3" "php": ">=5.3.9"
} }
} }

2
tests/controller/ext/vendor2/bar/config/test/routing/environment.yml
View file

@ -1,3 +1,3 @@
controller3: controller3:
pattern: /bar path: /bar
defaults: { _controller: bar.controller:handle } defaults: { _controller: bar.controller:handle }

2
travis/check-executable-files.sh
View file

@ -15,7 +15,7 @@ TRAVIS_PHP_VERSION=$2
root="$3" root="$3"
path="${root}phpBB/" path="${root}phpBB/"
if [ "$TRAVIS_PHP_VERSION" == "5.3.3" -a "$DB" == "mysqli" ] if [ "$TRAVIS_PHP_VERSION" == "5.3" -a "$DB" == "mysqli" ]
then then
# Check the permissions of the files # Check the permissions of the files

2
travis/check-image-icc-profiles.sh
View file

@ -13,7 +13,7 @@ set -e
DB=$1 DB=$1
TRAVIS_PHP_VERSION=$2 TRAVIS_PHP_VERSION=$2
if [ "$TRAVIS_PHP_VERSION" == "5.3.3" -a "$DB" == "mysqli" ] if [ "$TRAVIS_PHP_VERSION" == "5.3" -a "$DB" == "mysqli" ]
then then
find . -type f -not -path './phpBB/vendor/*' -iregex '.*\.\(gif\|jpg\|jpeg\|png\)$' | \ find . -type f -not -path './phpBB/vendor/*' -iregex '.*\.\(gif\|jpg\|jpeg\|png\)$' | \
parallel --gnu --keep-order 'phpBB/develop/strip_icc_profiles.sh {}' parallel --gnu --keep-order 'phpBB/develop/strip_icc_profiles.sh {}'

2
travis/check-sami-parse-errors.sh
View file

@ -13,7 +13,7 @@ set -e
DB=$1 DB=$1
TRAVIS_PHP_VERSION=$2 TRAVIS_PHP_VERSION=$2
if [ "$TRAVIS_PHP_VERSION" == "5.3.3" -a "$DB" == "mysqli" ] if [ "$TRAVIS_PHP_VERSION" == "5.3" -a "$DB" == "mysqli" ]
then then
# Workarounds for # Workarounds for
# https://github.com/fabpot/Sami/issues/116 # https://github.com/fabpot/Sami/issues/116

2
travis/setup-phpbb.sh
View file

@ -14,7 +14,7 @@ set -x
DB=$1 DB=$1
TRAVIS_PHP_VERSION=$2 TRAVIS_PHP_VERSION=$2
if [ "$TRAVIS_PHP_VERSION" == "5.3.3" -a "$DB" == "mysqli" ] if [ "$TRAVIS_PHP_VERSION" == "5.3" -a "$DB" == "mysqli" ]
then then
travis/setup-exiftool.sh travis/setup-exiftool.sh
travis/setup-unbuffer.sh travis/setup-unbuffer.sh