Skip to content

Commit f9eb148

Browse files
author
Jeremiah VALERIE
committed
Merge branch '0.11' into 0.12
2 parents d3497c1 + b23825f commit f9eb148

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@
7070
"scripts": {
7171
"test": "bin/phpunit --color=always -v --debug",
7272
"static-analysis": [
73-
"@composer req --ansi --dev 'phpstan/phpstan:^0.10.3' 'phpstan/phpstan-phpunit:^0.10.0'",
73+
"@composer req --ansi --dev --no-update 'phpstan/phpstan:^0.11' 'phpstan/phpstan-phpunit:*'",
74+
"@composer update --ansi",
7475
"phpstan analyse --ansi",
7576
"@composer rem --ansi --dev phpstan/phpstan phpstan/phpstan-phpunit"
7677
],

src/Definition/ConfigProcessor/AclConfigProcessor.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public static function acl(array $fields, AccessResolver $accessResolver, callab
2929
throw new UserWarning('Access denied to this field.');
3030
};
3131
foreach ($fields as &$field) {
32-
if (isset($field['access']) && true !== $field['access']) {
32+
if (\is_array($field) && isset($field['access']) && true !== $field['access']) {
3333
$accessChecker = $field['access'];
3434
if (false === $accessChecker) {
3535
$field['resolve'] = $deniedAccess;

src/Definition/ConfigProcessor/PublicFieldsFilterConfigProcessor.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public static function filter(array $fields)
1515
function ($field, $fieldName) {
1616
$exposed = true;
1717

18-
if (isset($field['public']) && \is_callable($field['public'])) {
18+
if (\is_array($field) && isset($field['public']) && \is_callable($field['public'])) {
1919
$exposed = (bool) \call_user_func($field['public'], $fieldName);
2020
}
2121

src/Definition/ConfigProcessor/WrapArgumentConfigProcessor.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public function process(LazyConfig $lazyConfig): LazyConfig
4343
private function wrapFieldsArgument(array $fields)
4444
{
4545
foreach ($fields as &$field) {
46-
if (isset($field['resolve']) && \is_callable($field['resolve'])) {
46+
if (\is_array($field) && isset($field['resolve']) && \is_callable($field['resolve'])) {
4747
$field['resolve'] = $this->argumentFactory->wrapResolverArgs($field['resolve']);
4848
}
4949
}

0 commit comments

Comments
 (0)