Merge pull request #28 from sparkfabrik/update_tools

refs #000: update dependencies for drupal 10.3beta1
sparkfabrik · May 21, 2024 · ed83fd0 · ed83fd0
2 parents ed44e0f + dd5f586
commit ed83fd0
Show file tree

Hide file tree

Showing 6 changed files with 151 additions and 142 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,29 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.5.0] - 2024-05-21
+
+### Changed
+
+- Relevant dependency upgrades (php runtime is 8.3.7):
+
+```
+  - Upgrading phpstan/phpstan (1.10.50 => 1.11.1)
+  - Upgrading drupal/coder (8.3.22 => 8.3.24)
+  - Upgrading squizlabs/php_codesniffer (3.8.0 => 3.10.0)
+  - Upgrading phpstan/phpdoc-parser (1.24.5 => 1.29.0)
+  - Upgrading phpstan/phpstan-deprecation-rules (1.1.4 => 1.2.0)
+  - Upgrading jangregor/phpstan-prophecy (1.0.0 => 1.0.2)
+  - Upgrading mglaman/phpstan-drupal (1.2.4 => 1.2.11)
+  - Upgrading php-parallel-lint/php-parallel-lint (v1.3.2 => v1.4.0)
+  - Upgrading symfony/polyfill-php80 (v1.28.0 => v1.29.0)
+  - Upgrading webflo/drupal-finder (1.2.2 => 1.3.0)
+  - Upgrading symfony/deprecation-contracts (v3.4.0 => v3.5.0)
+  - Upgrading symfony/yaml (v6.4.0 => v6.4.7)
+  - Upgrading slevomat/coding-standard (8.14.1 => 8.15.0)
+  - Upgrading sirbrillig/phpcs-variable-analysis (v2.11.17 => v2.11.18)
+```
+
 ## [2.4.0] - 2023-12-19
 
 ### Changed

diff --git a/Dockerfile b/Dockerfile
@@ -1,10 +1,8 @@
-FROM composer:2.3.5
+FROM composer:2.7.6
 RUN apk add --no-cache \
     build-base libxslt-dev libxml2-dev libgcrypt-dev git unzip wget curl libpng-dev py3-pip && \
     docker-php-ext-install xml xsl gd
 
-RUN pip install djlint --root-user-action=ignore
-
 COPY composer* ./
 RUN composer install --no-interaction --prefer-dist --no-progress
 

diff --git a/composer.json b/composer.json
@@ -1,17 +1,17 @@
 {
     "require": {
         "cweagans/composer-patches": "^1.6",
-        "drupal/coder": "^8.3",
+        "drupal/coder": "^8.3.24",
         "edgedesign/phpqa": "dev-master#a3038f1e488fd11d660c47b2fd71cad2773e23b3",
         "enlightn/security-checker": "^1.9",
-        "mglaman/phpstan-drupal": "^1.1",
+        "mglaman/phpstan-drupal": "^1.2.11",
         "nette/neon": "^3.3",
-        "php-parallel-lint/php-parallel-lint": "^1.3",
-        "phpstan/phpstan": "^1.4",
-        "phpstan/phpstan-deprecation-rules": "^1.0",
+        "php-parallel-lint/php-parallel-lint": "^1.4.0",
+        "phpstan/phpstan": "^1.11.1",
+        "phpstan/phpstan-deprecation-rules": "^1.2.0",
         "vimeo/psalm": "^4.13",
-        "webflo/drupal-finder": "^1.2",
-        "jangregor/phpstan-prophecy": "^1.0",
+        "webflo/drupal-finder": "^1.3.0",
+        "jangregor/phpstan-prophecy": "^1.0.2",
         "sebastian/phpcpd": "^6"
     },
     "extra": {