Merge pull request #93 from utopia-php/fix-utopia-validator-typings

fix(validators): adapt to utopia changes

Author: TorstenDittmann

composer.lock

@@ -37,7 +37,7 @@ public function __construct($action)
      *
      * @return string
      */
-    public function getDescription()
+    public function getDescription(): string
     {
         return $this->message;
     }
@@ -51,7 +51,7 @@ public function getDescription()
      *
      * @return bool
      */
-    public function isValid($permissions)
+    public function isValid($permissions): bool
     {
         if (!self::$status) {
             return true;

src/Database/Validator/Authorization.php

@@ -42,7 +42,7 @@ public function __construct(Database $database, string $collection = '')
      *
      * @return string
      */
-    public function getDescription()
+    public function getDescription(): string
     {
         return $this->message;
     }
@@ -56,7 +56,7 @@ public function getDescription()
      *
      * @return bool
      */
-    public function isValid($id)
+    public function isValid($id): bool
     {
         $document = $this->database->getDocument($this->collection, $id);
 

src/Database/Validator/DocumentId.php

@@ -18,7 +18,7 @@ class Key extends Validator
      *
      * @return string
      */
-    public function getDescription()
+    public function getDescription(): string
     {
         return $this->message;
     }
@@ -32,7 +32,7 @@ public function getDescription()
      *
      * @return bool
      */
-    public function isValid($value)
+    public function isValid($value): bool
     {
         if (!\is_string($value)) {
             return false;

src/Database/Validator/Key.php

@@ -38,7 +38,7 @@ class Permissions extends Validator
      *
      * @return string
      */
-    public function getDescription()
+    public function getDescription(): string
     {
         return $this->message;
     }
@@ -52,7 +52,7 @@ public function getDescription()
      *
      * @return bool
      */
-    public function isValid($roles)
+    public function isValid($roles): bool
     {
         if(!is_array($roles)) {
             $this->message = 'Permissions roles must be an array of strings.';

src/Database/Validator/Permissions.php

@@ -55,7 +55,7 @@ public function __construct($validator, $indexes, $strict = true)
      *
      * @return string
      */
-    public function getDescription()
+    public function getDescription(): string
     {
         return $this->message;
     }
@@ -67,7 +67,7 @@ public function getDescription()
      * @param mixed $value as array of Query objects
      * @return bool
      */
-    public function isValid($value)
+    public function isValid($value): bool
     {
         /**
          * Array of attributes from Query->getAttribute()

src/Database/Validator/Queries.php

@@ -51,7 +51,7 @@ public function __construct(array $attributes)
      *
      * @return string
      */
-    public function getDescription()
+    public function getDescription(): string
     {
         return $this->message;
     }
@@ -65,7 +65,7 @@ public function getDescription()
      *
      * @return bool
      */
-    public function isValid($query)
+    public function isValid($query): bool
     {
         // Validate operator
         if (!in_array($query->getOperator(), $this->operators)) {

src/Database/Validator/QueryValidator.php

@@ -170,7 +170,7 @@ static public function removeFormat(string $name): void
      *
      * @return string
      */
-    public function getDescription()
+    public function getDescription(): string
     {
         return 'Invalid document structure: '.$this->message;
     }
@@ -184,7 +184,7 @@ public function getDescription()
      *
      * @return bool
      */
-    public function isValid($document)
+    public function isValid($document): bool
     {
         if(!$document instanceof Document) {
             $this->message = 'Value must be an instance of Document';

src/Database/Validator/Structure.php

@@ -13,7 +13,7 @@ class UID extends Key
      *
      * @return string
      */
-    public function getDescription()
+    public function getDescription(): string
     {
         return 'UID must contain at most 36 chars. Valid chars are a-z, A-Z, 0-9, and underscore. Can\'t start with a leading underscore';
     }

src/Database/Validator/UID.php

@@ -21,7 +21,7 @@ class Format extends Text
      *
      * @return string
      */
-    public function getDescription()
+    public function getDescription(): string
     {
         return 'Value must be a valid email address';
     }
@@ -34,7 +34,7 @@ public function getDescription()
      * @param  mixed $value
      * @return bool
      */
-    public function isValid($value)
+    public function isValid($value): bool
     {
         if (!\filter_var($value, FILTER_VALIDATE_EMAIL)) {
             return false;