Skip to content

Commit

Permalink
Merge branch 'update-symfony'
Browse files Browse the repository at this point in the history
  • Loading branch information
moay committed Jul 17, 2020
2 parents e0b1d54 + 85c088a commit 49d4143
Show file tree
Hide file tree
Showing 9 changed files with 4,034 additions and 4,043 deletions.
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v10.16.0
1 change: 1 addition & 0 deletions .php_cs.dist
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ return PhpCsFixer\Config::create()
'ternary_to_null_coalescing' => true,
'no_useless_else' => true,
'no_useless_return' => true,
'no_superfluous_phpdoc_tags' => false,
// Risky Rules
'pow_to_exponentiation' => true,
'psr4' => true,
Expand Down
27 changes: 14 additions & 13 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,25 @@
"robinvdvleuten/ulid": "^3.0",
"sensio/framework-extra-bundle": "^5.1",
"symfony/apache-pack": "^1.0",
"symfony/asset": "^4.0",
"symfony/cache": "^4.1",
"symfony/console": "^4.0",
"symfony/dotenv": "^4.0",
"symfony/filesystem": "^4.0",
"symfony/finder": "^4.0",
"symfony/asset": "^4",
"symfony/cache": "^4",
"symfony/console": "^4",
"symfony/dotenv": "^4",
"symfony/filesystem": "^4",
"symfony/finder": "^4",
"symfony/flex": "^1.0",
"symfony/framework-bundle": "^4.1",
"symfony/framework-bundle": "^4",
"symfony/monolog-bundle": "^3.3",
"symfony/twig-bundle": "^4.0",
"symfony/twig-bundle": "^4",
"symfony/webpack-encore-bundle": "^1.6",
"symfony/yaml": "^4.0"
"symfony/yaml": "^4"
},
"require-dev": {
"phpro/grumphp": "^0.15.2",
"symfony/browser-kit": "^4.1",
"symfony/browser-kit": "^4",
"symfony/debug-pack": "^1.0",
"symfony/phpunit-bridge": "^4.0",
"symfony/web-server-bundle": "^4.0"
"symfony/phpunit-bridge": "^4",
"symfony/web-server-bundle": "^4"
},
"config": {
"preferred-install": {
Expand Down Expand Up @@ -71,7 +71,8 @@
},
"extra": {
"symfony": {
"allow-contrib": false
"allow-contrib": false,
"require": "4.4.*"
}
}
}
Loading

0 comments on commit 49d4143

Please sign in to comment.