diff --git a/.travis.yml b/.travis.yml index 82e85e023..0fb2b44bd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,6 @@ before_install: - sudo apt-get install build-essential libpcre3-dev php-pear php5-curl php5-imagick before_script: - - pecl install oauth - pear channel-discover pear.bovigo.org - pear install bovigo/vfsStream-beta - phpenv rehash diff --git a/src/libraries/external/epi/EpiRoute.php b/src/libraries/external/epi/EpiRoute.php index 0618efd12..06a25b126 100644 --- a/src/libraries/external/epi/EpiRoute.php +++ b/src/libraries/external/epi/EpiRoute.php @@ -87,7 +87,6 @@ public function load($file) if(!file_exists($file)) { EpiException::raise(new EpiException("Config file ({$file}) does not exist")); - break; // need to simulate same behavior if exceptions are turned off } $parsed_array = parse_ini_file($file, true); diff --git a/src/libraries/initialize.php b/src/libraries/initialize.php index ec4f79b3f..bf981d9bf 100644 --- a/src/libraries/initialize.php +++ b/src/libraries/initialize.php @@ -11,7 +11,8 @@ require "{$basePath}/libraries/compatability.php"; require "{$basePath}/libraries/models/UserConfig.php"; -Epi::setSetting('exceptions', true); +Epi::setSetting('exceptions', true);//let it to true for an install with PHP7 cf: Deleted break on line 90 to make it work with php7 in EpiRoute.php + Epi::setPath('base', $epiPath); Epi::setPath('config', "{$basePath}/configs"); Epi::setPath('view', '');