ISAICP-4620: Restructure code to more closely represent the data model

web/modules/custom/collection/collection.info.yml

@@ -10,6 +10,7 @@ dependencies:
   - drupal:link
   - drupal:options
   - drupal:text
+  - drupal:user
   - ds:ds
   - facets:facets
   - field_group:field_group

web/profiles/joinup/src/Form/UserMultipleCancelConfirm.php → web/modules/custom/collection/src/Form/UserMultipleCancelConfirm.php

@@ -1,6 +1,8 @@
 <?php
 
-namespace Drupal\joinup\Form;
+declare(strict_types = 1);
+
+namespace Drupal\collection\Form;
 
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityManagerInterface;

web/modules/custom/joinup_core/joinup_core.module

@@ -5,6 +5,8 @@
  * Main functions and hook implementations of the Joinup core module.
  */
 
+declare(strict_types = 1);
+
 use Drupal\Component\Serialization\Json;
 use Drupal\Component\Utility\Html;
 use Drupal\Core\Access\AccessResult;

web/modules/custom/joinup_core/src/NodeWorkflowAccessControlHandler.php

@@ -108,13 +108,6 @@ class NodeWorkflowAccessControlHandler {
    */
   protected $workflowHelper;
 
-  /**
-   * The permission scheme stored in configuration.
-   *
-   * @var \Drupal\Core\Config\ImmutableConfig
-   */
-  protected $permissionScheme;
-
   /**
    * Constructs a JoinupDocumentRelationManager object.
    *

web/modules/custom/joinup_search/joinup_search.info.yml

@@ -5,18 +5,18 @@ core: 8.x
 package: Joinup
 
 dependencies:
+  - drupal:node
+  - drupal:taxonomy
+  - drupal:text
+  - drupal:views
   - facets:facets
   - joinup:joinup_core
   - joinup:joinup_user
-  - drupal:node
+  - joinup:search_api_field
+  - joinup:state_machine_revisions
   - rdf_entity:rdf_entity
   - search_api:search_api
-  - joinup:search_api_field
   - search_api_solr:search_api_solr
-  - joinup:state_machine_revisions
-  - drupal:taxonomy
-  - drupal:text
-  - drupal:views
 
 config_devel:
  - facets.facet.group

web/profiles/joinup/src/Routing/RouteSubscriber.php

@@ -43,7 +43,7 @@ protected function alterRoutes(RouteCollection $collection) {
     // that prevents deletion of users that are sole owners of collections.
     if ($route = $collection->get('user.multiple_cancel_confirm')) {
       $route->addDefaults([
-        '_form' => '\Drupal\joinup\Form\UserMultipleCancelConfirm',
+        '_form' => '\Drupal\collection\Form\UserMultipleCancelConfirm',
       ]);
     }
   }