Skip to content

Commit 5083b71

Browse files
committed
do not change jsrouting-bundle's version
1 parent 328add4 commit 5083b71

File tree

3 files changed

+17
-21
lines changed

3 files changed

+17
-21
lines changed

config/projects.yml

+1-5
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,7 @@ core-bundle:
3333
functional_tests_phpcr: ~
3434
test_installation: ~
3535
versions:
36-
symfony: ['2.8.*', '3.3.*', '3.4.*']
37-
failing_allowed_versions:
38-
symfony: ['4.0.*']
36+
symfony: ['2.8.*', '3.3.*', '3.4.*', '4.0.*']
3937
block-bundle:
4038
description: |
4139
The BlockBundle provides integration with
@@ -237,8 +235,6 @@ sonata-phpcr-admin-integration-bundle:
237235
test_installation: ~
238236
versions:
239237
symfony: ['2.8.*','3.3.*', '3.4.*', '4.0.*']
240-
failing_allowed_versions:
241-
symfony: ['4.0.*']
242238
resource:
243239
excluded_files:
244240
- .travis.yml.twig

project/README.md.twig

+14-14
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ For general support and questions, please use [StackOverflow](http://stackoverfl
4949
## Contributing
5050

5151
Pull requests are welcome. Please see our
52-
[CONTRIBUTING](https://github.com/symfony-cmf/symfony-cmf/blob/master/CONTRIBUTING.md)
52+
[CONTRIBUTING](https://github.com/symfony-cmf/blob/master/CONTRIBUTING.md)
5353
guide.
5454

5555
Unit and/or functional tests exist for this package. See the
@@ -63,16 +63,16 @@ Thanks to
6363

6464
This package is available under the [MIT license](src/Resources/meta/LICENSE).
6565

66-
[travis_legacy_badge]: https://travis-ci.org/symfony-cmf/{{ repository_name }}.svg?branch={{ legacy_branch }}
67-
[travis_legacy_link]: https://travis-ci.org/symfony-cmf/{{ packagist_name }}
68-
[travis_stable_badge]: https://travis-ci.org/symfony-cmf/{{ repository_name }}.svg?branch={{ stable_branch }}
69-
[travis_stable_link]: https://travis-ci.org/symfony-cmf/{{ packagist_name }}
70-
[travis_unstable_badge]: https://travis-ci.org/symfony-cmf/{{ repository_name }}.svg?branch={{ unstable_branch }}
71-
[travis_unstable_link]: https://travis-ci.org/symfony-cmf/{{ packagist_name }}
72-
73-
[coveralls_legacy_badge]: https://coveralls.io/repos/github/symfony-cmf/{{ repository_name }}/badge.svg?branch={{ legacy_branch }}
74-
[coveralls_legacy_link]: https://coveralls.io/github/symfony-cmf/{{ repository_name }}?branch={{ legacy_branch }}
75-
[coveralls_stable_badge]: https://coveralls.io/repos/github/symfony-cmf/{{ repository_name }}/badge.svg?branch={{ stable_branch }}
76-
[coveralls_stable_link]: https://coveralls.io/github/symfony-cmf/{{ repository_name }}?branch={{ stable_branch }}
77-
[coveralls_unstable_badge]: https://coveralls.io/repos/github/symfony-cmf/{{ repository_name }}/badge.svg?branch={{ unstable_branch }}
78-
[coveralls_unstable_link]: https://coveralls.io/github/symfony-cmf/{{ repository_name }}?branch={{ unstable_branch }}
66+
[travis_legacy_badge]: https://travis-ci.org/{{ repository_name }}.svg?branch={{ legacy_branch }}
67+
[travis_legacy_link]: https://travis-ci.org/{{ packagist_name }}
68+
[travis_stable_badge]: https://travis-ci.org/{{ repository_name }}.svg?branch={{ stable_branch }}
69+
[travis_stable_link]: https://travis-ci.org/{{ packagist_name }}
70+
[travis_unstable_badge]: https://travis-ci.org/{{ repository_name }}.svg?branch={{ unstable_branch }}
71+
[travis_unstable_link]: https://travis-ci.org/{{ packagist_name }}
72+
73+
[coveralls_legacy_badge]: https://coveralls.io/repos/github/{{ repository_name }}/badge.svg?branch={{ legacy_branch }}
74+
[coveralls_legacy_link]: https://coveralls.io/github/{{ repository_name }}?branch={{ legacy_branch }}
75+
[coveralls_stable_badge]: https://coveralls.io/repos/github/{{ repository_name }}/badge.svg?branch={{ stable_branch }}
76+
[coveralls_stable_link]: https://coveralls.io/github/{{ repository_name }}?branch={{ stable_branch }}
77+
[coveralls_unstable_badge]: https://coveralls.io/repos/github/{{ repository_name }}/badge.svg?branch={{ unstable_branch }}
78+
[coveralls_unstable_link]: https://coveralls.io/github/{{ repository_name }}?branch={{ unstable_branch }}

src/Console/Command/DispatchCommand.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ private function setVersionConstraintsInComposer($path, array $projectConfig, $c
574574
$this->evaluateVersionString($branchConfig['versions']['symfony']),
575575
'^2.8 | '
576576
);
577-
} elseif (preg_match('/symfony\//', $package)) {
577+
} elseif (preg_match('/symfony\//', $package) && 'friendsofsymfony/jsrouting-bundle' !== $package) {
578578
$composerAsJson['require'][$package] = $this->evaluateVersionString($branchConfig['versions']['symfony']);
579579
}
580580
}
@@ -584,7 +584,7 @@ private function setVersionConstraintsInComposer($path, array $projectConfig, $c
584584
$composerAsJson['require-dev'][$package] = '~3.1';
585585
} elseif ('symfony/phpunit-bridge' === $package) {
586586
$composerAsJson['require-dev'][$package] = $this->evaluateVersionString($branchConfig['versions']['symfony'], '3.2');
587-
} elseif (preg_match('/symfony\//', $package)) {
587+
} elseif (preg_match('/symfony\//', $package) && 'friendsofsymfony/jsrouting-bundle' !== $package) {
588588
$composerAsJson['require-dev'][$package] = $this->evaluateVersionString($branchConfig['versions']['symfony']);
589589
}
590590
}

0 commit comments

Comments
 (0)