diff --git a/Kiri.php b/Kiri.php index ae12f76c..38478098 100644 --- a/Kiri.php +++ b/Kiri.php @@ -25,6 +25,7 @@ defined('PARAMS_IS_NULL') or define('PARAMS_IS_NULL', 'Required items cannot be defined('CONTROLLER_PATH') or define('CONTROLLER_PATH', realpath(APP_PATH . 'controllers/')); defined('MODEL_PATH') or define('MODEL_PATH', realpath(APP_PATH . 'models/')); defined('COMPONENT_PATH') or define('COMPONENT_PATH', realpath(APP_PATH . 'components/')); +defined('URL_MATCH') or define('URL_MATCH', '/(http[s]?:\/\/)?((?:[\w\-_]+\.)+\w+(?::\d+)?)(?:(\/[a-zA-Z0-9-\/]+)+[\/]?(\?[a-zA-Z]+=.*)?)?/'); /** diff --git a/kiri-engine/Cache/File.php b/kiri-engine/Cache/File.php index 0fecb18f..410f6e52 100644 --- a/kiri-engine/Cache/File.php +++ b/kiri-engine/Cache/File.php @@ -119,7 +119,7 @@ class File extends Component implements ICache * @param $key * @return mixed|bool */ - public function get($key): string|bool + public function get($key): mixed { $tmpFile = $this->getCacheKey($key); if (!$this->exists($tmpFile)) { diff --git a/kiri-engine/Cache/ICache.php b/kiri-engine/Cache/ICache.php index 496d7c6f..f74b9ead 100644 --- a/kiri-engine/Cache/ICache.php +++ b/kiri-engine/Cache/ICache.php @@ -26,7 +26,7 @@ interface ICache * @param $key * @return string|int|bool */ - public function get($key): string|int|bool; + public function get($key): mixed; /** * @param $key