From 70132327f3e7d20da7eded9b3a8ca41feebc7769 Mon Sep 17 00:00:00 2001
From: Ted Cooper <12728-elc@users.noreply.drupalcode.org>
Date: Thu, 1 May 2025 04:04:54 +0000
Subject: [PATCH] Revert "[#3519377] Drupal 11 compatibility fixes."
This reverts merge request !3
---
.gitlab-ci.yml | 6 +++---
src/Plugin/views/cache/AdvancedViewsCache.php | 13 ++++++-------
.../views.view.views_advanced_cache_test.yml | 1 +
views_advanced_cache.info.yml | 2 +-
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 17206e9..b84b607 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,16 +30,16 @@ variables:
# _CURL_TEMPLATES_REF: 'main'
# Set to 0 to opt out testing against the current Drupal core version.
- OPT_IN_TEST_CURRENT: 1
+ OPT_IN_TEST_CURRENT: 0
# Set to '1' to opt in testing against various additional Drupal core versions relative to the current stable version of Drupal.
OPT_IN_TEST_PREVIOUS_MINOR: 0
- OPT_IN_TEST_NEXT_MINOR: 1
+ OPT_IN_TEST_NEXT_MINOR: 0
OPT_IN_TEST_PREVIOUS_MAJOR: 1
OPT_IN_TEST_NEXT_MAJOR: 0
# Set to 1 to opt in testing against the maximum/latest supported version of PHP for the current stable version of Drupal.
- OPT_IN_TEST_MAX_PHP: 1
+ OPT_IN_TEST_MAX_PHP: 0
# Check compatibility with next major Drupal release.
RUN_JOB_UPGRADE_STATUS: 0
diff --git a/src/Plugin/views/cache/AdvancedViewsCache.php b/src/Plugin/views/cache/AdvancedViewsCache.php
index 4e18c7f..ebefbc6 100644
--- a/src/Plugin/views/cache/AdvancedViewsCache.php
+++ b/src/Plugin/views/cache/AdvancedViewsCache.php
@@ -9,10 +9,8 @@ use Drupal\Core\Cache\CacheableMetadata;
use Drupal\Core\Datetime\DateFormatterInterface;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Link;
-use Drupal\Core\StringTranslation\TranslatableMarkup;
use Drupal\Core\Url;
use Drupal\Core\Utility\Token;
-use Drupal\views\Attribute\ViewsCache;
use Drupal\views\Plugin\views\cache\CachePluginBase;
use Drupal\views\ResultRow;
use Drupal\views\Views;
@@ -26,12 +24,13 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
* lifetime (which is used to calculate max-age).
*
* @ingroup views_cache_plugins
+ *
+ * @ViewsCache(
+ * id = "advanced_views_cache",
+ * title = @Translation("Advanced Caching"),
+ * help = @Translation("Caching based on tags, context, and max-age. Caches will persist until any related cache tags are invalidated or the max-age is reached.")
+ * )
*/
-#[ViewsCache(
- id: 'advanced_views_cache',
- title: new TranslatableMarkup('Advanced Caching'),
- help: new TranslatableMarkup('Caching based on tags, context, and max-age. Caches will persist until any related cache tags are invalidated or the max-age is reached.'),
-)]
class AdvancedViewsCache extends CachePluginBase {
/**
diff --git a/tests/modules/views_advanced_cache_test/config/install/views.view.views_advanced_cache_test.yml b/tests/modules/views_advanced_cache_test/config/install/views.view.views_advanced_cache_test.yml
index 050b70a..b1adea3 100644
--- a/tests/modules/views_advanced_cache_test/config/install/views.view.views_advanced_cache_test.yml
+++ b/tests/modules/views_advanced_cache_test/config/install/views.view.views_advanced_cache_test.yml
@@ -235,6 +235,7 @@ display:
default_argument_type: fixed
default_argument_options:
argument: ''
+ default_argument_skip_url: false
summary_options:
base_path: ''
count: true
diff --git a/views_advanced_cache.info.yml b/views_advanced_cache.info.yml
index 04da345..b46bf27 100644
--- a/views_advanced_cache.info.yml
+++ b/views_advanced_cache.info.yml
@@ -1,6 +1,6 @@
name: Views Advanced Cache
type: module
description: Contains an advanced views cache plugin that exposes cache tag, cache context, and output / results caching configuration.
-core_version_requirement: ^10.3 || ^11
+core_version_requirement: ^8.7.7 || ^9 || ^10
dependencies:
- drupal:views
--
GitLab