core/modules/system/src/Form/PerformanceForm.php | 36 +----------------------- 1 file changed, 1 insertion(+), 35 deletions(-) diff --git a/core/modules/system/src/Form/PerformanceForm.php b/core/modules/system/src/Form/PerformanceForm.php index e293bdc..bec7d4c 100644 --- a/core/modules/system/src/Form/PerformanceForm.php +++ b/core/modules/system/src/Form/PerformanceForm.php @@ -16,20 +16,6 @@ class PerformanceForm extends ConfigFormBase { /** - * The render cache bin. - * - * @var \Drupal\Core\Cache\CacheBackendInterface - */ - protected $renderCache; - - /** - * The internal page cache bin. - * - * @var \Drupal\Core\Cache\CacheBackendInterface|null - */ - protected $internalPageCache; - - /** * The date formatter service. * * @var \Drupal\Core\Datetime\DateFormatterInterface @@ -55,27 +41,16 @@ 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 * The CSS asset collection optimizer service. * @param \Drupal\Core\Asset\AssetCollectionOptimizerInterface $js_collection_optimizer * The JavaScript asset collection optimizer service. - * @param \Drupal\Core\Cache\CacheBackendInterface $internal_page_cache */ - public function __construct( - ConfigFactoryInterface $config_factory, - CacheBackendInterface $render_cache, - DateFormatterInterface $date_formatter, - AssetCollectionOptimizerInterface $css_collection_optimizer, - AssetCollectionOptimizerInterface $js_collection_optimizer, - CacheBackendInterface $internal_page_cache = NULL - ) { + 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->internalPageCache = $internal_page_cache; $this->dateFormatter = $date_formatter; $this->cssCollectionOptimizer = $css_collection_optimizer; $this->jsCollectionOptimizer = $js_collection_optimizer; @@ -87,11 +62,9 @@ public function __construct( 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'), - $container->get('cache.page', FALSE) ); } @@ -185,13 +158,6 @@ public function buildForm(array $form, FormStateInterface $form_state) { 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(); - if ($this->internalPageCache instanceof CacheBackendInterface) { - $this->internalPageCache->deleteAll(); - } $this->config('system.performance') ->set('cache.page.max_age', $form_state->getValue('page_cache_maximum_age'))