diff --git a/.travis.yml b/.travis.yml index 73ae082a7..0228fd3f7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ addons: postgresql: "9.3" install: - - composer install --dev + - composer install --dev --no-interaction - cp Tests/Fixtures/App/app/config/parameters.travis.yml Tests/Fixtures/App/app/config/parameters.yml before_script: @@ -22,7 +22,7 @@ before_script: - psql -d test0 -c 'CREATE EXTENSION unaccent;' -U postgres - php Tests/Fixtures/App/app/console.php --env=test cache:warmup - php Tests/Fixtures/App/app/console.php assets:install Tests/Fixtures/App/web - - php Tests/Fixtures/App/app/console.php doctrine:schema:create --env=test --no-interaction + - php Tests/Fixtures/App/app/console.php doctrine:migrations:migrate --no-interaction - php Tests/Fixtures/App/app/console.php doctrine:fixtures:load --env=test --no-interaction script: phpunit --coverage-text diff --git a/Tests/Fixtures/App/app/AppKernel.php b/Tests/Fixtures/App/app/AppKernel.php index 9880d4828..23b95d3fa 100644 --- a/Tests/Fixtures/App/app/AppKernel.php +++ b/Tests/Fixtures/App/app/AppKernel.php @@ -16,7 +16,8 @@ class AppKernel extends Kernel new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(), new Chill\PersonBundle\ChillPersonBundle(), new Chill\MainBundle\ChillMainBundle(), - new \Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle, + new \Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle(), + new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle() #add here all the required bundle (some bundle are not required) ); } diff --git a/Tests/Fixtures/App/app/DoctrineMigrations/.gitignore b/Tests/Fixtures/App/app/DoctrineMigrations/.gitignore new file mode 100644 index 000000000..d6b7ef32c --- /dev/null +++ b/Tests/Fixtures/App/app/DoctrineMigrations/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/composer.json b/composer.json index 501fab8a0..8210fcd75 100644 --- a/composer.json +++ b/composer.json @@ -30,7 +30,9 @@ "chill-project/main": "*@dev", "chill-project/custom-fields": "*@dev", "doctrine/doctrine-fixtures-bundle": "~2.2", - "champs-libres/composer-bundle-migration": "~1.0" + "champs-libres/composer-bundle-migration": "~1.0", + "doctrine/doctrine-migrations-bundle": "dev-master@dev", + "doctrine/migrations": "~1.0@dev" }, "require-dev": { "symfony/dom-crawler": "2.5",