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

Merge pull request #6246 from rxu/ticket/16821

Browse source 
[ticket/16821] Upgrade Symfony to the latest 5.x
This commit is contained in:
Marc Alexander 2021-07-18 15:18:04 +02:00 • committed by GitHub
commit ef668f560d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 305 additions and 218 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
phpBB/composer.json
View file

@ -41,21 +41,21 @@
"marc1706/fast-image-size": "^1.1",
"patchwork/utf8": "^1.1",
"s9e/text-formatter": "^2.0",
"symfony/config": "~5.2",
"symfony/console": "~5.2",
"symfony/config": "^5.0",
"symfony/console": "^5.0",
"symfony/debug": "~4.4",
"symfony/dependency-injection": "~5.2",
"symfony/event-dispatcher": "~5.2",
"symfony/filesystem": "~5.2",
"symfony/finder": "~5.2",
"symfony/http-foundation": "~5.2",
"symfony/http-kernel": "~5.2",
"symfony/mime": "~5.2",
"symfony/process": "^5.2",
"symfony/proxy-manager-bridge": "~5.2",
"symfony/routing": "~5.2",
"symfony/twig-bridge": "~5.2",
"symfony/yaml": "~5.2",
"symfony/dependency-injection": "^5.0",
"symfony/event-dispatcher": "^5.0",
"symfony/filesystem": "^5.0",
"symfony/finder": "^5.0",
"symfony/http-foundation": "^5.0",
"symfony/http-kernel": "^5.0",
"symfony/mime": "^5.0",
"symfony/process": "^5.0",
"symfony/proxy-manager-bridge": "^5.0",
"symfony/routing": "^5.0",
"symfony/twig-bridge": "^5.0",
"symfony/yaml": "^5.0",
"twig/twig": "^3.0"
},
"require-dev": {
@ -65,9 +65,9 @@
"phing/phing": "~2.4",
"phpunit/phpunit": "^9.0",
"squizlabs/php_codesniffer": "~3.4",
"symfony/browser-kit": "~5.2",
"symfony/css-selector": "~5.2",
"symfony/dom-crawler": "~5.2"
"symfony/browser-kit": "^5.0",
"symfony/css-selector": "^5.0",
"symfony/dom-crawler": "^5.0"
},
"extra": {
"branch-alias": {

484
phpBB/composer.lock generated
View file

File diff suppressed because it is too large Load diff

5
tests/functional/extension_controller_test.php
View file

@ -136,7 +136,10 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
{
$crawler = self::request('GET', 'app.php/does/not/exist', array(), false);
$this->assert_response_html(404);
$this->assertStringContainsString('No route found for "GET /does/not/exist"', $crawler->filter('body')->text());
// Since version 5.3.0-BETA1, Symfony shows full URI when route not found. See https://github.com/symfony/symfony/pull/39893
$full_uri = self::$client->getRequest()->getUri();
$this->assertStringContainsString('No route found for "GET ' . $full_uri . '"', $crawler->filter('body')->text());
}
/**