Update to Drupal 8.1.0. For more information, see https://www.drupal.org/drupal-8.1.0-release-notes

core/modules/language/language.module

@@ -29,7 +29,7 @@ function language_help($route_name, RouteMatchInterface $route_match) {
     case 'help.page.language':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Language module allows you to configure the languages used on your site, and provides information for the for <a href=":content">Content Translation</a>, <a href=":interface">Interface Translation</a>, and <a href=":configuration">Configuration Translation</a> modules, if they are enabled. For more information, see the <a href=":doc_url">online documentation for the Language module</a>.', array(':doc_url' => 'https://www.drupal.org/documentation/modules/language', ':content' => (\Drupal::moduleHandler()->moduleExists('content_translation')) ? \Drupal::url('help.page', array('name' => 'content_translation')) : '#', ':interface' => (\Drupal::moduleHandler()->moduleExists('locale')) ? \Drupal::url('help.page', array('name' => 'locale')) : '#', ':configuration' => (\Drupal::moduleHandler()->moduleExists('config_translation')) ? \Drupal::url('help.page', array('name' => 'config_translation')) : '#')) . '</p>';
+      $output .= '<p>' . t('The Language module allows you to configure the languages used on your site, and provides information for the <a href=":content">Content Translation</a>, <a href=":interface">Interface Translation</a>, and <a href=":configuration">Configuration Translation</a> modules, if they are enabled. For more information, see the <a href=":doc_url">online documentation for the Language module</a>.', array(':doc_url' => 'https://www.drupal.org/documentation/modules/language', ':content' => (\Drupal::moduleHandler()->moduleExists('content_translation')) ? \Drupal::url('help.page', array('name' => 'content_translation')) : '#', ':interface' => (\Drupal::moduleHandler()->moduleExists('locale')) ? \Drupal::url('help.page', array('name' => 'locale')) : '#', ':configuration' => (\Drupal::moduleHandler()->moduleExists('config_translation')) ? \Drupal::url('help.page', array('name' => 'config_translation')) : '#')) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Adding languages') . '</dt>';

core/modules/language/src/Annotation/LanguageNegotiation.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Annotation\LanguageNegotiation.
- */
-
 namespace Drupal\language\Annotation;
 
 use Drupal\Component\Annotation\Plugin;

core/modules/language/src/Config/LanguageConfigCollectionNameTrait.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Config\LanguageConfigCollectionNameTrait.
- */
-
 namespace Drupal\language\Config;
 
 /**

core/modules/language/src/Config/LanguageConfigFactoryOverride.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Config\LanguageConfigFactoryOverride.
- */
-
 namespace Drupal\language\Config;
 
 use Drupal\Core\Cache\CacheableMetadata;

core/modules/language/src/Config/LanguageConfigFactoryOverrideInterface.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Config\LanguageConfigFactoryOverrideInterface.
- */
-
 namespace Drupal\language\Config;
 
 use Drupal\Core\Config\ConfigFactoryOverrideInterface;

core/modules/language/src/Config/LanguageConfigOverride.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Config\LanguageConfigOverride.
- */
-
 namespace Drupal\language\Config;
 
 use Drupal\Core\Cache\Cache;

core/modules/language/src/Config/LanguageConfigOverrideCrudEvent.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Config\LanguageConfigOverrideCrudEvent.
- */
-
 namespace Drupal\language\Config;
 
 use Symfony\Component\EventDispatcher\Event;

core/modules/language/src/Config/LanguageConfigOverrideEvents.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Config\LanguageConfigOverrideEvents.
- */
-
 namespace Drupal\language\Config;
 
 /**

core/modules/language/src/ConfigurableLanguageInterface.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\ConfigurableLanguageInterface.
- */
-
 namespace Drupal\language;
 
 use Drupal\Core\Config\Entity\ConfigEntityInterface;

core/modules/language/src/ConfigurableLanguageManager.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\ConfigurableLanguageManager.
- */
-
 namespace Drupal\language;
 
 use Drupal\Core\Language\LanguageInterface;

core/modules/language/src/ConfigurableLanguageManagerInterface.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\ConfigurableLanguageManagerInterface.
- */
-
 namespace Drupal\language;
 
 use Drupal\Core\Language\LanguageInterface;

core/modules/language/src/ContentLanguageSettingsException.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\ContentLanguageSettingsException.
- */
-
 namespace Drupal\language;
 
 /**

core/modules/language/src/ContentLanguageSettingsInterface.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\ContentLanguageSettingsInterface.
- */
-
 namespace Drupal\language;
 
 use Drupal\Core\Config\Entity\ConfigEntityInterface;

core/modules/language/src/DefaultLanguageItem.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\DefaultLanguageItem.
- */
-
 namespace Drupal\language;
 
 use Drupal\Core\Entity\EntityInterface;

core/modules/language/src/Element/LanguageConfiguration.php

@@ -1,16 +1,10 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Element\LanguageConfiguration.
- */
-
 namespace Drupal\language\Element;
 
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\Core\Render\Element\FormElement;
-use Drupal\language\Entity\ContentLanguageSettings;
 
 /**
  * Provides language element configuration.
@@ -41,7 +35,7 @@ class LanguageConfiguration extends FormElement {
     // Avoid validation failure since we are moving the '#options' key in the
     // nested 'language' select element.
     unset($element['#options']);
-    /** @var ContentLanguageSettings $default_config */
+    /** @var \Drupal\language\Entity\ContentLanguageSettings $default_config */
     $default_config = $element['#default_value'];
     $element['langcode'] = array(
       '#type' => 'select',

core/modules/language/src/Entity/ConfigurableLanguage.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Entity\ConfigurableLanguage.
- */
-
 namespace Drupal\language\Entity;
 
 use Drupal\Core\Config\Entity\ConfigEntityBase;

core/modules/language/src/Entity/ContentLanguageSettings.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Entity\ContentLanguageSettings.
- */
-
 namespace Drupal\language\Entity;
 
 use Drupal\Core\Config\Entity\ConfigEntityBase;
@@ -68,7 +63,7 @@ class ContentLanguageSettings extends ConfigEntityBase implements ContentLanguag
    * Constructs a ContentLanguageSettings object.
    *
    * In most cases, Field entities are created via
-   * entity_create('field_config', $values), where $values is the same
+   * FieldConfig::create($values), where $values is the same
    * parameter as in this constructor.
    *
    * @param array $values

core/modules/language/src/EventSubscriber/ConfigSubscriber.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\EventSubscriber\ConfigSubscriber.
- */
-
 namespace Drupal\language\EventSubscriber;
 
 use Drupal\Core\Config\ConfigFactoryInterface;

core/modules/language/src/EventSubscriber/LanguageRequestSubscriber.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\EventSubscriber\LanguageRequestSubscriber.
- */
-
 namespace Drupal\language\EventSubscriber;
 
 use Drupal\Core\Session\AccountInterface;

core/modules/language/src/Exception/DeleteDefaultLanguageException.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Exception\DeleteDefaultLanguageException.
- */
-
 namespace Drupal\language\Exception;
 
 /**

core/modules/language/src/Exception/LanguageException.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Exception\LanguageException.
- */
-
 namespace Drupal\language\Exception;
 
 /**

core/modules/language/src/Form/ContentLanguageSettingsForm.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Form\ContentLanguageSettingsForm.
- */
-
 namespace Drupal\language\Form;
 
 use Drupal\Core\Entity\ContentEntityTypeInterface;

core/modules/language/src/Form/LanguageAddForm.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Form\LanguageAddForm.
- */
-
 namespace Drupal\language\Form;
 
 use Drupal\Core\Entity\EntityInterface;

core/modules/language/src/Form/LanguageDeleteForm.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Form\LanguageDeleteForm.
- */
-
 namespace Drupal\language\Form;
 
 use Drupal\Core\Entity\EntityDeleteForm;

core/modules/language/src/Form/LanguageEditForm.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Form\LanguageEditForm.
- */
-
 namespace Drupal\language\Form;
 
 use Drupal\Core\Form\FormStateInterface;

core/modules/language/src/Form/LanguageFormBase.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Form\LanguageFormBase.
- */
-
 namespace Drupal\language\Form;
 
 use Drupal\Component\Utility\Html;

core/modules/language/src/Form/NegotiationBrowserDeleteForm.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Form\NegotiationBrowserDeleteForm.
- */
-
 namespace Drupal\language\Form;
 
 use Drupal\Core\Form\ConfigFormBaseTrait;

core/modules/language/src/Form/NegotiationBrowserForm.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Form\NegotiationBrowserForm.
- */
-
 namespace Drupal\language\Form;
 
 use Drupal\Core\Config\ConfigFactoryInterface;

core/modules/language/src/Form/NegotiationConfigureForm.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Form\NegotiationConfigureForm.
- */
-
 namespace Drupal\language\Form;
 
 use Drupal\Core\Block\BlockManagerInterface;

core/modules/language/src/Form/NegotiationSelectedForm.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Form\NegotiationSelectedForm.
- */
-
 namespace Drupal\language\Form;
 
 use Drupal\Core\Form\FormStateInterface;

core/modules/language/src/Form/NegotiationSessionForm.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Form\NegotiationSessionForm.
- */
-
 namespace Drupal\language\Form;
 
 use Drupal\Core\Form\ConfigFormBase;

core/modules/language/src/Form/NegotiationUrlForm.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Form\NegotiationUrlForm.
- */
-
 namespace Drupal\language\Form;
 
 use Drupal\Core\Form\ConfigFormBase;
@@ -100,7 +95,7 @@ class NegotiationUrlForm extends ConfigFormBase {
       '#tree' => TRUE,
       '#title' => $this->t('Domain configuration'),
       '#open' => TRUE,
-      '#description' => $this->t('The domain names to use for these languages. <strong>Modifying this value may break existing URLs. Use with caution in a production environment.</strong> Example: Specifying "de.example.com" as language domain for German will result in an URL like "http://de.example.com/contact".'),
+      '#description' => $this->t('The domain names to use for these languages. <strong>Modifying this value may break existing URLs. Use with caution in a production environment.</strong> Example: Specifying "de.example.com" as language domain for German will result in a URL like "http://de.example.com/contact".'),
       '#states' => array(
         'visible' => array(
           ':input[name="language_negotiation_url_part"]' => array(

core/modules/language/src/HttpKernel/PathProcessorLanguage.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\HttpKernel\PathProcessorLanguage.
- */
-
 namespace Drupal\language\HttpKernel;
 
 use Drupal\Component\Utility\Unicode;

core/modules/language/src/LanguageAccessControlHandler.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\LanguageAccessControlHandler.
- */
-
 namespace Drupal\language;
 
 use Drupal\Core\Access\AccessResult;
@@ -26,13 +21,13 @@ class LanguageAccessControlHandler extends EntityAccessControlHandler {
     switch ($operation) {
       case 'update':
         /* @var \Drupal\Core\Language\LanguageInterface $entity */
-        return AccessResult::allowedIf(!$entity->isLocked())->cacheUntilEntityChanges($entity)
+        return AccessResult::allowedIf(!$entity->isLocked())->addCacheableDependency($entity)
           ->andIf(parent::checkAccess($entity, $operation, $account));
 
       case 'delete':
         /* @var \Drupal\Core\Language\LanguageInterface $entity */
-        return AccessResult::allowedIf(!$entity->isLocked())->cacheUntilEntityChanges($entity)
-          ->andIf(AccessResult::allowedIf(!$entity->isDefault())->cacheUntilEntityChanges($entity))
+        return AccessResult::allowedIf(!$entity->isLocked())->addCacheableDependency($entity)
+          ->andIf(AccessResult::allowedIf(!$entity->isDefault())->addCacheableDependency($entity))
           ->andIf(parent::checkAccess($entity, $operation, $account));
 
       default:

core/modules/language/src/LanguageConverter.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\LanguageConverter.
- */
-
 namespace Drupal\language;
 
 use Drupal\Core\Language\LanguageManagerInterface;

core/modules/language/src/LanguageListBuilder.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\LanguageListBuilder.
- */
-
 namespace Drupal\language;
 
 use Drupal\Core\Config\ConfigFactoryInterface;
@@ -14,7 +9,6 @@ use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Language\LanguageManagerInterface;
-use Drupal\Core\Render\Element;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**

core/modules/language/src/LanguageNegotiationMethodBase.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\LanguageNegotiationMethodBase.
- */
-
 namespace Drupal\language;
 
 use Drupal\Core\Config\ConfigFactoryInterface;

core/modules/language/src/LanguageNegotiationMethodInterface.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\LanguageNegotiationMethodInterface.
- */
-
 namespace Drupal\language;
 
 use Drupal\Core\Config\ConfigFactoryInterface;

core/modules/language/src/LanguageNegotiationMethodManager.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\LanguageNegotiationMethodManager.
- */
-
 namespace Drupal\language;
 
 use Drupal\Core\Cache\CacheBackendInterface;

core/modules/language/src/LanguageNegotiator.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\LanguageNegotiator.
- */
-
 namespace Drupal\language;
 
 use Drupal\Component\Plugin\PluginManagerInterface;

core/modules/language/src/LanguageNegotiatorInterface.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\LanguageNegotiatorInterface.
- */
-
 namespace Drupal\language;
 
 use Drupal\Core\Session\AccountInterface;

core/modules/language/src/LanguageServiceProvider.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\LanguageServiceProvider.
- */
-
 namespace Drupal\language;
 
 use Drupal\Core\Config\BootstrapConfigStorageFactory;

core/modules/language/src/LanguageSwitcherInterface.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\LanguageSwitcherInterface.
- */
-
 namespace Drupal\language;
 
 use Drupal\Core\Url;

core/modules/language/src/Plugin/Block/LanguageBlock.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Plugin\Block\LanguageBlock.
- */
-
 namespace Drupal\language\Plugin\Block;
 
 use Drupal\Core\Access\AccessResult;

core/modules/language/src/Plugin/Condition/Language.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Plugin\Condition\Language.
- */
-
 namespace Drupal\language\Plugin\Condition;
 
 use Drupal\Core\Condition\ConditionPluginBase;

core/modules/language/src/Plugin/Derivative/LanguageBlock.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Plugin\Derivative\LanguageBlock.
- */
-
 namespace Drupal\language\Plugin\Derivative;
 
 use Drupal\Component\Plugin\Derivative\DeriverBase;

core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationBrowser.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationBrowser.
- */
-
 namespace Drupal\language\Plugin\LanguageNegotiation;
 
 use Drupal\Component\Utility\UserAgent;

core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationContentEntity.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationContentEntity.
- */
-
 namespace Drupal\language\Plugin\LanguageNegotiation;
 
 use Drupal\Component\Utility\UrlHelper;
@@ -181,8 +176,8 @@ class LanguageNegotiationContentEntity extends LanguageNegotiationMethodBase imp
    * \Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationContentEntity::processOutbound().
    *
    * @return bool
-   *   TRUE if the content entity language negotiator has higher priority than
-   *   the url language negotiator, FALSE otherwise.
+   *   TRUE if the the content entity language negotiator has higher priority
+   *   than the url language negotiator, FALSE otherwise.
    */
   protected function hasLowerLanguageNegotiationWeight() {
     if (!isset($this->hasLowerLanguageNegotiationWeightResult)) {

core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationSelected.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationSelected.
- */
-
 namespace Drupal\language\Plugin\LanguageNegotiation;
 
 use Drupal\language\LanguageNegotiationMethodBase;

core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationSession.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationSession.
- */
-
 namespace Drupal\language\Plugin\LanguageNegotiation;
 
 use Drupal\Core\Language\LanguageInterface;

core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationUI.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationUI.
- */
-
 namespace Drupal\language\Plugin\LanguageNegotiation;
 
 use Drupal\language\LanguageNegotiationMethodBase;

core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationUrl.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationUrl.
- */
-
 namespace Drupal\language\Plugin\LanguageNegotiation;
 
 use Drupal\Core\Language\LanguageInterface;

core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationUrlFallback.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationUrlFallback.
- */
-
 namespace Drupal\language\Plugin\LanguageNegotiation;
 
 use Drupal\language\LanguageNegotiationMethodBase;

core/modules/language/src/Plugin/migrate/source/Language.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Plugin\migrate\source\Language.
- */
-
 namespace Drupal\language\Plugin\migrate\source;
 
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;

core/modules/language/src/ProxyClass/LanguageConverter.php

@@ -1,9 +1,5 @@
 <?php
-
-/**
- * @file
- * Contains \Drupal\language\ProxyClass\LanguageConverter.
- */
+// @codingStandardsIgnoreFile
 
 /**
  * This file was generated via php core/scripts/generate-proxy-class.php 'Drupal\language\LanguageConverter' "core/modules/language/src".

core/modules/language/src/Tests/AdminPathEntityConverterLanguageTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Tests\AdminPathEntityConverterLanguageTest.
- */
-
 namespace Drupal\language\Tests;
 
 use Drupal\language\Entity\ConfigurableLanguage;

core/modules/language/src/Tests/Condition/LanguageConditionTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Tests\Condition\LanguageConditionTest.
- */
-
 namespace Drupal\language\Tests\Condition;
 
 use Drupal\language\Entity\ConfigurableLanguage;

core/modules/language/src/Tests/ConfigurableLanguageTest.php

@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Contains \Drupal\language\Tests\ConfigurableLanguageTest.
- */
 
 namespace Drupal\language\Tests;
 

core/modules/language/src/Tests/EntityDefaultLanguageTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Tests\EntityDefaultLanguageTest.
- */
-
 namespace Drupal\language\Tests;
 
 use Drupal\Core\Language\LanguageInterface;

core/modules/language/src/Tests/EntityTypeWithoutLanguageFormTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Tests\EntityTypeWithoutLanguageFormTest.
- */
-
 namespace Drupal\language\Tests;
 
 use Drupal\simpletest\WebTestBase;

core/modules/language/src/Tests/EntityUrlLanguageTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Tests\EntityUrlLanguageTest.
- */
-
 namespace Drupal\language\Tests;
 
 use Drupal\Core\Language\LanguageInterface;
@@ -41,7 +36,6 @@ class EntityUrlLanguageTest extends LanguageTestBase {
 
     $this->installEntitySchema('entity_test');
     $this->installEntitySchema('configurable_language');
-    $this->installSchema('system', 'router');
     \Drupal::service('router.builder')->rebuild();
 
     // In order to reflect the changes for a multilingual site in the container

core/modules/language/src/Tests/LanguageBlockSettingsVisibilityTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Tests\LanguageBlockSettingsVisibilityTest.
- */
-
 namespace Drupal\language\Tests;
 
 use Drupal\simpletest\WebTestBase;

core/modules/language/src/Tests/LanguageBrowserDetectionTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Tests\LanguageBrowserDetectionTest.
- */
-
 namespace Drupal\language\Tests;
 
 use Drupal\simpletest\WebTestBase;

core/modules/language/src/Tests/LanguageConfigOverrideImportTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Tests\LanguageConfigOverrideImportTest.
- */
-
 namespace Drupal\language\Tests;
 
 use Drupal\language\Entity\ConfigurableLanguage;

core/modules/language/src/Tests/LanguageConfigOverrideInstallTest.php

@@ -1,9 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Tests\LanguageConfigOverrideInstallTest.
- */
 namespace Drupal\language\Tests;
 
 use Drupal\language\Entity\ConfigurableLanguage;

core/modules/language/src/Tests/LanguageConfigSchemaTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Tests\LanguageConfigSchemaTest.
- */
-
 namespace Drupal\language\Tests;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;

core/modules/language/src/Tests/LanguageConfigurationElementTest.php

@@ -1,16 +1,12 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Tests\LanguageConfigurationElementTest.
- */
-
 namespace Drupal\language\Tests;
 
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\language\Entity\ConfigurableLanguage;
 use Drupal\language\Entity\ContentLanguageSettings;
 use Drupal\simpletest\WebTestBase;
+use Drupal\taxonomy\Entity\Vocabulary;
 
 /**
  * Tests the features of the language configuration element field.
@@ -223,10 +219,10 @@ class LanguageConfigurationElementTest extends WebTestBase {
    * Tests that the configuration is retained when a vocabulary is updated.
    */
   public function testTaxonomyVocabularyUpdate() {
-    $vocabulary = entity_create('taxonomy_vocabulary', array(
+    $vocabulary = Vocabulary::create([
       'name' => 'Country',
       'vid' => 'country',
-    ));
+    ]);
     $vocabulary->save();
 
     $admin_user = $this->drupalCreateUser(array('administer taxonomy'));

core/modules/language/src/Tests/LanguageConfigurationTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Tests\LanguageConfigurationTest.
- */
-
 namespace Drupal\language\Tests;
 
 use Drupal\Core\Language\LanguageInterface;

core/modules/language/src/Tests/LanguageCustomLanguageConfigurationTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Tests\LanguageCustomLanguageConfigurationTest.
- */
-
 namespace Drupal\language\Tests;
 
 use Drupal\simpletest\WebTestBase;

core/modules/language/src/Tests/LanguageDependencyInjectionTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Tests\LanguageDependencyInjectionTest.
- */
-
 namespace Drupal\language\Tests;
 
 use Drupal\language\Entity\ConfigurableLanguage;

core/modules/language/src/Tests/LanguageFallbackTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Tests\LanguageFallbackTest.
- */
-
 namespace Drupal\language\Tests;
 
 use Drupal\Core\Language\LanguageInterface;

core/modules/language/src/Tests/LanguageListModuleInstallTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Tests\LanguageListModuleInstallTest.
- */
-
 namespace Drupal\language\Tests;
 
 use Drupal\simpletest\WebTestBase;

core/modules/language/src/Tests/LanguageListTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Tests\LanguageListTest.
- */
-
 namespace Drupal\language\Tests;
 
 use Drupal\language\Entity\ConfigurableLanguage;

core/modules/language/src/Tests/LanguageLocaleListTest.php

@@ -1,15 +1,8 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Tests\LanguageListTest.
- */
-
 namespace Drupal\language\Tests;
 
 use Drupal\simpletest\WebTestBase;
-use Drupal\Core\Language\Language;
-use Drupal\Core\Language\LanguageInterface;
 
 /**
  * Adds a new language with translations and tests language list order.

core/modules/language/src/Tests/LanguageNegotiationContentEntityTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Tests\LanguageNegotiationContentEntityTest.
- */
-
 namespace Drupal\language\Tests;
 
 use Drupal\Component\Render\FormattableMarkup;

core/modules/language/src/Tests/LanguageNegotiationInfoTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Tests\LanguageNegotiationInfoTest.
- */
-
 namespace Drupal\language\Tests;
 
 use Drupal\Core\Language\LanguageInterface;

core/modules/language/src/Tests/LanguagePathMonolingualTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Tests\LanguagePathMonolingualTest.
- */
-
 namespace Drupal\language\Tests;
 
 use Drupal\simpletest\WebTestBase;

core/modules/language/src/Tests/LanguageSelectorTranslatableTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Tests\LanguageSelectorTranslatableTest.
- */
-
 namespace Drupal\language\Tests;
 
 use Drupal\simpletest\WebTestBase;

core/modules/language/src/Tests/LanguageSwitchingTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Tests\LanguageSwitchingTest.
- */
-
 namespace Drupal\language\Tests;
 
 use Drupal\language\Entity\ConfigurableLanguage;

core/modules/language/src/Tests/LanguageTestBase.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Tests\LanguageTestBase.
- */
-
 namespace Drupal\language\Tests;
 
 use Drupal\simpletest\KernelTestBase;

core/modules/language/src/Tests/LanguageTourTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Tests\LanguageTourTest.
- */
-
 namespace Drupal\language\Tests;
 
 use Drupal\tour\Tests\TourTestBase;

core/modules/language/src/Tests/LanguageUILanguageNegotiationTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Tests\LanguageUILanguageNegotiationTest.
- */
-
 namespace Drupal\language\Tests;
 
 use Drupal\Core\Url;

core/modules/language/src/Tests/LanguageUrlRewritingTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Tests\LanguageUrlRewritingTest.
- */
-
 namespace Drupal\language\Tests;
 
 use Drupal\Core\Language\Language;

core/modules/language/src/Tests/Migrate/MigrateLanguageTest.php

@@ -1,15 +1,10 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Tests\Migrate\MigrateLanguageTest.
- */
-
 namespace Drupal\language\Tests\Migrate;
 
 use Drupal\language\ConfigurableLanguageInterface;
 use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * @group migrate_drupal_6

core/modules/language/tests/language_elements_test/src/Form/LanguageConfigurationElement.php

@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Contains \Drupal\language_elements_test\Form\LanguageConfigurationElement.
- */
 
 namespace Drupal\language_elements_test\Form;
 

core/modules/language/tests/language_elements_test/src/Form/LanguageConfigurationElementTest.php

@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Contains \Drupal\language_elements_test\Form\LanguageConfigurationElementTest.
- */
 
 namespace Drupal\language_elements_test\Form;
 

core/modules/language/tests/language_test/src/Controller/LanguageTestController.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language_test\Controller\LanguageTestController.
- */
-
 namespace Drupal\language_test\Controller;
 
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;

core/modules/language/tests/language_test/src/Entity/NoLanguageEntityTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language_test\Entity\NoLanguageEntityTest.
- */
-
 namespace Drupal\language_test\Entity;
 
 use Drupal\Core\Entity\ContentEntityBase;

core/modules/language/tests/language_test/src/Plugin/LanguageNegotiation/LanguageNegotiationTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language_test\Plugin\LanguageNegotiation\LanguageNegotiationTest.
- */
-
 namespace Drupal\language_test\Plugin\LanguageNegotiation;
 
 use Drupal\language\LanguageNegotiationMethodBase;

core/modules/language/tests/language_test/src/Plugin/LanguageNegotiation/LanguageNegotiationTestTs.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language_test\Plugin\LanguageNegotiation\LanguageNegotiationTestTs.
- */
-
 namespace Drupal\language_test\Plugin\LanguageNegotiation;
 
 /**

core/modules/language/tests/src/Kernel/Migrate/d7/MigrateLanguageNegotiationSettingsTest.php

@@ -1,13 +1,8 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Tests\Migrate\d7\MigrateLanguageNegotiationSettingsTest.
- */
+namespace Drupal\Tests\language\Kernel\Migrate\d7;
 
-namespace Drupal\language\Tests\Migrate\d7;
-
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
  * Tests migration of language negotiation variables.

core/modules/language/tests/src/Kernel/Views/ArgumentLanguageTest.php

@@ -1,11 +1,6 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Tests\Views\ArgumentLanguageTest.
- */
-
-namespace Drupal\language\Tests\Views;
+namespace Drupal\Tests\language\Kernel\Views;
 
 use Drupal\views\Views;
 

core/modules/language/tests/src/Kernel/Views/FieldLanguageTest.php

@@ -1,11 +1,6 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Tests\Views\FieldLanguageTest.
- */
-
-namespace Drupal\language\Tests\Views;
+namespace Drupal\Tests\language\Kernel\Views;
 
 use Drupal\views\Views;
 

core/modules/language/tests/src/Kernel/Views/FilterLanguageTest.php

@@ -1,11 +1,6 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Tests\Views\FilterLanguageTest.
- */
-
-namespace Drupal\language\Tests\Views;
+namespace Drupal\Tests\language\Kernel\Views;
 
 use Drupal\views\Views;
 

core/modules/language/tests/src/Kernel/Views/LanguageTestBase.php

@@ -1,19 +1,14 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\language\Tests\Views\LanguageTestBase.
- */
-
-namespace Drupal\language\Tests\Views;
+namespace Drupal\Tests\language\Kernel\Views;
 
 use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\views\Tests\ViewKernelTestBase;
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
 
 /**
  * Defines the base class for all Language handler tests.
  */
-abstract class LanguageTestBase extends ViewKernelTestBase {
+abstract class LanguageTestBase extends ViewsKernelTestBase {
 
   /**
    * Modules to enable.
@@ -22,7 +17,7 @@ abstract class LanguageTestBase extends ViewKernelTestBase {
    */
   public static $modules = array('system', 'language');
 
-  protected function setUp() {
+  protected function setUp($import_test_views = TRUE) {
     parent::setUp();
     $this->installConfig(array('language'));
 

core/modules/language/tests/src/Unit/Config/LanguageConfigOverrideTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Tests\language\Unit\Config\LanguageConfigOverrideTest.
- */
-
 namespace Drupal\Tests\language\Unit\Config;
 
 use Drupal\Core\DependencyInjection\ContainerBuilder;

core/modules/language/tests/src/Unit/ConfigurableLanguageUnitTest.php

@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Contains \Drupal\Tests\language\Unit\ConfigurableLanguageUnitTest.
- */
 
 namespace Drupal\Tests\language\Unit;
 

core/modules/language/tests/src/Unit/ContentLanguageSettingsUnitTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Tests\language\Unit\ContentLanguageSettingsUnitTest.
- */
-
 namespace Drupal\Tests\language\Unit;
 
 use Drupal\Core\Language\LanguageInterface;

core/modules/language/tests/src/Unit/LanguageNegotiationUrlTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Tests\language\Unit\LanguageNegotiationUrlTest.
- */
-
 namespace Drupal\Tests\language\Unit {
 
 use Drupal\Core\Cache\Cache;

core/modules/language/tests/src/Unit/Menu/LanguageLocalTasksTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Tests\language\Unit\Menu\LanguageLocalTasksTest.
- */
-
 namespace Drupal\Tests\language\Unit\Menu;
 
 use Drupal\Tests\Core\Menu\LocalTaskIntegrationTestBase;