more fixes

This commit is contained in:
Dennis Eichhorn 2022-09-27 19:50:54 +02:00
parent 4841e1538b
commit de0d70679b
4 changed files with 6 additions and 3 deletions

View File

@ -94,6 +94,7 @@ abstract class UninstallerAbstract
return; // @codeCoverageIgnore return; // @codeCoverageIgnore
} }
/** @var array<string, string> $definitions */
$definitions = \json_decode($content, true); $definitions = \json_decode($content, true);
$builder = new SchemaBuilder($dbPool->get('schema')); $builder = new SchemaBuilder($dbPool->get('schema'));

View File

@ -51,7 +51,7 @@ final class Auth
{ {
$uid = $session->get('UID'); $uid = $session->get('UID');
return empty($uid) ? 0 : $uid; return (int) (empty($uid) ? 0 : $uid);
} }
/** /**

View File

@ -129,8 +129,10 @@ final class Evaluator
while ($o2 !== false && \strpbrk($o2, '^*/+-') !== false while ($o2 !== false && \strpbrk($o2, '^*/+-') !== false
&& (($operators[$o1]['order'] === -1 && $operators[$o1]['precedence'] <= $operators[$o2]['precedence']) && (($operators[$o1]['order'] === -1 && $operators[$o1]['precedence'] <= $operators[$o2]['precedence'])
|| ($operators[$o1]['order'] === 1 && $operators[$o1]['precedence'] < $operators[$o2]['precedence'])) /*|| ($operators[$o1]['order'] === 1 && $operators[$o1]['precedence'] < $operators[$o2]['precedence'])*/)
) { ) {
// The commented part above is always FALSE because this equation always compares 4 < 2|3|4.
// Only uncomment if the opperators array changes.
$output[] = \array_pop($stack); $output[] = \array_pop($stack);
$o2 = \end($stack); $o2 = \end($stack);
} }

View File

@ -25,7 +25,7 @@
<exclude>./vendor</exclude> <exclude>./vendor</exclude>
<exclude>./Build</exclude> <exclude>./Build</exclude>
<exclude>./Resources</exclude> <exclude>./Resources</exclude>
<directory>./Application/Testapp*</directory> <exclude>./Application/Testapp*</exclude>
</testsuite> </testsuite>
</testsuites> </testsuites>
<groups> <groups>