Issue #3296796: Drupal 10 compatibility

cloudflare.info.yml

 name: CloudFlare
 type: module
 description: CloudFlare CDN integration.
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^8 || ^9 || ^10
 package: Web services
 configure: cloudflare.admin_settings_form
 

modules/cloudflarepurger/cloudflarepurger.info.yml

 name: CloudFlare Purger
 type: module
 description: CloudFlare CDN integration.
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^8 || ^9 || ^10
 package: Purge - reverse proxies & CDNs
 configure: cloudflare.admin_settings_form
 dependencies:

modules/cloudflarepurger/src/EventSubscriber/CloudFlareCacheTagHeaderGenerator.php

@@ -2,8 +2,8 @@
 
 namespace Drupal\cloudflarepurger\EventSubscriber;
 
+use Symfony\Component\HttpKernel\Event\ResponseEvent;
 use Drupal\Core\Cache\CacheableResponseInterface;
-use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
@@ -33,10 +33,10 @@ class CloudFlareCacheTagHeaderGenerator implements EventSubscriberInterface {
   /**
    * Generates a 'Cache-Tag' header in the format expected by CloudFlare.
    *
-   * @param \Symfony\Component\HttpKernel\Event\FilterResponseEvent $event
+   * @param \Symfony\Component\HttpKernel\Event\ResponseEvent $event
    *   The event to process.
    */
-  public function onResponse(FilterResponseEvent $event) {
+  public function onResponse(ResponseEvent $event) {
     if (!$event->isMasterRequest()) {
       return;
     }

modules/cloudflarepurger/src/Plugin/Purge/Purger/CloudFlarePurger.php

@@ -14,7 +14,6 @@ use Drupal\purge\Plugin\Purge\Purger\PurgerBase;
 use Drupal\purge\Plugin\Purge\Purger\PurgerInterface;
 use Drupal\purge\Plugin\Purge\Invalidation\InvalidationInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Psr\Log\LoggerInterface;
 
 /**
  * CloudFlare purger.
@@ -39,13 +38,6 @@ class CloudFlarePurger extends PurgerBase implements PurgerInterface {
    */
   protected $config;
 
-  /**
-   * A logger instance.
-   *
-   * @var \Psr\Log\LoggerInterface
-   */
-  protected $logger;
-
   /**
    * Tracks rate limits associated with CloudFlare Api.
    *
@@ -77,7 +69,6 @@ class CloudFlarePurger extends PurgerBase implements PurgerInterface {
       $plugin_definition,
       $container->get('config.factory'),
       $container->get('cloudflare.state'),
-      $container->get('logger.factory')->get('cloudflare'),
       $container->get('cloudflare.composer_dependency_check')
     );
   }
@@ -95,20 +86,17 @@ class CloudFlarePurger extends PurgerBase implements PurgerInterface {
    *   The factory for configuration objects.
    * @param \Drupal\cloudflare\CloudFlareStateInterface $state
    *   Tracks limits associated with CloudFlare Api.
-   * @param \Psr\Log\LoggerInterface $logger
-   *   A logger instance.
    * @param \Drupal\cloudflare\CloudFlareComposerDependenciesCheckInterface $checker
    *   Tests that composer dependencies are met.
    *
    * @throws \LogicException
    *   Thrown if $configuration['id'] is missing, see Purger\Service::createId.
    */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, ConfigFactoryInterface $config_factory, CloudFlareStateInterface $state, LoggerInterface $logger, CloudFlareComposerDependenciesCheckInterface $checker) {
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, ConfigFactoryInterface $config_factory, CloudFlareStateInterface $state, CloudFlareComposerDependenciesCheckInterface $checker) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
 
     $this->config = $config_factory->get('cloudflare.settings');
     $this->state = $state;
-    $this->logger = $logger;
     $this->areCloudflareComposerDepenciesMet = $checker->check();
   }
 

modules/cloudflarepurger/tests/src/Unit/CredentialTestCheckTest.php

@@ -26,9 +26,7 @@ class CredentialTestCheckTest extends DiagnosticCheckTestBase {
    */
   public function testCredentialTestCheck($cred_status, $expected_severity) {
     $config_factory = $this->createMock('\Drupal\Core\Config\ConfigFactoryInterface');
-    $config = $this->getMockBuilder('Drupal\Core\Config\Config')
-      ->disableOriginalConstructor()
-      ->getMock();
+    $config = $this->createMock('Drupal\Core\Config\Config');
     $config->expects($this->atLeastOnce())
       ->method('get')
       ->with('valid_credentials')

src/Form/ZoneSelectionForm.php

@@ -161,8 +161,8 @@ class ZoneSelectionForm extends FormBase implements ContainerInjectionInterface
           Url::fromUri('https://www.cloudflare.com/a/setup')
         );
         $section['zone_selection_fieldset']['zone_selection'] = [
-          '#markup' => $this->t('<p>Your CloudFlare account does not have any zones configured. Verify your API details or !add_site_link via the console.</p>', [
-            '!add_site_link' => $add_site_link->toString(),
+          '#markup' => $this->t('<p>Your CloudFlare account does not have any zones configured. Verify your API details or @add_site_link via the console.</p>', [
+            '@add_site_link' => $add_site_link->toString(),
           ]),
         ];
         return $section;

tests/modules/cloudflare_form_tester/cloudflare_form_tester.info.yml

 name: CloudFlare Form Tester
 type: module
 description: Adds replacement services used for testing CloudFlare forms
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^8 || ^9 || ^10
 package: Web services
 
 dependencies: