Merge pull request #248 from paulandrieux/bugfix/travis

drop database in travis script
Victoire · Oct 23, 2015 · ad8c27a · ad8c27a
2 parents 2ef4de0 + fd01306
commit ad8c27a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -13,8 +13,8 @@ before_script:
   - COMPOSER_ROOT_VERSION=dev-master composer install --prefer-dist
   # Prepare database
   - php Tests/Functionnal/bin/console --env=test doctrine:database:create
-  - php Tests/Functionnal/bin/console --env=test cache:warmup
   - php Tests/Functionnal/bin/console --env=test doctrine:schema:create
+  - php Tests/Functionnal/bin/console --env=test cache:warmup
   - php Tests/Functionnal/bin/console --env=test victoire:generate:view
   - php Tests/Functionnal/bin/console --env=test assets:install Tests/Functionnal/web
   - php Tests/Functionnal/bin/console --env=test assetic:dump

diff --git a/Bundle/CoreBundle/CacheWarmer/ViewCssWarmer.php b/Bundle/CoreBundle/CacheWarmer/ViewCssWarmer.php
@@ -37,6 +37,9 @@ public function __construct(ViewCssBuilder $viewCssBuilder, EntityManager $entit
      */
     public function warmUp($cacheDir)
     {
+        if (!$this->entityManager->getConnection()->isConnected()) {
+            return;
+        }
         $viewRepo = $this->entityManager->getRepository('Victoire\Bundle\CoreBundle\Entity\View');
         $widgetRepo = $this->entityManager->getRepository('Victoire\Bundle\WidgetBundle\Entity\Widget');
         $views = $viewRepo->findAll();