Fix code deprecations (#269)

* Fix code deprecations #268 * Test against LGD 2.x with Drupal 9 and LGD 3.x with Drupal 10
localgovdrupal · Jul 17, 2023 · c2c1314 · c2c1314
1 parent c675bc8
commit c2c1314
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 32 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -24,13 +24,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        localgov-version:
-          - '2.x'
-        drupal-version:
-          - '~9.3'
-        php-version:
-          - '7.4'
-          - '8.1'
+        include:
+          - localgov-version: '2.x'
+            drupal-version: '~9.4'
+            php-version: '8.1'
+          - localgov-version: '3.x'
+            drupal-version: '~10.0'
+            php-version: '8.1'
 
     steps:
 
@@ -108,13 +108,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        localgov-version:
-          - '2.x'
-        drupal-version:
-          - '~9.3'
-        php-version:
-          - '7.4'
-          - '8.1'
+        include:
+          - localgov-version: '2.x'
+            drupal-version: '~9.4'
+            php-version: '8.1'
+          - localgov-version: '3.x'
+            drupal-version: '~10.0'
+            php-version: '8.1'
 
     steps:
 
@@ -144,13 +144,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        localgov-version:
-          - '2.x'
-        drupal-version:
-          - '~9.3'
-        php-version:
-          - '7.4'
-          - '8.1'
+        include:
+          - localgov-version: '2.x'
+            drupal-version: '~9.4'
+            php-version: '8.1'
+          - localgov-version: '3.x'
+            drupal-version: '~10.0'
+            php-version: '8.1'
 
     steps:
 
@@ -179,13 +179,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        localgov-version:
-          - '2.x'
-        drupal-version:
-          - '~9.3'
-        php-version:
-          - '7.4'
-          - '8.1'
+        include:
+          - localgov-version: '2.x'
+            drupal-version: '~9.4'
+            php-version: '8.1'
+          - localgov-version: '3.x'
+            drupal-version: '~10.0'
+            php-version: '8.1'
 
     steps:
 

diff --git a/src/Controller/AlertBannerEntityController.php b/src/Controller/AlertBannerEntityController.php
@@ -109,7 +109,8 @@ public function revisionOverview(AlertBannerEntityInterface $localgov_alert_bann
     $latest_revision = TRUE;
 
     foreach (array_reverse($vids) as $vid) {
-      /** @var \Drupal\localgov_alert_banner\AlertBannerEntityInterface $revision */
+      /** @var \Drupal\localgov_alert_banner\Entity\AlertBannerEntityInterface $revision */
+      // @phpstan-ignore-next-line.
       $revision = $localgov_alert_banner_storage->loadRevision($vid);
       // Only show revisions that are affected by the language that is being
       // displayed.

diff --git a/src/Form/AlertBannerEntityRevisionDeleteForm.php b/src/Form/AlertBannerEntityRevisionDeleteForm.php
@@ -98,6 +98,7 @@ public function buildForm(array $form, FormStateInterface $form_state, AlertBann
    * {@inheritdoc}
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
+    // @phpstan-ignore-next-line.
     $this->alertBannerEntityStorage->deleteRevision($this->revision->getRevisionId());
 
     $this->logger('content')->notice('Alert banner: deleted %title revision %revision.', [

diff --git a/src/Plugin/Block/AlertBannerBlock.php b/src/Plugin/Block/AlertBannerBlock.php
@@ -178,16 +178,17 @@ protected function getCurrentAlertBanners() {
     }
 
     // Continue alert banner query.
-    $published_alert_banner_query->sort('changed', 'DESC')
-      ->accessCheck(TRUE);
+    $published_alert_banner_query->sort('changed', 'DESC');
 
     // If types (bunldes) are selected, add filter condition.
     if (!empty($types)) {
       $published_alert_banner_query->condition('type', $types, 'IN');
     }
 
     // Execute alert banner query.
-    $published_alert_banners = $published_alert_banner_query->execute();
+    $published_alert_banners = $published_alert_banner_query
+      ->accessCheck(TRUE)
+      ->execute();
 
     // Load alert banners and add all.
     // Visibility check happens in build, so we get cache contexts on all.