From eeeb78f343c7e912c9769e419ec798afed22fa6d Mon Sep 17 00:00:00 2001 From: Jordan Dukart Date: Thu, 25 Jul 2013 12:01:19 -0300 Subject: [PATCH 1/4] Codesniffer upgrade breaks on these two lines. --- includes/tuque_wrapper.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/includes/tuque_wrapper.inc b/includes/tuque_wrapper.inc index 8563070f..780622ee 100644 --- a/includes/tuque_wrapper.inc +++ b/includes/tuque_wrapper.inc @@ -269,6 +269,7 @@ class IslandoraFedoraApiM extends FedoraApiM { switch ($action) { case 'block': throw new Exception('Purge Datastream was blocked.'); + break; case 'delete': @@ -313,6 +314,7 @@ class IslandoraFedoraApiM extends FedoraApiM { switch ($action) { case 'block': throw new Exception('Purge object was blocked.'); + break; case 'delete': From 801573614909b7dc537853646fc165bd43848c20 Mon Sep 17 00:00:00 2001 From: Jordan Dukart Date: Thu, 25 Jul 2013 12:06:27 -0300 Subject: [PATCH 2/4] Unneeded breaks around throws. --- includes/tuque_wrapper.inc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/includes/tuque_wrapper.inc b/includes/tuque_wrapper.inc index 780622ee..3c14b303 100644 --- a/includes/tuque_wrapper.inc +++ b/includes/tuque_wrapper.inc @@ -270,8 +270,6 @@ class IslandoraFedoraApiM extends FedoraApiM { case 'block': throw new Exception('Purge Datastream was blocked.'); - break; - case 'delete': $object[$dsid]->state = 'D'; return array(); @@ -315,8 +313,6 @@ class IslandoraFedoraApiM extends FedoraApiM { case 'block': throw new Exception('Purge object was blocked.'); - break; - case 'delete': $object->state = 'D'; return ''; From 21b38377e1b0e45b59b244f58d68ae37fb4bad9c Mon Sep 17 00:00:00 2001 From: Jordan Dukart Date: Thu, 25 Jul 2013 14:18:43 -0300 Subject: [PATCH 3/4] Force update fix. --- tests/scripts/travis_setup.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/scripts/travis_setup.sh b/tests/scripts/travis_setup.sh index 45dc3ab9..2a3694e5 100755 --- a/tests/scripts/travis_setup.sh +++ b/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 From 8c6f39bc0422313d612128d6e7c9658ba3108229 Mon Sep 17 00:00:00 2001 From: Jordan Dukart Date: Thu, 25 Jul 2013 14:23:12 -0300 Subject: [PATCH 4/4] Dashes. --- tests/scripts/travis_setup.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/scripts/travis_setup.sh b/tests/scripts/travis_setup.sh index 2a3694e5..19c7db78 100755 --- a/tests/scripts/travis_setup.sh +++ b/tests/scripts/travis_setup.sh @@ -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