Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove twig bundle dependency #206

Merged
merged 2 commits into from
Nov 5, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
-
name: Restrict twig/twig version
if: matrix.twig-version != ''
run: composer require "twig/twig:${{ matrix.twig-version }}" --no-update --no-scripts
run: composer require --dev "twig/twig:${{ matrix.twig-version }}" --no-update --no-scripts

-
name: Install dependencies
Expand Down Expand Up @@ -104,9 +104,18 @@ jobs:
run: |
composer remove friendsofsymfony/rest-bundle willdurand/hateoas-bundle jms/serializer-bundle --dev --no-scripts
(cd src/Bundle/test && app/console cache:clear --env=test_without_fosrest)
composer require friendsofsymfony/rest-bundle willdurand/hateoas-bundle jms/serializer-bundle --dev --no-scripts

-
name: Run smoke tests without winzou/state-machine-bundle packages
name: Run smoke tests without winzou/state-machine-bundle package
run: |
composer remove winzou/state-machine-bundle --dev --no-scripts
(cd src/Bundle/test && app/console cache:clear --env=test_without_state_machine)
composer require winzou/state-machine-bundle --dev --no-scripts

-
name: Run smoke tests without twig/twig package
run: |
composer remove symfony/twig-bundle --dev --no-scripts
(cd src/Bundle/test && app/console cache:clear --env=test_without_twig)
composer require symfony/twig-bundle --dev --no-scripts
11 changes: 6 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
"symfony/framework-bundle": "^4.4 || ^5.1",
"symfony/security-csrf": "^4.4 || ^5.1",
"symfony/translation": "^4.4 || ^5.1",
"symfony/twig-bundle": "^4.4 || ^5.1",
"symfony/validator": "^4.4 || ^5.1",
"symfony/yaml": "^4.4 || ^5.1",
"webmozart/assert": "^1.8"
Expand All @@ -46,10 +45,11 @@
"sylius/resource": "self.version"
},
"conflict": {
"friendsofsymfony/rest-bundle": "<3.0 >=4.0",
"jms/serializer-bundle": "<3.5 >=4.0",
"willdurand/hateoas-bundle": "<2.0 >=3.0",
"winzou/state-machine-bundle": "<0.3.2 || >=0.4.0 <0.4.3"
"friendsofsymfony/rest-bundle": "<3.0 || >=4.0",
"jms/serializer-bundle": "<3.5 || >=4.0",
"willdurand/hateoas-bundle": "<2.0 || >=3.0",
"winzou/state-machine-bundle": "<0.3.2 || >=0.4 <0.4.3 || >=0.6",
"symfony/twig-bundle": "<4.4 || >=5.0 <5.1 || >=6.0"
},
"require-dev": {
"doctrine/orm": "^2.5",
Expand All @@ -68,6 +68,7 @@
"sylius-labs/coding-standard": "^3.0",
"sylius/grid-bundle": "^1.2",
"symfony/dependency-injection": "^4.4 || ^5.1",
"symfony/twig-bundle": "^4.4 || ^5.1",
"twig/twig": "^2.12 || ^3.0",
"vimeo/psalm": "3.17.1",
"willdurand/hateoas-bundle": "^2.0",
Expand Down
4 changes: 0 additions & 4 deletions src/Bundle/test/app/config/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@ framework:
http_method_override: true
test: ~

twig:
debug: "%kernel.debug%"
strict_variables: "%kernel.debug%"

doctrine:
dbal:
driver: "%database_driver%"
Expand Down
4 changes: 4 additions & 0 deletions src/Bundle/test/app/config/config_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,7 @@ fos_rest:
- { path: '^/', priorities: ['json'], fallback_format: json, prefer_extension: true }
exception:
enabled: false

twig:
debug: "%kernel.debug%"
strict_variables: "%kernel.debug%"
3 changes: 3 additions & 0 deletions src/Bundle/test/app/config/config_test_without_fosrest.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
twig:
debug: "%kernel.debug%"
strict_variables: "%kernel.debug%"
4 changes: 2 additions & 2 deletions src/Bundle/test/config/bundles.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
Doctrine\Bundle\DoctrineBundle\DoctrineBundle::class => ['all' => true],
Sylius\Bundle\ResourceBundle\SyliusResourceBundle::class => ['all' => true],
BabDev\PagerfantaBundle\BabDevPagerfantaBundle::class => ['all' => true],
Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true],
Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true, 'test_without_twig' => false],
Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle::class => ['all' => true],
AppBundle\AppBundle::class => ['all' => true],
FOS\RestBundle\FOSRestBundle::class => ['test' => true],
JMS\SerializerBundle\JMSSerializerBundle::class => ['test' => true],
Bazinga\Bundle\HateoasBundle\BazingaHateoasBundle::class => ['test' => true],
Fidry\AliceDataFixtures\Bridge\Symfony\FidryAliceDataFixturesBundle::class => ['test' => true],
Nelmio\Alice\Bridge\Symfony\NelmioAliceBundle::class => ['test' => true],
winzou\Bundle\StateMachineBundle\winzouStateMachineBundle::class => ['test' => true, 'test_without_fosrest' => true],
winzou\Bundle\StateMachineBundle\winzouStateMachineBundle::class => ['all' => true, 'test_without_state_machine' => false],
];