Updated

itk-dev · Dec 20, 2024 · 672e7d0 · 672e7d0
1 parent 24e3139
commit 672e7d0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 32 deletions.
diff --git a/README.md b/README.md
@@ -21,16 +21,18 @@ below to run the checks locally.
 ### PHP
 
 ```shell
-docker run --rm --volume ${PWD}:/app --workdir /app itkdev/php8.1-fpm composer install
+# Update to make sure that we use the latest versions of tools.
+docker run --rm --volume ${PWD}:/app --workdir /app itkdev/php8.3-fpm composer update
 # Fix (some) coding standards issues
-docker run --rm --volume ${PWD}:/app --workdir /app itkdev/php8.1-fpm composer coding-standards-apply
+docker run --rm --volume ${PWD}:/app --workdir /app itkdev/php8.3-fpm composer coding-standards-apply
 # Check that code adheres to the coding standards
-docker run --rm --volume ${PWD}:/app --workdir /app itkdev/php8.1-fpm composer coding-standards-check
+docker run --rm --volume ${PWD}:/app --workdir /app itkdev/php8.3-fpm composer coding-standards-check
 ```
 
 ### Markdown
 
 ```shell
+docker pull peterdavehello/markdownlint
 docker run --rm --volume $PWD:/md peterdavehello/markdownlint markdownlint --ignore vendor --ignore LICENSE.md '**/*.md' --fix
 docker run --rm --volume $PWD:/md peterdavehello/markdownlint markdownlint --ignore vendor --ignore LICENSE.md '**/*.md'
 ```
@@ -43,5 +45,5 @@ Running statis code analysis on a standalone Drupal module is a bit tricky, so w
 analysis:
 
 ```shell
-docker run --rm --volume ${PWD}:/app --workdir /app itkdev/php8.1-fpm ./scripts/code-analysis
+docker run --rm --volume ${PWD}:/app --workdir /app itkdev/php8.3-fpm ./scripts/code-analysis
 ```
diff --git a/composer.json b/composer.json
@@ -10,18 +10,19 @@
         }
     ],
     "require": {
-        "drupal/advancedqueue": "^1.0",
+        "drupal/advancedqueue": "^1.2",
         "drupal/key": "^1.17",
-        "drupal/webform": "^6.1",
-        "itk-dev/getorganized-api-client-php": "^1.2",
-        "os2forms/os2forms": "^3.13",
-        "symfony/options-resolver": "^5.4"
+        "drupal/webform": "^6.2",
+        "itk-dev/getorganized-api-client-php": "^1.2.2",
+        "os2forms/os2forms": "^3.17",
+        "symfony/options-resolver": "^5.4 || ^6.0"
     },
     "require-dev": {
         "dealerdirect/phpcodesniffer-composer-installer": "^1.0",
         "drupal/coder": "^8.3",
         "ergebnis/composer-normalize": "^2.42",
-        "mglaman/drupal-check": "^1.4"
+        "mglaman/drupal-check": "^1.4",
+        "mglaman/phpstan-drupal": "~1.2.0"
     },
     "repositories": [
         {
@@ -36,23 +37,11 @@
             "cweagans/composer-patches": true,
             "dealerdirect/phpcodesniffer-composer-installer": true,
             "ergebnis/composer-normalize": true,
+            "mglaman/composer-drupal-lenient": true,
             "simplesamlphp/composer-module-installer": true,
             "zaporylie/composer-drupal-optimizations": true
         }
     },
-    "require": {
-        "itk-dev/getorganized-api-client-php": "^1.2.2",
-        "drupal/webform": "^6.2",
-        "drupal/advancedqueue": "^1.2",
-        "symfony/options-resolver": "^5.4 || ^6.0",
-        "os2forms/os2forms": "^3.17"
-    },
-    "require-dev": {
-        "drupal/coder": "^8.3",
-        "dealerdirect/phpcodesniffer-composer-installer": "^0.7.1",
-        "mglaman/drupal-check": "^1.4",
-        "mglaman/phpstan-drupal": "~1.2.0"
-    },
     "scripts": {
         "code-analysis": [
             "@code-analysis/drupal-check"
@@ -73,14 +62,5 @@
         "coding-standards-check/phpcs": [
             "vendor/bin/phpcs --standard=phpcs.xml.dist"
         ]
-    },
-    "config": {
-        "allow-plugins": {
-            "dealerdirect/phpcodesniffer-composer-installer": true,
-            "zaporylie/composer-drupal-optimizations": true,
-            "cweagans/composer-patches": true,
-            "simplesamlphp/composer-module-installer": true,
-            "mglaman/composer-drupal-lenient": true
-        }
     }
 }