Skip to content

Commit 6ca97bd

Browse files
committed
Merge branch '4.4' into 5.2
* 4.4: Remove composer.lock # Conflicts: # composer.json # composer.lock
2 parents fbf8aa2 + a6e74d8 commit 6ca97bd

File tree

3 files changed

+29
-8796
lines changed

3 files changed

+29
-8796
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,4 @@
2121
npm-debug.log
2222
yarn-error.log
2323
###< symfony/webpack-encore-bundle ###
24+
composer.lock

composer.json

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -12,43 +12,43 @@
1212
"doctrine/orm": "^2.8",
1313
"phpdocumentor/reflection-docblock": "^5.2",
1414
"sensio/framework-extra-bundle": "^5.1",
15-
"symfony/asset": "5.2.*",
16-
"symfony/console": "5.2.*",
17-
"symfony/dotenv": "5.2.*",
18-
"symfony/expression-language": "5.2.*",
15+
"symfony/asset": "*",
16+
"symfony/console": "*",
17+
"symfony/dotenv": "*",
18+
"symfony/expression-language": "*",
1919
"symfony/flex": "^1.3.1",
20-
"symfony/form": "5.2.*",
21-
"symfony/framework-bundle": "5.2.*",
22-
"symfony/http-client": "5.2.*",
23-
"symfony/intl": "5.2.*",
24-
"symfony/mailer": "5.2.*",
20+
"symfony/form": "*",
21+
"symfony/framework-bundle": "*",
22+
"symfony/http-client": "*",
23+
"symfony/intl": "*",
24+
"symfony/mailer": "*",
2525
"symfony/mercure-bundle": "^0.3.2",
26-
"symfony/messenger": "5.2.*",
26+
"symfony/messenger": "*",
2727
"symfony/monolog-bundle": "^3.1",
28-
"symfony/process": "5.2.*",
29-
"symfony/property-access": "5.2.*",
30-
"symfony/property-info": "5.2.*",
31-
"symfony/proxy-manager-bridge": "5.2.*",
32-
"symfony/security-bundle": "5.2.*",
33-
"symfony/serializer": "5.2.*",
34-
"symfony/translation": "5.2.*",
35-
"symfony/twig-bundle": "5.2.*",
36-
"symfony/validator": "5.2.*",
37-
"symfony/web-link": "5.2.*",
28+
"symfony/process": "*",
29+
"symfony/property-access": "*",
30+
"symfony/property-info": "*",
31+
"symfony/proxy-manager-bridge": "*",
32+
"symfony/security-bundle": "*",
33+
"symfony/serializer": "*",
34+
"symfony/translation": "*",
35+
"symfony/twig-bundle": "*",
36+
"symfony/validator": "*",
37+
"symfony/web-link": "*",
3838
"symfony/webpack-encore-bundle": "^1.11",
39-
"symfony/yaml": "5.2.*",
39+
"symfony/yaml": "*",
4040
"twig/extra-bundle": "^3.0",
4141
"twig/twig": "^3.0"
4242
},
4343
"require-dev": {
44-
"symfony/browser-kit": "5.2.*",
45-
"symfony/css-selector": "5.2.*",
46-
"symfony/debug-bundle": "5.2.*",
44+
"symfony/browser-kit": "*",
45+
"symfony/css-selector": "*",
46+
"symfony/debug-bundle": "*",
4747
"symfony/maker-bundle": "^1.0",
48-
"symfony/phpunit-bridge": "5.2.*",
49-
"symfony/stopwatch": "5.2.*",
50-
"symfony/var-dumper": "5.2.*",
51-
"symfony/web-profiler-bundle": "5.2.*"
48+
"symfony/phpunit-bridge": "^5.2",
49+
"symfony/stopwatch": "*",
50+
"symfony/var-dumper": "*",
51+
"symfony/web-profiler-bundle": "*"
5252
},
5353
"config": {
5454
"preferred-install": {

0 commit comments

Comments
 (0)