[FEATURE] Catchup with final 8.0.0 version

Author: Mateu Aguiló Bosch

lib/Drupal/Component/Annotation/Reflection/MockFileFinder.php

@@ -26,7 +26,7 @@ class MockFileFinder implements ClassFinderInterface {
   protected $filename;
 
   /**
-   * Implements Doctrine\Common\Reflection\ClassFinderInterface::findFile().
+   * {@inheritdoc}
    */
   public function findFile($class) {
     return $this->filename;

lib/Drupal/Component/FileCache/FileCache.php

@@ -153,4 +153,13 @@ public function delete($filepath) {
     }
   }
 
+  /**
+   * Resets the static cache.
+   *
+   * @todo Replace this once https://www.drupal.org/node/2260187 is in.
+   */
+  public static function reset() {
+    static::$cached = [];
+  }
+
 }

lib/Drupal/Component/Plugin/Context/Context.php

@@ -31,24 +31,20 @@ class Context implements ContextInterface {
   protected $contextDefinition;
 
   /**
-   * Sets the contextDefinition for us without needing to call the setter.
+   * Create a context object.
    *
    * @param \Drupal\Component\Plugin\Context\ContextDefinitionInterface $context_definition
    *   The context definition.
+   * @param mixed|null $context_value
+   *   The value of the context.
    */
-  public function __construct(ContextDefinitionInterface $context_definition) {
+  public function __construct(ContextDefinitionInterface $context_definition, $context_value = NULL) {
     $this->contextDefinition = $context_definition;
+    $this->contextValue = $context_value;
   }
 
   /**
-   * Implements \Drupal\Component\Plugin\Context\ContextInterface::setContextValue().
-   */
-  public function setContextValue($value) {
-    $this->contextValue = $value;
-  }
-
-  /**
-   * Implements \Drupal\Component\Plugin\Context\ContextInterface::getContextValue().
+   * {@inheritdoc}
    */
   public function getContextValue() {
     // Support optional contexts.
@@ -77,19 +73,12 @@ public function hasContextValue() {
   /**
    * {@inheritdoc}
    */
-  public function setContextDefinition(ContextDefinitionInterface $context_definition) {
-    $this->contextDefinition = $context_definition;
-  }
-
-  /**
-   * Implements \Drupal\Component\Plugin\Context\ContextInterface::getContextDefinition().
-   */
   public function getContextDefinition() {
     return $this->contextDefinition;
   }
 
   /**
-   * Implements \Drupal\Component\Plugin\Context\ContextInterface::getConstraints().
+   * {@inheritdoc}
    */
   public function getConstraints() {
     if (empty($this->contextDefinition['class'])) {
@@ -99,7 +88,7 @@ public function getConstraints() {
   }
 
   /**
-   * Implements \Drupal\Component\Plugin\Context\ContextInterface::validate().
+   * {@inheritdoc}
    */
   public function validate() {
     $validator = Validation::createValidatorBuilder()

lib/Drupal/Component/Plugin/Context/ContextInterface.php

@@ -12,16 +12,6 @@
  */
 interface ContextInterface {
 
-  /**
-   * Sets the context value.
-   *
-   * @param mixed $value
-   *   The value of this context, matching the context definition.
-   *
-   * @see \Drupal\Component\Plugin\Context\ContextInterface::setContextDefinition().
-   */
-  public function setContextValue($value);
-
   /**
    * Gets the context value.
    *
@@ -38,15 +28,6 @@ public function getContextValue();
    */
   public function hasContextValue();
 
-  /**
-   * Sets the definition that the context must conform to.
-   *
-   * @param \Drupal\Component\Plugin\Context\ContextDefinitionInterface $context_definition
-   *   A defining characteristic representation of the context against which
-   *   that context can be validated.
-   */
-  public function setContextDefinition(ContextDefinitionInterface $context_definition);
-
   /**
    * Gets the provided definition that the context must conform to.
    *

lib/Drupal/Component/Plugin/ContextAwarePluginBase.php

@@ -41,17 +41,30 @@ abstract class ContextAwarePluginBase extends PluginBase implements ContextAware
    *   The plugin implementation definition.
    */
   public function __construct(array $configuration, $plugin_id, $plugin_definition) {
-    $context = array();
-    if (isset($configuration['context'])) {
-      $context = $configuration['context'];
-      unset($configuration['context']);
-    }
+    $context_configuration = isset($configuration['context']) ? $configuration['context'] : [];
+    unset($configuration['context']);
+
     parent::__construct($configuration, $plugin_id, $plugin_definition);
-    foreach ($context as $key => $value) {
+
+    $this->contexts = $this->createContextFromConfiguration($context_configuration);
+  }
+
+  /**
+   * Creates context objects from any context mappings in configuration.
+   *
+   * @param array $context_configuration
+   *   An associative array of context names and values.
+   *
+   * @return \Drupal\Component\Plugin\Context\ContextInterface[]
+   *   An array of context objects.
+   */
+  protected function createContextFromConfiguration(array $context_configuration) {
+    $contexts = [];
+    foreach ($context_configuration as $key => $value) {
       $context_definition = $this->getContextDefinition($key);
-      $this->context[$key] = new Context($context_definition);
-      $this->context[$key]->setContextValue($value);
+      $contexts[$key] = new Context($context_definition, $value);
     }
+    return $contexts;
   }
 
   /**
@@ -124,7 +137,7 @@ public function getContextValue($name) {
    * {@inheritdoc}
    */
   public function setContextValue($name, $value) {
-    $this->getContext($name)->setContextValue($value);
+    $this->context[$name] = new Context($this->getContextDefinition($name), $value);
     return $this;
   }
 

lib/Drupal/Component/Plugin/ContextAwarePluginInterface.php

@@ -33,22 +33,22 @@ public function getContextDefinitions();
    * @param string $name
    *   The name of the context in the plugin definition.
    *
-   * @throws \Drupal\Component\Plugin\Exception\PluginException
-   *   If the requested context is not defined.
-   *
    * @return \Drupal\Component\Plugin\Context\ContextDefinitionInterface.
    *   The definition against which the context value must validate.
+   *
+   * @throws \Drupal\Component\Plugin\Exception\PluginException
+   *   If the requested context is not defined.
    */
   public function getContextDefinition($name);
 
   /**
    * Gets the defined contexts.
    *
-   * @throws \Drupal\Component\Plugin\Exception\PluginException
-   *   If contexts are defined but not set.
-   *
    * @return array
    *   The set context objects.
+   *
+   * @throws \Drupal\Component\Plugin\Exception\PluginException
+   *   If contexts are defined but not set.
    */
   public function getContexts();
 
@@ -58,11 +58,11 @@ public function getContexts();
    * @param string $name
    *   The name of the context in the plugin definition.
    *
-   * @throws \Drupal\Component\Plugin\Exception\PluginException
-   *   If the requested context is not set.
-   *
    * @return \Drupal\Component\Plugin\Context\ContextInterface
    *   The context object.
+   *
+   * @throws \Drupal\Component\Plugin\Exception\PluginException
+   *   If the requested context is not set.
    */
   public function getContext($name);
 
@@ -81,11 +81,11 @@ public function getContextValues();
    * @param string $name
    *   The name of the context in the plugin configuration.
    *
-   * @throws \Drupal\Component\Plugin\Exception\PluginException
-   *   If the requested context is not set.
-   *
    * @return mixed
    *   The currently set context value.
+   *
+   * @throws \Drupal\Component\Plugin\Exception\PluginException
+   *   If the requested context is not set.
    */
   public function getContextValue($name);
 
@@ -108,11 +108,11 @@ public function setContext($name, ContextInterface $context);
    *   The value to set the context to. The value has to validate against the
    *   provided context definition.
    *
-   * @throws \Drupal\Component\Plugin\Exception\PluginException
-   *   If the value does not pass validation.
-   *
    * @return \Drupal\Component\Plugin\ContextAwarePluginInterface.
    *   A context aware plugin object for chaining.
+   *
+   * @throws \Drupal\Component\Plugin\Exception\PluginException
+   *   If the value does not pass validation.
    */
   public function setContextValue($name, $value);
 

lib/Drupal/Component/Plugin/Definition/PluginDefinitionInterface.php

@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Component\Plugin\Definition\PluginDefinitionInterface.
+ */
+
+namespace Drupal\Component\Plugin\Definition;
+
+/**
+ * Defines a plugin definition.
+ *
+ * Object-based plugin definitions MUST implement this interface.
+ *
+ * @ingroup Plugin
+ */
+interface PluginDefinitionInterface {
+
+  /**
+   * Sets the class.
+   *
+   * @param string $class
+   *   A fully qualified class name.
+   *
+   * @return static
+   *
+   * @throws \InvalidArgumentException
+   *   If the class is invalid.
+   */
+  public function setClass($class);
+
+  /**
+   * Gets the class.
+   *
+   * @return string
+   *   A fully qualified class name.
+   */
+  public function getClass();
+
+}

lib/Drupal/Component/Plugin/Discovery/StaticDiscovery.php

@@ -16,7 +16,7 @@ class StaticDiscovery implements DiscoveryInterface {
   use DiscoveryCachedTrait;
 
   /**
-   * Implements Drupal\Component\Plugin\Discovery\DiscoveryInterface::getDefinitions().
+   * {@inheritdoc}
    */
   public function getDefinitions() {
     if (!$this->definitions) {

lib/Drupal/Component/Plugin/Discovery/StaticDiscoveryDecorator.php

@@ -52,7 +52,7 @@ public function getDefinition($base_plugin_id, $exception_on_invalid = TRUE) {
   }
 
   /**
-   * Implements Drupal\Component\Plugin\Discovery\DiscoveryInterface::getDefinitions().
+   * {@inheritdoc}
    */
   public function getDefinitions() {
     if (isset($this->registerDefinitions)) {

lib/Drupal/Component/Plugin/Exception/InvalidDecoratedMethod.php

@@ -6,7 +6,6 @@
 
 namespace Drupal\Component\Plugin\Exception;
 
-use Drupal\Component\Plugin\Exception\ExceptionInterface;
 use \BadMethodCallException;
 
 /**