Skip to content

Commit 2eacede

Browse files
janbarasekdg
authored andcommitted
phpstan fix (#43) (#44)
1 parent d0d253b commit 2eacede

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

src/Bridges/SecurityDI/SecurityExtension.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ public function getConfigSchema(): Nette\Schema\Schema
5050

5151
public function loadConfiguration()
5252
{
53+
/** @var object{debugger: bool, users: array, roles: array, resources: array} $config */
5354
$config = $this->config;
5455
$builder = $this->getContainerBuilder();
5556

src/Security/Permission.php

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -597,20 +597,17 @@ public function isAllowed($role = self::ALL, $resource = self::ALL, $privilege =
597597
break;
598598
}
599599
}
600-
} else {
601-
if (($result = $this->getRuleType($resource, null, $privilege)) !== null) { // look for rule on 'allRoles' pseudo-parent
602-
break;
603-
604-
} elseif (($result = $this->getRuleType($resource, null, null)) !== null) {
605-
break;
606-
}
600+
} elseif (($result = $this->getRuleType($resource, null, $privilege)) !== null) { // look for rule on 'allRoles' pseudo-parent
601+
break;
602+
} elseif (($result = $this->getRuleType($resource, null, null)) !== null) {
603+
break;
607604
}
608605

609606
$resource = $this->resources[$resource]['parent']; // try next Resource
610607
} while (true);
611608

612609
$this->queriedRole = $this->queriedResource = null;
613-
return $result;
610+
return $result ?? false;
614611
}
615612

616613

tests/phpstan.neon

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@ includes:
33

44
parameters:
55
treatPhpDocTypesAsCertain: false
6+
ignoreErrors:
7+
- '#Variable \$this in isset\(\) always exists and is not nullable\.#'

0 commit comments

Comments
 (0)