Update to comply with new coding standards.

TheLanguageArchive · Feb 12, 2019 · 7ec9125 · 7ec9125
1 parent 612a05c
commit 7ec9125
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 11 deletions.
diff --git a/css/islandora_video.theme.css b/css/islandora_video.theme.css
@@ -1,5 +1,5 @@
 .islandora-video-content {
-  background-color: #F2F2F2;
+  background-color: #f2f2f2;
   border: 1px solid #ddd;
   -webkit-border-radius: 5px;
   -moz-border-radius: 5px;
@@ -26,7 +26,7 @@ dl.islandora-video-fields {
 }
 
 dl.islandora-metadata-fields {
-    width:100%;
+  width: 100%;
 }
 
 .islandora-video-metadata dt {
@@ -52,8 +52,8 @@ dl.islandora-metadata-fields {
 }
 
 body.two-sidebars .islandora-video-sidebar {
-    clear: both;
-    width: 100%;
+  clear: both;
+  width: 100%;
 }
 
 @media all and (min-width: 768px) {

diff --git a/includes/derivatives.inc b/includes/derivatives.inc
@@ -227,7 +227,7 @@ function islandora_video_create_thumbnail(AbstractObject $object, $force = FALSE
  *
  * @see hook_islandora_derivative()
  */
-function islandora_video_add_datastream($object, $datastream_id, $file_uri, $delete_file = TRUE) {
+function islandora_video_add_datastream(AbstractObject $object, $datastream_id, $file_uri, $delete_file = TRUE) {
   try {
     $ingest = !isset($object[$datastream_id]);
     $mime_detector = new MimeDetect();
@@ -289,7 +289,7 @@ function islandora_video_add_datastream($object, $datastream_id, $file_uri, $del
  * @param AbstractObject $object
  *   An AbstractObject representing an object within Fedora.
  *
- * @return array|stdClass
+ * @return array|object
  *   FALSE when the object doesn't have the OBJ, an array otherwise.
  */
 function islandora_video_copy_obj_datastream(AbstractObject $object) {

diff --git a/islandora_video.drush.inc b/islandora_video.drush.inc
@@ -56,7 +56,7 @@ function islandora_video_update_videos_create_batch() {
  * @param array $context
  *   The context of the Drupal batch.
  */
-function islandora_video_update_videos_batch_operation(&$context) {
+function islandora_video_update_videos_batch_operation(array &$context) {
   $update_offset = 25;
   $base_query = <<<EOQ
 SELECT ?pid ?date FROM <#ri>

diff --git a/islandora_video.module b/islandora_video.module
@@ -112,15 +112,15 @@ function islandora_video_xml_form_builder_form_associations() {
 /**
  * Implements hook_CMODEL_PID_islandora_view_object().
  */
-function islandora_video_islandora_sp_videoCModel_islandora_view_object($object, $page_number, $page_size) {
+function islandora_video_islandora_sp_videocmodel_islandora_view_object($object, $page_number, $page_size) {
   $output = theme('islandora_video', array('object' => $object));
   return array('' => $output);
 }
 
 /**
  * Implements hook_islandora_ingest_steps().
  */
-function islandora_video_islandora_sp_videoCModel_islandora_ingest_steps() {
+function islandora_video_islandora_sp_videocmodel_islandora_ingest_steps() {
   return array(
     'islandora_video_upload' => array(
       'weight' => 10,
@@ -135,7 +135,7 @@ function islandora_video_islandora_sp_videoCModel_islandora_ingest_steps() {
 /**
  * Implements hook_islandora_CMODEL_PID_derivative().
  */
-function islandora_video_islandora_sp_videoCModel_islandora_derivative() {
+function islandora_video_islandora_sp_videocmodel_islandora_derivative() {
   $derivatives = array();
   if (variable_get('islandora_video_make_thumbnail_locally', TRUE)) {
     $derivatives[] = array(

diff --git a/tests/islandora_video_and_derivatives_ingest_purge.test b/tests/islandora_video_and_derivatives_ingest_purge.test
@@ -5,6 +5,9 @@
  * Attempts to ingest a video file into a randomly generated video collection.
  */
 
+/**
+ * Ingest and purge a video from the repository.
+ */
 class IslandoraVideoAndDerivativesIngestTestCase extends IslandoraCollectionWebTestCase {
 
   /**
@@ -99,4 +102,5 @@ class IslandoraVideoAndDerivativesIngestTestCase extends IslandoraCollectionWebT
     $this->deleteObject($object->id);
     $this->deleteTestCollection($collectionpid);
   }
+
 }
diff --git a/tests/islandora_video_ingest_purge.test b/tests/islandora_video_ingest_purge.test
@@ -5,6 +5,9 @@
  * Attempts to ingest a video file into a randomly generated video collection.
  */
 
+/**
+ * Tests ingesting a video into islandora.
+ */
 class IslandoraVideoIngestTestCase extends IslandoraCollectionWebTestCase {
 
   /**
@@ -75,4 +78,5 @@ class IslandoraVideoIngestTestCase extends IslandoraCollectionWebTestCase {
     $this->deleteObject($object->id);
     $this->deleteTestCollection($collectionpid);
   }
+
 }
diff --git a/tests/islandora_video_load_test.test b/tests/islandora_video_load_test.test
@@ -5,6 +5,9 @@
  * A video load test. Instructions for its use are in the README.
  */
 
+/**
+ * Does a load test for videos, ingesting and deleting 10 videos.
+ */
 class IslandoraVideoLoadTestCase extends IslandoraCollectionWebTestCase {
 
   /**
@@ -97,4 +100,5 @@ class IslandoraVideoLoadTestCase extends IslandoraCollectionWebTestCase {
     // Attempts to delete the collection, removing all objects in batch.
     $this->deleteTestCollection($collectionpid);
   }
+
 }
diff --git a/theme/islandora-video.tpl.php b/theme/islandora-video.tpl.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * This is the template file for the object page for video
+ * This is the template file for the object page for video.
  *
  * Available variables:
  * - $islandora_content: The rendered output of the viewer configured for