Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 9 additions & 14 deletions src/Service/EffectivePrimitiveTypeIdentifierService.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
*/
final class EffectivePrimitiveTypeIdentifierService
{

/**
* <p>Returns strict effective primitive type of a variable</p>.
*
Expand Down Expand Up @@ -93,9 +94,7 @@ public function getTypedValueFromArray($needle, $array, $trim = false, $forceStr
*/
public function getTypedValueFromPost($needle, $trim = false, $forceString = false, $sanitizeHtml = false)
{
$inputPost = filter_input(INPUT_POST, $needle, FILTER_NULL_ON_FAILURE);

return $this->getTypedValue($inputPost, $trim, $forceString, $sanitizeHtml);
return array_key_exists($needle, $_POST) ? $this->getTypedValue(filter_var($_POST[$needle], FILTER_NULL_ON_FAILURE), $trim, $forceString, $sanitizeHtml) : null;
}

/**
Expand All @@ -110,9 +109,7 @@ public function getTypedValueFromPost($needle, $trim = false, $forceString = fal
*/
public function getTypedValueFromServer($needle, $trim = false, $forceString = false, $sanitizeHtml = false)
{
$inputPost = filter_input(INPUT_SERVER, $needle, FILTER_NULL_ON_FAILURE);

return $this->getTypedValue($inputPost, $trim, $forceString, $sanitizeHtml);
return array_key_exists($needle, $_SERVER) ? $this->getTypedValue(filter_var($_SERVER[$needle], FILTER_NULL_ON_FAILURE), $trim, $forceString, $sanitizeHtml) : null;
}

/**
Expand All @@ -127,9 +124,7 @@ public function getTypedValueFromServer($needle, $trim = false, $forceString = f
*/
public function getTypedValueFromGet($needle, $trim = false, $forceString = false, $sanitizeHtml = false)
{
$inputGet = filter_input(INPUT_GET, $needle, FILTER_NULL_ON_FAILURE);

return $this->getTypedValue($inputGet, $trim, $forceString, $sanitizeHtml);
return array_key_exists($needle, $_GET) ? $this->getTypedValue(filter_var($_GET[$needle], FILTER_NULL_ON_FAILURE), $trim, $forceString, $sanitizeHtml) : null;
}

/**
Expand Down Expand Up @@ -210,10 +205,10 @@ private function getSanitizedString($value, $trim = false, $sanitizeHtml = false
private function sanitizeHtml($string)
{
$stringFiltered = (string) filter_var(
$string,
FILTER_UNSAFE_RAW,
FILTER_NULL_ON_FAILURE | FILTER_FLAG_STRIP_LOW | FILTER_FLAG_STRIP_HIGH | FILTER_FLAG_STRIP_BACKTICK
);
$string,
FILTER_UNSAFE_RAW,
FILTER_NULL_ON_FAILURE | FILTER_FLAG_STRIP_LOW | FILTER_FLAG_STRIP_HIGH | FILTER_FLAG_STRIP_BACKTICK
);
$stringStripped = strip_tags($stringFiltered);
$stringDecoded = html_entity_decode($stringStripped);
$pattern = [
Expand All @@ -230,4 +225,4 @@ private function sanitizeHtml($string)

return (string) preg_replace($pattern, $replacement, $stringDecoded);
}
}
}
2 changes: 1 addition & 1 deletion tests/EffectivePrimitiveTypeTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -285,9 +285,9 @@ public function testAssociativeArraySantizieMethod(): void
$array['value'] = $value;
$ept = new EffectivePrimitiveTypeIdentifierService();
$result = $ept->getTypedValueFromArray('value', $array);
$this->assertIsString($result);
$this->assertTrue($array['value'] === $result);
$this->assertEquals($array['value'], $result);
$this->assertIsString($result);
}

public function testAssociativeArraySantizieWitTrimMethod(): void
Expand Down