Merge pull request #178 from localgovdrupal/3.x

3.1.2 release

.github/workflows/test.yml

@@ -11,15 +11,14 @@ on:
     branches:
       - '3.x'
   schedule:
-    - cron: "0 7 * * *"
+    - cron: '0 7 * * *'
   workflow_dispatch:
 
 env:
   LOCALGOV_DRUPAL_PROJECT: localgovdrupal/localgov-project
   LOCALGOV_DRUPAL_PROJECT_PATH:
 
 jobs:
-
   build:
     name: Install LocalGov Drupal
     runs-on: ubuntu-latest
@@ -39,7 +38,6 @@ jobs:
           - '8.3'
 
     steps:
-
       - name: Save git branch and git repo names to env if this is not a pull request
         if: github.event_name != 'pull_request'
         run: |
@@ -98,12 +96,9 @@ jobs:
         drupal-version:
           - '~10.0'
         php-version:
-          - '8.1'
-          - '8.2'
           - '8.3'
 
     steps:
-
       - name: Cached workspace
         uses: actions/cache@v2
         with:
@@ -123,7 +118,7 @@ jobs:
           ./bin/phpcs -p ${LOCALGOV_DRUPAL_PROJECT_PATH}
 
   phpstan:
-    name: Deprecated code checks
+    name: Static analysis checks
     needs: build
     runs-on: ubuntu-latest
 
@@ -135,12 +130,9 @@ jobs:
         drupal-version:
           - '~10.0'
         php-version:
-          - '8.1'
-          - '8.2'
           - '8.3'
 
     steps:
-
       - name: Cached workspace
         uses: actions/cache@v2
         with:
@@ -154,7 +146,7 @@ jobs:
         with:
           php-version: ${{ matrix.php-version }}
 
-      - name: Run deprecated code checks
+      - name: Run PHPStan code checks
         run: |
           cd html
           ./bin/phpstan analyse -c ./phpstan.neon ./web/modules/contrib/localgov* ./web/profiles/contrib/localgov* ./web/themes/contrib/localgov*
@@ -176,7 +168,6 @@ jobs:
           - '8.3'
 
     steps:
-
       - name: Clone Drupal container
         uses: actions/checkout@v2
         with:
@@ -192,7 +183,7 @@ jobs:
             localgov-build-${{ matrix.localgov-version }}-${{ matrix.drupal-version }}-${{ matrix.php-version }}-
 
       - name: Start Docker environment
-        run: docker-compose -f docker-compose.yml up -d
+        run: docker compose -f docker-compose.yml up -d
 
       - name: Run PHPUnit tests
         run: |

.lando.dist.yml

@@ -3,6 +3,7 @@ recipe: drupal10
 config:
   webroot: web
   php: '8.1'
+  database: mariadb:10.6
 proxy:
   mailhog:
     - mail.localgov.lndo.site
@@ -75,7 +76,7 @@ tooling:
   composer:
     service: appserver
     cmd: /usr/local/bin/composer
-  deprecated:
+  sca:
     service: appserver
     cmd: 'bash -c "/app/vendor/bin/phpstan analyse -c /app/phpstan.neon /app/web/profiles/contrib/localgov* /app/web/modules/contrib/localgov*  /app/web/themes/contrib/localgov*"'
   drush:

composer.json

@@ -26,6 +26,8 @@
         "phpspec/prophecy-phpunit": "^2",
         "phpstan/phpstan": "^1.0",
         "phpstan/phpstan-deprecation-rules": "^1.0",
+        "phpstan/phpstan-strict-rules": "^1.5",
+        "spaze/phpstan-disallowed-calls": "^3.4",
         "squizlabs/php_codesniffer": "^3.6"
     },
     "conflict": {
@@ -69,11 +71,16 @@
             }
         },
         "patches-ignore": {
+            "localgovdrupal/localgov": {
+                "drupal/core": {
+                    "Content moderation and Workspaces https://www.drupal.org/project/drupal/issues/3179199#comment-15711680" : "https://www.drupal.org/files/issues/2024-08-11/3179199-3132022-content-moderation-workspaces-query.patch"
+                }
+            },
             "localgovdrupal/localgov_services": {
                 "drupal/core": {
                     "node_access filters out accessible nodes when node is left joined (1349080)" : "https://git.drupalcode.org/project/drupal/-/commit/c271adb.diff"
                 }
-            }    
+            }
         },
         "installer-paths": {
             "web/core": ["type:drupal-core"],