Merge pull request #120 from localgovdrupal/3.x

Release 3.0.0-alpha1
localgovdrupal · Jul 24, 2023 · d632a7c · d632a7c
2 parents fe6d18b + 8e91d27
commit d632a7c
Show file tree

Hide file tree

Showing 8 changed files with 67 additions and 41 deletions.
diff --git a/.ddev/commands/web/phix b/.ddev/commands/web/phix
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+## Description: Run phpcbf to automatically fix some phpcs errors.
+## Usage: phix
+## Example: "ddev phix"
+
+/var/www/html/bin/phpcbf
diff --git a/.ddev/commands/web/phpcs b/.ddev/commands/web/phpcs
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+## Description: Run phpcs in the web container.
+## Usage: phpcs
+## Example: "ddev phpcs"
+
+/var/www/html/bin/phpcs -p
diff --git a/.ddev/commands/web/phpstan b/.ddev/commands/web/phpstan
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+## Description: Run PHPSTAN to report on code deprecations.
+## Usage: phpix
+## Example: "ddev phix"
+
+/var/www/html/bin/phpstan
diff --git a/.ddev/commands/web/phpunit b/.ddev/commands/web/phpunit
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+## Description: Run phpunit in the web container to run phpunit tests. 
+## Usage: phpunit
+## Example: "ddev phpunit"
+
+/var/www/html/bin/phpunit
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -6,10 +6,10 @@ name: Test localgovdrupal/localgov-project project
 on:
   push:
     branches:
-      - '2.x'
+      - '3.x'
   pull_request:
     branches:
-      - '2.x'
+      - '3.x'
   schedule:
     - cron: "0 7 * * *"
 
@@ -26,9 +26,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        localgov-version: ["2.x"]
-        drupal-version: ["~9.1"]
-        php-version: ["7.4","8.1"]
+        localgov-version:
+          - '3.x'
+        drupal-version:
+          - '~10.0'
+        php-version:
+          - '8.1'
 
     steps:
 
@@ -82,9 +85,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        localgov-version: ["2.x"]
-        drupal-version: ["~9.1"]
-        php-version: ["7.4","8.1"]
+        localgov-version:
+          - '3.x'
+        drupal-version:
+          - '~10.0'
+        php-version:
+          - '8.1'
 
     steps:
 
@@ -114,9 +120,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        localgov-version: ["2.x"]
-        drupal-version: ["~9.1"]
-        php-version: ["7.4","8.1"]
+        localgov-version:
+          - '3.x'
+        drupal-version:
+          - '~10.0'
+        php-version:
+          - '8.1'
 
     steps:
 
@@ -145,9 +154,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        localgov-version: ["2.x"]
-        drupal-version: ["~9.1"]
-        php-version: ["7.4","8.1"]
+        localgov-version:
+          - '3.x'
+        drupal-version:
+          - '~10.0'
+        php-version:
+          - '8.1'
 
     steps:
 

diff --git a/.lando.dist.yml b/.lando.dist.yml
@@ -1,5 +1,5 @@
 name: localgov
-recipe: drupal9
+recipe: drupal10
 config:
   xdebug: false
   webroot: web

diff --git a/composer.json b/composer.json
@@ -4,26 +4,24 @@
     "type": "project",
     "license": "GPL-2.0-or-later",
     "homepage": "https://github.com/localgovdrupal/localgov_project",
-    "repositories": [
-        {
+    "repositories": {
+        "drupal": {
             "type": "composer",
             "url": "https://packages.drupal.org/8"
         }
-    ],
+    },
     "require": {
         "composer/installers": "^1.10",
         "cweagans/composer-patches": "^1.6",
-        "drupal/core-composer-scaffold": "^9.1",
-        "drupal/core-project-message": "^9.1",
-        "drupal/core-recommended": "^9.1@stable",
-        "localgovdrupal/localgov": "^2.0",
-        "localgovdrupal/localgov_search_solr": "^1.0@alpha"
+        "drupal/core-composer-scaffold": "^10.0",
+        "drupal/core-recommended": "^10.0",
+        "localgovdrupal/localgov": "^3.0@alpha",
+        "localgovdrupal/localgov_search_solr": "^1.1"
     },
     "require-dev": {
         "brianium/paratest": "^6.0",
         "drupal/coder": "^8.3",
-        "drupal/config_inspector": "^1.3",
-        "drupal/core-dev": "^9.1",
+        "drupal/core-dev": "^10.0",
         "mglaman/phpstan-drupal": "^1.0",
         "phpspec/prophecy-phpunit": "^2",
         "phpstan/phpstan": "^1.0",
@@ -43,6 +41,7 @@
             "cweagans/composer-patches": true,
             "drupal/core-composer-scaffold": true,
             "drupal/core-project-message": true,
+            "phpstan/extension-installer": true,
             "dealerdirect/phpcodesniffer-composer-installer": true,
             "php-http/discovery": true
         }
@@ -76,19 +75,6 @@
             "drush/Commands/contrib/{$name}": ["type:drupal-drush"],
             "web/modules/custom/{$name}": ["type:drupal-custom-module"],
             "web/themes/custom/{$name}": ["type:drupal-custom-theme"]
-        },
-        "drupal-core-project-message": {
-            "post-create-project-cmd-message": [
-                "<bg=blue;fg=white>                                                                  </>",
-                "<bg=blue;fg=white>  Congratulations, you’ve installed the LocalGov Drupal codebase  </>",
-                "<bg=blue;fg=white>                                                                  </>",
-                "",
-                "<bg=yellow;fg=black>Next steps</>:",
-
-                "  * Install the site: https://www.drupal.org/docs/8/install",
-                "  * Remove the plugin that prints this message:",
-                "      composer remove drupal/core-project-message"
-            ]
         }
 
     }

diff --git a/phpstan.neon b/phpstan.neon
@@ -7,6 +7,6 @@ parameters:
 		- '#Plugin definitions cannot be altered.#'
 		- '#Missing cache backend declaration for performance.#'
 		- '#Plugin manager has cache backend specified but does not declare cache tags.#'
-includes:
-	- vendor/mglaman/phpstan-drupal/extension.neon
-	- vendor/phpstan/phpstan-deprecation-rules/rules.neon
+#includes:
+#	- vendor/mglaman/phpstan-drupal/extension.neon
+#	- vendor/phpstan/phpstan-deprecation-rules/rules.neon