Skip to content

Commit

Permalink
Update composer deps and update php-cs-fixer conf
Browse files Browse the repository at this point in the history
Update composer dependencies:
- jasig/phpcas is no longer maintained. apereo/phpcas is the suggested
  replacement.
- Updating to php-cs-fixer 3.64.0 introduces some new rules which would
  lead to changes in over ~400 files. Selectively changing or turning
  off some of these rules to avoid noise and to maintain the current
  standard in AtoM
  • Loading branch information
anvit committed Oct 10, 2024
1 parent 7956366 commit 83f1c18
Show file tree
Hide file tree
Showing 16 changed files with 1,254 additions and 1,110 deletions.
20 changes: 20 additions & 0 deletions .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
$finder = PhpCsFixer\Finder::create()
->exclude('.coverage')
->exclude('cache')
->notPath('docker/')
->notPath('#/model/om/#')
->notPath('#/model/map/#')
->in(__DIR__)
Expand All @@ -20,9 +21,28 @@
// which includes ensure_fully_multiline, causes
// inconsistencies in templates.
return (new PhpCsFixer\Config())
->setParallelConfig(PhpCsFixer\Runner\Parallel\ParallelConfigFactory::detect())
->setRules([
'@PhpCsFixer' => true,
'method_argument_space' => ['on_multiline' => 'ignore'],
'fully_qualified_strict_types' => false,
'statement_indentation' => false,
'single_line_empty_body' => false,
'string_implicit_backslashes' => false,
'no_extra_blank_lines' => ['tokens' => ['extra']],
'single_line_comment_spacing' => false,
'no_multiple_statements_per_line' => false,
'no_unneeded_control_parentheses' => ['statements' => ['break', 'clone', 'continue', 'echo_print', 'return', 'switch_case', 'yield']],
'multiline_whitespace_before_semicolons' => false,
'single_space_around_construct' => false,
'phpdoc_separation' => false,
'phpdoc_align' => false,
'phpdoc_trim' => false,
'phpdoc_order' => ['order' => ['param', 'throws', 'return']],
'no_superfluous_phpdoc_tags' => false,
'nullable_type_declaration_for_default_null_value' => false,
'no_useless_concat_operator' => false,
'blank_line_before_statement' => false,
])
->setFinder($finder)
;
4 changes: 2 additions & 2 deletions apps/qubit/modules/informationobject/templates/_actions.php
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@

<li class="divider"></li>

<li><?php echo link_to(__('Create new rights'), [$resource, 'sf_route' => 'slug/default', 'module' => 'right', 'action' => 'edit']); ?></li>
<li><?php echo link_to(__('Create new rights'), [$resource, 'sf_route' => 'slug/default', 'module' => 'right', 'action' => 'edit']); ?></li>
<?php if ($resource->hasChildren()) { ?>
<li><?php echo link_to(__('Manage rights inheritance'), [$resource, 'sf_route' => 'slug/default', 'module' => 'right', 'action' => 'manage']); ?></li>
<li><?php echo link_to(__('Manage rights inheritance'), [$resource, 'sf_route' => 'slug/default', 'module' => 'right', 'action' => 'manage']); ?></li>
<?php } ?>

<?php if (sfConfig::get('app_audit_log_enabled', false)) { ?>
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
},
"require": {
"league/csv": "^9.4",
"jasig/phpcas": "^1.3.8",
"apereo/phpcas": "^1.3.8",
"ezyang/htmlpurifier": "^4.13",
"ruflin/elastica": "5.*",
"jumbojett/openid-connect-php": "^1.0"
Expand Down
Loading

0 comments on commit 83f1c18

Please sign in to comment.