From 9fd5d209d5818e971848ef3753964fcebf0ee25c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20J=2E=20Garc=C3=ADa=20Lagar?= Date: Wed, 15 Dec 2021 13:00:57 +0100 Subject: [PATCH 1/3] Fix return docblock --- lib/Doctrine/DBAL/Query/QueryBuilder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Doctrine/DBAL/Query/QueryBuilder.php b/lib/Doctrine/DBAL/Query/QueryBuilder.php index 419937d3586..15332a94d16 100644 --- a/lib/Doctrine/DBAL/Query/QueryBuilder.php +++ b/lib/Doctrine/DBAL/Query/QueryBuilder.php @@ -201,7 +201,7 @@ public function getState() /** * Executes this query using the bound parameters and their types. * - * @return ForwardCompatibility\DriverStatement|int + * @return ForwardCompatibility\Result|int * * @throws Exception */ From 6cb7287d8ca650403bebcb919ef02b985bc7e40b Mon Sep 17 00:00:00 2001 From: Sergei Morozov Date: Thu, 23 Dec 2021 08:59:26 -0800 Subject: [PATCH 2/3] Specify allowed plugins for Composer 2.2 --- composer.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index adfbd241868..f5844777947 100644 --- a/composer.json +++ b/composer.json @@ -54,7 +54,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\\": "lib/Doctrine/DBAL" } From c68da3864b0dc846332eae9829c5cb7046c7e4f3 Mon Sep 17 00:00:00 2001 From: erwin maruli Date: Sat, 23 Oct 2021 18:31:36 +0800 Subject: [PATCH 3/3] Run workflow only if modified file matches the configured paths --- .github/workflows/coding-standards.yml | 14 ++++++++++++++ .github/workflows/continuous-integration.yml | 14 ++++++++++++++ .github/workflows/static-analysis.yml | 18 ++++++++++++++++++ 3 files changed, 46 insertions(+) diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml index ce6574d4064..5a2c2e1c0d0 100644 --- 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.* + - lib/** + - phpcs.xml.dist + - tests/** push: branches: - "*.x" + paths: + - .github/workflows/coding-standards.yml + - bin/** + - composer.* + - lib/** + - phpcs.xml.dist + - tests/** jobs: coding-standards: diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 614c30bcf1d..3dc066adc0e 100644 --- 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.* + - lib/** + - phpunit.xml.dist + - tests/** push: branches: - "*.x" + paths: + - .github/workflows/continuous-integration.yml + - ci/** + - composer.* + - lib/** + - phpunit.xml.dist + - tests/** schedule: - cron: "42 3 * * *" diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index ea150f247ba..7699ccaa0b1 100644 --- 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.* + - lib/** + - phpstan.neon.dist + - psalm.xml.dist + - psalm-strict.xml + - static-analysis/** + - tests/** push: branches: - "*.x" + paths: + - .github/workflows/static-analysis.yml + - composer.* + - lib/** + - phpstan.neon.dist + - psalm.xml.dist + - psalm-strict.xml + - static-analysis/** + - tests/** jobs: static-analysis-phpstan: