Merge branch '2.13.x' into 3.1.x

* 2.13.x: PHP CodeSniffer 3.6.1 Add Postgres 14 to the test matrix
doctrine · Oct 11, 2021 · c257360 · c257360
2 parents ff0dcd9 + cbd8cd8
commit c257360
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -157,9 +157,10 @@ jobs:
         postgres-version:
           - "9.4"
           - "13"
+          - "14"
         include:
           - php-version: "8.0"
-            postgres-version: "13"
+            postgres-version: "14"
 
     services:
       postgres:

diff --git a/composer.json b/composer.json
@@ -44,7 +44,7 @@
         "phpstan/phpstan-strict-rules": "^0.12.11",
         "phpunit/phpunit": "9.5.10",
         "psalm/plugin-phpunit": "0.16.1",
-        "squizlabs/php_codesniffer": "3.6.0",
+        "squizlabs/php_codesniffer": "3.6.1",
         "symfony/cache": "^5.2|^6.0",
         "symfony/console": "^2.0.5|^3.0|^4.0|^5.0|^6.0",
         "vimeo/psalm": "4.10.0"