Fixing a TODO at VBool verification.

Author: krulis-martin

app/V1Module/presenters/InstancesPresenter.php

@@ -3,18 +3,11 @@
 namespace App\V1Module\Presenters;
 
 use App\Helpers\MetaFormats\Attributes\Post;
-use App\Helpers\MetaFormats\Attributes\Query;
 use App\Helpers\MetaFormats\Attributes\Path;
-use App\Helpers\MetaFormats\Type;
-use App\Helpers\MetaFormats\Validators\VArray;
 use App\Helpers\MetaFormats\Validators\VBool;
-use App\Helpers\MetaFormats\Validators\VDouble;
-use App\Helpers\MetaFormats\Validators\VEmail;
-use App\Helpers\MetaFormats\Validators\VInt;
 use App\Helpers\MetaFormats\Validators\VMixed;
 use App\Helpers\MetaFormats\Validators\VString;
 use App\Helpers\MetaFormats\Validators\VTimestamp;
-use App\Helpers\MetaFormats\Validators\VUuid;
 use App\Exceptions\ForbiddenRequestException;
 use App\Exceptions\NotFoundException;
 use App\Model\Entity\LocalizedGroup;
@@ -164,12 +157,10 @@ public function actionUpdateInstance(string $id)
         $instance = $this->instances->findOrThrow($id);
 
         $req = $this->getRequest();
-        $isOpen = $req->getPost("isOpen") ? filter_var(
-            $req->getPost("isOpen"),
-            FILTER_VALIDATE_BOOLEAN
-        ) : $instance->isOpen();
-
-        $instance->setIsOpen($isOpen);
+        $isOpen = $req->getPost("isOpen");
+        if ($isOpen !== null) {
+            $instance->setIsOpen($isOpen);
+        }
         $this->instances->persist($instance);
         $this->sendSuccessResponse($this->instanceViewFactory->getInstance($instance, $this->getCurrentUser()));
     }

app/helpers/MetaFormats/Validators/VBool.php

@@ -20,17 +20,16 @@ public function validate(mixed $value): bool
             return true;
         }
 
-        if ($this->strict) {
-            ///TODO: replace this with 'return false;' once the testUpdateInstance test issue is fixed.
-            return $value === 'false';
+        if (!$this->strict) {
+            // FILTER_VALIDATE_BOOL is not used because it additionally allows "on", "yes", "off", "no" and ""
+            return $value === 0
+                || $value === 1
+                || $value === "0"
+                || $value === "1"
+                || $value === "false"
+                || $value === "true";
         }
 
-        // FILTER_VALIDATE_BOOL is not used because it additionally allows "on", "yes", "off", "no" and ""
-        return $value === 0
-            || $value === 1
-            || $value === "0"
-            || $value === "1"
-            || $value === "false"
-            || $value === "true";
+        return false;
     }
 }

tests/Presenters/InstancesPresenter.phpt

@@ -121,7 +121,7 @@ class TestInstancesPresenter extends Tester\TestCase
             'V1:Instances',
             'POST',
             ['action' => 'updateInstance', 'id' => $instance->getId()],
-            ['isOpen' => 'false']
+            ['isOpen' => false]
         );
         $response = $this->presenter->run($request);
         Assert::type(Nette\Application\Responses\JsonResponse::class, $response);