Merge pull request #4350 from marc1706/ticket/14670

[ticket/14670] Use symfony 3.x in master branch

phpBB/composer.json

@@ -25,42 +25,41 @@
 		"phpbb/phpbb-core": "self.version"
 	},
 	"require": {
-		"php": ">=5.4,<7.1",
+		"php": ">=5.5.9",
 		"bantu/ini-get-wrapper": "1.0.*",
 		"google/recaptcha": "~1.1",
-		"guzzlehttp/guzzle": "~5.3",
+		"guzzlehttp/guzzle": "~6.2",
 		"lusitanian/oauth": "^0.8.1",
 		"marc1706/fast-image-size": "1.1.*",
 		"paragonie/random_compat": "^1.2",
 		"patchwork/utf8": "1.1.*",
 		"s9e/text-formatter": "^0.5.4",
-		"symfony/config": "2.8.*",
-		"symfony/console": "2.8.*",
-		"symfony/debug": "2.8.*",
-		"symfony/dependency-injection": "2.8.*",
-		"symfony/event-dispatcher": "2.8.*",
-		"symfony/filesystem": "2.8.*",
-		"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.*",
+		"symfony/config": "~3.1",
+		"symfony/console": "~3.1",
+		"symfony/debug": "~3.1",
+		"symfony/dependency-injection": "~3.1",
+		"symfony/event-dispatcher": "~3.1",
+		"symfony/filesystem": "~3.1",
+		"symfony/finder": "~3.1",
+		"symfony/http-foundation": "~3.1",
+		"symfony/http-kernel": "~3.1",
+		"symfony/proxy-manager-bridge": "~3.1",
+		"symfony/routing": "~3.1",
+		"symfony/twig-bridge": "~3.1",
+		"symfony/yaml": "~3.1",
 		"twig/twig": "1.*"
 	},
 	"require-dev": {
-		"fabpot/goutte": "~2.0",
+		"fabpot/goutte": "~3.1",
 		"facebook/webdriver": "~1.1",
-		"laravel/homestead": "~2.2",
+		"laravel/homestead": "~3.0",
 		"phing/phing": "2.4.*",
-		"phpunit/dbunit": "1.3.*",
-		"phpunit/phpunit": "4.1.*",
-		"sami/sami": "1.*",
+		"phpunit/dbunit": "~2.0",
+		"phpunit/phpunit": "~4.8",
 		"squizlabs/php_codesniffer": "2.*",
-		"symfony/browser-kit": "2.8.*",
-		"symfony/css-selector": "2.8.*",
-		"symfony/dom-crawler": "2.8.*"
+		"symfony/browser-kit": "~3.1",
+		"symfony/css-selector": "~3.1",
+		"symfony/dom-crawler": "~3.1"
 	},
 	"extra": {
 		"branch-alias": {
@@ -69,7 +68,7 @@
 	},
 	"config": {
 		"platform": {
-			"php": "5.4"
+			"php": "5.5.9"
 		}
 	}
 }

phpBB/config/default/container/services_routing.yml

@@ -12,8 +12,6 @@ services:
         class: Symfony\Component\HttpKernel\EventListener\RouterListener
         arguments:
             - '@router'
-            - null
-            - null
             - '@request_stack'
         tags:
             - { name: kernel.event_subscriber }