Skip to content

Commit

Permalink
Merge pull request #932 from klaussilveira/8.2
Browse files Browse the repository at this point in the history
Upgraded to Symfony 6.3 and PHP 8.2.
  • Loading branch information
klaussilveira authored Nov 17, 2023
2 parents dd98962 + ea0d763 commit 3fd22e1
Show file tree
Hide file tree
Showing 18 changed files with 1,138 additions and 1,169 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:

strategy:
matrix:
php: [8.1]
php: [8.1, 8.2]

steps:
- uses: actions/checkout@v2
Expand Down
33 changes: 5 additions & 28 deletions .php-cs-fixer.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,34 +8,11 @@
$config = new PhpCsFixer\Config();
return $config->setRules([
'@Symfony' => true,
'@PHP80Migration:risky' => true,
'@PHPUnit84Migration:risky' => true,
'array_indentation' => true,
'array_syntax' => ['syntax' => 'short'],
'blank_line_after_opening_tag' => true,
'concat_space' => ['spacing' => 'one'],
'declare_strict_types' => true,
'increment_style' => ['style' => 'post'],
'is_null' => true,
'list_syntax' => ['syntax' => 'short'],
'method_argument_space' => ['on_multiline' => 'ensure_fully_multiline'],
'method_chaining_indentation' => true,
'modernize_types_casting' => true,
'no_superfluous_elseif' => true,
'no_superfluous_phpdoc_tags' => false,
'no_useless_else' => true,
'no_useless_return' => true,
'ordered_imports' => true,
'phpdoc_align' => false,
'phpdoc_order' => true,
'php_unit_construct' => true,
'php_unit_dedicate_assert' => true,
'return_assignment' => true,
'single_blank_line_at_eof' => true,
'single_line_comment_style' => true,
'ternary_to_null_coalescing' => true,
'yoda_style' => ['equal' => false, 'identical' => false, 'less_and_greater' => false],
'void_return' => true,
'global_namespace_import' => [
'import_classes' => true,
'import_constants' => false,
'import_functions' => false,
],
])
->setRiskyAllowed(true)
->setFinder($finder)
Expand Down
42 changes: 21 additions & 21 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,32 +5,32 @@
"type": "project",
"license": "BSD-3-Clause",
"require": {
"php": "^8.1",
"php": ">=8.1",
"ext-iconv": "*",
"ext-mbstring": "*",
"league/commonmark": "^2.1",
"nesbot/carbon": "^2.55",
"symfony/asset": "^6.0",
"symfony/cache": "^6.0",
"symfony/console": "^6.0",
"symfony/form": "^6.0",
"symfony/framework-bundle": "^6.0",
"symfony/monolog-bundle": "^3.5",
"symfony/process": "^6.0",
"symfony/string": "^6.0",
"symfony/templating": "^6.0",
"symfony/translation": "^6.0",
"symfony/twig-bundle": "^6.0",
"symfony/webpack-encore-bundle": "^1.13",
"symfony/yaml": "^6.0"
"league/commonmark": "^2.4",
"nesbot/carbon": "^2.71",
"symfony/asset": "^6.3",
"symfony/cache": "^6.3",
"symfony/console": "^6.3",
"symfony/form": "^6.3",
"symfony/framework-bundle": "^6.3",
"symfony/monolog-bundle": "^3.10",
"symfony/process": "^6.3",
"symfony/string": "^6.3",
"symfony/templating": "^6.3",
"symfony/translation": "^6.3",
"symfony/twig-bundle": "^6.3",
"symfony/webpack-encore-bundle": "^2.1",
"symfony/yaml": "^6.3"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^3.4",
"friendsofphp/php-cs-fixer": "^3.38",
"phpspec/prophecy-phpunit": "^2.0",
"phpstan/phpstan": "^1.3",
"phpunit/phpunit": "^9.5",
"symfony/debug-bundle": "^6.0",
"symfony/dotenv": "^6.0"
"phpstan/phpstan": "^1.10",
"phpunit/phpunit": "^9.6",
"symfony/debug-bundle": "^6.3",
"symfony/dotenv": "^6.3"
},
"config": {
"preferred-install": {
Expand Down
Loading

0 comments on commit 3fd22e1

Please sign in to comment.