From 8579cbf8993c34d47a05377a124325b65447fbc0 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Mon, 18 Apr 2016 22:05:47 +0200 Subject: [PATCH] Do not require phar extension --- src/phancap/Config.php | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/phancap/Config.php b/src/phancap/Config.php index b2d42b1..e45f08b 100644 --- a/src/phancap/Config.php +++ b/src/phancap/Config.php @@ -158,12 +158,18 @@ class Config */ protected function loadConfigFilePaths() { - $pharFile = \Phar::running(); - if ($pharFile == '') { - $this->cfgFiles[] = __DIR__ . '/../../data/phancap.config.php'; - } else { + $phar = false; + if (class_exists('\\Phar')) { + $pharFile = \Phar::running(); + if ($pharFile != '') { + $phar = true; + } + } + if ($phar) { //remove phar:// from the path $this->cfgFiles[] = substr($pharFile, 7) . '.config.php'; + } else { + $this->cfgFiles[] = __DIR__ . '/../../data/phancap.config.php'; } //TODO: add ~/.config/phancap.php @@ -235,7 +241,7 @@ class Config if (substr($url, -1) != '/') { $url = substr($url, 0, -strlen(basename($url)) - 1); } - if (\Phar::running()) { + if (class_exists('\\Phar') && \Phar::running()) { //remove .phar file name $url = substr($url, 0, -strlen(basename($url)) - 1); } -- 2.30.2