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

core/modules/views/config/schema/views.field.schema.yml

@@ -176,6 +176,13 @@ views.field.language:
       type: boolean
       label: 'Display in native language'
 
+views.field.rendered_entity:
+  type: views_field
+  label: 'Rendered entity'
+  mapping:
+    view_mode:
+      type: string
+      label: 'View mode'
 
 views.field.entity_link:
   type: views_field

core/modules/views/js/ajax_view.js

@@ -85,25 +85,25 @@
 
     // Add the ajax to exposed forms.
     this.$exposed_form = $('form#views-exposed-form-' + settings.view_name.replace(/_/g, '-') + '-' + settings.view_display_id.replace(/_/g, '-'));
-    this.$exposed_form.once('exposed-form').each(jQuery.proxy(this.attachExposedFormAjax, this));
+    this.$exposed_form.once('exposed-form').each($.proxy(this.attachExposedFormAjax, this));
 
     // Add the ajax to pagers.
     this.$view
       // Don't attach to nested views. Doing so would attach multiple behaviors
       // to a given element.
-      .filter(jQuery.proxy(this.filterNestedViews, this))
-      .once('ajax-pager').each(jQuery.proxy(this.attachPagerAjax, this));
+      .filter($.proxy(this.filterNestedViews, this))
+      .once('ajax-pager').each($.proxy(this.attachPagerAjax, this));
 
     // Add a trigger to update this view specifically. In order to trigger a
     // refresh use the following code.
     //
     // @code
-    // jQuery('.view-name').trigger('RefreshView');
+    // $('.view-name').trigger('RefreshView');
     // @endcode
     var self_settings = $.extend({}, this.element_settings, {
       event: 'RefreshView',
       base: this.selector,
-      element: this.$view
+      element: this.$view.get(0)
     });
     this.refreshViewAjax = Drupal.ajax(self_settings);
   };
@@ -140,7 +140,7 @@
    */
   Drupal.views.ajaxView.prototype.attachPagerAjax = function () {
     this.$view.find('ul.js-pager__items > li > a, th.views-field a, .attachment .views-summary a')
-      .each(jQuery.proxy(this.attachPagerLinkAjax, this));
+      .each($.proxy(this.attachPagerLinkAjax, this));
   };
 
   /**
@@ -168,7 +168,7 @@
     var self_settings = $.extend({}, this.element_settings, {
       submit: viewData,
       base: false,
-      element: $link
+      element: link
     });
     this.pagerAjax = Drupal.ajax(self_settings);
   };

core/modules/views/src/Ajax/HighlightCommand.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Ajax\HighlightCommand.
- */
-
 namespace Drupal\views\Ajax;
 
 use Drupal\Core\Ajax\CommandInterface;

core/modules/views/src/Ajax/ReplaceTitleCommand.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Ajax\ReplaceTitleCommand.
- */
-
 namespace Drupal\views\Ajax;
 
 use Drupal\Core\Ajax\CommandInterface;

core/modules/views/src/Ajax/ScrollTopCommand.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Ajax\ScrollTopCommand.
- */
-
 namespace Drupal\views\Ajax;
 
 use Drupal\Core\Ajax\CommandInterface;

core/modules/views/src/Ajax/ShowButtonsCommand.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Ajax\ShowButtonsCommand.
- */
-
 namespace Drupal\views\Ajax;
 
 use Drupal\Core\Ajax\CommandInterface;

core/modules/views/src/Ajax/TriggerPreviewCommand.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Ajax\TriggerPreviewCommand.
- */
-
 namespace Drupal\views\Ajax;
 
 use Drupal\Core\Ajax\CommandInterface;

core/modules/views/src/Ajax/ViewAjaxResponse.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Ajax\ViewAjaxResponse.
- */
-
 namespace Drupal\views\Ajax;
 
 use Drupal\Core\Ajax\AjaxResponse;

core/modules/views/src/Analyzer.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Analyzer.
- */
-
 namespace Drupal\views;
 
 use Drupal\Core\Extension\ModuleHandlerInterface;

core/modules/views/src/Annotation/ViewsAccess.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Annotation\ViewsAccess.
- */
-
 namespace Drupal\views\Annotation;
 
 

core/modules/views/src/Annotation/ViewsArea.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Annotation\ViewsArea.
- */
-
 namespace Drupal\views\Annotation;
 
 /**

core/modules/views/src/Annotation/ViewsArgument.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Annotation\ViewsArgument.
- */
-
 namespace Drupal\views\Annotation;
 
 /**

core/modules/views/src/Annotation/ViewsArgumentDefault.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Annotation\ViewsArgumentDefault.
- */
-
 namespace Drupal\views\Annotation;
 
 /**

core/modules/views/src/Annotation/ViewsArgumentValidator.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Annotation\ViewsArgumentValidator.
- */
-
 namespace Drupal\views\Annotation;
 
 /**

core/modules/views/src/Annotation/ViewsCache.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Annotation\ViewsCache.
- */
-
 namespace Drupal\views\Annotation;
 
 /**

core/modules/views/src/Annotation/ViewsDisplay.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Annotation\ViewsDisplay.
- */
-
 namespace Drupal\views\Annotation;
 
 /**

core/modules/views/src/Annotation/ViewsDisplayExtender.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Annotation\ViewsDisplayExtender.
- */
-
 namespace Drupal\views\Annotation;
 
 /**

core/modules/views/src/Annotation/ViewsExposedForm.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Annotation\ViewsExposedForm.
- */
-
 namespace Drupal\views\Annotation;
 
 /**

core/modules/views/src/Annotation/ViewsField.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Annotation\ViewsField.
- */
-
 namespace Drupal\views\Annotation;
 
 /**

core/modules/views/src/Annotation/ViewsFilter.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Annotation\ViewsFilter.
- */
-
 namespace Drupal\views\Annotation;
 
 /**

core/modules/views/src/Annotation/ViewsHandlerAnnotationBase.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Annotation\ViewsHandlerAnnotationBase.
- */
-
 namespace Drupal\views\Annotation;
 
 use Drupal\Component\Annotation\PluginID;

core/modules/views/src/Annotation/ViewsJoin.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Annotation\ViewsJoin.
- */
-
 namespace Drupal\views\Annotation;
 
 /**

core/modules/views/src/Annotation/ViewsPager.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Annotation\ViewsPager.
- */
-
 namespace Drupal\views\Annotation;
 
 /**

core/modules/views/src/Annotation/ViewsPluginAnnotationBase.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Annotation\ViewsPluginAnnotationBase.
- */
-
 namespace Drupal\views\Annotation;
 
 use Drupal\Component\Annotation\AnnotationInterface;
@@ -15,15 +10,6 @@ use Drupal\Component\Annotation\Plugin;
  */
 abstract class ViewsPluginAnnotationBase extends Plugin implements AnnotationInterface {
 
-  /**
-   * A class to make the plugin derivative aware.
-   *
-   * @var string
-   *
-   * @see \Drupal\Component\Plugin\Discovery\DerivativeDiscoveryDecorator
-   */
-  public $derivative;
-
   /**
    * Whether or not to register a theme function automatically.
    *

core/modules/views/src/Annotation/ViewsQuery.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Annotation\ViewsQuery.
- */
-
 namespace Drupal\views\Annotation;
 
 /**

core/modules/views/src/Annotation/ViewsRelationship.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Annotation\ViewsRelationship.
- */
-
 namespace Drupal\views\Annotation;
 
 /**

core/modules/views/src/Annotation/ViewsRow.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Annotation\ViewsRow.
- */
-
 namespace Drupal\views\Annotation;
 
 /**

core/modules/views/src/Annotation/ViewsSort.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Annotation\ViewsSort.
- */
-
 namespace Drupal\views\Annotation;
 
 /**

core/modules/views/src/Annotation/ViewsStyle.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Annotation\ViewsStyle.
- */
-
 namespace Drupal\views\Annotation;
 
 /**

core/modules/views/src/Annotation/ViewsWizard.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Annotation\ViewsWizard.
- */
-
 namespace Drupal\views\Annotation;
 
 /**

core/modules/views/src/Controller/ViewAjaxController.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Controller\ViewAjaxController.
- */
-
 namespace Drupal\views\Controller;
 
 use Drupal\Component\Utility\UrlHelper;
@@ -106,7 +101,7 @@ class ViewAjaxController implements ContainerInjectionInterface {
    * Loads and renders a view via AJAX.
    *
    * @param \Symfony\Component\HttpFoundation\Request $request
-   *  The current request object.
+   *   The current request object.
    *
    * @return \Drupal\views\Ajax\ViewAjaxResponse
    *  The view response as ajax response.

core/modules/views/src/DisplayPluginCollection.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\DisplayPluginCollection.
- */
-
 namespace Drupal\views;
 
 use Drupal\Component\Plugin\Exception\PluginException;

core/modules/views/src/Element/View.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Element\View.
- */
-
 namespace Drupal\views\Element;
 
 use Drupal\Core\Render\Element\RenderElement;

core/modules/views/src/Entity/Render/ConfigurableLanguageRenderer.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Entity\Render\ConfigurableLanguageRenderer.
- */
-
 namespace Drupal\views\Entity\Render;
 
 use Drupal\Core\Entity\EntityTypeInterface;

core/modules/views/src/Entity/Render/DefaultLanguageRenderer.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Entity\Render\DefaultLanguageRenderer.
- */
-
 namespace Drupal\views\Entity\Render;
 
 use Drupal\views\ResultRow;

core/modules/views/src/Entity/Render/EntityFieldRenderer.php

@@ -1,12 +1,8 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Entity\Render\EntityFieldRenderer.
- */
-
 namespace Drupal\views\Entity\Render;
 
+use Drupal\Core\DependencyInjection\DependencySerializationTrait;
 use Drupal\Core\Entity\Entity\EntityViewDisplay;
 use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
@@ -25,6 +21,7 @@ use Drupal\views\ViewExecutable;
  */
 class EntityFieldRenderer extends RendererBase {
   use EntityTranslationRenderTrait;
+  use DependencySerializationTrait;
 
   /**
    * The relationship being handled.

core/modules/views/src/Entity/Render/EntityTranslationRenderTrait.php

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

core/modules/views/src/Entity/Render/EntityTranslationRendererBase.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Entity\Render\EntityTranslationRendererBase.
- */
-
 namespace Drupal\views\Entity\Render;
 
 use Drupal\views\Plugin\views\query\QueryPluginBase;

core/modules/views/src/Entity/Render/RendererBase.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Entity\Render\RendererBase.
- */
-
 namespace Drupal\views\Entity\Render;
 
 use Drupal\Core\Cache\Cache;

core/modules/views/src/Entity/Render/TranslationLanguageRenderer.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Entity\Render\TranslationLanguageRenderer.
- */
-
 namespace Drupal\views\Entity\Render;
 
 use Drupal\Core\Language\LanguageInterface;

core/modules/views/src/Entity/View.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Entity\View.
- */
-
 namespace Drupal\views\Entity;
 
 use Drupal\Component\Utility\NestedArray;

core/modules/views/src/EntityViewsData.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\EntityViewsData.
- */
-
 namespace Drupal\views;
 
 use Drupal\Core\Entity\ContentEntityType;
@@ -182,6 +177,16 @@ class EntityViewsData implements EntityHandlerInterface, EntityViewsDataInterfac
       );
     }
 
+    if ($this->entityType->hasViewBuilderClass()) {
+      $data[$base_table]['rendered_entity'] = [
+        'field' => [
+          'title' => $this->t('Rendered entity'),
+          'help' => $this->t('Renders an entity in a view mode.'),
+          'id' => 'rendered_entity',
+        ],
+      ];
+    }
+
     // Setup relations to the revisions/property data.
     if ($data_table) {
       $data[$base_table]['table']['join'][$data_table] = [
@@ -230,7 +235,7 @@ class EntityViewsData implements EntityHandlerInterface, EntityViewsDataInterfac
     // Load all typed data definitions of all fields. This should cover each of
     // the entity base, revision, data tables.
     $field_definitions = $this->entityManager->getBaseFieldDefinitions($this->entityType->id());
-    if ($table_mapping = $this->storage->getTableMapping()) {
+    if ($table_mapping = $this->storage->getTableMapping($field_definitions)) {
       // Fetch all fields that can appear in both the base table and the data
       // table.
       $entity_keys = $this->entityType->getKeys();

core/modules/views/src/EntityViewsDataInterface.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\EntityViewsDataInterface.
- */
-
 namespace Drupal\views;
 
 use Drupal\Core\Entity\EntityTypeInterface;

core/modules/views/src/EventSubscriber/RouteSubscriber.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\EventSubscriber\RouteSubscriber.
- */
-
 namespace Drupal\views\EventSubscriber;
 
 use Drupal\Core\Entity\EntityManagerInterface;

core/modules/views/src/EventSubscriber/ViewsEntitySchemaSubscriber.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\EventSubscriber\ViewsEntitySchemaSubscriber.
- */
-
 namespace Drupal\views\EventSubscriber;
 
 use Drupal\Core\Entity\EntityManagerInterface;

core/modules/views/src/ExposedFormCache.php

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

core/modules/views/src/FieldAPIHandlerTrait.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\FieldAPIHandlerTrait.
- */
-
 namespace Drupal\views;
 
 use Drupal\Core\Field\BaseFieldDefinition;

core/modules/views/src/Form/ViewsExposedForm.php

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

core/modules/views/src/Form/ViewsForm.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Form\ViewsForm.
- */
-
 namespace Drupal\views\Form;
 
 use Drupal\Component\Utility\UrlHelper;
@@ -65,6 +60,13 @@ class ViewsForm implements FormInterface, ContainerInjectionInterface {
    */
   protected $viewDisplayId;
 
+  /**
+   * The arguments passed to the active view.
+   *
+   * @var string[]
+   */
+  protected $viewArguments;
+
   /**
    * Constructs a ViewsForm object.
    *
@@ -78,37 +80,60 @@ class ViewsForm implements FormInterface, ContainerInjectionInterface {
    *   The ID of the view.
    * @param string $view_display_id
    *   The ID of the active view's display.
+   * @param string[] $view_args
+   *   The arguments passed to the active view.
    */
-  public function __construct(ClassResolverInterface $class_resolver, UrlGeneratorInterface $url_generator, RequestStack $requestStack, $view_id, $view_display_id) {
+  public function __construct(ClassResolverInterface $class_resolver, UrlGeneratorInterface $url_generator, RequestStack $requestStack, $view_id, $view_display_id, array $view_args) {
     $this->classResolver = $class_resolver;
     $this->urlGenerator = $url_generator;
     $this->requestStack = $requestStack;
     $this->viewId = $view_id;
     $this->viewDisplayId = $view_display_id;
+    $this->viewArguments = $view_args;
   }
 
   /**
    * {@inheritdoc}
    */
-  public static function create(ContainerInterface $container, $view_id = NULL, $view_display_id = NULL) {
+  public static function create(ContainerInterface $container, $view_id = NULL, $view_display_id = NULL, array $view_args = NULL) {
     return new static(
       $container->get('class_resolver'),
       $container->get('url_generator'),
       $container->get('request_stack'),
       $view_id,
-      $view_display_id
+      $view_display_id,
+      $view_args
     );
   }
 
+  /**
+   * Returns a string for the form's base ID.
+   *
+   * @return string
+   *   The string identifying the form's base ID.
+   */
+  public function getBaseFormId() {
+    $parts = [
+      'views_form',
+      $this->viewId,
+      $this->viewDisplayId,
+    ];
+
+    return implode('_', $parts);
+  }
+
   /**
    * {@inheritdoc}
    */
   public function getFormId() {
-    $parts = array(
-      'views_form',
-      $this->viewId,
-      $this->viewDisplayId,
-    );
+    $parts = [
+      $this->getBaseFormId(),
+    ];
+
+    if (!empty($this->viewArguments)) {
+      // Append the passed arguments to ensure form uniqueness.
+      $parts = array_merge($parts, $this->viewArguments);
+    }
 
     return implode('_', $parts);
   }
@@ -123,6 +148,9 @@ class ViewsForm implements FormInterface, ContainerInjectionInterface {
     }
     $form_state->set(['step_controller', 'views_form_views_form'], 'Drupal\views\Form\ViewsFormMainForm');
 
+    // Add the base form ID.
+    $form_state->addBuildInfo('base_form_id', $this->getBaseFormId());
+
     $form = array();
 
     $query = $this->requestStack->getCurrentRequest()->query->all();

core/modules/views/src/Form/ViewsFormMainForm.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Form\ViewsFormMainForm.
- */
-
 namespace Drupal\views\Form;
 
 use Drupal\Core\Form\FormInterface;

core/modules/views/src/ManyToOneHelper.php

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

core/modules/views/src/Plugin/Block/ViewsBlock.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Plugin\Block\ViewsBlock.
- */
-
 namespace Drupal\views\Plugin\Block;
 
 use Drupal\Component\Utility\Xss;

core/modules/views/src/Plugin/Block/ViewsBlockBase.php

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

core/modules/views/src/Plugin/Block/ViewsExposedFilterBlock.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Plugin\Block\ViewsExposedFilterBlock.
- */
-
 namespace Drupal\views\Plugin\Block;
 use Drupal\Core\Cache\Cache;
 

core/modules/views/src/Plugin/Derivative/DefaultWizardDeriver.php

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

core/modules/views/src/Plugin/Derivative/ViewsBlock.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Plugin\Derivative\ViewsBlock.
- */
-
 namespace Drupal\views\Plugin\Derivative;
 
 use Drupal\Core\Entity\EntityStorageInterface;

core/modules/views/src/Plugin/Derivative/ViewsEntityArgumentValidator.php

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

core/modules/views/src/Plugin/Derivative/ViewsEntityRow.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Plugin\Derivative\ViewsEntityRow.
- */
-
 namespace Drupal\views\Plugin\Derivative;
 
 use Drupal\Core\Entity\EntityManagerInterface;

core/modules/views/src/Plugin/Derivative/ViewsExposedFilterBlock.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Plugin\Derivative\ViewsExposedFilterBlock.
- */
-
 namespace Drupal\views\Plugin\Derivative;
 
 use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface;

core/modules/views/src/Plugin/Derivative/ViewsLocalTask.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Plugin\Derivative\ViewsLocalTask.
- */
-
 namespace Drupal\views\Plugin\Derivative;
 
 use Drupal\Core\Entity\EntityStorageInterface;

core/modules/views/src/Plugin/Derivative/ViewsMenuLink.php

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

core/modules/views/src/Plugin/EntityReferenceSelection/ViewsSelection.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Plugin\EntityReferenceSelection\ViewsSelection.
- */
-
 namespace Drupal\views\Plugin\EntityReferenceSelection;
 
 use Drupal\Core\Database\Query\SelectInterface;

core/modules/views/src/Plugin/Menu/Form/ViewsMenuLinkForm.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Plugin\Menu\Form\ViewsMenuLinkForm.
- */
-
 namespace Drupal\views\Plugin\Menu\Form;
 
 use Drupal\Core\Form\FormStateInterface;

core/modules/views/src/Plugin/Menu/ViewsMenuLink.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Plugin\Menu\ViewsMenuLink.
- */
-
 namespace Drupal\views\Plugin\Menu;
 
 use Drupal\Core\Menu\MenuLinkBase;

core/modules/views/src/Plugin/ViewsHandlerManager.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Plugin\ViewsHandlerManager.
- */
-
 namespace Drupal\views\Plugin;
 
 use Drupal\Component\Plugin\FallbackPluginManagerInterface;

core/modules/views/src/Plugin/ViewsPluginManager.php

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

core/modules/views/src/Plugin/views/BrokenHandlerTrait.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Plugin\views\BrokenHandlerTrait.
- */
-
 namespace Drupal\views\Plugin\views;
 
 use Drupal\Component\Utility\SafeMarkup;

core/modules/views/src/Plugin/views/HandlerBase.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Plugin\views\HandlerBase.
- */
-
 namespace Drupal\views\Plugin\views;
 
 use Drupal\Component\Utility\Html;
@@ -49,13 +44,6 @@ abstract class HandlerBase extends PluginBase implements ViewsHandlerInterface {
    */
   public $tableAlias;
 
-  /**
-   * When a table has been moved this property is set.
-   *
-   * @var string
-   */
-  public $actualTable;
-
   /**
    * The actual field in the database table, maybe different
    * on other kind of query plugins/special handlers.
@@ -71,13 +59,6 @@ abstract class HandlerBase extends PluginBase implements ViewsHandlerInterface {
    */
   public $field;
 
-  /**
-   * When a field has been moved this property is set.
-   *
-   * @var string
-   */
-  public $actualField;
-
   /**
    * The relationship used for this field.
    *
@@ -124,15 +105,6 @@ abstract class HandlerBase extends PluginBase implements ViewsHandlerInterface {
     // we have to do a lookup because the type is singular but the
     // option is stored as the plural.
 
-    // If the 'moved to' keyword moved our handler, let's fix that now.
-    if (isset($this->actualTable)) {
-      $options['table'] = $this->actualTable;
-    }
-
-    if (isset($this->actualField)) {
-      $options['field'] = $this->actualField;
-    }
-
     $this->unpackOptions($this->options, $options);
 
     // This exist on most handlers, but not all. So they are still optional.

core/modules/views/src/Plugin/views/PluginBase.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Plugin\views\PluginBase.
- */
-
 namespace Drupal\views\Plugin\views;
 
 use Drupal\Component\Plugin\DependentPluginInterface;
@@ -369,7 +364,7 @@ abstract class PluginBase extends ComponentPluginBase implements ContainerFactor
       if (strpos($token, '.') === FALSE) {
         // We need to validate tokens are valid Twig variables. Twig uses the
         // same variable naming rules as PHP.
-        // @see http://php.net/manual/en/language.variables.basics.php
+        // @see http://php.net/manual/language.variables.basics.php
         assert('preg_match(\'/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$/\', $token) === 1', 'Tokens need to be valid Twig variables.');
         $twig_tokens[$token] = $replacement;
       }

core/modules/views/src/Plugin/views/PluginInterface.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Plugin\views\PluginInterface.
- */
-
 namespace Drupal\views\Plugin\views;
 
 use Drupal\Component\Plugin\PluginInspectionInterface;

core/modules/views/src/Plugin/views/ViewsHandlerInterface.php

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

core/modules/views/src/Plugin/views/ViewsPluginInterface.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Plugin\views\ViewsPluginInterface.
- */
-
 namespace Drupal\views\Plugin\views;
 
 use Drupal\Component\Plugin\DerivativeInspectionInterface;

core/modules/views/src/Plugin/views/access/AccessPluginBase.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Plugin\views\access\AccessPluginBase.
- */
-
 namespace Drupal\views\Plugin\views\access;
 
 use Drupal\Core\Session\AccountInterface;

core/modules/views/src/Plugin/views/access/None.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Plugin\views\access\None.
- */
-
 namespace Drupal\views\Plugin\views\access;
 
 use Drupal\Core\Session\AccountInterface;

core/modules/views/src/Plugin/views/area/AreaPluginBase.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Plugin\views\area\AreaPluginBase.
- */
-
 namespace Drupal\views\Plugin\views\area;
 
 use Drupal\Core\Form\FormStateInterface;
@@ -98,7 +93,7 @@ abstract class AreaPluginBase extends HandlerBase {
    * Performs any operations needed before full rendering.
    *
    * @param array $results
-   *  The results of the view.
+   *   The results of the view.
    */
   public function preRender(array $results) {
   }

core/modules/views/src/Plugin/views/area/Broken.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Plugin\views\area\Broken.
- */
-
 namespace Drupal\views\Plugin\views\area;
 
 use Drupal\views\Plugin\views\BrokenHandlerTrait;

core/modules/views/src/Plugin/views/area/Entity.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Plugin\views\area\Entity.
- */
-
 namespace Drupal\views\Plugin\views\area;
 
 use Drupal\Core\Entity\EntityManagerInterface;

core/modules/views/src/Plugin/views/area/HTTPStatusCode.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Plugin\views\area\HTTPStatusCode.
- */
-
 namespace Drupal\views\Plugin\views\area;
 
 use Drupal\Core\Form\FormStateInterface;

core/modules/views/src/Plugin/views/area/Messages.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Plugin\views\area\Messages.
- */
-
 namespace Drupal\views\Plugin\views\area;
 
 /**

core/modules/views/src/Plugin/views/area/Result.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Plugin\views\area\Result.
- */
-
 namespace Drupal\views\Plugin\views\area;
 
 use Drupal\Component\Utility\Html;
@@ -104,11 +99,15 @@ class Result extends AreaPluginBase {
     }
     $current_record_count = ($end - $start) + 1;
     // Get the search information.
-    $items = array('start', 'end', 'total', 'label', 'per_page', 'current_page', 'current_record_count', 'page_count');
-    $replacements = array();
-    foreach ($items as $item) {
-      $replacements["@$item"] = ${$item};
-    }
+    $replacements = [];
+    $replacements['@start'] = $start;
+    $replacements['@end'] = $end;
+    $replacements['@total'] = $total;
+    $replacements['@label'] = $label;
+    $replacements['@per_page'] = $per_page;
+    $replacements['@current_page'] = $current_page;
+    $replacements['@current_record_count'] = $current_record_count;
+    $replacements['@page_count'] = $page_count;
     // Send the output.
     if (!empty($total)) {
       $output .= Xss::filterAdmin(str_replace(array_keys($replacements), array_values($replacements), $format));

core/modules/views/src/Plugin/views/area/Text.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Plugin\views\area\Text.
- */
-
 namespace Drupal\views\Plugin\views\area;
 
 use Drupal\Core\Form\FormStateInterface;

core/modules/views/src/Plugin/views/area/TextCustom.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Plugin\views\area\TextCustom.
- */
-
 namespace Drupal\views\Plugin\views\area;
 
 use Drupal\Core\Form\FormStateInterface;

core/modules/views/src/Plugin/views/area/Title.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Plugin\views\area\Title.
- */
-
 namespace Drupal\views\Plugin\views\area;
 
 use Drupal\Core\Form\FormStateInterface;

core/modules/views/src/Plugin/views/area/TokenizeAreaPluginBase.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Plugin\views\area\TokenizeAreaPluginBase.
- */
-
 namespace Drupal\views\Plugin\views\area;
 
 use Drupal\Core\Form\FormStateInterface;

core/modules/views/src/Plugin/views/area/View.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Plugin\views\area\View.
- */
-
 namespace Drupal\views\Plugin\views\area;
 
 use Drupal\Core\Entity\EntityStorageInterface;

core/modules/views/src/Plugin/views/argument/ArgumentPluginBase.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Plugin\views\argument\ArgumentPluginBase.
- */
-
 namespace Drupal\views\Plugin\views\argument;
 
 use Drupal\Component\Plugin\DependentPluginInterface;

core/modules/views/src/Plugin/views/argument/Broken.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Plugin\views\argument\Broken.
- */
-
 namespace Drupal\views\Plugin\views\argument;
 
 use Drupal\views\Plugin\views\BrokenHandlerTrait;

core/modules/views/src/Plugin/views/argument/Date.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Plugin\views\argument\Date.
- */
-
 namespace Drupal\views\Plugin\views\argument;
 
 use Drupal\Core\Form\FormStateInterface;

core/modules/views/src/Plugin/views/argument/DayDate.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Plugin\views\argument\DayDate.
- */
-
 namespace Drupal\views\Plugin\views\argument;
 
 /**

core/modules/views/src/Plugin/views/argument/Formula.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Plugin\views\argument\Formula.
- */
-
 namespace Drupal\views\Plugin\views\argument;
 
 use Drupal\views\Plugin\views\display\DisplayPluginBase;

core/modules/views/src/Plugin/views/argument/FullDate.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Plugin\views\argument\FullDate.
- */
-
 namespace Drupal\views\Plugin\views\argument;
 
 /**

core/modules/views/src/Plugin/views/argument/GroupByNumeric.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Plugin\views\argument\GroupByNumeric.
- */
-
 namespace Drupal\views\Plugin\views\argument;
 
 /**

core/modules/views/src/Plugin/views/argument/LanguageArgument.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Plugin\views\argument\LanguageArgument.
- */
-
 namespace Drupal\views\Plugin\views\argument;
 
 /**

core/modules/views/src/Plugin/views/argument/ManyToOne.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Plugin\views\argument\ManyToOne.
- */
-
 namespace Drupal\views\Plugin\views\argument;
 
 use Drupal\Core\Form\FormStateInterface;

core/modules/views/src/Plugin/views/argument/MonthDate.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Plugin\views\argument\MonthDate.
- */
-
 namespace Drupal\views\Plugin\views\argument;
 
 /**

core/modules/views/src/Plugin/views/argument/NullArgument.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Plugin\views\argument\NullArgument.
- */
-
 namespace Drupal\views\Plugin\views\argument;
 
 use Drupal\Core\Form\FormStateInterface;

core/modules/views/src/Plugin/views/argument/NumericArgument.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Plugin\views\argument\NumericArgument.
- */
-
 namespace Drupal\views\Plugin\views\argument;
 
 use Drupal\Core\Form\FormStateInterface;

core/modules/views/src/Plugin/views/argument/Standard.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Plugin\views\argument\Standard.
- */
-
 namespace Drupal\views\Plugin\views\argument;
 
 /**

core/modules/views/src/Plugin/views/argument/StringArgument.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Plugin\views\argument\StringArgument.
- */
-
 namespace Drupal\views\Plugin\views\argument;
 
 use Drupal\Component\Utility\Unicode;
@@ -99,7 +94,7 @@ class StringArgument extends ArgumentPluginBase {
     $form['path_case'] = array(
       '#type' => 'select',
       '#title' => $this->t('Case in path'),
-      '#description' => $this->t('When printing url paths, how to transform the case of the filter value. Do not use this unless with Postgres as it uses case sensitive comparisons.'),
+      '#description' => $this->t('When printing URL paths, how to transform the case of the filter value. Do not use this unless with Postgres as it uses case sensitive comparisons.'),
       '#options' => array(
         'none' => $this->t('No transform'),
         'upper' => $this->t('Upper case'),

core/modules/views/src/Plugin/views/argument/WeekDate.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\views\Plugin\views\argument\WeekDate.
- */
-
 namespace Drupal\views\Plugin\views\argument;
 
 /**