Possible fix for #491 - solving for giticide on package dep

snipe · Feb 5, 2015 · 1aeb4de · 1aeb4de
1 parent bff33cb
commit 1aeb4de
Show file tree

Hide file tree

Showing 3 changed files with 103 additions and 89 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,7 @@
+addons:
+  hosts:
+    - AlisonMBP
+
 # see http://about.travis-ci.org/docs/user/languages/php/ for more hints
 language: php
 
@@ -20,9 +24,9 @@ before_script:
   - composer self-update
   - composer install --prefer-source --no-interaction --no-dev
   - php artisan key:generate
-  - php artisan migrate:install --force
-  - php artisan migrate --package cartalyst/sentry --force
-  - php artisan migrate --force
+  - php artisan migrate:install
+  - php artisan migrate --package cartalyst/sentry
+  - php artisan migrate
   - php artisan db:seed
 
 # omitting "script:" will default to phpunit

diff --git a/composer.json b/composer.json
@@ -8,8 +8,11 @@
 		"issues": "https://github.com/snipe/snipe-it/issues",
 		"source": "https://github.com/snipe/snipe-it"
 	},
+	"replace": {
+    	"mtdowling/classpreloader":"1.0.*"
+	},
 	"require": {
-		 "classpreloader/classpreloader": "1.0.2",
+		"classpreloader/classpreloader": "1.2.0",
 		"laravel/framework": "4.2.*",
 		"cartalyst/sentry": "2.0.*",
 		"barryvdh/laravel-debugbar": "1.x",