From 62abc290e9c7936bdb855541d28129e80e534f28 Mon Sep 17 00:00:00 2001 From: EMarcais Date: Thu, 26 May 2016 13:19:31 +0200 Subject: [PATCH 1/5] Update EpiRoute.php To use openphoto with PHP7, removed break in line 90 : break; // need to simulate same behavior if exceptions are turned off --- src/libraries/external/epi/EpiRoute.php | 1 - 1 file changed, 1 deletion(-) 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); From e86d20c2d5cd638911f2593c5cb6cc5be4c19a5d Mon Sep 17 00:00:00 2001 From: EMarcais Date: Thu, 26 May 2016 14:29:53 +0200 Subject: [PATCH 2/5] Update EpiRoute.php Deleted break on line 90 to make it work with php7 break; // need to simulate same behavior if exceptions are turned off --- src/libraries/external/epi/EpiRoute.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/external/epi/EpiRoute.php b/src/libraries/external/epi/EpiRoute.php index 0618efd12..1ca8c949b 100644 --- a/src/libraries/external/epi/EpiRoute.php +++ b/src/libraries/external/epi/EpiRoute.php @@ -87,7 +87,7 @@ 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); From 812421dd2621fc2685c820080f266f72c0cea341 Mon Sep 17 00:00:00 2001 From: Jaisen Mathai Date: Thu, 26 May 2016 10:22:00 -0700 Subject: [PATCH 3/5] Update .travis.yml --- .travis.yml | 1 - 1 file changed, 1 deletion(-) 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 From eae843959c6767326972ce26163e7265fccff0e2 Mon Sep 17 00:00:00 2001 From: EMarcais Date: Fri, 27 May 2016 09:00:30 +0200 Subject: [PATCH 4/5] Update initialize.php Add comment in line 14 : //let it to true for an install with PHP7 cf: Deleted break on line 90 to make it work with php7 in EpiRoute.php --- src/libraries/initialize.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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', ''); From 75991148a25b93dbd30da9b4e0794ed3603c2126 Mon Sep 17 00:00:00 2001 From: EMarcais Date: Fri, 27 May 2016 10:50:40 +0200 Subject: [PATCH 5/5] =?UTF-8?q?=09modifi=C3=A9=C2=A0:=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20src/libraries/external/epi/EpiRoute.php?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit modifié : src/libraries/external/epi/EpiRoute.php --- src/libraries/external/epi/EpiRoute.php | 1 - 1 file changed, 1 deletion(-) 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);