diff --git a/.travis.yml b/.travis.yml index 629ff631..cda9420c 100644 --- a/.travis.yml +++ b/.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 diff --git a/composer.json b/composer.json index 4feebf4a..99322951 100644 --- a/composer.json +++ b/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" } ] -} \ No newline at end of file +} diff --git a/islandora/config/install/core.entity_form_display.fedora_resource.rdf_source.default.yml b/config/install/core.entity_form_display.fedora_resource.rdf_source.default.yml similarity index 100% rename from islandora/config/install/core.entity_form_display.fedora_resource.rdf_source.default.yml rename to config/install/core.entity_form_display.fedora_resource.rdf_source.default.yml diff --git a/islandora/config/install/core.entity_view_mode.fedora_resource.teaser.yml b/config/install/core.entity_view_mode.fedora_resource.teaser.yml similarity index 100% rename from islandora/config/install/core.entity_view_mode.fedora_resource.teaser.yml rename to config/install/core.entity_view_mode.fedora_resource.teaser.yml diff --git a/islandora/config/install/field.field.fedora_resource.rdf_source.field_ldp_contains.yml b/config/install/field.field.fedora_resource.rdf_source.field_ldp_contains.yml similarity index 100% rename from islandora/config/install/field.field.fedora_resource.rdf_source.field_ldp_contains.yml rename to config/install/field.field.fedora_resource.rdf_source.field_ldp_contains.yml diff --git a/islandora/config/install/field.storage.fedora_resource.rdf_source.field_ldp_contains.yml b/config/install/field.storage.fedora_resource.rdf_source.field_ldp_contains.yml similarity index 100% rename from islandora/config/install/field.storage.fedora_resource.rdf_source.field_ldp_contains.yml rename to config/install/field.storage.fedora_resource.rdf_source.field_ldp_contains.yml diff --git a/islandora/config/install/islandora.fedora_resource_type.non_rdf_source.yml b/config/install/islandora.fedora_resource_type.non_rdf_source.yml similarity index 100% rename from islandora/config/install/islandora.fedora_resource_type.non_rdf_source.yml rename to config/install/islandora.fedora_resource_type.non_rdf_source.yml diff --git a/islandora/config/install/islandora.fedora_resource_type.rdf_source.yml b/config/install/islandora.fedora_resource_type.rdf_source.yml similarity index 100% rename from islandora/config/install/islandora.fedora_resource_type.rdf_source.yml rename to config/install/islandora.fedora_resource_type.rdf_source.yml diff --git a/islandora/config/install/islandora.settings.yml b/config/install/islandora.settings.yml similarity index 100% rename from islandora/config/install/islandora.settings.yml rename to config/install/islandora.settings.yml diff --git a/islandora/config/install/rdf.mapping.fedora_resource_type.non_rdf_source.yml b/config/install/rdf.mapping.fedora_resource_type.non_rdf_source.yml similarity index 97% rename from islandora/config/install/rdf.mapping.fedora_resource_type.non_rdf_source.yml rename to config/install/rdf.mapping.fedora_resource_type.non_rdf_source.yml index c6eac02a..96e8d3b0 100644 --- a/islandora/config/install/rdf.mapping.fedora_resource_type.non_rdf_source.yml +++ b/config/install/rdf.mapping.fedora_resource_type.non_rdf_source.yml @@ -40,4 +40,4 @@ fieldMappings: ldp_contains: properties: - 'ldp:contains' - mapping_type: rel \ No newline at end of file + mapping_type: rel diff --git a/islandora/config/install/rdf.mapping.fedora_resource_type.rdf_source.yml b/config/install/rdf.mapping.fedora_resource_type.rdf_source.yml similarity index 100% rename from islandora/config/install/rdf.mapping.fedora_resource_type.rdf_source.yml rename to config/install/rdf.mapping.fedora_resource_type.rdf_source.yml diff --git a/islandora/config/install/rules.reaction.broadcast_create_event.yml b/config/install/rules.reaction.broadcast_create_event.yml similarity index 100% rename from islandora/config/install/rules.reaction.broadcast_create_event.yml rename to config/install/rules.reaction.broadcast_create_event.yml diff --git a/islandora/config/install/rules.reaction.broadcast_delete_event.yml b/config/install/rules.reaction.broadcast_delete_event.yml similarity index 100% rename from islandora/config/install/rules.reaction.broadcast_delete_event.yml rename to config/install/rules.reaction.broadcast_delete_event.yml diff --git a/islandora/config/install/rules.reaction.broadcast_update_event.yml b/config/install/rules.reaction.broadcast_update_event.yml similarity index 100% rename from islandora/config/install/rules.reaction.broadcast_update_event.yml rename to config/install/rules.reaction.broadcast_update_event.yml diff --git a/islandora/config/install/views.view.fedora_entities_reference.yml b/config/install/views.view.fedora_entities_reference.yml similarity index 100% rename from islandora/config/install/views.view.fedora_entities_reference.yml rename to config/install/views.view.fedora_entities_reference.yml diff --git a/islandora/config/schema/fedora_resource_type.schema.yml b/config/schema/fedora_resource_type.schema.yml similarity index 100% rename from islandora/config/schema/fedora_resource_type.schema.yml rename to config/schema/fedora_resource_type.schema.yml diff --git a/islandora/fedora_resource.page.inc b/fedora_resource.page.inc similarity index 100% rename from islandora/fedora_resource.page.inc rename to fedora_resource.page.inc diff --git a/islandora/islandora.info.yml b/islandora.info.yml similarity index 96% rename from islandora/islandora.info.yml rename to islandora.info.yml index 139e58d5..ed5c110d 100644 --- a/islandora/islandora.info.yml +++ b/islandora.info.yml @@ -14,4 +14,5 @@ dependencies: - inline_entity_form - jsonld - rules + - search_api version: '8.x-1.x-dev' diff --git a/islandora/islandora.links.action.yml b/islandora.links.action.yml similarity index 100% rename from islandora/islandora.links.action.yml rename to islandora.links.action.yml diff --git a/islandora/islandora.links.menu.yml b/islandora.links.menu.yml similarity index 100% rename from islandora/islandora.links.menu.yml rename to islandora.links.menu.yml diff --git a/islandora/islandora.links.task.yml b/islandora.links.task.yml similarity index 100% rename from islandora/islandora.links.task.yml rename to islandora.links.task.yml diff --git a/islandora/islandora.module b/islandora.module similarity index 100% rename from islandora/islandora.module rename to islandora.module diff --git a/islandora/islandora.permissions.yml b/islandora.permissions.yml similarity index 100% rename from islandora/islandora.permissions.yml rename to islandora.permissions.yml diff --git a/islandora/islandora.routing.yml b/islandora.routing.yml similarity index 100% rename from islandora/islandora.routing.yml rename to islandora.routing.yml diff --git a/islandora/islandora.services.yml b/islandora.services.yml similarity index 100% rename from islandora/islandora.services.yml rename to islandora.services.yml diff --git a/islandora_collection/composer.json b/islandora_collection/composer.json deleted file mode 100644 index 1bb86d51..00000000 --- a/islandora_collection/composer.json +++ /dev/null @@ -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": { } -} diff --git a/islandora_collection/config/install/field.field.fedora_resource.collection.field_description.yml b/islandora_collection/config/install/field.field.fedora_resource.collection.field_description.yml deleted file mode 100644 index 4ddacfb7..00000000 --- a/islandora_collection/config/install/field.field.fedora_resource.collection.field_description.yml +++ /dev/null @@ -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 diff --git a/islandora_collection/config/install/field.field.fedora_resource.collection.field_memberof.yml b/islandora_collection/config/install/field.field.fedora_resource.collection.field_memberof.yml deleted file mode 100644 index 045046fd..00000000 --- a/islandora_collection/config/install/field.field.fedora_resource.collection.field_memberof.yml +++ /dev/null @@ -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 - diff --git a/islandora_collection/config/install/field.storage.fedora_resource.field_description.yml b/islandora_collection/config/install/field.storage.fedora_resource.field_description.yml deleted file mode 100644 index f3a05483..00000000 --- a/islandora_collection/config/install/field.storage.fedora_resource.field_description.yml +++ /dev/null @@ -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 diff --git a/islandora_collection/config/install/field.storage.fedora_resource.field_memberof.yml b/islandora_collection/config/install/field.storage.fedora_resource.field_memberof.yml deleted file mode 100644 index 59517206..00000000 --- a/islandora_collection/config/install/field.storage.fedora_resource.field_memberof.yml +++ /dev/null @@ -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 - diff --git a/islandora_collection/config/install/islandora.fedora_resource_type.collection.yml b/islandora_collection/config/install/islandora.fedora_resource_type.collection.yml deleted file mode 100644 index 7d47b276..00000000 --- a/islandora_collection/config/install/islandora.fedora_resource_type.collection.yml +++ /dev/null @@ -1,9 +0,0 @@ -langcode: en -status: true -dependencies: - enforced: - module: - - islandora_collection -id: collection -label: Collection -description: 'Islandora Collection' \ No newline at end of file diff --git a/islandora_collection/config/install/rdf.mapping.fedora_resource_type.collection.yml b/islandora_collection/config/install/rdf.mapping.fedora_resource_type.collection.yml deleted file mode 100644 index aed04d12..00000000 --- a/islandora_collection/config/install/rdf.mapping.fedora_resource_type.collection.yml +++ /dev/null @@ -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 - diff --git a/islandora_collection/islandora_collection.info.yml b/islandora_collection/islandora_collection.info.yml deleted file mode 100644 index 063e17dd..00000000 --- a/islandora_collection/islandora_collection.info.yml +++ /dev/null @@ -1,5 +0,0 @@ -name: islandora_collection -type: module -description: Islandora Collection -core: 8.x -package: islandora diff --git a/islandora_collection/islandora_collection.module b/islandora_collection/islandora_collection.module deleted file mode 100644 index 3d82c1ba..00000000 --- a/islandora_collection/islandora_collection.module +++ /dev/null @@ -1,24 +0,0 @@ -' . t('About') . ''; - $output .= '

' . t('Islandora Collection') . '

'; - return $output; - - default: - } -} diff --git a/islandora/src/Controller/FedoraResourceAddController.php b/src/Controller/FedoraResourceAddController.php similarity index 100% rename from islandora/src/Controller/FedoraResourceAddController.php rename to src/Controller/FedoraResourceAddController.php diff --git a/islandora/src/Entity/FedoraResource.php b/src/Entity/FedoraResource.php similarity index 100% rename from islandora/src/Entity/FedoraResource.php rename to src/Entity/FedoraResource.php diff --git a/islandora/src/Entity/FedoraResourceType.php b/src/Entity/FedoraResourceType.php similarity index 100% rename from islandora/src/Entity/FedoraResourceType.php rename to src/Entity/FedoraResourceType.php diff --git a/islandora/src/Entity/FedoraResourceViewsData.php b/src/Entity/FedoraResourceViewsData.php similarity index 100% rename from islandora/src/Entity/FedoraResourceViewsData.php rename to src/Entity/FedoraResourceViewsData.php diff --git a/islandora/src/EventGenerator/EventGenerator.php b/src/EventGenerator/EventGenerator.php similarity index 100% rename from islandora/src/EventGenerator/EventGenerator.php rename to src/EventGenerator/EventGenerator.php diff --git a/islandora/src/EventGenerator/EventGeneratorActionBase.php b/src/EventGenerator/EventGeneratorActionBase.php similarity index 100% rename from islandora/src/EventGenerator/EventGeneratorActionBase.php rename to src/EventGenerator/EventGeneratorActionBase.php diff --git a/islandora/src/EventGenerator/EventGeneratorInterface.php b/src/EventGenerator/EventGeneratorInterface.php similarity index 100% rename from islandora/src/EventGenerator/EventGeneratorInterface.php rename to src/EventGenerator/EventGeneratorInterface.php diff --git a/islandora/src/FedoraResourceAccessControlHandler.php b/src/FedoraResourceAccessControlHandler.php similarity index 100% rename from islandora/src/FedoraResourceAccessControlHandler.php rename to src/FedoraResourceAccessControlHandler.php diff --git a/islandora/src/FedoraResourceHtmlRouteProvider.php b/src/FedoraResourceHtmlRouteProvider.php similarity index 100% rename from islandora/src/FedoraResourceHtmlRouteProvider.php rename to src/FedoraResourceHtmlRouteProvider.php diff --git a/islandora/src/FedoraResourceInterface.php b/src/FedoraResourceInterface.php similarity index 100% rename from islandora/src/FedoraResourceInterface.php rename to src/FedoraResourceInterface.php diff --git a/islandora/src/FedoraResourceListBuilder.php b/src/FedoraResourceListBuilder.php similarity index 100% rename from islandora/src/FedoraResourceListBuilder.php rename to src/FedoraResourceListBuilder.php diff --git a/islandora/src/FedoraResourceTypeHtmlRouteProvider.php b/src/FedoraResourceTypeHtmlRouteProvider.php similarity index 100% rename from islandora/src/FedoraResourceTypeHtmlRouteProvider.php rename to src/FedoraResourceTypeHtmlRouteProvider.php diff --git a/islandora/src/FedoraResourceTypeInterface.php b/src/FedoraResourceTypeInterface.php similarity index 100% rename from islandora/src/FedoraResourceTypeInterface.php rename to src/FedoraResourceTypeInterface.php diff --git a/islandora/src/FedoraResourceTypeListBuilder.php b/src/FedoraResourceTypeListBuilder.php similarity index 100% rename from islandora/src/FedoraResourceTypeListBuilder.php rename to src/FedoraResourceTypeListBuilder.php diff --git a/islandora/src/FedoraResourceViewBuilder.php b/src/FedoraResourceViewBuilder.php similarity index 100% rename from islandora/src/FedoraResourceViewBuilder.php rename to src/FedoraResourceViewBuilder.php diff --git a/islandora/src/Form/FedoraResourceDeleteForm.php b/src/Form/FedoraResourceDeleteForm.php similarity index 100% rename from islandora/src/Form/FedoraResourceDeleteForm.php rename to src/Form/FedoraResourceDeleteForm.php diff --git a/islandora/src/Form/FedoraResourceEntityInlineForm.php b/src/Form/FedoraResourceEntityInlineForm.php similarity index 100% rename from islandora/src/Form/FedoraResourceEntityInlineForm.php rename to src/Form/FedoraResourceEntityInlineForm.php diff --git a/islandora/src/Form/FedoraResourceForm.php b/src/Form/FedoraResourceForm.php similarity index 100% rename from islandora/src/Form/FedoraResourceForm.php rename to src/Form/FedoraResourceForm.php diff --git a/islandora/src/Form/FedoraResourceSettingsForm.php b/src/Form/FedoraResourceSettingsForm.php similarity index 100% rename from islandora/src/Form/FedoraResourceSettingsForm.php rename to src/Form/FedoraResourceSettingsForm.php diff --git a/islandora/src/Form/FedoraResourceTypeDeleteForm.php b/src/Form/FedoraResourceTypeDeleteForm.php similarity index 100% rename from islandora/src/Form/FedoraResourceTypeDeleteForm.php rename to src/Form/FedoraResourceTypeDeleteForm.php diff --git a/islandora/src/Form/FedoraResourceTypeForm.php b/src/Form/FedoraResourceTypeForm.php similarity index 100% rename from islandora/src/Form/FedoraResourceTypeForm.php rename to src/Form/FedoraResourceTypeForm.php diff --git a/islandora/src/Form/IslandoraSettingsForm.php b/src/Form/IslandoraSettingsForm.php similarity index 100% rename from islandora/src/Form/IslandoraSettingsForm.php rename to src/Form/IslandoraSettingsForm.php diff --git a/islandora/src/ParamConverter/UuidEntityConverter.php b/src/ParamConverter/UuidEntityConverter.php similarity index 100% rename from islandora/src/ParamConverter/UuidEntityConverter.php rename to src/ParamConverter/UuidEntityConverter.php diff --git a/islandora/src/Plugin/RulesAction/CreateEventGenerator.php b/src/Plugin/RulesAction/CreateEventGenerator.php similarity index 100% rename from islandora/src/Plugin/RulesAction/CreateEventGenerator.php rename to src/Plugin/RulesAction/CreateEventGenerator.php diff --git a/islandora/src/Plugin/RulesAction/DeleteEventGenerator.php b/src/Plugin/RulesAction/DeleteEventGenerator.php similarity index 100% rename from islandora/src/Plugin/RulesAction/DeleteEventGenerator.php rename to src/Plugin/RulesAction/DeleteEventGenerator.php diff --git a/islandora/src/Plugin/RulesAction/UpdateEventGenerator.php b/src/Plugin/RulesAction/UpdateEventGenerator.php similarity index 100% rename from islandora/src/Plugin/RulesAction/UpdateEventGenerator.php rename to src/Plugin/RulesAction/UpdateEventGenerator.php diff --git a/islandora/src/Plugin/Search/FedoraEntitySearch.php b/src/Plugin/Search/FedoraEntitySearch.php similarity index 100% rename from islandora/src/Plugin/Search/FedoraEntitySearch.php rename to src/Plugin/Search/FedoraEntitySearch.php diff --git a/islandora/src/Plugin/views/wizard/FedoraResource.php b/src/Plugin/views/wizard/FedoraResource.php similarity index 100% rename from islandora/src/Plugin/views/wizard/FedoraResource.php rename to src/Plugin/views/wizard/FedoraResource.php diff --git a/islandora/templates/fedora-resource-content-add-list.html.twig b/templates/fedora-resource-content-add-list.html.twig similarity index 100% rename from islandora/templates/fedora-resource-content-add-list.html.twig rename to templates/fedora-resource-content-add-list.html.twig diff --git a/islandora/templates/fedora_resource.html.twig b/templates/fedora_resource.html.twig similarity index 100% rename from islandora/templates/fedora_resource.html.twig rename to templates/fedora_resource.html.twig diff --git a/islandora/tests/src/Kernel/CreateEventGeneratorTest.php b/tests/src/Kernel/CreateEventGeneratorTest.php similarity index 100% rename from islandora/tests/src/Kernel/CreateEventGeneratorTest.php rename to tests/src/Kernel/CreateEventGeneratorTest.php diff --git a/islandora/tests/src/Kernel/DeleteEventGeneratorTest.php b/tests/src/Kernel/DeleteEventGeneratorTest.php similarity index 100% rename from islandora/tests/src/Kernel/DeleteEventGeneratorTest.php rename to tests/src/Kernel/DeleteEventGeneratorTest.php diff --git a/islandora/tests/src/Kernel/EventGeneratorActionTestBase.php b/tests/src/Kernel/EventGeneratorActionTestBase.php similarity index 89% rename from islandora/tests/src/Kernel/EventGeneratorActionTestBase.php rename to tests/src/Kernel/EventGeneratorActionTestBase.php index e5b777ba..39584723 100644 --- a/islandora/tests/src/Kernel/EventGeneratorActionTestBase.php +++ b/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'); } diff --git a/islandora/tests/src/Kernel/EventGeneratorTest.php b/tests/src/Kernel/EventGeneratorTest.php similarity index 100% rename from islandora/tests/src/Kernel/EventGeneratorTest.php rename to tests/src/Kernel/EventGeneratorTest.php diff --git a/islandora/tests/src/Kernel/EventGeneratorTestBase.php b/tests/src/Kernel/EventGeneratorTestBase.php similarity index 93% rename from islandora/tests/src/Kernel/EventGeneratorTestBase.php rename to tests/src/Kernel/EventGeneratorTestBase.php index eb63bb35..36dd8c51 100644 --- a/islandora/tests/src/Kernel/EventGeneratorTestBase.php +++ b/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(); } diff --git a/islandora/tests/src/Kernel/IslandoraKernelTestBase.php b/tests/src/Kernel/IslandoraKernelTestBase.php similarity index 98% rename from islandora/tests/src/Kernel/IslandoraKernelTestBase.php rename to tests/src/Kernel/IslandoraKernelTestBase.php index 7dc3a3d5..1a8e1671 100644 --- a/islandora/tests/src/Kernel/IslandoraKernelTestBase.php +++ b/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 { } } - diff --git a/islandora/tests/src/Kernel/UpdateEventGeneratorTest.php b/tests/src/Kernel/UpdateEventGeneratorTest.php similarity index 100% rename from islandora/tests/src/Kernel/UpdateEventGeneratorTest.php rename to tests/src/Kernel/UpdateEventGeneratorTest.php diff --git a/islandora/tests/src/Kernel/VectorClockTest.php b/tests/src/Kernel/VectorClockTest.php similarity index 96% rename from islandora/tests/src/Kernel/VectorClockTest.php rename to tests/src/Kernel/VectorClockTest.php index 310ca76d..e5ae3340 100644 --- a/islandora/tests/src/Kernel/VectorClockTest.php +++ b/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();