From 0614c12eef44d796632266a14c6665c41bbcde7d Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sat, 14 Jul 2018 14:41:15 +0200 Subject: [PATCH] Fix more type bugs --- DataStorage/DataStoragePoolInterface.php | 2 +- DataStorage/Database/GrammarAbstract.php | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/DataStorage/DataStoragePoolInterface.php b/DataStorage/DataStoragePoolInterface.php index bc3bd597f..d55c14d72 100644 --- a/DataStorage/DataStoragePoolInterface.php +++ b/DataStorage/DataStoragePoolInterface.php @@ -44,7 +44,7 @@ interface DataStoragePoolInterface * * @param string $key Connection key * - * @return mixed + * @return DataStorageConnectionInterface * * @since 1.0.0 */ diff --git a/DataStorage/Database/GrammarAbstract.php b/DataStorage/Database/GrammarAbstract.php index ecd7c91c0..c55d09abe 100644 --- a/DataStorage/Database/GrammarAbstract.php +++ b/DataStorage/Database/GrammarAbstract.php @@ -225,20 +225,20 @@ abstract class GrammarAbstract * * A system is a table, a sub query or special keyword. * - * @param array|string $system System - * @param string $prefix Prefix for table + * @param string $system System + * @param string $prefix Prefix for table * * @return string * * @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? $identifier = $this->systemIdentifier; foreach ($this->specialKeywords as $keyword) { - if (strrpos($system, $keyword, -strlen($system)) !== false) { + if (\strrpos($system, $keyword, -\strlen($system)) !== false) { $prefix = ''; $identifier = ''; }