Skip to content

Commit

Permalink
Do not require symfony/symfony (#17)
Browse files Browse the repository at this point in the history 
Description
-----------

Currently Contao 4.6 implicitly requires at least Symfony 4.1, because we need `symfony/http-kernel` and `symfony/monolog-bridge` in at least version 4.1.

However, if we stop requiring `symfony/symfony`, all components but the two mentioned above could be installed in version 3.4, 4.0 or 4.1, therefore this PR replaces requirements for `symfony/symfony` and for `symfony/framework-bundle` with their respective components.

@contao/developers Do you prefer merging this PR so Contao 4.6 is compatible with Symfony 3.4 or do you prefer to keep `symfony/symfony` with Contao 4.6 not being compatible with Symfony <4.1 anymore?

Commits
-------

d5bcc37 No longer require symfony/symfony and symfony/framework-bundle
0270c5d Remove support for Symfony 4.0
57303ac Remove an unused dependency
  • Loading branch information
@leofeyer
leofeyer committed Aug 21, 2018
1 parent 0e6bb26 commit 58ad40c
Show file tree
Hide file tree
Showing 10 changed files with 88 additions and 27 deletions.
5 changes: 4 additions & 1 deletion calendar-bundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@
"require": {
"php": "^7.1",
"contao/core-bundle": "self.version",
"symfony/framework-bundle": "^3.4 || ^4.0"
"symfony/config": "3.4.* || 4.1.*",
"symfony/dependency-injection": "3.4.* || 4.1.*",
"symfony/http-foundation": "3.4.* || 4.1.*",
"symfony/http-kernel": "3.4.* || 4.1.*"
},
"conflict": {
"contao/core": "*",
Expand Down
2 changes: 1 addition & 1 deletion comments-bundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"require": {
"php": "^7.1",
"contao/core-bundle": "self.version",
"symfony/framework-bundle": "^3.4 || ^4.0"
"symfony/http-kernel": "3.4.* || 4.1.*"
},
"conflict": {
"contao/core": "*",
Expand Down
27 changes: 23 additions & 4 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,34 @@
"sensiolabs/ansi-to-html": "^1.1",
"simplepie/simplepie": "^1.3",
"spomky-labs/otphp": "^9.1",
"symfony/asset": "3.4.* || 4.1.*",
"symfony/config": "3.4.* || 4.1.*",
"symfony/console": "3.4.* || 4.1.*",
"symfony/debug-bundle": "3.4.* || 4.1.*",
"symfony/dependency-injection": "3.4.* || 4.1.*",
"symfony/dotenv": "3.4.* || 4.1.*",
"symfony/event-dispatcher": "3.4.* || 4.1.*",
"symfony/filesystem": "3.4.* || 4.1.*",
"symfony/finder": "3.4.* || 4.1.*",
"symfony/framework-bundle": "3.4.* || 4.1.*",
"symfony/http-foundation": "3.4.* || 4.1.*",
"symfony/http-kernel": "4.1.*",
"symfony/lock": "3.4.* || 4.1.*",
"symfony/monolog-bridge": "4.1.*",
"symfony/monolog-bundle": "^3.1",
"symfony/process": "3.4.* || 4.1.*",
"symfony/proxy-manager-bridge": "3.4.* || 4.1.*",
"symfony/routing": "3.4.* || 4.1.*",
"symfony/security-bundle": "3.4.* || 4.1.*",
"symfony/swiftmailer-bundle": "^3.1.5",
"symfony/symfony": "4.1.*",
"symfony/translation": "3.4.* || 4.1.*",
"symfony/twig-bundle": "3.4.* || 4.1.*",
"symfony/web-profiler-bundle": "3.4.* || 4.1.*",
"symfony/yaml": "3.4.* || 4.1.*",
"tecnickcom/tcpdf": "^6.0",
"terminal42/header-replay-bundle": "^1.4.2",
"toflar/psr6-symfony-http-cache-store": "^1.0.2",
"true/punycode": "^2.1",
"twig/twig": "^1.26 || ^2.0"
"true/punycode": "^2.1"
},
"replace": {
"contao/calendar-bundle": "self.version",
Expand Down Expand Up @@ -110,7 +130,6 @@
"monolog/monolog": "^1.22",
"ocramius/proxy-manager": "^2.0",
"oneup/phpstan-contao": "^0.2.1",
"php-http/message-factory": "^1.0.2",
"phpstan/phpstan-phpunit": "^0.10",
"phpunit/phpunit": "^7.0",
"symfony/phpunit-bridge": "^3.4.5"
Expand Down
31 changes: 17 additions & 14 deletions core-bundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,22 +62,26 @@
"sensio/framework-extra-bundle": "^5.0",
"simplepie/simplepie": "^1.3",
"spomky-labs/otphp": "^9.1",
"symfony/asset": "^3.4 || ^4.0",
"symfony/console": "^3.4 || ^4.0",
"symfony/dependency-injection": "^3.4 || ^4.0",
"symfony/filesystem": "^3.4 || ^4.0",
"symfony/finder": "^3.4 || ^4.0",
"symfony/framework-bundle": "^3.4 || ^4.0",
"symfony/http-foundation": "^3.4 || ^4.0",
"symfony/http-kernel": "^4.1",
"symfony/lock": "^3.4 || ^4.0",
"symfony/security-bundle": "^3.4 || ^4.0",
"symfony/asset": "3.4.* || 4.1.*",
"symfony/config": "3.4.* || 4.1.*",
"symfony/console": "3.4.* || 4.1.*",
"symfony/dependency-injection": "3.4.* || 4.1.*",
"symfony/event-dispatcher": "3.4.* || 4.1.*",
"symfony/filesystem": "3.4.* || 4.1.*",
"symfony/finder": "3.4.* || 4.1.*",
"symfony/framework-bundle": "3.4.* || 4.1.*",
"symfony/http-foundation": "3.4.* || 4.1.*",
"symfony/http-kernel": "4.1.*",
"symfony/lock": "3.4.* || 4.1.*",
"symfony/process": "3.4.* || 4.1.*",
"symfony/routing": "3.4.* || 4.1.*",
"symfony/security-bundle": "3.4.* || 4.1.*",
"symfony/swiftmailer-bundle": "^3.1.5",
"symfony/yaml": "^3.4 || ^4.0",
"symfony/translation": "3.4.* || 4.1.*",
"symfony/twig-bundle": "3.4.* || 4.1.*",
"tecnickcom/tcpdf": "^6.0",
"terminal42/header-replay-bundle": "^1.4",
"true/punycode": "^2.1",
"twig/twig": "^1.26 || ^2.0"
"true/punycode": "^2.1"
},
"conflict": {
"contao-community-alliance/composer-plugin": "<3.0",
Expand All @@ -101,7 +105,6 @@
"lexik/maintenance-bundle": "^2.1.3",
"monolog/monolog": "^1.22",
"php-http/guzzle6-adapter": "^1.1",
"php-http/message-factory": "^1.0.2",
"phpunit/phpunit": "^7.0",
"symfony/phpunit-bridge": "^3.4.5"
},
Expand Down
4 changes: 3 additions & 1 deletion faq-bundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@
"require": {
"php": "^7.1",
"contao/core-bundle": "self.version",
"symfony/framework-bundle": "^3.4 || ^4.0"
"symfony/config": "3.4.* || 4.1.*",
"symfony/dependency-injection": "3.4.* || 4.1.*",
"symfony/http-kernel": "3.4.* || 4.1.*"
},
"conflict": {
"contao/core": "*",
Expand Down
16 changes: 14 additions & 2 deletions installation-bundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,21 @@
"require": {
"php": "^7.1",
"contao/core-bundle": "self.version",
"doctrine/dbal": "^2.5",
"patchwork/utf8": "^1.2",
"psr/log": "^1.0",
"sensio/framework-extra-bundle": "^5.0",
"sensiolabs/ansi-to-html": "^1.1",
"symfony/filesystem": "^3.4 || ^4.0",
"symfony/framework-bundle": "^3.4 || ^4.0"
"symfony/config": "3.4.* || 4.1.*",
"symfony/console": "3.4.* || 4.1.*",
"symfony/dependency-injection": "3.4.* || 4.1.*",
"symfony/event-dispatcher": "3.4.* || 4.1.*",
"symfony/filesystem": "3.4.* || 4.1.*",
"symfony/finder": "3.4.* || 4.1.*",
"symfony/framework-bundle": "3.4.* || 4.1.*",
"symfony/http-foundation": "3.4.* || 4.1.*",
"symfony/http-kernel": "3.4.* || 4.1.*",
"symfony/yaml": "3.4.* || 4.1.*"
},
"conflict": {
"contao/core": "*",
Expand Down
2 changes: 1 addition & 1 deletion listing-bundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"require": {
"php": "^7.1",
"contao/core-bundle": "self.version",
"symfony/framework-bundle": "^3.4 || ^4.0"
"symfony/http-kernel": "3.4.* || 4.1.*"
},
"conflict": {
"contao/core": "*",
Expand Down
21 changes: 20 additions & 1 deletion manager-bundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,36 @@
"contao/core-bundle": "self.version",
"contao/installation-bundle": "self.version",
"contao/manager-plugin": "^2.4",
"doctrine/dbal": "^2.5",
"doctrine/doctrine-bundle": "^1.7.2",
"doctrine/doctrine-cache-bundle": "^1.3",
"friendsofsymfony/http-cache": "^2.4",
"friendsofsymfony/http-cache-bundle": "^2.3",
"lexik/maintenance-bundle": "^2.1.3",
"nelmio/cors-bundle": "^1.5.3",
"nelmio/security-bundle": "^2.2",
"php-http/guzzle6-adapter": "^1.1",
"sensio/framework-extra-bundle": "^5.0",
"symfony/config": "3.4.* || 4.1.*",
"symfony/console": "3.4.* || 4.1.*",
"symfony/debug-bundle": "3.4.* || 4.1.*",
"symfony/dependency-injection": "3.4.* || 4.1.*",
"symfony/dotenv": "3.4.* || 4.1.*",
"symfony/filesystem": "3.4.* || 4.1.*",
"symfony/finder": "3.4.* || 4.1.*",
"symfony/framework-bundle": "3.4.* || 4.1.*",
"symfony/http-foundation": "3.4.* || 4.1.*",
"symfony/http-kernel": "3.4.* || 4.1.*",
"symfony/monolog-bridge": "4.1.*",
"symfony/monolog-bundle": "^3.1",
"symfony/process": "3.4.* || 4.1.*",
"symfony/proxy-manager-bridge": "3.4.* || 4.1.*",
"symfony/routing": "3.4.* || 4.1.*",
"symfony/security-bundle": "3.4.* || 4.1.*",
"symfony/swiftmailer-bundle": "^3.1.5",
"symfony/symfony": "4.1.*",
"symfony/twig-bundle": "3.4.* || 4.1.*",
"symfony/web-profiler-bundle": "3.4.* || 4.1.*",
"symfony/yaml": "3.4.* || 4.1.*",
"terminal42/header-replay-bundle": "^1.4.2",
"toflar/psr6-symfony-http-cache-store": "^1.0.2"
},
Expand Down
5 changes: 4 additions & 1 deletion news-bundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@
"require": {
"php": "^7.1",
"contao/core-bundle": "self.version",
"symfony/framework-bundle": "^3.4 || ^4.0"
"symfony/config": "3.4.* || 4.1.*",
"symfony/dependency-injection": "3.4.* || 4.1.*",
"symfony/http-foundation": "3.4.* || 4.1.*",
"symfony/http-kernel": "3.4.* || 4.1.*"
},
"conflict": {
"contao/core": "*",
Expand Down
2 changes: 1 addition & 1 deletion newsletter-bundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"require": {
"php": "^7.1",
"contao/core-bundle": "self.version",
"symfony/framework-bundle": "^3.4 || ^4.0"
"symfony/http-kernel": "3.4.* || 4.1.*"
},
"conflict": {
"contao/core": "*",
Expand Down

0 comments on commit 58ad40c

Please sign in to comment.