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

[feature/controller] Inject dependencies instead of container

Browse source 
PHPBB3-10864
This commit is contained in:
David King 2012-11-13 09:26:31 -05:00
parent 6e647cf6e1
commit 7687f06961
1 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
phpBB/includes/controller/helper.php
View file

@ -15,9 +15,7 @@ if (!defined('IN_PHPBB'))
exit; exit;
} }
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\DependencyInjection\ContainerBuilder;
/** /**
* Controller helper class, contains methods that do things for controllers * Controller helper class, contains methods that do things for controllers
@ -25,12 +23,6 @@ use Symfony\Component\DependencyInjection\ContainerBuilder;
*/ */
class phpbb_controller_helper class phpbb_controller_helper
{ {
/**
* Container
* @var ContainerBuilder
*/
protected $container;
/** /**
* Template object * Template object
* @var phpbb_template * @var phpbb_template
@ -38,13 +30,19 @@ class phpbb_controller_helper
protected $template; protected $template;
/** /**
* phpBB Root Path * User object
* @var string * @var phpbb_user
*/ */
protected $phpbb_root_path; protected $user;
/** /**
* PHP Extension * phpBB root path
* @var string
*/
protected $root_path;
/**
* PHP extension
* @var string * @var string
*/ */
protected $php_ext; protected $php_ext;
@ -58,15 +56,17 @@ class phpbb_controller_helper
/** /**
* Constructor * Constructor
* *
* @param ContainerBuilder $container DI Container * @param phpbb_template $template Template object
* @param phpbb_user $user User object
* @param string $root_path phpBB root path
* @param string $php_ext PHP extension
*/ */
public function __construct(ContainerBuilder $container) public function __construct(phpbb_template $template, phpbb_user $user, $root_path, $php_ext)
{ {
$this->container = $container; $this->template = $template;
$this->user = $user;
$this->template = $this->container->get('template'); $this->root_path = $root_path;
$this->phpbb_root_path = $this->container->getParameter('core.root_path'); $this->php_ext = $php_ext;
$this->php_ext = $this->container->getParameter('core.php_ext');
} }
/** /**
@ -101,7 +101,7 @@ class phpbb_controller_helper
*/ */
public function url(array $url_parts, $query = '') public function url(array $url_parts, $query = '')
{ {
return append_sid($this->phpbb_root_path . $this->url_base . implode('/', $url_parts), $query); return append_sid($this->root_path . $this->url_base . implode('/', $url_parts), $query);
} }
/** /**
@ -129,9 +129,9 @@ class phpbb_controller_helper
{ {
$this->template->assign_vars(array( $this->template->assign_vars(array(
'MESSAGE_TEXT' => $message, 'MESSAGE_TEXT' => $message,
'MESSAGE_TITLE' => $this->container->get('user')->lang('INFORMATION'), 'MESSAGE_TITLE' => $this->user->lang('INFORMATION'),
)); ));
return $this->render('message_body.html', $this->container->get('user')->lang('INFORMATION'), $code); return $this->render('message_body.html', $this->user->lang('INFORMATION'), $code);
} }
} }