From 168bbb18a2b72ec061efaadb34701042b84558b1 Mon Sep 17 00:00:00 2001
From: Alan Stanley <astanley@upei.ca>
Date: Tue, 2 Jul 2019 16:09:51 -0700
Subject: [PATCH] fixed method names

---
 composer.json                 |  8 ++++++--
 islandora_fits.module         |  6 +++---
 src/Services/XMLTransform.php | 12 +++++++-----
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/composer.json b/composer.json
index 9793e0be..5d1acc64 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,9 @@
   "name": "islandora-rdm/islandora_fits",
   "type": "drupal-module",
   "description": "Enables Technical Metadata derivative generation.",
-  "keywords": ["Drupal"],
+  "keywords": [
+    "Drupal"
+  ],
   "license": "GPL-2.0+",
   "homepage": "https://www.drupal.org/project/islandora_fits",
   "minimum-stability": "dev",
@@ -10,5 +12,7 @@
     "issues": "https://www.drupal.org/project/issues/islandora_fits",
     "source": "http://cgit.drupalcode.org/islandora_fits"
   },
-  "require": { }
+  "require": {
+    "ext-SimpleXML": "*"
+  }
 }
diff --git a/islandora_fits.module b/islandora_fits.module
index 9d94a047..17238058 100644
--- a/islandora_fits.module
+++ b/islandora_fits.module
@@ -55,12 +55,12 @@ function islandora_fits_media_presave(MediaInterface $media) {
   $file = File::load($file_id);
   $data = file_get_contents($file->getFileUri());
   // Adds any new fields to FITS media type.
-  $has_new = $transformer->check_new($data);
+  $has_new = $transformer->checkNew($data);
   if ($has_new) {
     $media->set('field_complete', FALSE);
   }
   else {
-    $transformer->populate_media($data, $media);
+    $transformer->populateMedia($data, $media);
   }
 }
 
@@ -76,7 +76,7 @@ function islandora_fits_media_update(MediaInterface $media) {
     $file_id = $media->get('field_media_file')->getValue()[0]['target_id'];
     $file = File::load($file_id);
     $data = file_get_contents($file->getFileUri());
-    $transformer->add_media_fields($data);
+    $transformer->addMediaFields($data);
     $new_media = Media::load($media->id());
     $new_media->set('field_complete', TRUE);
     $new_media->save();
diff --git a/src/Services/XMLTransform.php b/src/Services/XMLTransform.php
index f1a6b184..f15f6f35 100644
--- a/src/Services/XMLTransform.php
+++ b/src/Services/XMLTransform.php
@@ -4,11 +4,13 @@ namespace Drupal\islandora_fits\Services;
 
 use Drupal\Component\Utility\Xss;
 use Drupal\Core\DependencyInjection\ServiceProviderBase;
+use Drupal\Core\Entity\EntityFieldManager;
 use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\Messenger\MessengerInterface;
 use Drupal\Core\Render\RendererInterface;
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\field\Entity\FieldConfig;
+use DrupalCodeGenerator\Command\Drupal_8\Form\Simple;
 
 /**
  * Class XMLTransform.
@@ -49,7 +51,7 @@ class XMLTransform extends ServiceProviderBase {
    * @param \Drupal\Core\Messenger\MessengerInterface $messenger
    *   The messenger.
    */
-  public function __construct(RendererInterface $renderer, EntityManagerInterface $entityManager, MessengerInterface $messenger) {
+  public function __construct(RendererInterface $renderer, EntityFieldManager $entityManager, MessengerInterface $messenger) {
     $this->renderer = $renderer;
     $this->entityManager = $entityManager;
     $this->messenger = $messenger;
@@ -151,13 +153,13 @@ class XMLTransform extends ServiceProviderBase {
    *
    * Once it has these it passes them off recursively.
    *
-   * @param SimpleXMLElement $xml
+   * @param  \SimpleXMLElement
    *   The SimpleXMLElement to parse.
    *
    * @return array
    *   An array containing key/value pairs of fields and data.
    */
-  private function islandoraFitsChildXpath(SimpleXMLElement $xml) {
+  private function islandoraFitsChildXpath(\SimpleXMLElement $xml) {
     $results = $xml->xpath('/*|/*/fits:metadata');
     $output = [];
     foreach ($results as $result) {
@@ -173,12 +175,12 @@ class XMLTransform extends ServiceProviderBase {
    * we grab the node's text value and add to
    * the output array.
    *
-   * @param SimpleXMLElement $child
+   * @param \SimpleXMLElement $child
    *   The current child that we are searching through.
    * @param array $output
    *   An array containing key/value pairs of fields and data.
    */
-  private function islandoraFitsChildren(SimpleXMLElement $child, array &$output) {
+  private function islandoraFitsChildren(\SimpleXMLElement $child, array &$output) {
     $grandchildren = $child->xpath('*/*');
 
     if (count($grandchildren) > 0) {