ISAICP-6027: Fix deprecated warning: Passing an account object is dep…

…recated. Deprecated in og:8.1.0-alpha4 and is removed from og:8.1.0-beta1. See Gizra/og#542.
ec-europa · Jun 9, 2020 · bba1e45 · bba1e45
1 parent d24534c
commit bba1e45
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/web/modules/custom/collection/src/Form/LeaveCollectionConfirmForm.php b/web/modules/custom/collection/src/Form/LeaveCollectionConfirmForm.php
@@ -165,13 +165,13 @@ public function validateForm(array &$form, FormStateInterface $form_state): void
    * {@inheritdoc}
    */
   public function submitForm(array &$form, FormStateInterface $form_state): void {
-    $user = $this->currentUser();
+    $user_id = $this->currentUser()->id();
 
-    $membership = $this->membershipManager->getMembership($this->collection, $user);
+    $membership = $this->membershipManager->getMembership($this->collection, $user_id);
     $membership->delete();
 
     // Also remove the user authorship, if case.
-    if ($this->collection->getOwnerId() === $user->id()) {
+    if ($this->collection->getOwnerId() === $user_id) {
       $this->collection->skip_notification = TRUE;
       $this->collection->setOwnerId(0)->save();
     }

diff --git a/web/modules/custom/collection/src/Form/SubscribeToCollectionForm.php b/web/modules/custom/collection/src/Form/SubscribeToCollectionForm.php
@@ -238,11 +238,10 @@ public function access(RdfInterface $rdf_entity): AccessResultInterface {
    *   The membership of the user or null.
    */
   protected function getUserNonBlockedMembership(RdfInterface $collection): ?OgMembershipInterface {
-    $membership = $this->membershipManager->getMembership($collection, $this->getUser(), [
+    return $this->membershipManager->getMembership($collection, $this->getUser()->id(), [
       OgMembershipInterface::STATE_ACTIVE,
       OgMembershipInterface::STATE_PENDING,
     ]);
-    return $membership;
   }
 
   /**