Merge pull request #340 from jonathangreen/7.x-fix-travis

Attempt to fix travis

includes/ingest.form.inc

@@ -78,7 +78,7 @@ function islandora_ingest_form_init_form_state_storage(array &$form_state, array
     if (empty($objects)) {
       $objects[] = islandora_ingest_form_prepare_new_object($configuration);
     }
-    // Make sure the models actually exist
+    // Make sure the models actually exist.
     foreach ($configuration['models'] as $key => $model) {
       if (!islandora_object_load($model)) {
         unset($configuration['models'][$key]);

tests/scripts/travis_setup.sh

@@ -11,12 +11,16 @@ cd islandora_tomcat
 export CATALINA_HOME='.'
 ./bin/startup.sh
 cd $HOME
-pyrus channel-discover pear.drush.org
-pyrus channel-discover pear.phpqatools.org
-pyrus channel-discover pear.netpirates.net
-pyrus install drush/drush
-pyrus install pear/PHP_CodeSniffer
-pyrus install pear.phpunit.de/phpcpd
+pear upgrade –force Console_Getopt
+pear upgrade –force pear
+pear upgrade-all
+pear channel-discover pear.drush.org
+pear channel-discover pear.drush.org
+pear channel-discover pear.phpqatools.org
+pear channel-discover pear.netpirates.net
+pear install pear/PHP_CodeSniffer
+pear install pear.phpunit.de/phpcpd
+pear install drush/drush
 phpenv rehash
 drush dl --yes drupal
 cd drupal-*