Add contrib hal and rdf to composer. Also fix deprecated code. (#70)

* Add contrib hal and rdf to composer. * Fix deprecations. * Drop 9.3 which isn't compatible with contributed RDF module. * Add requirement of 9.4 to .info.yml. * Test on 9.5 released versions.
Islandora · Jul 18, 2023 · 21761dd · 21761dd
1 parent 5db3cd5
commit 21761dd
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 16 deletions.
diff --git a/.github/workflows/build-2.x.yml b/.github/workflows/build-2.x.yml
@@ -22,7 +22,7 @@ jobs:
     strategy:
       matrix:
         php-versions: ["7.4", "8.0", "8.1"]
-        drupal-version: ["9.3.x", "9.4.x", "9.5.x-dev"]
+        drupal-version: ["9.4.x", "9.5.x"]
 
     env:
       DRUPAL_VERSION: ${{ matrix.drupal-version }}

diff --git a/composer.json b/composer.json
@@ -20,7 +20,9 @@
         }
     ],
     "require" : {
-        "php": ">=7.4"
+        "php": ">=7.4",
+        "drupal/hal": "^1||^2",
+        "drupal/rdf": "^2.1"
     },
     "require-dev": {
         "phpunit/phpunit": "^8",

diff --git a/jsonld.info.yml b/jsonld.info.yml
@@ -2,8 +2,8 @@ name: 'JSON-LD'
 type: module
 description: 'Serializes entities to JSON-LD / LDP for the Islandora Project'
 package: Web services
-core_version_requirement: ^9
+core_version_requirement: ^9.4
 dependencies:
-  - hal
-  - serialization
-  - rdf
+  - drupal:serialization
+  - hal:hal
+  - rdf:rdf
diff --git a/src/ContextGenerator/JsonldContextGenerator.php b/src/ContextGenerator/JsonldContextGenerator.php
@@ -333,9 +333,8 @@ protected function getTermContextFromField($field_type) {
     // yet for this instance.
     if (empty($this->fieldMappings)) {
       // Cribbed from rdf module's rdf_get_namespaces.
-      foreach (\Drupal::moduleHandler()->getImplementations(self::FIELD_MAPPPINGS_HOOK) as $module) {
-        $function = $module . '_' . self::FIELD_MAPPPINGS_HOOK;
-        foreach ($function() as $field => $mapping) {
+      \Drupal::moduleHandler()->invokeAllWith(self::FIELD_MAPPPINGS_HOOK, function (callable $hook, string $module) {
+        foreach ($hook() as $field => $mapping) {
           if (array_key_exists($field, $this->fieldMappings)) {
             $this->logger->warning(
               t('Tried to map @field_type to @new_type, but @field_type is already mapped to @orig_type.', [
@@ -349,7 +348,7 @@ protected function getTermContextFromField($field_type) {
             $this->fieldMappings[$field] = $mapping;
           }
         }
-      }
+      });
     }
     return array_key_exists($field_type, $this->fieldMappings) ? $this->fieldMappings[$field_type] : $default_mapping;
   }

diff --git a/tests/src/Functional/JsonldContextGeneratorTest.php b/tests/src/Functional/JsonldContextGeneratorTest.php
@@ -94,7 +94,7 @@ public function testJsonldcontextContentypeheaderResponseIsValid() {
     );
     $this->drupalGet($url);
     $this->assertSession()->statusCodeEquals(200);
-    $this->assertEquals($this->drupalGetHeader('Content-Type'), 'application/ld+json', 'Correct JSON-LD mime type was returned');
+    $this->assertEquals($this->getSession()->getResponseHeader('Content-Type'), 'application/ld+json', 'Correct JSON-LD mime type was returned');
   }
 
   /**
@@ -121,7 +121,7 @@ public function testJsonldcontextResponseIsValid() {
     $this->drupalGet($url);
     $this->assertSession()->statusCodeEquals(200);
     $jsonldarray = json_decode($this->getSession()->getPage()->getContent(), TRUE);
-    $this->verbose($jsonldarray);
+    dump($jsonldarray);
     $this->assertEquals($expected, $jsonldarray, "Returned @context matches expected response.");
   }
 

diff --git a/tests/src/Kernel/JsonldContextGeneratorTest.php b/tests/src/Kernel/JsonldContextGeneratorTest.php
@@ -17,7 +17,7 @@ class JsonldContextGeneratorTest extends JsonldKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = [
+  protected static $modules = [
     'entity_test',
     'hal',
     'jsonld',

diff --git a/tests/src/Kernel/JsonldHookTest.php b/tests/src/Kernel/JsonldHookTest.php
@@ -13,7 +13,7 @@ class JsonldHookTest extends JsonldKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = [
+  protected static $modules = [
     'entity_test',
     'hal',
     'jsonld',

diff --git a/tests/src/Kernel/JsonldKernelTestBase.php b/tests/src/Kernel/JsonldKernelTestBase.php
@@ -24,7 +24,7 @@ abstract class JsonldKernelTestBase extends KernelTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = [
+  protected static $modules = [
     'system',
     'user',
     'field',

diff --git a/tests/src/Kernel/JsonldTestEntityGenerator.php b/tests/src/Kernel/JsonldTestEntityGenerator.php
@@ -158,7 +158,7 @@ public function makeDuplicateReferenceMapping(): JsonldTestEntityGenerator {
    *   Error saving the entity.
    */
   public function generateNewEntity(): array {
-    $dt = new \DateTime(NULL, new \DateTimeZone('UTC'));
+    $dt = new \DateTime('now', new \DateTimeZone('UTC'));
     $created = $dt->format("U");
     $created_iso = $dt->format(\DateTime::W3C);
     // Create an entity.