diff --git a/core/core.services.yml b/core/core.services.yml
index 4e28f55b9af293fd1ff22a966df976397ed7360d..f3715856ba6628a2adb3560cd49d6e80f658bd09 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -211,17 +211,12 @@ services:
plugin.manager.menu.local_task:
class: Drupal\Core\Menu\LocalTaskManager
arguments: ['@controller_resolver', '@request', '@router.route_provider', '@module_handler', '@cache.cache', '@language_manager', '@access_manager', '@current_user']
- scope: request
plugin.manager.menu.contextual_link:
class: Drupal\Core\Menu\ContextualLinkManager
arguments: ['@controller_resolver', '@module_handler', '@cache.cache', '@language_manager', '@access_manager', '@current_user']
request:
class: Symfony\Component\HttpFoundation\Request
- # @TODO the synthetic setting must be uncommented whenever drupal_session_initialize()
- # is run after there is a request and the following two lines should be removed.
- factory_class: Symfony\Component\HttpFoundation\Request
- factory_method: createFromGlobals
- #synthetic: true
+ synthetic: true
event_dispatcher:
class: Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher
arguments: ['@service_container']
@@ -365,6 +360,10 @@ services:
tags:
- { name: event_subscriber }
arguments: ['@settings']
+ ajax_response_subscriber:
+ class: Drupal\Core\EventSubscriber\AjaxResponseSubscriber
+ tags:
+ - { name: event_subscriber }
route_enhancer.authentication:
class: Drupal\Core\Routing\Enhancer\AuthenticationEnhancer
calls:
@@ -436,7 +435,6 @@ services:
- [setCurrentUser, ['@?current_user']]
tags:
- { name: event_subscriber }
- scope: request
access_route_subscriber:
class: Drupal\Core\EventSubscriber\AccessRouteSubscriber
tags:
diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc
index 109ff2420e0154d98dde3eabc51829fd59a07ff6..f414d53f5e702c67f4ce94cb020514572f8151e5 100644
--- a/core/includes/bootstrap.inc
+++ b/core/includes/bootstrap.inc
@@ -1552,7 +1552,7 @@ function watchdog($type, $message, array $variables = NULL, $severity = WATCHDOG
$log_entry['referer'] = $request->headers->get('Referer', '');
$log_entry['ip'] = $request->getClientIP();
}
- catch (\InvalidArgumentException $e) {
+ catch (DependencyInjectionRuntimeException $e) {
// We are not in a request context.
}
@@ -1718,9 +1718,18 @@ function drupal_set_title($title = NULL, $output = Title::CHECK_PLAIN) {
* The user session object.
*/
function drupal_anonymous_user() {
+ try {
+ $request = \Drupal::request();
+ $hostname = $request->getClientIP();
+ }
+ catch (DependencyInjectionRuntimeException $e) {
+ // We are not in a request context.
+ $hostname = '';
+ }
+
$values = array(
'uid' => 0,
- 'hostname' => \Drupal::request()->getClientIP(),
+ 'hostname' => $hostname,
'roles' => array(DRUPAL_ANONYMOUS_RID),
);
return new UserSession($values);
@@ -1861,10 +1870,13 @@ function drupal_handle_request($test_only = FALSE) {
// @todo Remove this once everything in the bootstrap has been
// converted to services in the DIC.
$kernel->boot();
- drupal_bootstrap(DRUPAL_BOOTSTRAP_CODE);
// Create a request object from the HttpFoundation.
$request = Request::createFromGlobals();
+ \Drupal::getContainer()->set('request', $request);
+
+ drupal_bootstrap(DRUPAL_BOOTSTRAP_CODE);
+
$response = $kernel->handle($request)->prepare($request)->send();
$kernel->terminate($request, $response);
@@ -1994,6 +2006,8 @@ function _drupal_bootstrap_kernel() {
if (!\Drupal::getContainer()) {
$kernel = new DrupalKernel('prod', drupal_classloader());
$kernel->boot();
+ $request = Request::createFromGlobals();
+ \Drupal::getContainer()->set('request', $request);
}
}
diff --git a/core/includes/install.inc b/core/includes/install.inc
index 4e70be4a93044a8c7930c829227faa7dc45fe7b0..f6848c9eeaefd9d086f6ca94cb7d88f18910aad2 100644
--- a/core/includes/install.inc
+++ b/core/includes/install.inc
@@ -625,10 +625,19 @@ function drupal_install_system() {
// Create tables.
drupal_install_schema('system');
- if (!drupal_container()->has('kernel')) {
- // Immediately boot a kernel to have real services ready.
+ if (!\Drupal::getContainer()->has('kernel')) {
+ // Immediately boot a kernel to have real services ready. If there's already
+ // an initialized request object in the pre-kernel container, persist it in
+ // the post-kernel container.
+ if (\Drupal::getContainer()->initialized('request')) {
+ $request = \Drupal::request();
+ }
$kernel = new DrupalKernel('install', drupal_classloader(), FALSE);
$kernel->boot();
+ if (isset($request)) {
+ \Drupal::getContainer()->set('request', $request);
+ }
+
}
$system_path = drupal_get_path('module', 'system');
diff --git a/core/lib/Drupal/Core/Ajax/AjaxResponse.php b/core/lib/Drupal/Core/Ajax/AjaxResponse.php
index 44d146a4ebe3e341c70fdf0bc7c2f6acbc75c1cc..6619a56e383e40cfd552b1a97adc4d0500712a07 100644
--- a/core/lib/Drupal/Core/Ajax/AjaxResponse.php
+++ b/core/lib/Drupal/Core/Ajax/AjaxResponse.php
@@ -9,6 +9,7 @@
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
/**
* JSON response object for AJAX requests.
@@ -46,17 +47,25 @@ public function addCommand($command, $prepend = FALSE) {
}
/**
- * Sets the response's data to be the array of AJAX commands.
- *
- * @param Request $request
- * A request object.
+ * {@inheritdoc}
*
- * @return Response
- * The current response.
+ * Sets the response's data to be the array of AJAX commands.
*/
public function prepare(Request $request) {
- $this->setData($this->ajaxRender($request));
- return parent::prepare($request);
+ $this->prepareResponse($request);
+ return $this;
+ }
+
+ /**
+ * Sets the rendered AJAX right before the response is prepared.
+ *
+ * @param \Symfony\Component\HttpFoundation\Request $request
+ * The request object.
+ */
+ public function prepareResponse(Request $request) {
+ if ($this->data == '{}') {
+ $this->setData($this->ajaxRender($request));
+ }
}
/**
diff --git a/core/lib/Drupal/Core/DrupalKernel.php b/core/lib/Drupal/Core/DrupalKernel.php
index 3e97607034065653937eb68a11b97154eb0358e1..8d6e28c1cc4a43749bfad0ab5d7f5cfe7d3bf1c3 100644
--- a/core/lib/Drupal/Core/DrupalKernel.php
+++ b/core/lib/Drupal/Core/DrupalKernel.php
@@ -369,10 +369,17 @@ protected function getKernelParameters() {
protected function initializeContainer() {
$this->containerNeedsDumping = FALSE;
$persist = $this->getServicesToPersist();
- // If we are rebuilding the kernel and we are in a request scope, store
- // request info so we can add them back after the rebuild.
- if (isset($this->container) && $this->container->hasScope('request')) {
- $request = $this->container->get('request');
+ // The request service requires custom persisting logic, since it is also
+ // potentially scoped. During Drupal installation, there is a request
+ // service without a request scope.
+ $request_scope = FALSE;
+ if (isset($this->container)) {
+ if ($this->container->isScopeActive('request')) {
+ $request_scope = TRUE;
+ }
+ if ($this->container->initialized('request')) {
+ $request = $this->container->get('request');
+ }
}
$this->container = NULL;
$class = $this->getClassName();
@@ -445,8 +452,10 @@ protected function initializeContainer() {
// Set the class loader which was registered as a synthetic service.
$this->container->set('class_loader', $this->classLoader);
// If we have a request set it back to the new container.
- if (isset($request)) {
+ if ($request_scope) {
$this->container->enterScope('request');
+ }
+ if (isset($request)) {
$this->container->set('request', $request);
}
\Drupal::setContainer($this->container);
diff --git a/core/lib/Drupal/Core/EventSubscriber/AjaxResponseSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/AjaxResponseSubscriber.php
new file mode 100644
index 0000000000000000000000000000000000000000..cf4dca18fab4720f1cc21399680fd239211a808a
--- /dev/null
+++ b/core/lib/Drupal/Core/EventSubscriber/AjaxResponseSubscriber.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\EventSubscriber\AjaxResponseSubscriber.
+ */
+
+namespace Drupal\Core\EventSubscriber;
+
+use Drupal\Core\Ajax\AjaxResponse;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+use Symfony\Component\HttpKernel\KernelEvents;
+
+class AjaxResponseSubscriber implements EventSubscriberInterface {
+
+ /**
+ * Renders the ajax commands right before preparing the result.
+ *
+ * @param \Symfony\Component\HttpKernel\Event\FilterResponseEvent $event
+ * The response event, which contains the possible AjaxResponse object.
+ */
+ public function onResponse(FilterResponseEvent $event) {
+ $response = $event->getResponse();
+ if ($response instanceof AjaxResponse) {
+ $response->prepareResponse($event->getRequest());
+ }
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public static function getSubscribedEvents() {
+ $events[KernelEvents::RESPONSE][] = array('onResponse', -100);
+
+ return $events;
+ }
+
+}
diff --git a/core/modules/comment/lib/Drupal/comment/Entity/Comment.php b/core/modules/comment/lib/Drupal/comment/Entity/Comment.php
index 4d22fbf8e6bfa7d9abce99c9abbae84ec968945e..209d08b6b0ab2e964087faab0abcc37854012529 100644
--- a/core/modules/comment/lib/Drupal/comment/Entity/Comment.php
+++ b/core/modules/comment/lib/Drupal/comment/Entity/Comment.php
@@ -216,10 +216,10 @@ public function id() {
public function preSave(EntityStorageControllerInterface $storage_controller) {
parent::preSave($storage_controller);
- global $user;
+ $user = \Drupal::currentUser();
if (!isset($this->status->value)) {
- $this->status->value = user_access('skip comment approval') ? COMMENT_PUBLISHED : COMMENT_NOT_PUBLISHED;
+ $this->status->value = $user->hasPermission('skip comment approval') ? COMMENT_PUBLISHED : COMMENT_NOT_PUBLISHED;
}
if ($this->isNew()) {
// Add the comment to database. This next section builds the thread field.
diff --git a/core/modules/simpletest/lib/Drupal/simpletest/DrupalUnitTestBase.php b/core/modules/simpletest/lib/Drupal/simpletest/DrupalUnitTestBase.php
index b7fb02fc2f514fb1f1a89081e22d8e32a459488d..5eb5b26e5cb839c1b665167ca37214cbcf710654 100644
--- a/core/modules/simpletest/lib/Drupal/simpletest/DrupalUnitTestBase.php
+++ b/core/modules/simpletest/lib/Drupal/simpletest/DrupalUnitTestBase.php
@@ -13,6 +13,7 @@
use Symfony\Component\DependencyInjection\Reference;
use Drupal\Core\Database\Database;
use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\HttpFoundation\Request;
/**
* Base test case class for Drupal unit tests.
@@ -188,7 +189,8 @@ public function containerBuild(ContainerBuilder $container) {
$definition = $container->getDefinition('path_processor_alias');
$definition->clearTag('path_processor_inbound')->clearTag('path_processor_outbound');
}
-
+ $request = Request::create('/');
+ $this->container->set('request', $request);
}
/**
diff --git a/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php b/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php
index c00f72f36b9c409157f7e30a7e74004d50f37ff8..2108b677eaba5d8388491ebed32373a08b20f2b4 100644
--- a/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php
+++ b/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php
@@ -18,6 +18,7 @@
use Drupal\Core\DrupalKernel;
use Drupal\Core\Language\Language;
use Drupal\Core\StreamWrapper\PublicStream;
+use Symfony\Component\HttpFoundation\Request;
/**
* Base class for Drupal tests.
@@ -973,6 +974,10 @@ protected function prepareEnvironment() {
// Register info parser.
$this->container->register('info_parser', 'Drupal\Core\Extension\InfoParser');
+ $request = Request::create('/');
+ $this->container->set('request', $request);
+ $this->container->set('current_user', $GLOBALS['user']);
+
\Drupal::setContainer($this->container);
// Unset globals.
@@ -1035,12 +1040,16 @@ protected function prepareConfigDirectories() {
* enabled modules to be immediately available in the same request.
*/
protected function rebuildContainer() {
+ // Preserve the request object after the container rebuild.
+ $request = \Drupal::request();
+
$this->kernel = new DrupalKernel('testing', drupal_classloader(), FALSE);
$this->kernel->boot();
// DrupalKernel replaces the container in \Drupal::getContainer() with a
// different object, so we need to replace the instance on this test class.
$this->container = \Drupal::getContainer();
// The global $user is set in TestBase::prepareEnvironment().
+ $this->container->set('request', $request);
$this->container->set('current_user', $GLOBALS['user']);
}
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
index 7af12f77c7acfc15d129bfb389ac5c1382c4e3f5..0268284ba90e69f911b8902a135e077a441c4bc8 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
@@ -14,6 +14,7 @@
use Drupal\views\ViewExecutable;
use Drupal\views\Plugin\views\PluginBase;
use Drupal\views\Views;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException as DependencyInjectionRuntimeException;
/**
* @defgroup views_display_plugins Views display plugins
@@ -886,8 +887,15 @@ public function getHandlers($type) {
// If this is during form submission and there are temporary options
// which can only appear if the view is in the edit cache, use those
// options instead. This is used for AJAX multi-step stuff.
- if (\Drupal::request()->request->get('form_id') && isset($this->view->temporary_options[$type][$id])) {
- $info = $this->view->temporary_options[$type][$id];
+ // @todo Remove dependency on Request object
+ // https://drupal.org/node/2059003.
+ try {
+ $request = \Drupal::request();
+ if ($request->request->get('form_id') && isset($this->view->temporary_options[$type][$id])) {
+ $info = $this->view->temporary_options[$type][$id];
+ }
+ }
+ catch (DependencyInjectionRuntimeException $e) {
}
if ($info['id'] != $id) {
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayPageTest.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayPageTest.php
index dc51709d3cb03de1abde8841dc97d4b89b006c88..b4e343d407208b1f1c066f9ca94153d03765205f 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayPageTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayPageTest.php
@@ -81,11 +81,14 @@ public function testPageResponses() {
$response = $this->container->get('http_kernel')->handle($subrequest, HttpKernelInterface::SUB_REQUEST);
$this->assertEqual($response->getStatusCode(), 200);
+ $subrequest = Request::create('/test_page_display_200', 'GET');
+ \Drupal::getContainer()->set('request', $subrequest);
+
// Test accessing a disabled page for a view.
$view = views_get_view('test_page_display');
// Disable the view, rebuild menu, and request the page again.
$view->storage->disable()->save();
- $subrequest = Request::create('/test_page_display_200', 'GET');
+
$response = $this->container->get('http_kernel')->handle($subrequest, HttpKernelInterface::SUB_REQUEST);
$this->assertEqual($response->getStatusCode(), 404);
}
diff --git a/core/scripts/run-tests.sh b/core/scripts/run-tests.sh
index 58f45ae9451f60f1a0930659dc73dfe96b4c8a90..7912f6a9f68575a89f28c8bad91327a64463a87d 100755
--- a/core/scripts/run-tests.sh
+++ b/core/scripts/run-tests.sh
@@ -39,6 +39,10 @@
exit;
}
simpletest_classloader_register();
+// We have to add a Request.
+$request = \Symfony\Component\HttpFoundation\Request::createFromGlobals();
+$container = \Drupal::getContainer();
+$container->set('request', $request);
if ($args['clean']) {
// Clean up left-over times and directories.
@@ -477,8 +481,11 @@ function simpletest_script_run_one_test($test_id, $test_class) {
try {
// Bootstrap Drupal.
drupal_bootstrap(DRUPAL_BOOTSTRAP_CODE);
-
simpletest_classloader_register();
+ // We have to add a Request.
+ $request = \Symfony\Component\HttpFoundation\Request::createFromGlobals();
+ $container = \Drupal::getContainer();
+ $container->set('request', $request);
// Override configuration according to command line parameters.
$conf['simpletest.settings']['verbose'] = $args['verbose'];
diff --git a/core/update.php b/core/update.php
index 7abd5665526274fcb19af8573fb5bcc06ec689e5..f3f381be103f476c4d93f5f989e35debeca8ed02 100644
--- a/core/update.php
+++ b/core/update.php
@@ -450,13 +450,14 @@ function update_check_requirements($skip_warnings = FALSE) {
// Determine if the current user has access to run update.php.
drupal_bootstrap(DRUPAL_BOOTSTRAP_VARIABLES);
-require_once DRUPAL_ROOT . '/' . settings()->get('session_inc', 'core/includes/session.inc');
-drupal_session_initialize();
// A request object from the HTTPFoundation to tell us about the request.
$request = Request::createFromGlobals();
\Drupal::getContainer()->set('request', $request);
+require_once DRUPAL_ROOT . '/' . settings()->get('session_inc', 'core/includes/session.inc');
+drupal_session_initialize();
+
// Ensure that URLs generated for the home and admin pages don't have 'update.php'
// in them.
$generator = \Drupal::urlGenerator();