partkeepr

commit 3269bbf7d6c8f713dc0c54664a8b8ea3c43e7b93
parent 2619b53ab1b26192fcc8d31b570236d6907b56ba
Author: Felicitus <felicitus@felicitus.org>
Date:   Tue,  7 Jul 2015 00:20:02 +0200

Don't run clearCache as script for now, until the ModelCacheWarmer is fixed

Diffstat:
M
.travis.yml
 | 
4
+---
M
composer.json
 | 
4
+---

2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/.travis.yml b/.travis.yml
@@ -29,8 +29,6 @@ before_script:
   - if [[ "$DB" == "mysql" ]]; then mysql -e "DROP IF EXISTS partkeepr_test;" -uroot; fi
   - if [[ "$DB" == "mysql" ]]; then mysql -e "create database IF NOT EXISTS partkeepr_test;" -uroot; fi
   - composer self-update
-  - composer install --prefer-source --no-interaction --no-scripts
-  - composer update --no-scripts
+  - composer install --prefer-source --no-interaction
   - app/console cache:warmup --env=test
-  - app/console doctrine:database:create --env=test
   - app/console doctrine:schema:create --env=test 
\ No newline at end of file
diff --git a/composer.json b/composer.json
@@ -27,7 +27,7 @@
         "php": ">=5.3.3",
         "symfony/symfony": "~2.7",
         "incenteev/composer-parameter-handler": "~2.0",
-        "doctrine/orm": "~2.4",
+        "doctrine/orm": "~2.5",
         "doctrine/doctrine-bundle": "~1.2",
         "twig/extensions": "*",
         "symfony/assetic-bundle": "~2.3",
@@ -60,14 +60,12 @@
         "post-install-cmd": [
             "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile"
         ],
         "post-update-cmd": [
             "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile"