Merge branch '3.x' into feature/3.x/142/fix_non_standard_bin_dir

.ddev/config.yaml

@@ -1,5 +1,5 @@
 name: localgov
-type: drupal9
+type: drupal10
 docroot: web
 php_version: "8.1"
 webserver_type: nginx-fpm

.github/workflows/test.yml

@@ -36,6 +36,7 @@ jobs:
         php-version:
           - '8.1'
           - '8.2'
+          - '8.3'
 
     steps:
 
@@ -99,6 +100,7 @@ jobs:
         php-version:
           - '8.1'
           - '8.2'
+          - '8.3'
 
     steps:
 
@@ -135,6 +137,7 @@ jobs:
         php-version:
           - '8.1'
           - '8.2'
+          - '8.3'
 
     steps:
 
@@ -170,6 +173,7 @@ jobs:
         php-version:
           - '8.1'
           - '8.2'
+          - '8.3'
 
     steps:
 

.gitignore

@@ -76,3 +76,7 @@
 .ddev/homeadditions/
 .ddev/providers/
 .ddev/xhprof/
+
+# Ignore macOS DS_Store files
+.DS_Store
+**/.DS_Store

.lando.dist.yml

@@ -12,6 +12,8 @@ proxy:
     - 'solr-sitewide.localgov.lndo.site:8983'
 services:
   appserver:
+    scanner:
+      retry: 5
     xdebug: true
     build_as_root:
       # This disables Xdebug during build, but puts all dependencies in place
@@ -71,6 +73,9 @@ services:
     config:
       dir: .lando/solr/localgov_sitewide_solr
 tooling:
+  composer:
+    service: appserver
+    cmd: /usr/local/bin/composer
   deprecated:
     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*"'

README.md

@@ -10,9 +10,15 @@ This project template should provide a kickstart for managing your site dependen
 
 For guidance on installing see: 
 
- - [Installing LocalGov Drupal locally with composer](https://github.com/localgovdrupal/localgov/blob/2.x/README.md#installing-localgov-drupal-locally-with-composer)
+ - [Installing LocalGov Drupal locally with composer](https://github.com/localgovdrupal/localgov#installing-localgov-drupal-locally-with-composer)
  - [Getting started on LocalGov Drupal docs](https://docs.localgovdrupal.org/devs/getting-started/)
 
+## composer.json and composer.lock
+
+We expect most projects using this package will start with the composer.json in this package, committing it to your own project repository as your own root composer.json. You can then extend composer.json, requiring other Drupal and composer packages and evolve your codebase as needed.
+
+Once you have run a `composer create-project` command, it is usually desirable to commit the composer.lock file to your project repository and use this lock file to control the specific version of packages that you deploy to dev, test and ultimately production hosting environments. 
+
 ## Gitpod
 
 Gitpod allows you to run a virtual development environment in the cloud in your browser. 

assets/composer/settings.lando.php

@@ -33,7 +33,7 @@
  * @see https://wiki.php.net/rfc/expectations
  */
 assert_options(ASSERT_ACTIVE, TRUE);
-\Drupal\Component\Assertion\Handle::register();
+assert_options(ASSERT_EXCEPTION, TRUE);
 
 /**
  * Enable local development services.

composer.json

@@ -15,7 +15,7 @@
         "cweagans/composer-patches": "^1.6",
         "drupal/core-composer-scaffold": "^10.0",
         "drupal/core-recommended": "^10.0",
-        "localgovdrupal/localgov": "^3.0@alpha",
+        "localgovdrupal/localgov": "^3.0",
         "localgovdrupal/localgov_search_solr": "^1.1"
     },
     "require-dev": {
@@ -47,6 +47,9 @@
     },
     "extra": {
         "enable-patching": true,
+        "patchLevel": {
+          "drupal/core": "-p2"
+        },
         "drupal-scaffold": {
             "locations": {
                 "web-root": "web/"

phpcs.xml.dist

@@ -3,12 +3,16 @@
   <description>PHP CodeSniffer configuration for LocalGovDrupal.</description>
 
   <arg name="extensions" value="inc,install,module,php,profile,test,theme,yml"/>
-  <config name="drupal_core_version" value="9"/>
+  <config name="drupal_core_version" value="10"/>
 
   <file>web/modules/contrib/</file>
   <file>web/profiles/contrib/localgov/</file>
+  <file>web/themes/contrib/</file>
+
   <!-- Exclude 3rd party code -->
   <exclude-pattern>web\/modules\/contrib\/(?!localgov_.*)</exclude-pattern>
+  <exclude-pattern>web\/themes\/contrib\/(?!localgov_.*)</exclude-pattern>
+
   <rule ref="./vendor/drupal/coder/coder_sniffer/Drupal"/>
   <rule ref="./vendor/drupal/coder/coder_sniffer/DrupalPractice"/>