Skip to content
This repository was archived by the owner on Oct 20, 2022. It is now read-only.

Commit 1a32c7a

Browse files
Merge branch '3.4' into 4.0
* 3.4: (84 commits) Adopt "flex-require" from v1.3 Update dependencies - v3.4.28.7 Update dependencies - v3.4.28.6 Update dependencies - v3.4.28.5 Update dependencies - v3.4.28.4 Update dependencies - v3.4.28.3 Update dependencies - v3.4.28.2 Update dependencies - v3.4.28.1 Update dependencies - v3.4.27.5 Update dependencies - v3.4.27.4 Update dependencies - v3.4.27.3 Update dependencies - v3.4.27.2 Update dependencies - v3.4.27.1 Update dependencies - v3.4.26.2 Update dependencies - v3.4.26.1 Update dependencies - v3.4.24.2 Update dependencies - v3.4.24.1 Update dependencies - v3.4.23.3 Update dependencies - v3.4.23.2 Update dependencies - v3.4.23.1 ...
2 parents e3fa575 + 96b4570 commit 1a32c7a

File tree

2 files changed

+24
-5935
lines changed

2 files changed

+24
-5935
lines changed

composer.json

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,33 +5,36 @@
55
"description": "A skeleton to start a new Symfony website",
66
"require": {
77
"php": "^7.1.3",
8+
"ext-ctype": "*",
89
"ext-iconv": "*",
10+
"symfony/flex": "^1.3.1"
11+
},
12+
"flex-require": {
913
"sensio/framework-extra-bundle": "^5.1",
10-
"symfony/asset": "^4.0",
11-
"symfony/console": "^4.0",
12-
"symfony/expression-language": "^4.0",
13-
"symfony/flex": "^1.0",
14-
"symfony/form": "^4.0",
15-
"symfony/framework-bundle": "^4.0",
16-
"symfony/lts": "^4@dev",
14+
"symfony/asset": "*",
15+
"symfony/console": "*",
16+
"symfony/dotenv": "*",
17+
"symfony/expression-language": "*",
18+
"symfony/form": "*",
19+
"symfony/framework-bundle": "*",
1720
"symfony/monolog-bundle": "^3.1",
1821
"symfony/orm-pack": "*",
19-
"symfony/process": "^4.0",
20-
"symfony/security-bundle": "^4.0",
22+
"symfony/process": "*",
23+
"symfony/security-bundle": "*",
2124
"symfony/serializer-pack": "*",
2225
"symfony/swiftmailer-bundle": "^3.1",
23-
"symfony/twig-bundle": "^4.0",
24-
"symfony/validator": "^4.0",
25-
"symfony/web-link": "^4.0",
26-
"symfony/yaml": "^4.0"
26+
"symfony/translation": "*",
27+
"symfony/twig-bundle": "*",
28+
"symfony/validator": "*",
29+
"symfony/web-link": "*",
30+
"symfony/yaml": "*"
2731
},
28-
"require-dev": {
32+
"flex-require-dev": {
2933
"symfony/debug-pack": "*",
30-
"symfony/dotenv": "^4.0",
3134
"symfony/maker-bundle": "^1.0",
3235
"symfony/profiler-pack": "*",
33-
"symfony/test-pack": "^1.0",
34-
"symfony/web-server-bundle": "^4.0"
36+
"symfony/test-pack": "*",
37+
"symfony/web-server-bundle": "*"
3538
},
3639
"config": {
3740
"preferred-install": {
@@ -50,6 +53,8 @@
5053
}
5154
},
5255
"replace": {
56+
"paragonie/random_compat": "2.*",
57+
"symfony/polyfill-ctype": "*",
5358
"symfony/polyfill-iconv": "*",
5459
"symfony/polyfill-php71": "*",
5560
"symfony/polyfill-php70": "*",
@@ -70,7 +75,8 @@
7075
},
7176
"extra": {
7277
"symfony": {
73-
"allow-contrib": false
78+
"allow-contrib": false,
79+
"require": "4.0.*"
7480
}
7581
}
7682
}

0 commit comments

Comments
 (0)