Commit 05b65b8a authored by webchick's avatar webchick

Issue #2110643 by amateescu, dawehner: ControllerBase::container() and...

Issue #2110643 by amateescu, dawehner: ControllerBase::container() and FormBase::container() needs to be private.
parent 4fe2c8e8
......@@ -265,10 +265,15 @@ protected function languageManager() {
/**
* Returns the service container.
*
* This method is marked private to prevent sub-classes from retrieving
* services from the container through it. Instead,
* \Drupal\Core\DependencyInjection\ContainerInjectionInterface should be used
* for injecting services.
*
* @return \Symfony\Component\DependencyInjection\ContainerInterface $container
* The service container.
*/
protected function container() {
private function container() {
return \Drupal::getContainer();
}
......
......@@ -214,10 +214,15 @@ public function setUrlGenerator(UrlGeneratorInterface $url_generator) {
/**
* Returns the service container.
*
* This method is marked private to prevent sub-classes from retrieving
* services from the container through it. Instead,
* \Drupal\Core\DependencyInjection\ContainerInjectionInterface should be used
* for injecting services.
*
* @return \Symfony\Component\DependencyInjection\ContainerInterface $container
* The service container.
*/
protected function container() {
private function container() {
return \Drupal::getContainer();
}
......
......@@ -7,12 +7,40 @@
namespace Drupal\error_test\Controller;
use Drupal\Core\Controller\ControllerBase;
use Drupal\Core\Database\Connection;
use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
* Controller routines for error_test routes.
*/
class ErrorTestController extends ControllerBase implements ContainerInjectionInterface {
class ErrorTestController extends ControllerBase {
/**
* The database connection.
*
* @var \Drupal\Core\Database\Connection;
*/
protected $database;
/**
* Constructs a \Drupal\error_test\Controller\ErrorTestController object.
*
* @param \Drupal\Core\Database\Connection $database
* The database connection.
*/
public function __construct(Connection $database) {
$this->database = $database;
}
/**
* {@inheritdoc}
*/
public static function create(ContainerInterface $container) {
return new static(
$container->get('database')
);
}
/**
* Generate warnings to test the error handler.
......@@ -42,7 +70,7 @@ public function triggerException() {
*/
public function triggerPDOException() {
define('SIMPLETEST_COLLECT_ERRORS', FALSE);
$this->container()->get('database')->query('SELECT * FROM bananas_are_awesome');
$this->database->query('SELECT * FROM bananas_are_awesome');
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment