Commit cc2b867b authored by Pavel Ruban's avatar Pavel Ruban
Browse files

Return back dependency injections & implement plugin factory interface so...

Return back dependency injections & implement plugin factory interface so plugin instance can be created by factory in a generic way without any issues.
parent f96e0216
Loading
Loading
Loading
Loading
+46 −2
Original line number Diff line number Diff line
@@ -4,6 +4,9 @@ namespace Drupal\cookie_condition\Plugin\Condition;

use Drupal\Core\Condition\ConditionPluginBase;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpFoundation\RequestStack;

/**
 * Pass checks if cookie is present & it's value equal to defined value.
@@ -14,7 +17,46 @@ use Drupal\Core\Form\FormStateInterface;
 *   description = @Translation("Allows to select cookie & it's value.")
 * )
 */
class Cookie extends ConditionPluginBase {
class Cookie extends ConditionPluginBase implements ContainerFactoryPluginInterface {

  /**
   * The request stack.
   *
   * @var \Symfony\Component\HttpFoundation\RequestStack
   */
  protected $requestStack;

  /**
   * Creates a new Cookie instance.
   *
   * @param \Symfony\Component\HttpFoundation\RequestStack $request_stack
   *   The request stack.
   * @param array $configuration
   *   The plugin configuration, i.e. an array with configuration values keyed
   *   by configuration option name. The special key 'context' may be used to
   *   initialize the defined contexts by setting it to an array of context
   *   values keyed by context names.
   * @param string $plugin_id
   *   The plugin_id for the plugin instance.
   * @param mixed $plugin_definition
   *   The plugin implementation definition.
   */
  public function __construct(RequestStack $request_stack, array $configuration, $plugin_id, $plugin_definition) {
    parent::__construct($configuration, $plugin_id, $plugin_definition);
    $this->requestStack = $request_stack;
  }

  /**
   * {@inheritdoc}
   */
  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
    return new static(
      $container->get('request_stack'),
      $configuration,
      $plugin_id,
      $plugin_definition
    );
  }

  /**
   * {@inheritdoc}
@@ -71,7 +113,9 @@ class Cookie extends ConditionPluginBase {
    $cookie_name = $this->configuration['cookie_name'];
    $cookie_value = $this->configuration['cookie_value'];

    return \Drupal::request()->cookies->get($cookie_name) === $cookie_value;
    $cookies = $this->requestStack->getCurrentRequest()->cookies;

    return $cookies->get($cookie_name) === $cookie_value;
  }

  /**