Merge branch 'master' of ssh://git.autonomic.zone:2222/autonomic-cooperative/opencase into trav

modules/opencase_cases/opencase_cases.info.yml

@@ -1,7 +1,7 @@
 name: 'Opencase Cases'
 type: module
 description: 'Provides case entities and a required field on activities linking them to a case.'
-core: 8.x
+core_version_requirement: 9.x
 package: OpenCase
 dependencies:
   0: opencase_entities

modules/opencase_cases/opencase_cases.permissions.yml

@@ -29,8 +29,6 @@ delete all case provision revisions:
   title: 'Delete all revisions'
   description: 'Role requires permission to <em>view Case Provision revisions</em> and <em>delete rights</em> for case provision entities in question or <em>administer case provision entities</em>.'
 
-permission_callbacks:
-  - \Drupal\opencase_cases\OCCaseProvisionPermissions::generatePermissions
 add case fee entities:
   title: 'Create new Case Fee entities'
 
@@ -64,3 +62,4 @@ delete all case fee revisions:
 
 permission_callbacks:
   - \Drupal\opencase_cases\OCCaseFeePermissions::generatePermissions
+  - \Drupal\opencase_cases\OCCaseProvisionPermissions::generatePermissions

modules/opencase_cases/src/Entity/OCCaseFee.php

@@ -55,6 +55,11 @@ use Drupal\user\UserInterface;
  *     "langcode" = "langcode",
  *     "published" = "status",
  *   },
+ *   revision_metadata_keys = {
+ *     "revision_user" = "revision_user",
+ *     "revision_created" = "revision_created",
+ *     "revision_log_message" = "revision_log",
+ *   },
  *   links = {
  *     "canonical" = "/opencase/oc_case_fee/{oc_case_fee}",
  *     "add-page" = "/opencase/oc_case_fee/add",

modules/opencase_cases/src/Entity/OCCaseProvision.php

@@ -55,6 +55,11 @@ use Drupal\user\UserInterface;
  *     "langcode" = "langcode",
  *     "published" = "status",
  *   },
+ *   revision_metadata_keys = {
+ *     "revision_user" = "revision_user",
+ *     "revision_created" = "revision_created",
+ *     "revision_log_message" = "revision_log",
+ *   },
  *   links = {
  *     "canonical" = "/opencase/oc_case_provision/{oc_case_provision}",
  *     "add-page" = "/opencase/oc_case_provision/add",

modules/opencase_cases/src/Form/OCCaseRevisionDeleteForm.php

@@ -107,7 +107,7 @@ class OCCaseRevisionDeleteForm extends ConfirmFormBase {
     $this->OCCaseStorage->deleteRevision($this->revision->getRevisionId());
 
     $this->logger('content')->notice('Case: deleted %title revision %revision.', ['%title' => $this->revision->label(), '%revision' => $this->revision->getRevisionId()]);
-    drupal_set_message(t('Revision from %revision-date of Case %title has been deleted.', ['%revision-date' => format_date($this->revision->getRevisionCreationTime()), '%title' => $this->revision->label()]));
+    \Drupal::messenger()->addMessage(t('Revision from %revision-date of Case %title has been deleted.', ['%revision-date' => format_date($this->revision->getRevisionCreationTime()), '%title' => $this->revision->label()]));
     $form_state->setRedirect(
       'entity.oc_case.canonical',
        ['oc_case' => $this->revision->id()]

modules/opencase_cases/src/Form/OCCaseRevisionRevertForm.php

@@ -120,7 +120,7 @@ class OCCaseRevisionRevertForm extends ConfirmFormBase {
     $this->revision->save();
 
     $this->logger('content')->notice('Case: reverted %title revision %revision.', ['%title' => $this->revision->label(), '%revision' => $this->revision->getRevisionId()]);
-    drupal_set_message(t('Case %title has been reverted to the revision from %revision-date.', ['%title' => $this->revision->label(), '%revision-date' => $this->dateFormatter->format($original_revision_timestamp)]));
+    \Drupal::messenger()->addMessage(t('Case %title has been reverted to the revision from %revision-date.', ['%title' => $this->revision->label(), '%revision-date' => $this->dateFormatter->format($original_revision_timestamp)]));
     $form_state->setRedirect(
       'entity.oc_case.version_history',
       ['oc_case' => $this->revision->id()]

modules/opencase_cases/src/Form/OCCaseTypeDeleteForm.php

@@ -38,7 +38,7 @@ class OCCaseTypeDeleteForm extends EntityConfirmFormBase {
   public function submitForm(array &$form, FormStateInterface $form_state) {
     $this->entity->delete();
 
-    drupal_set_message(
+    \Drupal::messenger()->addMessage(
       $this->t('content @type: deleted @label.',
         [
           '@type' => $this->entity->bundle(),

modules/opencase_cases/src/Form/OCCaseTypeForm.php

@@ -49,13 +49,13 @@ class OCCaseTypeForm extends EntityForm {
 
     switch ($status) {
       case SAVED_NEW:
-        drupal_set_message($this->t('Created the %label Case type.', [
+        \Drupal::messenger()->addMessage($this->t('Created the %label Case type.', [
           '%label' => $oc_case_type->label(),
         ]));
         break;
 
       default:
-        drupal_set_message($this->t('Saved the %label Case type.', [
+        \Drupal::messenger()->addMessage($this->t('Saved the %label Case type.', [
           '%label' => $oc_case_type->label(),
         ]));
     }

modules/opencase_entities/opencase_entities.info.yml

@@ -1,5 +1,5 @@
 name: 'OpenCase Entities'
 type: module
 description: 'Entity Types for OpenCase'
-core: 8.x
+core_version_requirement: 9.x
 package: 'OpenCase'

modules/opencase_entities/src/Form/OCActivityForm.php

@@ -55,19 +55,19 @@ class OCActivityForm extends ContentEntityForm {
 
     switch ($status) {
       case SAVED_NEW:
-        drupal_set_message($this->t('Created the %bundle.', [
+         \Drupal::messenger()->addMessage($this->t('Created the %bundle.', [
           '%bundle' => $entity->bundle(),
         ]));
         break;
 
       default:
-        drupal_set_message($this->t('Saved the %bundle.', [
+         \Drupal::messenger()->addMessage($this->t('Saved the %bundle.', [
           '%bundle' => $entity->bundle(),
         ]));
     }
     // If you have unpublished the entity and you can't see unpublished entities, redirect to a more informative message than just "Access Denied".
     if (!$form_state->getValue('status')['value'] && !\Drupal::currentUser()->hasPermission('view unpublished activity entities')) {
-      drupal_set_message($this->t('The %bundle is now unpublished & hidden from you.', [
+       \Drupal::messenger()->addMessage($this->t('The %bundle is now unpublished & hidden from you.', [
         '%bundle' => $entity->bundle(),
       ]));
       $form_state->setRedirect('<front>');

modules/opencase_entities/src/Form/OCActivityRevisionDeleteForm.php

@@ -107,7 +107,7 @@ class OCActivityRevisionDeleteForm extends ConfirmFormBase {
     $this->OCActivityStorage->deleteRevision($this->revision->getRevisionId());
 
     $this->logger('content')->notice('Activity: deleted %title revision %revision.', ['%title' => $this->revision->label(), '%revision' => $this->revision->getRevisionId()]);
-    drupal_set_message(t('Revision from %revision-date of Activity %title has been deleted.', ['%revision-date' => format_date($this->revision->getRevisionCreationTime()), '%title' => $this->revision->label()]));
+    \Drupal::messenger()->addMessage(t('Revision from %revision-date of Activity %title has been deleted.', ['%revision-date' => format_date($this->revision->getRevisionCreationTime()), '%title' => $this->revision->label()]));
     $form_state->setRedirect(
       'entity.oc_activity.canonical',
        ['oc_activity' => $this->revision->id()]

modules/opencase_entities/src/Form/OCActivityRevisionRevertForm.php

@@ -120,7 +120,7 @@ class OCActivityRevisionRevertForm extends ConfirmFormBase {
     $this->revision->save();
 
     $this->logger('content')->notice('Activity: reverted %title revision %revision.', ['%title' => $this->revision->label(), '%revision' => $this->revision->getRevisionId()]);
-    drupal_set_message(t('Activity %title has been reverted to the revision from %revision-date.', ['%title' => $this->revision->label(), '%revision-date' => $this->dateFormatter->format($original_revision_timestamp)]));
+    \Drupal::messenger()->addMessage(t('Activity %title has been reverted to the revision from %revision-date.', ['%title' => $this->revision->label(), '%revision-date' => $this->dateFormatter->format($original_revision_timestamp)]));
     $form_state->setRedirect(
       'entity.oc_activity.version_history',
       ['oc_activity' => $this->revision->id()]

modules/opencase_entities/src/Form/OCActivityTypeDeleteForm.php

@@ -38,7 +38,7 @@ class OCActivityTypeDeleteForm extends EntityConfirmFormBase {
   public function submitForm(array &$form, FormStateInterface $form_state) {
     $this->entity->delete();
 
-    drupal_set_message(
+    \Drupal::messenger()->addMessage(
       $this->t('content @type: deleted @label.',
         [
           '@type' => $this->entity->bundle(),

modules/opencase_entities/src/Form/OCActivityTypeForm.php

@@ -49,13 +49,13 @@ class OCActivityTypeForm extends EntityForm {
 
     switch ($status) {
       case SAVED_NEW:
-        drupal_set_message($this->t('Created the %label Activity type.', [
+        \Drupal::messenger()->addMessage($this->t('Created the %label Activity type.', [
           '%label' => $oc_activity_type->label(),
         ]));
         break;
 
       default:
-        drupal_set_message($this->t('Saved the %label Activity type.', [
+        \Drupal::messenger()->addMessage($this->t('Saved the %label Activity type.', [
           '%label' => $oc_activity_type->label(),
         ]));
     }

modules/opencase_entities/src/Form/OCActorForm.php

@@ -48,19 +48,19 @@ class OCActorForm extends ContentEntityForm {
 
     switch ($status) {
       case SAVED_NEW:
-        drupal_set_message($this->t('Created %label.', [
+        \Drupal::messenger()->addMessage($this->t('Created %label.', [
           '%label' => $entity->label(),
         ]));
         break;
 
       default:
-        drupal_set_message($this->t('Saved %label.', [
+        \Drupal::messenger()->addMessage($this->t('Saved %label.', [
           '%label' => $entity->label(),
         ]));
     }
     // If you have unpublished the entity and you can't see unpublished entities, redirect to a more informative message than just "Access Denied".
     if (!$form_state->getValue('status')['value'] && !\Drupal::currentUser()->hasPermission('view unpublished actor entities')) {
-      drupal_set_message($this->t('The record for "%label" is now unpublished & hidden from you.', [
+      \Drupal::messenger()->addMessage($this->t('The record for "%label" is now unpublished & hidden from you.', [
         '%label' => $entity->label(),
       ]));
       $form_state->setRedirect('<front>');

modules/opencase_entities/src/Form/OCActorRevisionDeleteForm.php

@@ -107,7 +107,7 @@ class OCActorRevisionDeleteForm extends ConfirmFormBase {
     $this->OCActorStorage->deleteRevision($this->revision->getRevisionId());
 
     $this->logger('content')->notice('Actor: deleted %title revision %revision.', ['%title' => $this->revision->label(), '%revision' => $this->revision->getRevisionId()]);
-    drupal_set_message(t('Revision from %revision-date of Actor %title has been deleted.', ['%revision-date' => format_date($this->revision->getRevisionCreationTime()), '%title' => $this->revision->label()]));
+    \Drupal::messenger()->addMessage(t('Revision from %revision-date of Actor %title has been deleted.', ['%revision-date' => format_date($this->revision->getRevisionCreationTime()), '%title' => $this->revision->label()]));
     $form_state->setRedirect(
       'entity.oc_actor.canonical',
        ['oc_actor' => $this->revision->id()]

modules/opencase_entities/src/Form/OCActorRevisionRevertForm.php

@@ -120,7 +120,7 @@ class OCActorRevisionRevertForm extends ConfirmFormBase {
     $this->revision->save();
 
     $this->logger('content')->notice('Actor: reverted %title revision %revision.', ['%title' => $this->revision->label(), '%revision' => $this->revision->getRevisionId()]);
-    drupal_set_message(t('Actor %title has been reverted to the revision from %revision-date.', ['%title' => $this->revision->label(), '%revision-date' => $this->dateFormatter->format($original_revision_timestamp)]));
+    \Drupal::messenger()->addMessage(t('Actor %title has been reverted to the revision from %revision-date.', ['%title' => $this->revision->label(), '%revision-date' => $this->dateFormatter->format($original_revision_timestamp)]));
     $form_state->setRedirect(
       'entity.oc_actor.version_history',
       ['oc_actor' => $this->revision->id()]

modules/opencase_entities/src/Form/OCActorTypeDeleteForm.php

@@ -38,7 +38,7 @@ class OCActorTypeDeleteForm extends EntityConfirmFormBase {
   public function submitForm(array &$form, FormStateInterface $form_state) {
     $this->entity->delete();
 
-    drupal_set_message(
+    \Drupal::messenger()->addMessage(
       $this->t('content @type: deleted @label.',
         [
           '@type' => $this->entity->bundle(),

modules/opencase_entities/src/Form/OCActorTypeForm.php

@@ -49,13 +49,13 @@ class OCActorTypeForm extends EntityForm {
 
     switch ($status) {
       case SAVED_NEW:
-        drupal_set_message($this->t('Created the %label Person type.', [
+        \Drupal::messenger()->addMessage($this->t('Created the %label Person type.', [
           '%label' => $oc_actor_type->label(),
         ]));
         break;
 
       default:
-        drupal_set_message($this->t('Saved the %label Person type.', [
+        \Drupal::messenger()->addMessage($this->t('Saved the %label Person type.', [
           '%label' => $oc_actor_type->label(),
         ]));
     }

modules/opencase_entities/src/Form/OCEventForm.php

@@ -62,7 +62,7 @@ class OCEventForm extends ContentEntityForm {
     }
     // If you have unpublished the entity and you can't see unpublished entities, redirect to a more informative message than just "Access Denied".
     if (!$form_state->getValue('status')['value'] && !\Drupal::currentUser()->hasPermission('view unpublished event entities')) {
-      drupal_set_message($this->t('The record for "%label" is now unpublished & hidden from you.', [
+      \Drupal::messenger()->addMessage($this->t('The record for "%label" is now unpublished & hidden from you.', [
         '%label' => $entity->label(),
       ]));
       $form_state->setRedirect('<front>');

modules/opencase_entities/src/Form/OCOrganisationForm.php

@@ -83,7 +83,7 @@ class OCOrganisationForm extends ContentEntityForm {
     }
     // If you have unpublished the entity and you can't see unpublished entities, redirect to a more informative message than just "Access Denied".
     if (!$form_state->getValue('status')['value'] && !\Drupal::currentUser()->hasPermission('view unpublished organisation entities')) {
-      drupal_set_message($this->t('The record for "%label" is now unpublished & hidden from you.', [
+      \Drupal::messenger()->addMessage($this->t('The record for "%label" is now unpublished & hidden from you.', [
         '%label' => $entity->label(),
       ]));
       $form_state->setRedirect('<front>');

modules/opencase_search/opencase_search.info.yml

@@ -1,7 +1,7 @@
 name: 'OpenCase Search'
 type: module
 description: 'Search functionality for OpenCase'
-core: 8.x
+core_version_requirement: 9.x
 package: 'OpenCase'
 dependencies:
   - search_api

opencase.info.yml

@@ -1,8 +1,8 @@
 name: 'OpenCase'
 type: module
 description: 'Simple Case Management'
-core: 8.x
+core_version_requirement: 9.x
-version: 8.x-3.0
+version: 9.x-1.0
 package: 'OpenCase'
 dependencies:
   - opencase_entities