From ee208980cf2bfd9673c17d554dcf58e9432b692d Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Tue, 29 Nov 2016 02:56:11 +0000 Subject: [PATCH 1/7] Nesting islandora in its own folder --- README.md | 4 ++-- composer.json => islandora/composer.json | 0 .../install/islandora.fedora_resource_type.non_rdf_source.yml | 0 .../install/islandora.fedora_resource_type.rdf_source.yml | 0 {config => islandora/config}/install/islandora.settings.yml | 0 .../install/rdf.mapping.fedora_resource_type.rdf_source.yml | 0 .../config}/schema/fedora_resource_type.schema.yml | 0 .../fedora_resource.page.inc | 0 islandora.info.yml => islandora/islandora.info.yml | 0 .../islandora.links.action.yml | 0 .../islandora.links.menu.yml | 0 .../islandora.links.task.yml | 0 islandora.module => islandora/islandora.module | 0 .../islandora.permissions.yml | 0 islandora.routing.yml => islandora/islandora.routing.yml | 0 islandora.services.yml => islandora/islandora.services.yml | 0 .../src}/Controller/FedoraResourceAddController.php | 0 {src => islandora/src}/Entity/FedoraResource.php | 0 {src => islandora/src}/Entity/FedoraResourceType.php | 0 {src => islandora/src}/Entity/FedoraResourceViewsData.php | 0 {src => islandora/src}/FedoraResourceAccessControlHandler.php | 0 {src => islandora/src}/FedoraResourceHtmlRouteProvider.php | 0 {src => islandora/src}/FedoraResourceInterface.php | 0 {src => islandora/src}/FedoraResourceListBuilder.php | 0 .../src}/FedoraResourceTypeHtmlRouteProvider.php | 0 {src => islandora/src}/FedoraResourceTypeInterface.php | 0 {src => islandora/src}/FedoraResourceTypeListBuilder.php | 0 {src => islandora/src}/FedoraResourceViewBuilder.php | 0 {src => islandora/src}/Form/FedoraResourceDeleteForm.php | 0 .../src}/Form/FedoraResourceEntityInlineForm.php | 0 {src => islandora/src}/Form/FedoraResourceForm.php | 0 {src => islandora/src}/Form/FedoraResourceSettingsForm.php | 0 {src => islandora/src}/Form/FedoraResourceTypeDeleteForm.php | 0 {src => islandora/src}/Form/FedoraResourceTypeForm.php | 0 {src => islandora/src}/Form/IslandoraSettingsForm.php | 0 {src => islandora/src}/ParamConverter/UuidEntityConverter.php | 0 {src => islandora/src}/Plugin/Search/FedoraEntitySearch.php | 0 .../templates}/fedora-resource-content-add-list.html.twig | 0 {templates => islandora/templates}/fedora_resource.html.twig | 0 {tests => islandora/tests}/scripts/line_endings.sh | 0 {tests => islandora/tests}/scripts/travis_setup.sh | 0 41 files changed, 2 insertions(+), 2 deletions(-) rename composer.json => islandora/composer.json (100%) rename {config => islandora/config}/install/islandora.fedora_resource_type.non_rdf_source.yml (100%) rename {config => islandora/config}/install/islandora.fedora_resource_type.rdf_source.yml (100%) rename {config => islandora/config}/install/islandora.settings.yml (100%) rename {config => islandora/config}/install/rdf.mapping.fedora_resource_type.rdf_source.yml (100%) rename {config => islandora/config}/schema/fedora_resource_type.schema.yml (100%) rename fedora_resource.page.inc => islandora/fedora_resource.page.inc (100%) rename islandora.info.yml => islandora/islandora.info.yml (100%) rename islandora.links.action.yml => islandora/islandora.links.action.yml (100%) rename islandora.links.menu.yml => islandora/islandora.links.menu.yml (100%) rename islandora.links.task.yml => islandora/islandora.links.task.yml (100%) rename islandora.module => islandora/islandora.module (100%) rename islandora.permissions.yml => islandora/islandora.permissions.yml (100%) rename islandora.routing.yml => islandora/islandora.routing.yml (100%) rename islandora.services.yml => islandora/islandora.services.yml (100%) rename {src => islandora/src}/Controller/FedoraResourceAddController.php (100%) rename {src => islandora/src}/Entity/FedoraResource.php (100%) rename {src => islandora/src}/Entity/FedoraResourceType.php (100%) rename {src => islandora/src}/Entity/FedoraResourceViewsData.php (100%) rename {src => islandora/src}/FedoraResourceAccessControlHandler.php (100%) rename {src => islandora/src}/FedoraResourceHtmlRouteProvider.php (100%) rename {src => islandora/src}/FedoraResourceInterface.php (100%) rename {src => islandora/src}/FedoraResourceListBuilder.php (100%) rename {src => islandora/src}/FedoraResourceTypeHtmlRouteProvider.php (100%) rename {src => islandora/src}/FedoraResourceTypeInterface.php (100%) rename {src => islandora/src}/FedoraResourceTypeListBuilder.php (100%) rename {src => islandora/src}/FedoraResourceViewBuilder.php (100%) rename {src => islandora/src}/Form/FedoraResourceDeleteForm.php (100%) rename {src => islandora/src}/Form/FedoraResourceEntityInlineForm.php (100%) rename {src => islandora/src}/Form/FedoraResourceForm.php (100%) rename {src => islandora/src}/Form/FedoraResourceSettingsForm.php (100%) rename {src => islandora/src}/Form/FedoraResourceTypeDeleteForm.php (100%) rename {src => islandora/src}/Form/FedoraResourceTypeForm.php (100%) rename {src => islandora/src}/Form/IslandoraSettingsForm.php (100%) rename {src => islandora/src}/ParamConverter/UuidEntityConverter.php (100%) rename {src => islandora/src}/Plugin/Search/FedoraEntitySearch.php (100%) rename {templates => islandora/templates}/fedora-resource-content-add-list.html.twig (100%) rename {templates => islandora/templates}/fedora_resource.html.twig (100%) rename {tests => islandora/tests}/scripts/line_endings.sh (100%) rename {tests => islandora/tests}/scripts/travis_setup.sh (100%) diff --git a/README.md b/README.md index 005eb12c..49a92eb7 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ ## Introduction -Islandora Fedora 4 Repository Module for Drupal 8.1.x +Islandora modules for Drupal 8.2.x ## Maintainers @@ -22,4 +22,4 @@ If you would like to contribute code to the project, you need to be covered by a ## License -[GPLv2](http://www.gnu.org/licenses/gpl-2.0.txt) \ No newline at end of file +[GPLv2](http://www.gnu.org/licenses/gpl-2.0.txt) diff --git a/composer.json b/islandora/composer.json similarity index 100% rename from composer.json rename to islandora/composer.json diff --git a/config/install/islandora.fedora_resource_type.non_rdf_source.yml b/islandora/config/install/islandora.fedora_resource_type.non_rdf_source.yml similarity index 100% rename from config/install/islandora.fedora_resource_type.non_rdf_source.yml rename to islandora/config/install/islandora.fedora_resource_type.non_rdf_source.yml diff --git a/config/install/islandora.fedora_resource_type.rdf_source.yml b/islandora/config/install/islandora.fedora_resource_type.rdf_source.yml similarity index 100% rename from config/install/islandora.fedora_resource_type.rdf_source.yml rename to islandora/config/install/islandora.fedora_resource_type.rdf_source.yml diff --git a/config/install/islandora.settings.yml b/islandora/config/install/islandora.settings.yml similarity index 100% rename from config/install/islandora.settings.yml rename to islandora/config/install/islandora.settings.yml diff --git a/config/install/rdf.mapping.fedora_resource_type.rdf_source.yml b/islandora/config/install/rdf.mapping.fedora_resource_type.rdf_source.yml similarity index 100% rename from config/install/rdf.mapping.fedora_resource_type.rdf_source.yml rename to islandora/config/install/rdf.mapping.fedora_resource_type.rdf_source.yml diff --git a/config/schema/fedora_resource_type.schema.yml b/islandora/config/schema/fedora_resource_type.schema.yml similarity index 100% rename from config/schema/fedora_resource_type.schema.yml rename to islandora/config/schema/fedora_resource_type.schema.yml diff --git a/fedora_resource.page.inc b/islandora/fedora_resource.page.inc similarity index 100% rename from fedora_resource.page.inc rename to islandora/fedora_resource.page.inc diff --git a/islandora.info.yml b/islandora/islandora.info.yml similarity index 100% rename from islandora.info.yml rename to islandora/islandora.info.yml diff --git a/islandora.links.action.yml b/islandora/islandora.links.action.yml similarity index 100% rename from islandora.links.action.yml rename to islandora/islandora.links.action.yml diff --git a/islandora.links.menu.yml b/islandora/islandora.links.menu.yml similarity index 100% rename from islandora.links.menu.yml rename to islandora/islandora.links.menu.yml diff --git a/islandora.links.task.yml b/islandora/islandora.links.task.yml similarity index 100% rename from islandora.links.task.yml rename to islandora/islandora.links.task.yml diff --git a/islandora.module b/islandora/islandora.module similarity index 100% rename from islandora.module rename to islandora/islandora.module diff --git a/islandora.permissions.yml b/islandora/islandora.permissions.yml similarity index 100% rename from islandora.permissions.yml rename to islandora/islandora.permissions.yml diff --git a/islandora.routing.yml b/islandora/islandora.routing.yml similarity index 100% rename from islandora.routing.yml rename to islandora/islandora.routing.yml diff --git a/islandora.services.yml b/islandora/islandora.services.yml similarity index 100% rename from islandora.services.yml rename to islandora/islandora.services.yml diff --git a/src/Controller/FedoraResourceAddController.php b/islandora/src/Controller/FedoraResourceAddController.php similarity index 100% rename from src/Controller/FedoraResourceAddController.php rename to islandora/src/Controller/FedoraResourceAddController.php diff --git a/src/Entity/FedoraResource.php b/islandora/src/Entity/FedoraResource.php similarity index 100% rename from src/Entity/FedoraResource.php rename to islandora/src/Entity/FedoraResource.php diff --git a/src/Entity/FedoraResourceType.php b/islandora/src/Entity/FedoraResourceType.php similarity index 100% rename from src/Entity/FedoraResourceType.php rename to islandora/src/Entity/FedoraResourceType.php diff --git a/src/Entity/FedoraResourceViewsData.php b/islandora/src/Entity/FedoraResourceViewsData.php similarity index 100% rename from src/Entity/FedoraResourceViewsData.php rename to islandora/src/Entity/FedoraResourceViewsData.php diff --git a/src/FedoraResourceAccessControlHandler.php b/islandora/src/FedoraResourceAccessControlHandler.php similarity index 100% rename from src/FedoraResourceAccessControlHandler.php rename to islandora/src/FedoraResourceAccessControlHandler.php diff --git a/src/FedoraResourceHtmlRouteProvider.php b/islandora/src/FedoraResourceHtmlRouteProvider.php similarity index 100% rename from src/FedoraResourceHtmlRouteProvider.php rename to islandora/src/FedoraResourceHtmlRouteProvider.php diff --git a/src/FedoraResourceInterface.php b/islandora/src/FedoraResourceInterface.php similarity index 100% rename from src/FedoraResourceInterface.php rename to islandora/src/FedoraResourceInterface.php diff --git a/src/FedoraResourceListBuilder.php b/islandora/src/FedoraResourceListBuilder.php similarity index 100% rename from src/FedoraResourceListBuilder.php rename to islandora/src/FedoraResourceListBuilder.php diff --git a/src/FedoraResourceTypeHtmlRouteProvider.php b/islandora/src/FedoraResourceTypeHtmlRouteProvider.php similarity index 100% rename from src/FedoraResourceTypeHtmlRouteProvider.php rename to islandora/src/FedoraResourceTypeHtmlRouteProvider.php diff --git a/src/FedoraResourceTypeInterface.php b/islandora/src/FedoraResourceTypeInterface.php similarity index 100% rename from src/FedoraResourceTypeInterface.php rename to islandora/src/FedoraResourceTypeInterface.php diff --git a/src/FedoraResourceTypeListBuilder.php b/islandora/src/FedoraResourceTypeListBuilder.php similarity index 100% rename from src/FedoraResourceTypeListBuilder.php rename to islandora/src/FedoraResourceTypeListBuilder.php diff --git a/src/FedoraResourceViewBuilder.php b/islandora/src/FedoraResourceViewBuilder.php similarity index 100% rename from src/FedoraResourceViewBuilder.php rename to islandora/src/FedoraResourceViewBuilder.php diff --git a/src/Form/FedoraResourceDeleteForm.php b/islandora/src/Form/FedoraResourceDeleteForm.php similarity index 100% rename from src/Form/FedoraResourceDeleteForm.php rename to islandora/src/Form/FedoraResourceDeleteForm.php diff --git a/src/Form/FedoraResourceEntityInlineForm.php b/islandora/src/Form/FedoraResourceEntityInlineForm.php similarity index 100% rename from src/Form/FedoraResourceEntityInlineForm.php rename to islandora/src/Form/FedoraResourceEntityInlineForm.php diff --git a/src/Form/FedoraResourceForm.php b/islandora/src/Form/FedoraResourceForm.php similarity index 100% rename from src/Form/FedoraResourceForm.php rename to islandora/src/Form/FedoraResourceForm.php diff --git a/src/Form/FedoraResourceSettingsForm.php b/islandora/src/Form/FedoraResourceSettingsForm.php similarity index 100% rename from src/Form/FedoraResourceSettingsForm.php rename to islandora/src/Form/FedoraResourceSettingsForm.php diff --git a/src/Form/FedoraResourceTypeDeleteForm.php b/islandora/src/Form/FedoraResourceTypeDeleteForm.php similarity index 100% rename from src/Form/FedoraResourceTypeDeleteForm.php rename to islandora/src/Form/FedoraResourceTypeDeleteForm.php diff --git a/src/Form/FedoraResourceTypeForm.php b/islandora/src/Form/FedoraResourceTypeForm.php similarity index 100% rename from src/Form/FedoraResourceTypeForm.php rename to islandora/src/Form/FedoraResourceTypeForm.php diff --git a/src/Form/IslandoraSettingsForm.php b/islandora/src/Form/IslandoraSettingsForm.php similarity index 100% rename from src/Form/IslandoraSettingsForm.php rename to islandora/src/Form/IslandoraSettingsForm.php diff --git a/src/ParamConverter/UuidEntityConverter.php b/islandora/src/ParamConverter/UuidEntityConverter.php similarity index 100% rename from src/ParamConverter/UuidEntityConverter.php rename to islandora/src/ParamConverter/UuidEntityConverter.php diff --git a/src/Plugin/Search/FedoraEntitySearch.php b/islandora/src/Plugin/Search/FedoraEntitySearch.php similarity index 100% rename from src/Plugin/Search/FedoraEntitySearch.php rename to islandora/src/Plugin/Search/FedoraEntitySearch.php diff --git a/templates/fedora-resource-content-add-list.html.twig b/islandora/templates/fedora-resource-content-add-list.html.twig similarity index 100% rename from templates/fedora-resource-content-add-list.html.twig rename to islandora/templates/fedora-resource-content-add-list.html.twig diff --git a/templates/fedora_resource.html.twig b/islandora/templates/fedora_resource.html.twig similarity index 100% rename from templates/fedora_resource.html.twig rename to islandora/templates/fedora_resource.html.twig diff --git a/tests/scripts/line_endings.sh b/islandora/tests/scripts/line_endings.sh similarity index 100% rename from tests/scripts/line_endings.sh rename to islandora/tests/scripts/line_endings.sh diff --git a/tests/scripts/travis_setup.sh b/islandora/tests/scripts/travis_setup.sh similarity index 100% rename from tests/scripts/travis_setup.sh rename to islandora/tests/scripts/travis_setup.sh From b2899ba893162f32ea613f2d42d3afb646428d5d Mon Sep 17 00:00:00 2001 From: Danny Lamb Date: Tue, 29 Nov 2016 03:04:55 +0000 Subject: [PATCH 2/7] Pulling out composer.json so tests can run. --- islandora/composer.json => composer.json | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename islandora/composer.json => composer.json (100%) diff --git a/islandora/composer.json b/composer.json similarity index 100% rename from islandora/composer.json rename to composer.json From 9cd086f619f3bc60cb5ee77beb6f05d94a2bab22 Mon Sep 17 00:00:00 2001 From: Danny Lamb Date: Tue, 29 Nov 2016 03:11:47 +0000 Subject: [PATCH 3/7] Does this even work? --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e043b79d..615213d3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ install: script: - $ISLANDORA_DIR/tests/scripts/line_endings.sh . - - php vendor/bin/phpcs --standard=Drupal *.module src + - php vendor/bin/phpcs --standard=Drupal */*.module */src - php vendor/bin/phpcpd --names *.module,*.inc,*.test,*.php --exclude=vendor . notifications: From 5580ffac318cc34f00f409be439387174decb76c Mon Sep 17 00:00:00 2001 From: Danny Lamb Date: Tue, 29 Nov 2016 03:19:53 +0000 Subject: [PATCH 4/7] Pulling out tests folder too, since it's just travis stuff. --- .travis.yml | 2 +- {islandora/tests => tests}/scripts/line_endings.sh | 0 {islandora/tests => tests}/scripts/travis_setup.sh | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename {islandora/tests => tests}/scripts/line_endings.sh (100%) rename {islandora/tests => tests}/scripts/travis_setup.sh (100%) diff --git a/.travis.yml b/.travis.yml index 615213d3..86835b64 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ install: script: - $ISLANDORA_DIR/tests/scripts/line_endings.sh . - - php vendor/bin/phpcs --standard=Drupal */*.module */src + - php vendor/bin/phpcs --standard=Drupal *.module *.php --exclude=vendor . - php vendor/bin/phpcpd --names *.module,*.inc,*.test,*.php --exclude=vendor . notifications: diff --git a/islandora/tests/scripts/line_endings.sh b/tests/scripts/line_endings.sh similarity index 100% rename from islandora/tests/scripts/line_endings.sh rename to tests/scripts/line_endings.sh diff --git a/islandora/tests/scripts/travis_setup.sh b/tests/scripts/travis_setup.sh similarity index 100% rename from islandora/tests/scripts/travis_setup.sh rename to tests/scripts/travis_setup.sh From c6b2621160f7a81d991cf994bb6e4b0146f649a6 Mon Sep 17 00:00:00 2001 From: Danny Lamb Date: Tue, 29 Nov 2016 03:33:35 +0000 Subject: [PATCH 5/7] Playing with phpcs options --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 86835b64..320a92b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ install: script: - $ISLANDORA_DIR/tests/scripts/line_endings.sh . - - php vendor/bin/phpcs --standard=Drupal *.module *.php --exclude=vendor . + - php vendor/bin/phpcs --standard=Drupal --file-list=*.module,*.php --ignore=tests,vendor . - php vendor/bin/phpcpd --names *.module,*.inc,*.test,*.php --exclude=vendor . notifications: From a9240b4c67f6c81b1e770472a970c9182cb531dc Mon Sep 17 00:00:00 2001 From: Danny Lamb Date: Tue, 29 Nov 2016 03:36:03 +0000 Subject: [PATCH 6/7] Recursively looking for php and module files --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 320a92b9..84b2d592 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ install: script: - $ISLANDORA_DIR/tests/scripts/line_endings.sh . - - php vendor/bin/phpcs --standard=Drupal --file-list=*.module,*.php --ignore=tests,vendor . + - php vendor/bin/phpcs --standard=Drupal **/*.module **/*.php --ignore=tests,vendor . - php vendor/bin/phpcpd --names *.module,*.inc,*.test,*.php --exclude=vendor . notifications: From b7d628dbb1546392d8453031e5040e3e7ee4608a Mon Sep 17 00:00:00 2001 From: Danny Lamb Date: Tue, 29 Nov 2016 14:10:46 +0000 Subject: [PATCH 7/7] Moved travis scripts to hidden folder --- {tests/scripts => .scripts}/line_endings.sh | 0 {tests/scripts => .scripts}/travis_setup.sh | 0 .travis.yml | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) rename {tests/scripts => .scripts}/line_endings.sh (100%) rename {tests/scripts => .scripts}/travis_setup.sh (100%) diff --git a/tests/scripts/line_endings.sh b/.scripts/line_endings.sh similarity index 100% rename from tests/scripts/line_endings.sh rename to .scripts/line_endings.sh diff --git a/tests/scripts/travis_setup.sh b/.scripts/travis_setup.sh similarity index 100% rename from tests/scripts/travis_setup.sh rename to .scripts/travis_setup.sh diff --git a/.travis.yml b/.travis.yml index 84b2d592..b3d2ddec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,7 +26,7 @@ install: script: - - $ISLANDORA_DIR/tests/scripts/line_endings.sh . + - $ISLANDORA_DIR/.scripts/line_endings.sh . - php vendor/bin/phpcs --standard=Drupal **/*.module **/*.php --ignore=tests,vendor . - php vendor/bin/phpcpd --names *.module,*.inc,*.test,*.php --exclude=vendor .