Skip to content

Commit e2455b7

Browse files
committed
Speed up Travis
1 parent b1c6d6b commit e2455b7

File tree

3 files changed

+32
-34
lines changed

3 files changed

+32
-34
lines changed

.travis.yml

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,32 +15,31 @@ cache:
1515
- $HOME/.composer/cache/files
1616

1717
env:
18-
- SYMFONY_VERSION=2.7.* SYMFONY_DEPRECATIONS_HELPER=weak
18+
global:
19+
- SYMFONY_DEPRECATIONS_HELPER=7
1920

2021
matrix:
2122
include:
2223
- php: 5.6
23-
env: SYMFONY_VERSION=2.3.* SYMFONY_DEPRECATIONS_HELPER=weak
24+
env: DEPS=dev
25+
- php: 5.3
26+
env: COMPOSER_FLAGS="--prefer-lowest"
2427
- php: 5.6
25-
env: SYMFONY_VERSION=2.8.*
28+
env: SYMFONY_VERSION=2.3.*
2629
- php: 5.6
27-
env: SYMFONY_VERSION=3.0.*
28-
- php: 5.3
29-
env: SYMFONY_VERSION=2.3.* COMPOSER_FLAGS="--prefer-lowest" SYMFONY_DEPRECATIONS_HELPER=weak
30-
allow_failures:
31-
- php: nightly
32-
- env: SYMFONY_VERSION=2.8.*
33-
- env: SYMFONY_VERSION=3.0.*
30+
env: SYMFONY_VERSION=2.7.*
3431
fast_finish: true
3532

3633
before_install:
34+
- if [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then echo "memory_limit = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi
35+
- phpenv config-rm xdebug.ini || true
3736
- composer self-update
38-
- if [ "${TRAVIS_PHP_VERSION}" != "hhvm" ]; then echo "memory_limit = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi
39-
- composer require symfony/symfony:${SYMFONY_VERSION} --no-update
37+
- if [ "$DEPS" = "dev" ]; then perl -pi -e 's/^}$/,"minimum-stability":"dev"}/' composer.json; fi
38+
- if [ "$SYMFONY_VERSION" != "" ]; then composer require symfony/symfony:${SYMFONY_VERSION} --no-update; fi
4039

41-
install: composer update $COMPOSER_FLAGS --prefer-dist
40+
install: composer update --prefer-dist $COMPOSER_FLAGS
4241

43-
script: phpunit --coverage-text
42+
script: phpunit
4443

4544
notifications:
4645
irc: "irc.freenode.org#symfony-cmf"

Tests/Resources/DataFixture/LoadRouteData.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ public function load(ObjectManager $manager)
2828

2929
$test = new Generic();
3030
$test->setNodename('test');
31-
$test->setParent($root);
31+
$test->setParentDocument($root);
3232
$manager->persist($test);
3333

3434
$content = new Generic();
3535
$content->setNodename('content');
36-
$content->setParent($test);
36+
$content->setParentDocument($test);
3737
$manager->persist($content);
3838

3939
$aContent = new Content();
@@ -46,22 +46,22 @@ public function load(ObjectManager $manager)
4646

4747
$cms = new Generic();
4848
$cms->setNodename('cms');
49-
$cms->setParent($test);
49+
$cms->setParentDocument($test);
5050
$manager->persist($cms);
5151

5252
$routes = new Generic();
5353
$routes->setNodename('routes');
54-
$routes->setParent($cms);
54+
$routes->setParentDocument($cms);
5555
$manager->persist($routes);
5656

5757
$aRoute = new Route();
5858
$aRoute->setName('a');
59-
$aRoute->setParent($routes);
59+
$aRoute->setParentDocument($routes);
6060
$aRoute->setContent($aContent);
6161
$manager->persist($aRoute);
6262
$bRoute = new Route();
6363
$bRoute->setName('b');
64-
$bRoute->setParent($routes);
64+
$bRoute->setParentDocument($routes);
6565
$bRoute->setContent($bContent);
6666
$manager->persist($bRoute);
6767
$manager->flush();

composer.json

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,26 @@
1111
"homepage": "https://github.com/symfony-cmf/CoreBundle/contributors"
1212
}
1313
],
14-
"minimum-stability": "dev",
1514
"require": {
1615
"php": "^5.3.9|^7.0",
17-
"symfony/framework-bundle": "~2.3"
16+
"symfony/framework-bundle": "^2.3"
1817
},
1918
"require-dev": {
20-
"symfony/security-bundle": "~2.1",
21-
"mockery/mockery": "~0.9.4",
22-
"symfony-cmf/routing-bundle": "~1.2,>=1.2.0-RC3",
23-
"symfony-cmf/testing": "~1.2,>=1.2.6",
24-
"sonata-project/admin-bundle": "~2.2",
19+
"symfony/security-bundle": "^2.1",
20+
"mockery/mockery": "^0.9.4",
21+
"symfony-cmf/routing-bundle": "^1.2.0-RC3",
22+
"symfony-cmf/testing": "^1.3@dev",
23+
"sonata-project/admin-bundle": "^2.2",
2524
"doctrine/dbal": "2.5.*"
2625
},
2726
"suggest": {
28-
"symfony/twig-bundle": "To get access to the CMF twig extension, ~2.1",
29-
"doctrine/phpcr-bundle": "To be able to use the CMF twig extension, ~1.0",
30-
"doctrine/phpcr-odm": "To be able to use the CMF twig extension, ~1.0",
31-
"symfony/security-bundle": "To be able to use the publish workflow system, ~2.1",
32-
"symfony-cmf/routing": "To be able to use the CMF twig extension functions cmf_prev_linkable/cmf_next_linkable, ~1.0",
33-
"symfony-cmf/routing-bundle": "To be able to enable the publish_workflow_listener, ~1.0",
34-
"sonata-project/admin-bundle": "To be able to enable the publish_workflow_listener extension, ~2.2"
27+
"symfony/twig-bundle": "To get access to the CMF twig extension (^2.1)",
28+
"doctrine/phpcr-bundle": "To be able to use the CMF twig extension (^1.0)",
29+
"doctrine/phpcr-odm": "To be able to use the CMF twig extension (^1.0)",
30+
"symfony/security-bundle": "To be able to use the publish workflow system (^2.1)",
31+
"symfony-cmf/routing": "To be able to use the CMF twig extension functions cmf_prev_linkable/cmf_next_linkable (^1.2)",
32+
"symfony-cmf/routing-bundle": "To be able to enable the publish_workflow_listener (^1.2)",
33+
"sonata-project/admin-bundle": "To be able to enable the publish_workflow_listener extension (^2.2)"
3534
},
3635
"autoload": {
3736
"psr-4": {

0 commit comments

Comments
 (0)