From 456ba0a5c6418a3bd987a45bdbbfa0e68142d48c Mon Sep 17 00:00:00 2001 From: Ted Cooper <elc@784944.no-reply.drupal.org> Date: Wed, 16 Apr 2025 11:11:58 +1000 Subject: [PATCH 1/5] Increase core version requirement to 10.3 and 11. --- views_advanced_cache.info.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views_advanced_cache.info.yml b/views_advanced_cache.info.yml index b46bf27..04da345 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: ^8.7.7 || ^9 || ^10 +core_version_requirement: ^10.3 || ^11 dependencies: - drupal:views -- GitLab From 39b47ccbab08f20505c38a6298ae15e4d415464f Mon Sep 17 00:00:00 2001 From: Ted Cooper <elc@784944.no-reply.drupal.org> Date: Wed, 16 Apr 2025 11:12:21 +1000 Subject: [PATCH 2/5] Convert view plugin to attributes. --- src/Plugin/views/cache/AdvancedViewsCache.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/Plugin/views/cache/AdvancedViewsCache.php b/src/Plugin/views/cache/AdvancedViewsCache.php index ebefbc6..e1e4495 100644 --- a/src/Plugin/views/cache/AdvancedViewsCache.php +++ b/src/Plugin/views/cache/AdvancedViewsCache.php @@ -24,13 +24,12 @@ 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 { /** -- GitLab From c5f53cf566b3974244ed9fb37ebe035d4f832dfc Mon Sep 17 00:00:00 2001 From: Ted Cooper <elc@784944.no-reply.drupal.org> Date: Mon, 28 Apr 2025 13:42:04 +1000 Subject: [PATCH 3/5] Update GitlabCI to current version. --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b84b607..17206e9 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: 0 + OPT_IN_TEST_CURRENT: 1 # 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: 0 + OPT_IN_TEST_NEXT_MINOR: 1 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: 0 + OPT_IN_TEST_MAX_PHP: 1 # Check compatibility with next major Drupal release. RUN_JOB_UPGRADE_STATUS: 0 -- GitLab From 914ae2211aaf9daeac92708ae4f6e9cb917b851e Mon Sep 17 00:00:00 2001 From: Ted Cooper <elc@784944.no-reply.drupal.org> Date: Mon, 28 Apr 2025 13:58:01 +1000 Subject: [PATCH 4/5] Add missing uses. --- src/Plugin/views/cache/AdvancedViewsCache.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Plugin/views/cache/AdvancedViewsCache.php b/src/Plugin/views/cache/AdvancedViewsCache.php index e1e4495..4e18c7f 100644 --- a/src/Plugin/views/cache/AdvancedViewsCache.php +++ b/src/Plugin/views/cache/AdvancedViewsCache.php @@ -9,8 +9,10 @@ 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; -- GitLab From 3c3fb23475ce04853e6bfd7755ba1d257aa16c1a Mon Sep 17 00:00:00 2001 From: Ted Cooper <elc@784944.no-reply.drupal.org> Date: Mon, 28 Apr 2025 14:04:47 +1000 Subject: [PATCH 5/5] Remove deprecated default_argument_skip_url from test view. --- .../config/install/views.view.views_advanced_cache_test.yml | 1 - 1 file changed, 1 deletion(-) 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 b1adea3..050b70a 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,7 +235,6 @@ display: default_argument_type: fixed default_argument_options: argument: '' - default_argument_skip_url: false summary_options: base_path: '' count: true -- GitLab