-
Notifications
You must be signed in to change notification settings - Fork 126
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update composer deps and update php-cs-fixer conf
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 that would lead to problems.
- Loading branch information
Showing
211 changed files
with
1,818 additions
and
1,685 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,28 +1,71 @@ | ||
<?php | ||
|
||
// Exclude cache folder (vendor is already excluded) | ||
// Exclude cache and docker folders (vendor is already excluded) | ||
// and model classes generated with Propel. | ||
$finder = PhpCsFixer\Finder::create() | ||
->exclude('.coverage') | ||
->exclude('cache') | ||
->notPath('docker/') | ||
->notPath('#/model/om/#') | ||
->notPath('#/model/map/#') | ||
->in(__DIR__) | ||
; | ||
|
||
// Indentation inside switch blocks and some multiline | ||
// elements (control statements, assignments, strings) | ||
// is not considered. See: | ||
// https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues/776 | ||
// https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues/4502 | ||
// | ||
// PhpCsFixer's method_argument_space default value, | ||
// which includes ensure_fully_multiline, causes | ||
// inconsistencies in templates. | ||
// method_argument_space, statement_indentation | ||
/* | ||
* Indentation inside switch blocks and some multiline | ||
* elements (control statements, assignments, strings) | ||
* is not considered. See: | ||
* https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues/776 | ||
* https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues/4502 | ||
* | ||
* PhpCsFixer's method_argument_space default value, | ||
* which includes ensure_fully_multiline, causes | ||
* inconsistencies in templates. | ||
*/ | ||
|
||
// fully_qualified_strict_types | ||
/* | ||
* TODO: Currently the only cases where we don't have fully | ||
* qualified strict types is where we reference Elastica, | ||
* and having those helps developers quickly find locations | ||
* where Elastica is present in the AtoM codebase outside | ||
* plugins. When ES is no longer deeply integrated with the | ||
* AtoM code base, this rule exception can be removed. | ||
*/ | ||
|
||
// string_implicit_backslashes | ||
/* | ||
* This breaks regex strings, and currently there are no | ||
* options that distinguish regex strings from regular | ||
* strings. | ||
*/ | ||
|
||
// no_superfluous_phpdoc_tags | ||
/* | ||
* This removes phpdoc where the function signature already | ||
* includes types. Adding this exception since we still | ||
* want to retain phpdoc specially if they include a | ||
* description. | ||
*/ | ||
|
||
// multiline_whitespace_before_semicolons | ||
/* | ||
* This prevents semicolons to be moved to a new line in | ||
* cases where there are chained multiline function calls. | ||
* Adding this exception since the semicolons in new lines | ||
* are not indented. | ||
*/ | ||
return (new PhpCsFixer\Config()) | ||
->setParallelConfig(PhpCsFixer\Runner\Parallel\ParallelConfigFactory::detect()) | ||
->setRules([ | ||
'@PhpCsFixer' => true, | ||
'method_argument_space' => ['on_multiline' => 'ignore'], | ||
'statement_indentation' => false, | ||
'fully_qualified_strict_types' => false, | ||
'string_implicit_backslashes' => false, | ||
'multiline_whitespace_before_semicolons' => ['strategy' => 'no_multi_line'], | ||
'no_superfluous_phpdoc_tags' => false, | ||
]) | ||
->setFinder($finder) | ||
; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.