Merge pull request #632 from localgovdrupal/feature/3.x/631-PHP82

Feature/3.x/631 php82
localgovdrupal · Oct 16, 2023 · 4b709b8 · 4b709b8
2 parents 1e9b949 + a703718
commit 4b709b8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -30,6 +30,7 @@ jobs:
           - '~10.0'
         php-version:
           - '8.1'
+          - '8.2'
 
     steps:
 
@@ -113,6 +114,7 @@ jobs:
           - '~10.0'
         php-version:
           - '8.1'
+          - '8.2'
 
     steps:
 
@@ -148,6 +150,7 @@ jobs:
           - '~10.0'
         php-version:
           - '8.1'
+          - '8.2'
 
     steps:
 
@@ -182,6 +185,7 @@ jobs:
           - '~10.0'
         php-version:
           - '8.1'
+          - '8.2'
 
     steps:
 

diff --git a/composer.json b/composer.json
@@ -54,6 +54,9 @@
             "drupal/core": "-p2"
         },
         "patches": {
+	    "drupal/content_lock": {
+                "Fix PHP 8.2 deprecation notices": "https://www.drupal.org/files/issues/2023-05-22/3343964-5.patch"
+            },
             "drupal/core": {
                 "Users can't reference unpublished content even when they have access to it. See https://www.drupal.org/project/drupal/issues/2845144": "https://www.drupal.org/files/issues/2022-06-17/2845144-67.patch"
             }
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,6 +30,7 @@ jobs: @@
               - '~10.0'
             php-version:
               - '8.1'
+              - '8.2'
         steps:
@@ Expand Down Expand Up / @@ -113,6 +114,7 @@ jobs: @@
               - '~10.0'
             php-version:
               - '8.1'
+              - '8.2'
         steps:
@@ Expand Down Expand Up / @@ -148,6 +150,7 @@ jobs: @@
               - '~10.0'
             php-version:
               - '8.1'
+              - '8.2'
         steps:
@@ Expand Down Expand Up / @@ -182,6 +185,7 @@ jobs: @@
               - '~10.0'
             php-version:
               - '8.1'
+              - '8.2'
         steps:
@@ Expand Down @@