Merge pull request #478 from dotkernel/issue-453

Issue 453

Author: arhimede

src/User/src/Entity/User.php

@@ -34,10 +34,7 @@ class User extends AbstractEntity implements UserInterface
     public const IS_DELETED_YES = true;
     public const IS_DELETED_NO  = false;
 
-    public const IS_DELETED = [
-        self::IS_DELETED_YES,
-        self::IS_DELETED_NO,
-    ];
+    public const IS_DELETED = ['1', '0'];
 
     #[ORM\OneToOne(mappedBy: 'user', targetEntity: UserDetail::class, cascade: ['persist', 'remove'])]
     protected UserDetail $detail;

src/User/src/Form/ProfileDeleteForm.php

@@ -45,7 +45,7 @@ public function init(): void
             ],
             'options'    => [
                 'label'              => 'I want to delete account',
-                'use_hidden_element' => true,
+                'use_hidden_element' => false,
                 'checked_value'      => (string) User::IS_DELETED_YES,
                 'unchecked_value'    => (string) User::IS_DELETED_NO,
             ],

src/User/src/Service/UserService.php

@@ -133,7 +133,7 @@ public function updateUser(User $user, array $data = []): User
         }
 
         if (isset($data['isDeleted'])) {
-            $user->setIsDeleted($data['isDeleted']);
+            $user->setIsDeleted((bool) $data['isDeleted']);
         }
 
         if (isset($data['hash'])) {

test/Unit/User/InputFilter/ProfileDeleteInputFilterTest.php

@@ -5,6 +5,7 @@
 namespace FrontendTest\Unit\User\InputFilter;
 
 use Frontend\App\Common\Message;
+use Frontend\User\Entity\User;
 use Frontend\User\InputFilter\ProfileDeleteInputFilter;
 use FrontendTest\Common\AbstractInputFilterTest;
 use Laminas\Session\Container;
@@ -51,10 +52,10 @@ public function testWillPassValidation(): void
     {
         $hash = (new Csrf(['session' => new Container()]))->getHash();
 
-        $this->inputFilter->setData(['isDeleted' => true, 'userDeleteCsrf' => $hash]);
+        $this->inputFilter->setData(['isDeleted' => (string) User::IS_DELETED_YES, 'userDeleteCsrf' => $hash]);
         $this->assertTrue($this->inputFilter->isValid());
         $this->assertSame(
-            true,
+            (string) User::IS_DELETED_YES,
             $this->inputFilter->getValue('isDeleted')
         );
     }