Merge branch '2.13.x' into 3.2.x

doctrine · Dec 23, 2021 · 5b6b7ff · 5b6b7ff
2 parents 9a95d47 + fb16995
commit 5b6b7ff
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 1 deletion.
diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
@@ -4,9 +4,23 @@ on:
   pull_request:
     branches:
       - "*.x"
+    paths:
+      - .github/workflows/coding-standards.yml
+      - bin/**
+      - composer.*
+      - phpcs.xml.dist
+      - src/**
+      - tests/**
   push:
     branches:
       - "*.x"
+    paths:
+      - .github/workflows/coding-standards.yml
+      - bin/**
+      - composer.*
+      - phpcs.xml.dist
+      - src/**
+      - tests/**
 
 jobs:
   coding-standards:

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -5,9 +5,23 @@ on:
   pull_request:
     branches:
       - "*.x"
+    paths:
+      - .github/workflows/continuous-integration.yml
+      - ci/**
+      - composer.*
+      - phpunit.xml.dist
+      - src/**
+      - tests/**
   push:
     branches:
       - "*.x"
+    paths:
+      - .github/workflows/continuous-integration.yml
+      - ci/**
+      - composer.*
+      - phpunit.xml.dist
+      - src/**
+      - tests/**
   schedule:
     - cron: "42 3 * * *"
 

diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -4,9 +4,27 @@ on:
   pull_request:
     branches:
       - "*.x"
+    paths:
+      - .github/workflows/static-analysis.yml
+      - composer.*
+      - phpstan.neon.dist
+      - psalm.xml.dist
+      - psalm-strict.xml
+      - src/**
+      - static-analysis/**
+      - tests/**
   push:
     branches:
       - "*.x"
+    paths:
+      - .github/workflows/static-analysis.yml
+      - composer.*
+      - phpstan.neon.dist
+      - psalm.xml.dist
+      - psalm-strict.xml
+      - src/**
+      - static-analysis/**
+      - tests/**
 
 jobs:
   static-analysis-phpstan:

diff --git a/composer.json b/composer.json
@@ -56,7 +56,11 @@
     },
     "bin": ["bin/doctrine-dbal"],
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true,
+            "composer/package-versions-deprecated": true
+        }
     },
     "autoload": {
         "psr-4": { "Doctrine\\DBAL\\": "src" }