Merge branch '7.x' of https://github.com/Islandora/islandora into 7.x

.travis.yml

@@ -8,9 +8,11 @@ branches:
 env:
   - FEDORA_VERSION="3.5"
 before_install:
+  - export ISLANDORA_DIR=$TRAVIS_BUILD_DIR
   - $TRAVIS_BUILD_DIR/tests/travis_setup.sh
   - cd $HOME/drupal-*
 script:
   - ant -buildfile sites/all/modules/islandora/build.xml lint
   - drush dcs sites/all/modules/islandora
+  - phpcpd --names *.module,*.inc,*.test sites/all/modules/islandora
   - drush test-run --uri=http://localhost:8081 Islandora

islandora.module

@@ -238,13 +238,6 @@ function islandora_menu() {
     'access arguments' => array(FEDORA_VIEW_OBJECTS, 2),
     'load arguments' => array(2),
   );
-  $items['islandora/ingest'] = array(
-    'title' => 'Add an Object',
-    'page callback' => 'islandora_ingest_callback',
-    'file' => 'includes/ingest.menu.inc',
-    'type' => MENU_SUGGESTED_ITEM,
-    'access arguments' => array(FEDORA_INGEST),
-  );
   $items['islandora/object/%islandora_object/download_clip'] = array(
     'page callback' => 'islandora_download_clip',
     'page arguments' => array(2),

tests/islandora_test.info

@@ -1,6 +0,0 @@
-name = Islandora Test Module
-description = Tests Hooks. Do not enable.
-core = 7.x
-package = Testing
-hidden = TRUE
-dependencies[] = islandora

tests/islandora_test.module

@@ -1,152 +0,0 @@
-<?php
-
-/**
- * @file
- * Implements hooks that get tested by islandora_hooks.test
- */
-
-/**
- * Implements hook_islandora_object_alter().
- */
-function islandora_hooks_test_islandora_object_alter(AbstractFedoraObject $object, array &$context) {
-  switch ($context['action']) {
-    case 'ingest':
-      if ($object->id == 'test:testIngestedObjectHook') {
-        $_SESSION['islandora_hooks']['alter'][ISLANDORA_OBJECT_INGESTED_HOOK] = TRUE;
-        if ($object->label == 'block') {
-          $context['block'] = TRUE;
-        }
-      }
-      break;
-
-    case 'modify':
-      if ($object->id == 'test:testModifiedObjectHook') {
-        $_SESSION['islandora_hooks']['alter'][ISLANDORA_OBJECT_MODIFIED_HOOK] = TRUE;
-        if (isset($context['params']['label']) && $context['params']['label'] == 'block') {
-          $context['block'] = TRUE;
-        }
-      }
-      elseif ($object->id == 'test:testPurgedObjectHook') {
-        $_SESSION['islandora_hooks']['alter'][ISLANDORA_OBJECT_PURGED_HOOK] = TRUE;
-        if (isset($context['params']['label']) && $context['params']['label'] == 'block') {
-          $context['block'] = TRUE;
-        }
-        elseif (isset($context['params']['label']) && $context['params']['label'] == 'delete') {
-          $context['delete'] = TRUE;
-        }
-      }
-      break;
-
-    case 'purge':
-      if ($object->id == 'test:testPurgedObjectHook') {
-        $_SESSION['islandora_hooks']['alter'][ISLANDORA_OBJECT_PURGED_HOOK] = TRUE;
-        if ($object->label == 'block') {
-          $context['block'] = TRUE;
-        }
-        elseif ($object->label == 'delete') {
-          $context['delete'] = TRUE;
-        }
-      }
-      break;
-  }
-}
-
-/**
- * Implements hook_islandora_object_alter().
- */
-function islandora_hooks_test_islandora_datastream_alter(AbstractFedoraObject $object, AbstractFedoraDatastream $datastream, array &$context) {
-  switch ($context['action']) {
-    case 'ingest':
-      if ($object->id == 'test:testIngestedDatastreamHook') {
-        $_SESSION['islandora_hooks']['alter'][ISLANDORA_DATASTREAM_INGESTED_HOOK] = TRUE;
-        if ($datastream->label == 'block') {
-          $context['block'] = TRUE;
-        }
-      }
-      break;
-
-    case 'modify':
-      if ($object->id == 'test:testModifiedDatastreamHook') {
-        $_SESSION['islandora_hooks']['alter'][ISLANDORA_DATASTREAM_MODIFIED_HOOK] = TRUE;
-        if (isset($context['params']['dsLabel']) && $context['params']['dsLabel'] == 'block') {
-          $context['block'] = TRUE;
-        }
-      }
-      elseif ($object->id == 'test:testPurgedDatastreamHook') {
-        $_SESSION['islandora_hooks']['alter'][ISLANDORA_DATASTREAM_PURGED_HOOK] = TRUE;
-        if (isset($context['params']['dsLabel']) && $context['params']['dsLabel'] == 'block') {
-          $context['block'] = TRUE;
-        }
-        elseif (isset($context['params']['dsLabel']) && $context['params']['dsLabel'] == 'delete') {
-          $context['delete'] = TRUE;
-        }
-      }
-      break;
-
-    case 'purge':
-      if ($object->id == 'test:testPurgedDatastreamHook') {
-        $_SESSION['islandora_hooks']['alter'][ISLANDORA_DATASTREAM_PURGED_HOOK] = TRUE;
-        if ($datastream->label == 'block') {
-          $context['block'] = TRUE;
-        }
-        elseif ($datastream->label == 'delete') {
-          $context['delete'] = TRUE;
-        }
-      }
-      break;
-  }
-}
-
-/**
- * Implements hook_islandora_object_ingested().
- */
-function islandora_hooks_test_islandora_object_ingested(FedoraObject $object) {
-  if ($object->id == 'test:testIngestedObjectHook') {
-    $_SESSION['islandora_hooks']['hook'][ISLANDORA_OBJECT_INGESTED_HOOK] = TRUE;
-  }
-}
-
-/**
- * Implements hook_islandora_object_modified().
- */
-function islandora_hooks_test_islandora_object_modified(FedoraObject $object) {
-  if ($object->id == 'test:testModifiedObjectHook') {
-    $_SESSION['islandora_hooks']['hook'][ISLANDORA_OBJECT_MODIFIED_HOOK] = TRUE;
-  }
-}
-
-/**
- * Implements hook_islandora_object_purged().
- */
-function islandora_hooks_test_islandora_object_purged($pid) {
-  if ($pid == 'test:testPurgedObjectHook') {
-    $_SESSION['islandora_hooks']['hook'][ISLANDORA_OBJECT_PURGED_HOOK] = TRUE;
-  }
-}
-
-/**
- * Implements hook_islandora_datastream_ingested().
- */
-function islandora_hooks_test_islandora_datastream_ingested(FedoraObject $object, FedoraDatastream $datastream) {
-  if ($object->id == 'test:testIngestedDatastreamHook' && $datastream->id == "TEST") {
-    $_SESSION['islandora_hooks']['hook'][ISLANDORA_DATASTREAM_INGESTED_HOOK] = TRUE;
-  }
-}
-
-/**
- * Implements hook_islandora_datastream_modified().
- */
-function islandora_hooks_test_islandora_datastream_modified(FedoraObject $object, FedoraDatastream $datastream) {
-  if ($object->id == 'test:testModifiedDatastreamHook' && $datastream->id == "TEST") {
-    $_SESSION['islandora_hooks']['hook'][ISLANDORA_DATASTREAM_MODIFIED_HOOK] = TRUE;
-  }
-}
-
-/**
- * Implements hook_islandora_datastream_purged().
- */
-function islandora_hooks_test_islandora_datastream_purged(FedoraObject $object, $dsid) {
-  if ($object->id == 'test:testPurgedDatastreamHook' && $dsid == "TEST") {
-    $_SESSION['islandora_hooks']['hook'][ISLANDORA_DATASTREAM_PURGED_HOOK] = TRUE;
-  }
-}

tests/travis_setup.sh

@@ -12,14 +12,17 @@ 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
 phpenv rehash
 drush dl --yes drupal
 cd drupal-*
 drush si standard --db-url=mysql://drupal:drupal@localhost/drupal --yes
 drush runserver --php-cgi=$HOME/.phpenv/shims/php-cgi localhost:8081 &>/dev/null &
-ln -s $TRAVIS_BUILD_DIR sites/all/modules/islandora
+ln -s $ISLANDORA_DIR sites/all/modules/islandora
 mv sites/all/modules/islandora/tests/travis.test_config.ini sites/all/modules/islandora/tests/test_config.ini
 mkdir sites/all/libraries
 ln -s $HOME/tuque sites/all/libraries/tuque