Security update for Core, with self-updated composer

[yaffs-website] / web / core / modules / system / src / Form / PerformanceForm.php

diff --git a/web/core/modules/system/src/Form/PerformanceForm.php b/web/core/modules/system/src/Form/PerformanceForm.php
index a2e85927d52084a051ac131e0b16f10e0389e3ed..33f99dbce6be710354540d0e0f32c722c7f80130 100644 (file)
--- a/web/core/modules/system/src/Form/PerformanceForm.php
+++ b/web/core/modules/system/src/Form/PerformanceForm.php
@@ -5,7 +5,6 @@ namespace Drupal\system\Form;
 use Drupal\Core\Asset\AssetCollectionOptimizerInterface;
 use Drupal\Core\Form\ConfigFormBase;
 use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\Core\Datetime\DateFormatterInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -15,13 +14,6 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
  */
 class PerformanceForm extends ConfigFormBase {
 
-  /**
-   * The render cache bin.
-   *
-   * @var \Drupal\Core\Cache\CacheBackendInterface
-   */
-  protected $renderCache;
-
   /**
    * The date formatter service.
    *
@@ -48,7 +40,6 @@ class PerformanceForm extends ConfigFormBase {
    *
    * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
    *   The factory for configuration objects.
-   * @param \Drupal\Core\Cache\CacheBackendInterface $render_cache
    * @param \Drupal\Core\Datetime\DateFormatterInterface $date_formatter
    *   The date formatter service.
    * @param \Drupal\Core\Asset\AssetCollectionOptimizerInterface $css_collection_optimizer
@@ -56,10 +47,9 @@ class PerformanceForm extends ConfigFormBase {
    * @param \Drupal\Core\Asset\AssetCollectionOptimizerInterface $js_collection_optimizer
    *   The JavaScript asset collection optimizer service.
    */
-  public function __construct(ConfigFactoryInterface $config_factory, CacheBackendInterface $render_cache, DateFormatterInterface $date_formatter, AssetCollectionOptimizerInterface $css_collection_optimizer, AssetCollectionOptimizerInterface $js_collection_optimizer) {
+  public function __construct(ConfigFactoryInterface $config_factory, DateFormatterInterface $date_formatter, AssetCollectionOptimizerInterface $css_collection_optimizer, AssetCollectionOptimizerInterface $js_collection_optimizer) {
     parent::__construct($config_factory);
 
-    $this->renderCache = $render_cache;
     $this->dateFormatter = $date_formatter;
     $this->cssCollectionOptimizer = $css_collection_optimizer;
     $this->jsCollectionOptimizer = $js_collection_optimizer;
@@ -71,7 +61,6 @@ class PerformanceForm extends ConfigFormBase {
   public static function create(ContainerInterface $container) {
     return new static(
       $container->get('config.factory'),
-      $container->get('cache.render'),
       $container->get('date.formatter'),
       $container->get('asset.css.collection_optimizer'),
       $container->get('asset.js.collection_optimizer')
@@ -168,10 +157,6 @@ class PerformanceForm extends ConfigFormBase {
   public function submitForm(array &$form, FormStateInterface $form_state) {
     $this->cssCollectionOptimizer->deleteAll();
     $this->jsCollectionOptimizer->deleteAll();
-    // This form allows page compression settings to be changed, which can
-    // invalidate cached pages in the render cache, so it needs to be cleared on
-    // form submit.
-    $this->renderCache->deleteAll();
 
     $this->config('system.performance')
       ->set('cache.page.max_age', $form_state->getValue('page_cache_maximum_age'))