Merge branch '7.x' into 7.x-new-datastream-alter

includes/tuque_wrapper.inc

@@ -282,7 +282,6 @@ class IslandoraFedoraApiM extends FedoraApiM {
       switch ($action) {
         case 'block':
           throw new Exception('Purge Datastream was blocked.');
-        break;
 
         case 'delete':
           $object[$dsid]->state = 'D';
@@ -326,7 +325,6 @@ class IslandoraFedoraApiM extends FedoraApiM {
       switch ($action) {
         case 'block':
           throw new Exception('Purge object was blocked.');
-        break;
 
         case 'delete':
           $object->state = 'D';

tests/scripts/travis_setup.sh

@@ -1,4 +1,4 @@
-#!/bin/bash     
+#!/bin/bash
 
 mysql -u root -e 'create database drupal;'
 mysql -u root -e "create database fedora;"
@@ -11,8 +11,8 @@ cd islandora_tomcat
 export CATALINA_HOME='.'
 ./bin/startup.sh
 cd $HOME
-pear upgrade –force Console_Getopt
-pear upgrade –force pear
+pear upgrade --force Console_Getopt
+pear upgrade --force pear
 pear upgrade-all
 pear channel-discover pear.drush.org
 pear channel-discover pear.drush.org