diff -u b/core/modules/language/tests/language_test/lib/Drupal/language_test/LanguageTestManager.php b/core/modules/language/tests/language_test/lib/Drupal/language_test/LanguageTestManager.php --- b/core/modules/language/tests/language_test/lib/Drupal/language_test/LanguageTestManager.php +++ b/core/modules/language/tests/language_test/lib/Drupal/language_test/LanguageTestManager.php @@ -19,8 +19,8 @@ * Constructs a LanguageTestManager object. */ public function __construct(Request $request = NULL) { - if (state()->get('language_test.domain')) { - $_SERVER['HTTP_HOST'] = state()->get('language_test.domain'); + if ($test_domain = state()->get('language_test.domain')) { + $_SERVER['HTTP_HOST'] = $test_domain; } return parent::__construct($request); } diff -u b/core/modules/system/tests/modules/session_test/lib/Drupal/session_test/EventSubscriber/SessionTestSubscriber.php b/core/modules/system/tests/modules/session_test/lib/Drupal/session_test/EventSubscriber/SessionTestSubscriber.php --- b/core/modules/system/tests/modules/session_test/lib/Drupal/session_test/EventSubscriber/SessionTestSubscriber.php +++ b/core/modules/system/tests/modules/session_test/lib/Drupal/session_test/EventSubscriber/SessionTestSubscriber.php @@ -2,7 +2,7 @@ /** * @file - * Definition of Drupal\session_test\EventSubscriber\SessionTestSubscriber. + * Contains \Drupal\session_test\EventSubscriber\SessionTestSubscriber. */ namespace Drupal\session_test\EventSubscriber; @@ -12,10 +12,8 @@ use Symfony\Component\HttpKernel\Event\GetResponseEvent; use Symfony\Component\EventDispatcher\EventSubscriberInterface; - - /** - * Ban subscriber for controller requests. + * Defines a test session subscriber that checks whether the session is empty. */ class SessionTestSubscriber implements EventSubscriberInterface { @@ -27,7 +25,7 @@ /** * Set header for session testing. * - * @param Symfony\Component\HttpKernel\Event\GetResponseEvent $event + * @param \Symfony\Component\HttpKernel\Event\GetResponseEvent $event * The Event to process. */ public function onKernelRequestSessionTest(GetResponseEvent $event) { @@ -37,7 +35,7 @@ /** * Set header for session testing. * - * @param Symfony\Component\HttpKernel\Event\FilterResponseEvent $event + * @param \Symfony\Component\HttpKernel\Event\FilterResponseEvent $event * The Event to process. */ public function onKernelResponseSessionTest(FilterResponseEvent $event) { diff -u b/core/modules/system/tests/modules/session_test/lib/Drupal/session_test/SessionTestBundle.php b/core/modules/system/tests/modules/session_test/lib/Drupal/session_test/SessionTestBundle.php --- b/core/modules/system/tests/modules/session_test/lib/Drupal/session_test/SessionTestBundle.php +++ b/core/modules/system/tests/modules/session_test/lib/Drupal/session_test/SessionTestBundle.php @@ -2,7 +2,7 @@ /** * @file - * Definition of Drupal\session_test\SessionTestBundle. + * Contains \Drupal\session_test\SessionTestBundle. */ namespace Drupal\session_test; @@ -16,7 +16,7 @@ class SessionTestBundle extends Bundle { /** - * Overrides Symfony\Component\HttpKernel\Bundle\Bundle::build(). + * Overrides \Symfony\Component\HttpKernel\Bundle\Bundle::build(). */ public function build(ContainerBuilder $container) { $container->register('session_test.subscriber', 'Drupal\session_test\EventSubscriber\SessionTestSubscriber') only in patch2: unchanged: --- a/core/modules/language/lib/Drupal/language/Tests/LanguageUILanguageNegotiationTest.php +++ b/core/modules/language/lib/Drupal/language/Tests/LanguageUILanguageNegotiationTest.php @@ -59,6 +59,7 @@ public static function getInfo() { function setUp() { parent::setUp(); + require_once DRUPAL_ROOT . '/core/includes/language.inc'; $admin_user = $this->drupalCreateUser(array('administer languages', 'translate interface', 'access administration pages', 'administer blocks')); $this->drupalLogin($admin_user);