Skip to content

Fix isValidType for JSON type #384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix isValidType for JSON type #384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7131d2e
Fixing isValidType method when type is "json"
jaydiablo Oct 9, 2025
ceafd93
bumping php-cs-fixer version
jaydiablo Oct 9, 2025
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
5 changes: 3 additions & 2 deletions .php-cs-fixer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@

$config = new PhpCsFixer\Config();
return $config
->setParallelConfig(PhpCsFixer\Runner\Parallel\ParallelConfigFactory::detect())
->setRiskyAllowed(true)
->setRules(array(
'@PSR2' => true,
'@PHP70Migration:risky' => true,
'@PHP7x0Migration:risky' => true,
'binary_operator_spaces' => array(
'default' => 'align_single_space_minimal',
'operators' => array('||' => null, '&&' => null)
Expand All @@ -26,5 +27,5 @@
'psr_autoloading' => false,
))
->setUsingCache(true)
->setFinder($finder);
->setFinder($finder)
;
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
},
"require-dev": {
"phpunit/php-code-coverage": "^9.1.10",
"friendsofphp/php-cs-fixer": "^3.75.0",
"friendsofphp/php-cs-fixer": "^3.88.0",
"phpstan/phpstan": "2.1.17",
"vimeo/psalm": "6.11.0"
},
Expand Down
5 changes: 3 additions & 2 deletions lib/Doctrine/Validator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,9 @@ public static function isValidType($var, $type)
return true;
} elseif ($var === null) {
return true;
} elseif ($type === 'json') {
// JSON type can be object, array, string, number, boolean, or null (null handled above)
return is_object($var) || is_array($var) || is_string($var) || is_numeric($var) || is_bool($var);
Copy link

@Pittiplatsch Pittiplatsch Oct 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So you're basically checking for:
is_object($var) || is_array($var) || is_scalar($var) || is_null($var), right?
=> basically everything except resources, callables and such

Note the fine difference that is_numeric() !== (is_int() || is_float()) ;-)

} elseif (is_object($var)) {
return $type == 'object';
} elseif (is_array($var)) {
Expand All @@ -195,8 +198,6 @@ public static function isValidType($var, $type)
return is_array($var);
case 'object':
return is_object($var);
case 'json':
return is_object($var) || is_array($var);
case 'boolean':
return is_bool($var) || (is_numeric($var) && ($var == 0 || $var == 1));
case 'timestamp':
Expand Down
2 changes: 1 addition & 1 deletion phpstan-baseline.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1222,7 +1222,7 @@
$ignoreErrors[] = array(
'message' => '#^Call to function is_array\\(\\) with mixed will always evaluate to false\\.$#',
'identifier' => 'function.impossibleType',
'count' => 3,
'count' => 2,
'path' => __DIR__ . '/lib/Doctrine/Validator.php',
);
$ignoreErrors[] = array(
Expand Down
24 changes: 24 additions & 0 deletions tests/ValidatorTestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,30 @@ public function testIsValidType()
$this->assertFalse(Doctrine_Validator::isValidType($var, 'float'));
$this->assertFalse(Doctrine_Validator::isValidType($var, 'array'));
$this->assertTrue(Doctrine_Validator::isValidType($var, 'object'));

// Test JSON type validation
$var = array('key' => 'value');
$this->assertTrue(Doctrine_Validator::isValidType($var, 'json'));
$this->assertTrue(Doctrine_Validator::isValidType($var, 'array'));
$this->assertFalse(Doctrine_Validator::isValidType($var, 'object'));

$var = new stdClass();
$var->property = 'value';
$this->assertTrue(Doctrine_Validator::isValidType($var, 'json'));
$this->assertFalse(Doctrine_Validator::isValidType($var, 'array'));
$this->assertTrue(Doctrine_Validator::isValidType($var, 'object'));

$var = 'string';
$this->assertTrue(Doctrine_Validator::isValidType($var, 'json'));

$var = 123;
$this->assertTrue(Doctrine_Validator::isValidType($var, 'json'));

$var = null;
$this->assertTrue(Doctrine_Validator::isValidType($var, 'json'));

$var = true;
$this->assertTrue(Doctrine_Validator::isValidType($var, 'json'));
}

public function testValidate2()
Expand Down