Merge c68a1bbc74 into 5df969be82

tests/scripts/travis_setup.sh

@@ -11,12 +11,15 @@ 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.phpqatools.org
+pear channel-discover pear.netpirates.net
+pear install drush/drush
+pear install pear/PHP_CodeSniffer
+pear install pear.phpunit.de/phpcpd
 phpenv rehash
 drush dl --yes drupal
 cd drupal-*