Part of https://github.com/Islandora-CLAW/CLAW/issues/475 (#27)

* Pulling islandora module back to the top

* Pulling dependencies from main composer.json into this module's

* Testing how module dependencies work

* Adding search_api to module depenedencies.

* Just .info is not enough

* Adding jsonld serializer to composer dependencies

* Changing vendor name and pointing to @DiegoPino's fork

* Adding keywords

* Adding phpcs back in

* Pointing to islandora org for jsonld serializer.

.travis.yml

@@ -33,7 +33,7 @@ install:
 script:
   - $ISLANDORA_DIR/.scripts/line_endings.sh .
   - cd $HOME/drupal/modules/islandora
-  - php vendor/bin/phpcs --standard=Drupal **/*.module **/*.php --ignore=tests,vendor . 
+  - php vendor/bin/phpcs --standard=Drupal --extensions=module/php,php/php src tests
   - php vendor/bin/phpcpd --names *.module,*.inc,*.test,*.php --exclude=vendor .
   - cd $HOME/drupal; php core/scripts/run-tests.sh --php `which php` islandora
 

composer.json

@@ -1,14 +1,32 @@
 {
-  "name": "drupal/islandora",
-  "description": "A client for interacting with a Fedora 4 server using CLAW microservices.",
+  "name": "islandora/islandora",
+  "description": "Core Islandora module",
   "type": "drupal-module",
+  "keywords": ["Drupal", "Islandora"],
   "homepage": "https://github.com/islandora-claw/islandora",
   "support": {
     "issues": "https://github.com/islandora-claw/CLAW/issues",
     "irc": "irc://irc.freenode.net/islandora"
   },
+  "repositories": [
+    {
+      "type": "composer",
+      "url": "https://packages.drupal.org/8"
+    },
+    {
+      "type": "vcs",
+      "url": "https://github.com/Islandora-CLAW/claw-jsonld"
+    }
+  ],
+  "require": {
+    "drupal/inline_entity_form": "^1.0@beta",
+    "drupal/rules": "^3.0@alpha",
+    "drupal/search_api": "^1.0@beta",
+    "drupal/claw-jsonld": "dev-master"
+  },
   "require-dev": {
     "phpunit/phpunit": "^4.8",
+    "squizlabs/php_codesniffer": "2.7.1",
     "drupal/coder": "*",
     "sebastian/phpcpd": "*"
   },
@@ -18,7 +36,6 @@
       "name": "Islandora Foundation",
       "email": "community@islandora.ca",
       "role": "Owner"
-
     },
     {
       "name": "Daniel Lamb",
@@ -31,4 +48,4 @@
       "role": "Maintainer"
     }
   ]
-}
+}

config/install/rdf.mapping.fedora_resource_type.non_rdf_source.yml

@@ -40,4 +40,4 @@ fieldMappings:
   ldp_contains:
     properties:
       - 'ldp:contains'
-    mapping_type: rel
+    mapping_type: rel

islandora.info.yml

@@ -14,4 +14,5 @@ dependencies:
   - inline_entity_form
   - jsonld
   - rules
+  - search_api
 version: '8.x-1.x-dev'

islandora_collection/composer.json

@@ -1,14 +0,0 @@
-{
-  "name": "drupal/islandora_collection",
-  "type": "drupal-module",
-  "description": "Islandora Collection",
-  "keywords": ["Drupal"],
-  "license": "GPL-2.0+",
-  "homepage": "https://www.drupal.org/project/islandora_collection",
-  "minimum-stability": "dev",
-  "support": {
-    "issues": "http://drupal.org/project/issues/islandora_collection",
-    "source": "http://cgit.drupalcode.org/islandora_collection"
-  },
-  "require": { }
-}

islandora_collection/config/install/field.field.fedora_resource.collection.field_description.yml

@@ -1,21 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.fedora_resource.field_description
-    - islandora.fedora_resource_type.collection
-  enforced:
-    module:
-      - islandora_collection
-id: fedora_resource.collection.field_description
-field_name: field_description
-entity_type: fedora_resource
-bundle: collection
-label: description
-description: 'Description about the collection'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string_long

islandora_collection/config/install/field.field.fedora_resource.collection.field_memberof.yml

@@ -1,30 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.fedora_resource.field_memberof
-    - islandora.fedora_resource_type.collection
-  enforced:
-    module:
-      - islandora_collection
-id: fedora_resource.collection5.field_memberof
-field_name: field_memberof
-entity_type: fedora_resource
-bundle: collection
-label: memberOf
-description: 'Other collections or bundles this collection is member of.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:fedora_resource'
-  handler_settings:
-    target_bundles:
-      collection: collection
-    sort:
-      field: _none
-    auto_create: false
-    auto_create_bundle: ''
-field_type: entity_reference
-

islandora_collection/config/install/field.storage.fedora_resource.field_description.yml

@@ -1,21 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - islandora
-  enforced:
-    module:
-      - islandora_collection
-id: fedora_resource.field_description
-field_name: field_description
-entity_type: fedora_resource
-type: string_long
-settings:
-  case_sensitive: false
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false

islandora_collection/config/install/field.storage.fedora_resource.field_memberof.yml

@@ -1,22 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - islandora
-  enforced:
-    module:
-      - islandora_collection
-id: fedora_resource.field_memberof
-field_name: field_memberof
-entity_type: fedora_resource
-type: entity_reference
-settings:
-  target_type: fedora_resource
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
-

islandora_collection/config/install/islandora.fedora_resource_type.collection.yml

@@ -1,9 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  enforced:
-    module:
-      - islandora_collection
-id: collection
-label: Collection
-description: 'Islandora Collection'

islandora_collection/config/install/rdf.mapping.fedora_resource_type.collection.yml

@@ -1,50 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - islandora.fedora_resource_type.collection
-  module:
-    - islandora
-  enforced:
-    module:
-      - islandora_collection
-id: fedora_resource.collection
-targetEntityType: fedora_resource
-bundle: collection
-types:
-  - 'pcdm:Collection'
-  - 'schema:CollectionPage'
-fieldMappings:
-  field_description:
-    properties:
-      - 'dc:description'
-  field_memberof:
-    properties:
-      - 'pcdm:memberOf'
-  uuid:
-    properties:
-      - 'islandora:hasURN'
-  name:
-    properties:
-      - 'dc:title'
-  created:
-    properties:
-      - 'schema:dateCreated'
-    datatype_callback:
-      callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
-  changed:
-    properties:
-      - 'schema:dateModified'
-    datatype_callback:
-      callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
-  rdf_type:
-    properties:
-      - 'rdf:type'
-  vclock:
-    properties:
-      - 'islandora:vclock'
-  uid:
-    properties:
-      - 'schema:author'
-    mapping_type: rel
-

islandora_collection/islandora_collection.info.yml

@@ -1,5 +0,0 @@
-name: islandora_collection
-type: module
-description: Islandora Collection
-core: 8.x
-package: islandora

islandora_collection/islandora_collection.module

@@ -1,24 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains islandora_collection.module..
- */
-
-use Drupal\Core\Routing\RouteMatchInterface;
-
-/**
- * Implements hook_help().
- */
-function islandora_collection_help($route_name, RouteMatchInterface $route_match) {
-  switch ($route_name) {
-    // Main module help for the islandora_collection module.
-    case 'help.page.islandora_collection':
-      $output = '';
-      $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('Islandora Collection') . '</p>';
-      return $output;
-
-    default:
-  }
-}

tests/src/Kernel/EventGeneratorActionTestBase.php

@@ -2,10 +2,6 @@
 
 namespace Drupal\Tests\islandora\Kernel;
 
-use Drupal\islandora\Entity\FedoraResource;
-use Drupal\islandora\EventGenerator\EventGenerator;
-use Drupal\simpletest\UserCreationTrait;
-
 /**
  * Base class for testing EventGenerator functionality.
  */
@@ -31,7 +27,7 @@ abstract class EventGeneratorActionTestBase extends EventGeneratorTestBase {
   public function setUp() {
     parent::setUp();
 
-    // Get the action manager
+    // Get the action manager.
     $this->actionManager = $this->container->get('plugin.manager.rules_action');
   }
 

tests/src/Kernel/EventGeneratorTestBase.php

@@ -3,7 +3,6 @@
 namespace Drupal\Tests\islandora\Kernel;
 
 use Drupal\islandora\Entity\FedoraResource;
-use Drupal\islandora\EventGenerator\EventGenerator;
 use Drupal\simpletest\UserCreationTrait;
 
 /**
@@ -45,7 +44,7 @@ abstract class EventGeneratorTestBase extends IslandoraKernelTestBase {
       "name" => "Test Fixture",
       "langcode" => "und",
       "status" => 1,
-    ]); 
+    ]);
     $this->entity->save();
   }
 

tests/src/Kernel/IslandoraKernelTestBase.php

@@ -29,7 +29,7 @@ abstract class IslandoraKernelTestBase extends KernelTestBase {
     'typed_data',
     'rules',
     'jsonld',
-    'islandora'
+    'islandora',
   ];
 
   /**
@@ -46,4 +46,3 @@ abstract class IslandoraKernelTestBase extends KernelTestBase {
   }
 
 }
-

tests/src/Kernel/VectorClockTest.php

@@ -3,7 +3,6 @@
 namespace Drupal\Tests\islandora\Kernel;
 
 use Drupal\islandora\Entity\FedoraResource;
-use Drupal\simpletest\UserCreationTrait;
 
 /**
  * Tests the basic behavior of a vector clock.
@@ -33,7 +32,7 @@ class VectorClockTest extends IslandoraKernelTestBase {
       "name" => "Test Fixture",
       "langcode" => "und",
       "status" => 1,
-    ]); 
+    ]);
     $this->entity->save();
 
   }
@@ -46,7 +45,7 @@ class VectorClockTest extends IslandoraKernelTestBase {
   public function testVectorClock() {
     // Check the vclock is set to 0 when a new entity is created.
     $this->assertTrue($this->entity->getVclock() == 0, "Vector clock must be initialized to zero.");
-    
+
     // Edit the entity.
     $this->entity->setName("Edited Test Fixture")->save();