Skip to content

Commit

Permalink
Upgrade to Symfony 5.0 and Twig 3
Browse files Browse the repository at this point in the history
  • Loading branch information
jordisala1991 committed Jul 29, 2020
1 parent c7370b6 commit f85e17b
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 12 deletions.
17 changes: 8 additions & 9 deletions composer.json
Expand Up @@ -22,23 +22,22 @@
}
],
"require": {
"php": "^7.1",
"symfony/config": "^4.4",
"symfony/dependency-injection": "^4.4",
"symfony/http-foundation": "^4.4",
"symfony/http-kernel": "^4.4",
"php": "^7.2",
"symfony/config": "^4.4 || ^5.0",
"symfony/dependency-injection": "^4.4 || ^5.0",
"symfony/http-foundation": "^4.4 || ^5.0",
"symfony/http-kernel": "^4.4 || ^5.0",
"symfony/intl": "^4.4 || ^5.0",
"symfony/templating": "^4.4",
"twig/twig": "^2.9"
"twig/twig": "^2.9 || ^3.0"
},
"conflict": {
"sonata-project/user-bundle": "<2.0 || >=5.0"
"sonata-project/user-bundle": "<3.6"
},
"require-dev": {
"matthiasnoback/symfony-dependency-injection-test": "^4.0",
"sonata-project/user-bundle": "^3.6 || ^4.0",
"symfony/phpunit-bridge": "^5.1",
"symfony/security-core": "^4.4"
"symfony/security-core": "^4.4 || ^5.0"
},
"config": {
"sort-packages": true
Expand Down
6 changes: 6 additions & 0 deletions phpstan-baseline.neon
@@ -0,0 +1,6 @@
parameters:
ignoreErrors:
-
message: "#^Class Sonata\\\\UserBundle\\\\Model\\\\User not found\\.$#"
count: 2
path: src/Timezone/UserBasedTimezoneDetector.php
6 changes: 3 additions & 3 deletions phpstan.neon.dist
@@ -1,3 +1,6 @@
includes:
- phpstan-baseline.neon

parameters:
level: 1

Expand All @@ -9,6 +12,3 @@ parameters:
excludes_analyse:
- src/Test/AbstractWidgetTestCase.php
- tests/bootstrap.php

autoload_files:
- vendor/autoload.php

0 comments on commit f85e17b

Please sign in to comment.