Merge pull request #7 from ppavlovic/master

Small bugfixes found in 2.1.0

Author: ppavlovic

composer.json

@@ -30,8 +30,9 @@
     "rector/rector": "^0.14.6"
   },
   "require": {
-    "php"                         : ">=7.3",
-    "g4/constants"                : "*",
-    "zendframework/zend-paginator": "2.*"
+      "php": ">=7.3",
+      "ext-json": "*",
+      "g4/constants": "*",
+      "zendframework/zend-paginator": "2.*"
   }
 }

src/Formatter/FormatterAbstract.php

@@ -50,7 +50,7 @@ public function reference(\G4\CleanCore\Formatter\FormatterAbstract $formatter,
     }
 
     /**
-     * @param mixed $response
+     * @param mixed $resource
      * @return FormatterAbstract
      */
     public function setResource($resource)
@@ -80,4 +80,4 @@ private function getResourcePart(string $part)
             ? $this->resource[$part]
             : null;
     }
-}
+}

src/Validator/Param/Type/ArrayType.php

@@ -4,9 +4,9 @@
 
 class ArrayType extends TypeAbstract
 {
-    public function cast(): self
+    public function cast()
     {
-        if ($this->_isNotEmptyString()) {
+        if ($this->isNotEmptyString()) {
 
             $this->value = explode($this->getArrayValueSeparator(), $this->value);
         }
@@ -32,10 +32,10 @@ public function validValue(): self
         return $this;
     }
 
-    protected function _isNotEmptyString(): bool
+    protected function isNotEmptyString(): bool
     {
         return !$this->isValueNull()
             && is_string($this->value)
             && !$this->isValueEmptyString();
     }
-}
+}

src/Validator/Param/Type/Json.php

@@ -4,13 +4,13 @@
 
 class Json extends ArrayType
 {
-    public function cast(): self
+    public function cast()
     {
-        if($this->_isNotEmptyString()) {
+        if($this->isNotEmptyString()) {
             $this->value = json_decode($this->value, true);
         }
 
-        if($this->_isNotEmptyString() && json_last_error() !== JSON_ERROR_NONE) {
+        if($this->isNotEmptyString() && json_last_error() !== JSON_ERROR_NONE) {
             throw new \G4\CleanCore\Exception\Validation($this->name, $this->value, $this->meta);
         }
 
@@ -20,4 +20,4 @@ public function cast(): self
 
         return $this;
     }
-}
+}