From 54d529994029564d5cecbec2aaac36a0544552a0 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Fri, 21 Nov 2014 17:38:13 +0100 Subject: [ticket/12620] Fix tests PHPBB3-12620 --- phpBB/app.php | 1 - 1 file changed, 1 deletion(-) (limited to 'phpBB/app.php') diff --git a/phpBB/app.php b/phpBB/app.php index d9250adc75..10909f7103 100644 --- a/phpBB/app.php +++ b/phpBB/app.php @@ -21,7 +21,6 @@ define('IN_PHPBB', true); $phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './'; $phpEx = substr(strrchr(__FILE__, '.'), 1); include($phpbb_root_path . 'common.' . $phpEx); -include($phpbb_root_path . 'includes/functions_url_matcher.' . $phpEx); // Start session management $user->session_begin(); -- cgit v1.2.1 From b5544b2f471ce4c93b08d19919ab062725545ce8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gae=CC=88tan=20Muller?= Date: Sat, 3 Jan 2015 11:39:29 +0100 Subject: [ticket/13450] Type-hint return value of $phpbb_container->get() PHPBB3-13450 --- phpBB/app.php | 3 +++ 1 file changed, 3 insertions(+) (limited to 'phpBB/app.php') diff --git a/phpBB/app.php b/phpBB/app.php index 10909f7103..4873fb10c3 100644 --- a/phpBB/app.php +++ b/phpBB/app.php @@ -27,7 +27,10 @@ $user->session_begin(); $auth->acl($user->data); $user->setup('app'); +/* @var $http_kernel \Symfony\Component\HttpKernel\HttpKernel */ $http_kernel = $phpbb_container->get('http_kernel'); + +/* @var $symfony_request \phpbb\symfony_request */ $symfony_request = $phpbb_container->get('symfony_request'); $response = $http_kernel->handle($symfony_request); $response->send(); -- cgit v1.2.1