mirror of
https://github.com/Karaka-Management/phpOMS.git
synced 2026-02-09 13:38:41 +00:00
more fixes
This commit is contained in:
parent
4841e1538b
commit
de0d70679b
|
|
@ -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'));
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -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);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user