RetailCRM-Mirror/graphql-php
1
0
Fork 0
mirror of https://github.com/retailcrm/graphql-php.git synced 2025-02-16 20:33:14 +03:00
Code Issues Projects Releases Wiki Activity

Improvements in config validation

Browse Source
This commit is contained in:
Vladimir Razuvaev 2017-06-12 22:48:48 +07:00
parent e7cde5ecf3
commit ffc4542cd0
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Type/Definition/Config.php
View File

@ -187,12 +187,14 @@ class Config
$arrValue = ['name' => $arrValue]; $arrValue = ['name' => $arrValue];
} }
Utils::invariant(is_array($arrValue), $err, $arrKey, Utils::getVariableType($arrValue)); if (!$arrValue instanceof FieldDefinition) {
Utils::invariant(is_array($arrValue), $err, $arrKey, Utils::getVariableType($arrValue));
if ($def->flags & self::KEY_AS_NAME && is_string($arrKey)) { if ($def->flags & self::KEY_AS_NAME && is_string($arrKey)) {
$arrValue += ['name' => $arrKey]; $arrValue += ['name' => $arrKey];
}
self::validateMap($typeName, $arrValue, $def->definition, "$pathStr:$arrKey");
} }
self::validateMap($typeName, $arrValue, $def->definition, "$pathStr:$arrKey");
} else { } else {
self::validateEntry($typeName, $arrKey, $arrValue, $def->definition, "$pathStr:$arrKey"); self::validateEntry($typeName, $arrKey, $arrValue, $def->definition, "$pathStr:$arrKey");
} }

2
src/Type/Definition/InputObjectType.php
View File

@ -29,6 +29,8 @@ class InputObjectType extends Type implements InputType
$config['name'] = $this->tryInferName(); $config['name'] = $this->tryInferName();
} }
Utils::invariant(!empty($config['name']), 'Every type is expected to have name');
Config::validate($config, [ Config::validate($config, [
'name' => Config::NAME | Config::REQUIRED, 'name' => Config::NAME | Config::REQUIRED,
'fields' => Config::arrayOf([ 'fields' => Config::arrayOf([