Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update php-cs-fixer to v3.52 #340

Merged
merged 1 commit into from
Mar 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
9 changes: 9 additions & 0 deletions .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
21 changes: 11 additions & 10 deletions lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildTask.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down