Merge pull request #154 from harikt/initial

Changes in types

src/Rule/Sanitize/Strlen.php

@@ -38,7 +38,7 @@ class Strlen extends AbstractStrlen
      * @return bool True if the value was sanitized, false if not.
      *
      */
-    public function __invoke(object $subject, string $field, $len, $pad_string = ' ', $pad_type = STR_PAD_RIGHT): bool
+    public function __invoke(object $subject, string $field, $len, string $pad_string = ' ', int $pad_type = STR_PAD_RIGHT): bool
     {
         $value = $subject->$field;
         if (! is_scalar($value)) {

src/Rule/Sanitize/StrlenBetween.php

@@ -40,7 +40,7 @@ class StrlenBetween extends AbstractStrlen
      * @return bool True if the value was sanitized, false if not.
      *
      */
-    public function __invoke(object $subject, string $field, $min, $max, $pad_string = ' ', $pad_type = STR_PAD_RIGHT): bool
+    public function __invoke(object $subject, string $field, int $min, int $max, string $pad_string = ' ', int $pad_type = STR_PAD_RIGHT): bool
     {
         $value = $subject->$field;
         if (! is_scalar($value)) {

src/Rule/Sanitize/StrlenMax.php

@@ -34,7 +34,7 @@ class StrlenMax extends AbstractStrlen
      * @return bool True if the value was sanitized, false if not.
      *
      */
-    public function __invoke(object $subject, string $field, $max): bool
+    public function __invoke(object $subject, string $field, int $max): bool
     {
         $value = $subject->$field;
         if (! is_scalar($value)) {

src/Rule/Sanitize/StrlenMin.php

@@ -38,7 +38,7 @@ class StrlenMin extends AbstractStrlen
      * @return bool True if the value was sanitized, false if not.
      *
      */
-    public function __invoke(object $subject, string $field, $min, $pad_string = ' ', $pad_type = STR_PAD_RIGHT): bool
+    public function __invoke(object $subject, string $field, int $min, string $pad_string = ' ', int $pad_type = STR_PAD_RIGHT): bool
     {
         $value = $subject->$field;
         if (! is_scalar($value)) {

src/Rule/Sanitize/Trim.php

@@ -32,7 +32,7 @@ class Trim
      * @return bool True if the value was sanitized, false if not.
      *
      */
-    public function __invoke(object $subject, string $field, $chars = " \t\n\r\0\x0B"): bool
+    public function __invoke(object $subject, string $field, string $chars = " \t\n\r\0\x0B"): bool
     {
         $value = $subject->$field;
         if (is_scalar($value) || $value === null) {

src/Rule/Validate/Between.php

@@ -27,9 +27,9 @@ class Between
      *
      * @param string $field The subject field name.
      *
-     * @param mixed $min The minimum valid value.
+     * @param int $min The minimum valid value.
      *
-     * @param mixed $max The maximum valid value.
+     * @param int $max The maximum valid value.
      *
      * @return bool True if valid, false if not.
      *

src/Rule/Validate/EqualToField.php

@@ -35,7 +35,7 @@ class EqualToField
      * @return bool True if the values are equal, false if not equal.
      *
      */
-    public function __invoke(object $subject, string $field, $other_field): bool
+    public function __invoke(object $subject, string $field, string $other_field): bool
     {
         // the other field needs to exist and *not* be null
         if (! isset($subject->$other_field)) {

src/Rule/Validate/Ip.php

@@ -27,7 +27,7 @@ class Ip
      *
      * @param string $field The subject field name.
      *
-     * @param mixed $flags `FILTER_VALIDATE_IP` flags to pass to filter_var();
+     * @param array|int $flags `FILTER_VALIDATE_IP` flags to pass to filter_var();
      * cf. <http://php.net/manual/en/filter.filters.flags.php>.
      *
      * @return bool True if valid, false if not.

src/Rule/Validate/Max.php

@@ -27,7 +27,7 @@ class Max
      *
      * @param string $field The subject field name.
      *
-     * @param mixed $max The maximum valid value.
+     * @param int|float $max The maximum valid value.
      *
      * @return bool True if valid, false if not.
      *

src/Rule/Validate/Min.php

@@ -27,7 +27,7 @@ class Min
      *
      * @param string $field The subject field name.
      *
-     * @param mixed $min The minimum valid value.
+     * @param int|float $min The minimum valid value.
      *
      * @return bool True if valid, false if not.
      *

src/Rule/Validate/StrictEqualToField.php

@@ -36,7 +36,7 @@ class StrictEqualToField
      * @return bool True if the values are equal, false if not equal.
      *
      */
-    public function __invoke(object $subject, string $field, $other_field): bool
+    public function __invoke(object $subject, string $field, string $other_field): bool
     {
         // the other field needs to exist and *not* be null
         if (! isset($subject->$other_field)) {

src/Rule/Validate/StrictEqualToValue.php

@@ -32,7 +32,7 @@ class StrictEqualToValue
      * @return bool True if the values are equal, false if not equal.
      *
      */
-    public function __invoke(object $subject, string $field, $other_value): bool
+    public function __invoke(object $subject, string $field, string $other_value): bool
     {
         return $subject->$field === $other_value;
     }

src/Rule/Validate/Strlen.php

@@ -29,12 +29,12 @@ class Strlen extends AbstractStrlen
      *
      * @param string $field The subject field name.
      *
-     * @param mixed $len The minimum valid length.
+     * @param int $len String length equal to length.
      *
      * @return bool True if valid, false if not.
      *
      */
-    public function __invoke(object $subject, string $field, $len): bool
+    public function __invoke(object $subject, string $field, int $len): bool
     {
         $value = $subject->$field;
         if (! is_scalar($value)) {

src/Rule/Validate/StrlenBetween.php

@@ -29,9 +29,9 @@ class StrlenBetween extends AbstractStrlen
      *
      * @param string $field The subject field name.
      *
-     * @param mixed $min The minimum valid length.
+     * @param int|float $min The minimum valid length.
      *
-     * @param mixed $max The maximum valid length.
+     * @param int|float $max The maximum valid length.
      *
      * @return bool True if valid, false if not.
      *

src/Rule/Validate/StrlenMax.php

@@ -29,7 +29,7 @@ class StrlenMax extends AbstractStrlen
      *
      * @param string $field The subject field name.
      *
-     * @param mixed $max The value must have no more than this many
+     * @param int|float $max The value must have no more than this many
      * characters.
      *
      * @return bool True if valid, false if not.

src/Rule/Validate/StrlenMin.php

@@ -29,7 +29,7 @@ class StrlenMin extends AbstractStrlen
      *
      * @param string $field The subject field name.
      *
-     * @param mixed $min The value must have at least this many characters.
+     * @param int|float $min The value must have at least this many characters.
      *
      * @return bool True if valid, false if not.
      *

src/Rule/Validate/Trim.php

@@ -32,7 +32,7 @@ class Trim
      * @return bool True if valid, false if not.
      *
      */
-    public function __invoke(object $subject, string $field, $chars = " \t\n\r\0\x0B"): bool
+    public function __invoke(object $subject, string $field, string $chars = " \t\n\r\0\x0B"): bool
     {
         $value = $subject->$field;
         if (! is_scalar($value)) {