Add autoconfigure to services yml.

.github/workflows/ci.yml

@@ -1,26 +1,27 @@
+# To add new Drupal versions, update quant-ci-images repo.
 name: Test and code coverage
 on:
   - push
 jobs:
   lint:
     runs-on: ubuntu-latest
-    container: quantcdn/drupal-ci:9.4.x-dev
+    container: quantcdn/drupal-ci:11.0.x-dev
     steps:
       - uses: actions/checkout@v2
       - name: Lint
         run: phpcs --standard=Drupal --extensions=php,module,inc,install,test,profile,theme,css,info,txt,yml .
 
   phpunit:
     runs-on: ubuntu-latest
-    container: quantcdn/drupal-ci:9.4.x-dev
+    container: quantcdn/drupal-ci:11.0.x-dev
 
     services:
       mariadb:
         image: mariadb:10.11
         ports:
           - 3306:3306
         env:
-          MYSQL_DATABASE: drupal9
+          MYSQL_DATABASE: drupal
           MYSQL_ROOT_PASSWORD: drupal
           MYSQL_USER: drupal
           MYSQL_PASSWORD: drupal
@@ -32,7 +33,7 @@ jobs:
 
     steps:
       - name: Install Drupal
-        run: drush si --db-url=mysql://root:drupal@mariadb:3306/drupal9 -y
+        run: drush si --db-url=mysql://root:drupal@mariadb:3306/drupal -y
         working-directory: /var/www/drupal
 
       - name: Install module dependencies

modules/quant_api/quant_api.info.yml

@@ -3,7 +3,7 @@ description: Connect to the hosted Quant service
 package: Quant
 
 type: module
-core_version_requirement: ^9.3 || ^10
+core_version_requirement: ^11
 configure: quant_api.settings_form
 dependencies:
   - drupal:quant

modules/quant_api/src/Client/QuantClient.php

@@ -270,7 +270,7 @@ public function sendRedirect(array $data) : array {
   /**
    * {@inheritdoc}
    */
-  public function sendFile(string $file, string $url, int $rid = NULL) : array {
+  public function sendFile(string $file, string $url, ?int $rid = NULL) : array {
 
     // Ensure the file is accessible before attempting to send to the API.
     if (!file_exists($file) || !is_readable($file) || !is_file($file)) {

modules/quant_api/src/Client/QuantClientInterface.php

@@ -65,7 +65,7 @@ public function send(array $data) : array;
    * @throws \Drupal\quant_api\Exception\InvalidPayload
    * @throws \Drupal\quant_api\Exception\InvalidResposne
    */
-  public function sendFile(string $file, string $url, int $rid = NULL) : array;
+  public function sendFile(string $file, string $url, ?int $rid = NULL) : array;
 
   /**
    * Send a redirect to the API.

modules/quant_api/src/EventSubscriber/QuantApi.php

@@ -2,7 +2,6 @@
 
 namespace Drupal\quant_api\EventSubscriber;
 
-use Drupal\Component\EventDispatcher\ContainerAwareEventDispatcher;
 use Drupal\Core\Logger\LoggerChannelFactoryInterface;
 use Drupal\quant\Event\QuantEvent;
 use Drupal\quant\Event\QuantFileEvent;
@@ -14,6 +13,7 @@
 use Drupal\quant\Utility;
 use Drupal\quant_api\Client\QuantClientInterface;
 use Drupal\quant_api\Exception\InvalidPayload;
+use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 /**
@@ -38,7 +38,7 @@ class QuantApi implements EventSubscriberInterface {
   /**
    * The event dispatcher.
    *
-   * @var \Drupal\Component\EventDispatcher\ContainerAwareEventDispatcher
+   * @var \Symfony\Component\EventDispatcher\EventDispatcher
    */
   protected $eventDispatcher;
 
@@ -52,10 +52,10 @@ class QuantApi implements EventSubscriberInterface {
    *   The Drupal HTTP Client to make requests.
    * @param \Drupal\Core\Logger\LoggerChannelFactoryInterface $logger_factory
    *   The logger channel factory.
-   * @param \Drupal\Component\EventDispatcher\ContainerAwareEventDispatcher $event_dispatcher
+   * @param \Symfony\Component\EventDispatcher\EventDispatcher $event_dispatcher
    *   The event dispatcher.
    */
-  public function __construct(QuantClientInterface $client, LoggerChannelFactoryInterface $logger_factory, ContainerAwareEventDispatcher $event_dispatcher) {
+  public function __construct(QuantClientInterface $client, LoggerChannelFactoryInterface $logger_factory, EventDispatcher $event_dispatcher) {
     $this->client = $client;
     $this->logger = $logger_factory->get('quant_api');
     $this->eventDispatcher = $event_dispatcher;
@@ -64,7 +64,7 @@ public function __construct(QuantClientInterface $client, LoggerChannelFactoryIn
   /**
    * {@inheritdoc}
    */
-  public static function getSubscribedEvents() {
+  public static function getSubscribedEvents(): array {
     $events[QuantEvent::OUTPUT] = ['onOutput', -999];
     $events[QuantFileEvent::OUTPUT] = ['onMedia', -999];
     $events[QuantRedirectEvent::UPDATE] = ['onRedirect', -999];

modules/quant_api/tests/src/Unit/QuantClientTest.php

@@ -2,12 +2,13 @@
 
 namespace Drupal\Tests\quant_api\Unit;
 
-use Drupal\Tests\UnitTestCase;
-use Drupal\quant_api\Client\QuantClient;
-use GuzzleHttp\Client;
 use Drupal\Core\Logger\LoggerChannelFactoryInterface;
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Config\ImmutableConfig;
+use Drupal\quant_api\Client\QuantClient;
+use Drupal\quant_api\Exception\InvalidPayload;
+use Drupal\Tests\UnitTestCase;
+use GuzzleHttp\Client;
 use GuzzleHttp\Exception\RequestException;
 use GuzzleHttp\Psr7\Response;
 use GuzzleHttp\RequestOptions;
@@ -199,10 +200,9 @@ public function testSendValid() {
 
   /**
    * Ensure that send handles server errors.
-   *
-   * @expectedException GuzzleHttp\Exception\RequestException
    */
   public function testSendError() {
+    $this->expectException(RequestException::class);
     $http = $this->prophesize(Client::class);
     $logger = $this->prophesize(LoggerChannelFactoryInterface::class);
     $config = $this->getConfigStub();
@@ -254,10 +254,9 @@ public function testSendRedirectValid() {
 
   /**
    * Ensure a valid redirect response is sent.
-   *
-   * @expectedException GuzzleHttp\Exception\RequestException
    */
   public function testSendRedirectError() {
+    $this->expectException(RequestException::class);
     $http = $this->prophesize(Client::class);
     $logger = $this->prophesize(LoggerChannelFactoryInterface::class);
     $config = $this->getConfigStub();
@@ -278,10 +277,9 @@ public function testSendRedirectError() {
 
   /**
    * Ensure files are validated before sending.
-   *
-   * @expectedException Drupal\quant_api\Exception\InvalidPayload
    */
   public function testSendFileFileNoExist() {
+    $this->expectException(InvalidPayload::class);
     // phpcs:ignore
     global $exists_return;
     // phpcs:ignore

modules/quant_cron/quant_cron.info.yml

@@ -3,7 +3,7 @@ description: Run Quant tasks during cron
 package: Quant
 
 type: module
-core_version_requirement: ^9.3 || ^10
+core_version_requirement: ^11
 configure: quant_cron.settings_form
 dependencies:
   - quant:quant_api

modules/quant_purger/quant_purger.info.yml

@@ -3,7 +3,7 @@ description: Cache tag purger for Quant.
 package: Quant
 
 type: module
-core_version_requirement: ^9.3 || ^10
+core_version_requirement: ^11
 
 dependencies:
   - quant:quant

modules/quant_purger/src/StackMiddleware/UrlRegistrar.php

@@ -57,7 +57,7 @@ public function __construct(HttpKernelInterface $http_kernel, TrafficRegistryInt
     /**
      * {@inheritdoc}
      */
-    public function handle(Request $request, $type = self::MASTER_REQUEST, $catch = TRUE) {
+    public function handle(Request $request, $type = self::MAIN_REQUEST, $catch = TRUE) {
       $response = $this->httpKernel->handle($request, $type, $catch);
       if ($this->determine($request, $response)) {
         $this->registry->add(

modules/quant_search/quant_search.info.yml

@@ -3,7 +3,7 @@ description: 'Allows creation of Quant Search pages.'
 package: Quant
 
 type: module
-core_version_requirement: ^9.3 || ^10
+core_version_requirement: ^11
 configure: quant_search.main
 dependencies:
   - drupal:quant

modules/quant_search/src/EventSubscriber/SearchEventSubscriber.php

@@ -2,10 +2,10 @@
 
 namespace Drupal\quant_search\EventSubscriber;
 
-use Drupal\Component\EventDispatcher\ContainerAwareEventDispatcher;
 use Drupal\Core\Logger\LoggerChannelFactoryInterface;
 use Drupal\quant\Event\QuantEvent;
 use Drupal\quant_search\Controller\Search;
+use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 /**
@@ -23,7 +23,7 @@ class SearchEventSubscriber implements EventSubscriberInterface {
   /**
    * The event dispatcher.
    *
-   * @var \Drupal\Component\EventDispatcher\ContainerAwareEventDispatcher
+   * @var \Symfony\Component\EventDispatcher\EventDispatcher
    */
   protected $eventDispatcher;
 
@@ -34,18 +34,18 @@ class SearchEventSubscriber implements EventSubscriberInterface {
    *
    * @param \Drupal\Core\Logger\LoggerChannelFactoryInterface $logger_factory
    *   The logger channel factory.
-   * @param \Drupal\Component\EventDispatcher\ContainerAwareEventDispatcher $event_dispatcher
+   * @param \Symfony\Component\EventDispatcher\EventDispatcher $event_dispatcher
    *   The event dispatcher.
    */
-  public function __construct(LoggerChannelFactoryInterface $logger_factory, ContainerAwareEventDispatcher $event_dispatcher) {
+  public function __construct(LoggerChannelFactoryInterface $logger_factory, EventDispatcher $event_dispatcher) {
     $this->logger = $logger_factory->get('quant_search');
     $this->eventDispatcher = $event_dispatcher;
   }
 
   /**
    * {@inheritdoc}
    */
-  public static function getSubscribedEvents() {
+  public static function getSubscribedEvents(): array {
     $events[QuantEvent::OUTPUT] = ['onOutput', 1];
     return $events;
   }

modules/quant_search/src/Form/ConfirmIndexClearForm.php

@@ -14,7 +14,7 @@ class ConfirmIndexClearForm extends ConfirmFormBase {
   /**
    * {@inheritdoc}
    */
-  public function buildForm(array $form, FormStateInterface $form_state, string $id = NULL) {
+  public function buildForm(array $form, FormStateInterface $form_state, ?string $id = NULL) {
     return parent::buildForm($form, $form_state);
   }
 

modules/quant_sitemap/quant_sitemap.info.yml

@@ -3,7 +3,7 @@ description: Quant simple_sitemap support
 package: Quant
 
 type: module
-core_version_requirement: ^9.3 || ^10
+core_version_requirement: ^11
 
 dependencies:
   - quant:quant_api

modules/quant_sitemap/src/EventSubscriber/CollectionSubscriber.php

@@ -37,7 +37,7 @@ public function __construct(SitemapManager $manager) {
   /**
    * {@inheritdoc}
    */
-  public static function getSubscribedEvents() {
+  public static function getSubscribedEvents(): array {
     $events[QuantCollectionEvents::ROUTES][] = ['collectRoutes'];
     return $events;
   }

modules/quant_sitemap/tests/src/Unit/SitemapManagerTest.php

@@ -157,7 +157,7 @@ public function testSitemapUnavailable() {
         $entity_manager_mock,
         $module_list_mock,
       ])
-      ->setMethods(['isAvailable'])
+      ->onlyMethods(['isAvailable'])
       ->getMock();
 
     $manager->expects($this->once())
@@ -197,7 +197,7 @@ public function testSimpleSitemapListItems() {
         $entity_manager_mock,
         $module_list_mock,
       ])
-      ->setMethods(['isAvailable', 'getSitemapManager'])
+      ->onlyMethods(['isAvailable', 'getSitemapManager'])
       ->getMock();
 
     $manager->expects($this->once())

modules/quant_tome/quant_tome.info.yml

@@ -3,7 +3,7 @@ description: 'Deploy Tome static output to Quant.'
 package: Quant
 
 type: module
-core_version_requirement: ^9.3 || ^10
+core_version_requirement: ^11
 
 dependencies:
 - tome:tome_static

modules/quant_tome/src/EventSubscriber/RedirectSubscriber.php

@@ -60,7 +60,7 @@ public function onResponse(ResponseEvent $event) {
   /**
    * {@inheritdoc}
    */
-  public static function getSubscribedEvents() {
+  public static function getSubscribedEvents(): array {
     $events[KernelEvents::RESPONSE][] = ['onResponse'];
     return $events;
   }

modules/quant_webform/quant_webform.info.yml

@@ -3,7 +3,7 @@ description: Quant Form support for Webform
 package: Quant
 
 type: module
-core_version_requirement: ^9.3 || ^10
+core_version_requirement: ^11
 
 dependencies:
   - quant:quant

quant.info.yml

@@ -3,7 +3,7 @@ description: Quant content export
 package: Quant
 
 type: module
-core_version_requirement: ^9.3 || ^10
+core_version_requirement: ^11
 configure: quant.config
 dependencies:
   - drupal:taxonomy

quant.module

@@ -6,6 +6,7 @@
  */
 
 use Drupal\Core\Access\AccessResult;
+use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Session\AccountInterface;
@@ -501,3 +502,45 @@ function quant_preprocess_views_view_table(&$variables) {
     }
   }
 }
+
+/**
+ * Implements hook_preprocess_views_view().
+ */
+function quant_preprocess_views_view(array &$variables) {
+  /** @var \Drupal\views\ViewExecutable $view */
+  $view = $variables['view'];
+
+  // If the view has exposed filters, add a warning for admins.
+  if ($view->exposed_data && \Drupal::currentUser()->hasRole('administrator')) {
+    \Drupal::messenger()->addWarning(t('The view (@view_id - @view_display) has exposed filters which need special handling for a static website.<br/> <a href="https://docs.quantcdn.io/integrations/drupal">See the documentation for your options</a>.',
+      [
+        '@view_id' => $view->id(),
+        '@view_display' => $view->current_display,
+      ])
+    );
+  }
+
+}
+
+/**
+ * Implements hook_node_view().
+ */
+function quant_node_view(array &$build, EntityInterface $node, EntityViewDisplayInterface $display, $view_mode) {
+
+  // If there are any webforms in layout_builder, add warning for admins.
+  if ($node->hasField('layout_builder__layout') && !$node->get('layout_builder__layout')->isEmpty() && \Drupal::currentUser()->hasRole('administrator')) {
+    $sections = $node->get('layout_builder__layout')->getSections();
+
+    foreach ($sections as $section) {
+      $components = $section->getComponents();
+
+      foreach ($components as $component) {
+        $configuration = $component->get('configuration');
+        if (isset($configuration['webform_id'])) {
+          \Drupal::messenger()->addWarning(t('Forms need special handling for a static website. <a href="https://docs.quantcdn.io/integrations/drupal">See the documentation for your options</a>.'));
+          return;
+        }
+      }
+    }
+  }
+}

quant.services.yml

@@ -1,4 +1,7 @@
 services:
+  _defaults:
+    autoconfigure: true
+
   plugin.manager.quant.metadata:
     class: Drupal\quant\Plugin\QuantMetadataManager
     parent: default_plugin_manager

src/Controller/QuantNodeViewController.php

@@ -53,7 +53,8 @@ class QuantNodeViewController extends NodeViewController {
    * @param \Drupal\Core\Session\AccountSwitcherInterface $account_switcher
    *   The account switcher interface.
    */
-  public function __construct(EntityTypeManagerInterface $entity_type_manager, RendererInterface $renderer, AccountInterface $current_user = NULL, EntityRepositoryInterface $entity_repository = NULL, RequestStack $request_stack, CurrentRouteMatch $route_match, AccountSwitcherInterface $account_switcher) {
+  public function __construct(EntityTypeManagerInterface $entity_type_manager, RendererInterface $renderer, AccountInterface $current_user, EntityRepositoryInterface $entity_repository, RequestStack $request_stack, CurrentRouteMatch $route_match, AccountSwitcherInterface $account_switcher) {
+
     parent::__construct($entity_type_manager, $renderer, $current_user, $entity_repository);
 
     $this->accountSwitcher = $account_switcher;