Skip to content

Commit a3d3b69

Browse files
committed
Merge pull request #280 from symfony-cmf/test_lowest
Test lowest versions of dependencies
2 parents 05192bd + f365ae9 commit a3d3b69

File tree

4 files changed

+26
-16
lines changed

4 files changed

+26
-16
lines changed

.travis.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,29 +15,29 @@ cache:
1515
- $HOME/.composer/cache
1616

1717
env:
18-
- SYMFONY_VERSION=2.6.*
18+
- SYMFONY_VERSION=2.6.* PACKAGE_VERSION=high
1919

2020
matrix:
2121
include:
2222
- php: 5.6
23-
env: SYMFONY_VERSION=2.3.*
23+
env: SYMFONY_VERSION=2.3.* PACKAGE_VERSION=high
2424
- php: 5.6
25-
env: SYMFONY_VERSION=2.5.*
26-
- php: 5.6
27-
env: SYMFONY_VERSION=2.7.*
28-
- php: 5.6
29-
env: SYMFONY_VERSION=3.0.*
25+
env: SYMFONY_VERSION=2.5.* PACKAGE_VERSION=high
26+
- php: 5.3
27+
env: SYMFONY_VERSION=2.3.* PACKAGE_VERSION=low
3028
allow_failures:
3129
- php: 5.6
32-
env: SYMFONY_VERSION=2.7.*
30+
env: SYMFONY_VERSION=2.7.* PACKAGE_VERSION=high
3331
- php: 5.6
34-
env: SYMFONY_VERSION=3.0.*
32+
env: SYMFONY_VERSION=3.0.*@dev PACKAGE_VERSION=high
3533
- php: nightly
3634

3735
before_script:
36+
- if [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then echo "memory_limit = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi
3837
- composer self-update
39-
- if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then echo "memory_limit = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi
40-
- composer require symfony/symfony:${SYMFONY_VERSION} --prefer-dist
38+
- composer require symfony/symfony:${SYMFONY_VERSION} --no-update
39+
- if [[ "$PACKAGE_VERSION" == "high" ]]; then composer update --prefer-source; fi
40+
- if [[ "$PACKAGE_VERSION" == "low" ]]; then composer update --prefer-lowest --prefer-source; fi
4141
- vendor/symfony-cmf/testing/bin/travis/phpcr_odm_doctrine_dbal.sh
4242

4343
script: phpunit --coverage-text

Admin/Extension/FrontendLinkExtension.php

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,16 @@ public function __construct(RouterInterface $router, TranslatorInterface $transl
5050
$this->translator = $translator;
5151
}
5252

53+
public function configureSideMenu(
54+
AdminInterface $admin,
55+
MenuItemInterface $menu,
56+
$action,
57+
AdminInterface $childAdmin = null
58+
) {
59+
$this->configureTabMenu($admin, $menu, $action, $childAdmin);
60+
}
61+
5362
/**
54-
* @return void
5563
* @throws InvalidConfigurationException
5664
*/
5765
public function configureTabMenu(

Tests/WebTest/RedirectRouteAdminTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public function testRedirectRouteCreate()
8484
*/
8585
private function assertFrontendLinkPresent(Crawler $crawler)
8686
{
87-
$this->assertCount(1, $link = $crawler->filter('a[class="sonata-admin-frontend-link"]'));
87+
$this->assertCount(1, $link = $crawler->filter('a[class="sonata-admin-frontend-link"]'), 'The page contains a frontend link');
8888
$this->assertEquals('/redirect-route-1', $link->attr('href'));
8989
}
9090

composer.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,14 @@
2020
},
2121
"require-dev": {
2222
"symfony-cmf/core-bundle": "~1.1",
23-
"symfony-cmf/testing": "~1.1",
24-
"matthiasnoback/symfony-dependency-injection-test": "0.*",
23+
"symfony-cmf/testing": "~1.2,>=1.2.6",
24+
"matthiasnoback/symfony-dependency-injection-test": "~0.6",
2525
"matthiasnoback/symfony-config-test": "0.*",
26+
"phpunit/php-code-coverage": "@stable",
2627
"sonata-project/doctrine-phpcr-admin-bundle": "~1.1",
2728
"symfony/monolog-bundle": "~2.3",
28-
"doctrine/orm": "~2.3"
29+
"doctrine/orm": "~2.3",
30+
"doctrine/data-fixtures": "1.*,>=1.0.0-alpha3"
2931
},
3032
"suggest": {
3133
"doctrine/phpcr-odm": "To enable support for the PHPCR ODM documents",

0 commit comments

Comments
 (0)