Skip to content

Commit 3c1270b

Browse files
committed
bugfix #126 [dependencies] Provide "translation" service via "symfony/translation" instead of "sensio/framework-extra-bundle" (phansys)
This PR was merged into the master branch. Discussion ---------- |Q |A | |--- |--- | |Branch |master| |Bug fix? |yes | |New feature? |no | |BC breaks? |no | |Deprecations?|no | |Tests pass? |yes | |Fixed tickets|n/a | |License |MIT | |Doc PR |n/a | * Provide "translation" service via "symfony/translation" instead of "sensio/framework-extra-bundle"; * Declare "SYMFONY_PHPUNIT_VERSION" at CI tests in order to avoid issues with nonexistent PHPUnit branches (see symfony/symfony#29265, sebastianbergmann/phpunit#3413). Commits ------- dd8ec39 [dependencies] Provide "translation" service via "symfony/translation" instead of "sensio/framework-extra-bundle"
2 parents 79192b1 + dd8ec39 commit 3c1270b

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

.travis.yml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,25 @@ matrix:
1717
fast_finish: true
1818
include:
1919
- php: 5.6
20+
env: SYMFONY_PHPUNIT_VERSION="5.7.27"
2021
- php: 5.6
21-
env: COMPOSER_FLAGS="--prefer-lowest"
22+
env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_PHPUNIT_VERSION="5.7.27"
2223
- php: 5.6
23-
env: SYMFONY_VERSION="~2.8.0"
24+
env: SYMFONY_VERSION="~2.8.0" SYMFONY_PHPUNIT_VERSION="5.7.27"
2425
- php: 5.6
25-
env: SYMFONY_VERSION="~3.0.0"
26+
env: SYMFONY_VERSION="~3.0.0" SYMFONY_PHPUNIT_VERSION="5.7.27"
2627
- php: 5.6
27-
env: SYMFONY_VERSION="~3.1.0"
28+
env: SYMFONY_VERSION="~3.1.0" SYMFONY_PHPUNIT_VERSION="5.7.27"
2829
- php: 5.6
29-
env: SYMFONY_VERSION="~3.2.0"
30+
env: SYMFONY_VERSION="~3.2.0" SYMFONY_PHPUNIT_VERSION="5.7.27"
3031
- php: 5.6
31-
env: INSTALL_VICH_UPLOADER_BUNDLE=true
32+
env: INSTALL_VICH_UPLOADER_BUNDLE=true SYMFONY_PHPUNIT_VERSION="5.7.27"
3233
- php: 7.2
33-
env: SYMFONY_VERSION="^4.1@dev"
34+
env: SYMFONY_VERSION="^4.2@dev" SYMFONY_PHPUNIT_VERSION="7.4.4"
3435
allow_failures:
3536
- php: nightly
3637
- php: hhvm
37-
- env: SYMFONY_VERSION="^4.1@dev"
38+
- env: SYMFONY_VERSION="^4.2@dev" SYMFONY_PHPUNIT_VERSION="7.4.4"
3839

3940
sudo: false
4041

@@ -47,7 +48,7 @@ before_script:
4748
- if [ "$GITHUB_OAUTH_TOKEN" != "" ]; then echo -e $GITHUB_OAUTH_TOKEN && composer config -g github-oauth.github.com $GITHUB_OAUTH_TOKEN; fi;
4849
- if [ "$SYMFONY_VERSION" != "" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --no-update; fi;
4950
- if [ -n $INSTALL_VICH_UPLOADER_BUNDLE ]; then composer require "vich/uploader-bundle" --no-update; fi;
50-
- composer update --prefer-dist --no-interaction $COMPOSER_FLAGS
51+
- COMPOSER_MEMORY_LIMIT=-1 composer update --prefer-dist --no-interaction $COMPOSER_FLAGS
5152

5253
script:
5354
- if [[ -n $INSTALL_VICH_UPLOADER_BUNDLE ]]; then make test_with_vichuploaderbundle; else make test; fi;

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
"doctrine/doctrine-bundle": "^1.4",
3030
"doctrine/orm": "^2.4.8",
3131
"knplabs/knp-paginator-bundle": "^2.3",
32-
"sensio/framework-extra-bundle": "^3.0.2 || ^4.0",
3332
"symfony/config": "^2.8 || ^3.0 || ^4.0",
3433
"symfony/console": "^2.8 || ^3.0 || ^4.0",
3534
"symfony/dependency-injection": "^2.8 || ^3.0 || ^4.0",
@@ -40,6 +39,7 @@
4039
"symfony/http-kernel": "^2.8 || ^3.0 || ^4.0",
4140
"symfony/options-resolver": "^2.8 || ^3.0 || ^4.0",
4241
"symfony/security-bundle": "^2.8 || ^3.0 || ^4.0",
42+
"symfony/translation": "^2.8 || ^3.0 || ^4.0",
4343
"symfony/validator": "^2.8 || ^3.0 || ^4.0",
4444
"symfony/yaml": "^2.8 || ^3.0 || ^4.0"
4545
},
@@ -53,6 +53,7 @@
5353
"phpunit/phpunit": "<5.4.3"
5454
},
5555
"suggest": {
56+
"friendsofsymfony/user-bundle": "In order to ease user management",
5657
"vich/uploader-bundle": "Allow attaching files to ticket messages"
5758
},
5859
"autoload": {

0 commit comments

Comments
 (0)