mirror of
https://github.com/Karaka-Management/phpOMS.git
synced 2026-02-08 13:28:39 +00:00
Fix more type bugs
This commit is contained in:
parent
39f299e211
commit
0614c12eef
|
|
@ -44,7 +44,7 @@ interface DataStoragePoolInterface
|
||||||
*
|
*
|
||||||
* @param string $key Connection key
|
* @param string $key Connection key
|
||||||
*
|
*
|
||||||
* @return mixed
|
* @return DataStorageConnectionInterface
|
||||||
*
|
*
|
||||||
* @since 1.0.0
|
* @since 1.0.0
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -225,20 +225,20 @@ abstract class GrammarAbstract
|
||||||
*
|
*
|
||||||
* A system is a table, a sub query or special keyword.
|
* A system is a table, a sub query or special keyword.
|
||||||
*
|
*
|
||||||
* @param array|string $system System
|
* @param string $system System
|
||||||
* @param string $prefix Prefix for table
|
* @param string $prefix Prefix for table
|
||||||
*
|
*
|
||||||
* @return string
|
* @return string
|
||||||
*
|
*
|
||||||
* @since 1.0.0
|
* @since 1.0.0
|
||||||
*/
|
*/
|
||||||
protected function compileSystem($system, string $prefix = '') : string
|
protected function compileSystem(string $system, string $prefix = '') : string
|
||||||
{
|
{
|
||||||
// todo: this is a bad way to handle select count(*) which doesn't need a prefix. Maybe remove prefixes in total?
|
// todo: this is a bad way to handle select count(*) which doesn't need a prefix. Maybe remove prefixes in total?
|
||||||
$identifier = $this->systemIdentifier;
|
$identifier = $this->systemIdentifier;
|
||||||
|
|
||||||
foreach ($this->specialKeywords as $keyword) {
|
foreach ($this->specialKeywords as $keyword) {
|
||||||
if (strrpos($system, $keyword, -strlen($system)) !== false) {
|
if (\strrpos($system, $keyword, -\strlen($system)) !== false) {
|
||||||
$prefix = '';
|
$prefix = '';
|
||||||
$identifier = '';
|
$identifier = '';
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user