From 50c946b4415691df3d2ece73c63364777f70cd2e Mon Sep 17 00:00:00 2001 From: thePanz Date: Tue, 19 Mar 2024 13:11:25 +0100 Subject: [PATCH] Update php-cs-fixer to v3.52 --- .github/workflows/lint.yml | 2 +- .php-cs-fixer.dist.php | 9 ++++++++ .../lib/task/sfDoctrineBuildTask.class.php | 21 ++++++++++--------- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index d65945a72..99adc703b 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -28,7 +28,7 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: 7.4 - tools: php-cs-fixer:3.51, cs2pr + tools: php-cs-fixer:3.52, cs2pr - uses: actions/cache@v4 with: diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php index 1212fe9b4..fccc2b3f9 100644 --- a/.php-cs-fixer.dist.php +++ b/.php-cs-fixer.dist.php @@ -9,6 +9,15 @@ // Exclude PHP classes templates/generators, which are not valid PHP files ->exclude('task/generator/skeleton/') ->exclude('plugins/sfDoctrinePlugin/data/generator/') + ->exclude('plugins/sfDoctrinePlugin/test/functional/fixtures/') + + // Exclude sub-modules folders + ->exclude('plugins/sfDoctrinePlugin/lib/vendor/doctrine') + + // Exclude generated files (whole directories) + ->exclude('functional/fixtures/cache') + ->exclude('functional/fixtures/log') + // Exclude generated files (single files) ->notPath('unit/config/fixtures/sfDefineEnvironmentConfigHandler/prefix_result.php') ->notPath('unit/config/fixtures/sfFilterConfigHandler/result.php') diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildTask.class.php index f11c5fd0d..c4093f96c 100644 --- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildTask.class.php +++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildTask.class.php @@ -23,18 +23,19 @@ class sfDoctrineBuildTask extends sfDoctrineBaseTask public const BUILD_FILTERS = 4; public const BUILD_SQL = 8; public const BUILD_DB = 16; + // model, forms public const OPTION_MODEL = 1; public const OPTION_FORMS = 3; - public const // model, forms - OPTION_FILTERS = 5; - public const // model, filters - OPTION_SQL = 9; - public const // model, sql - OPTION_DB = 25; - public const // model, sql, db - OPTION_ALL_CLASSES = 7; - public const // model, forms, filters - OPTION_ALL = 31; // model, forms, filters, sql, db + // model, filters + public const OPTION_FILTERS = 5; + // model, sql + public const OPTION_SQL = 9; + // model, sql, db + public const OPTION_DB = 25; + // model, forms, filters + public const OPTION_ALL_CLASSES = 7; + // model, forms, filters, sql, db + public const OPTION_ALL = 31; /** * @see sfTask