From 3b508bf5199fa6bd0c960e943e0a0bd28f9d737c Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Fri, 15 May 2015 09:44:35 +0200 Subject: [PATCH] correctly bail out on non-existing INI file --- bin/pharext | Bin 70871 -> 70972 bytes src/pharext/Installer.php | 2 +- src/pharext/Task/Activate.php | 3 +++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/bin/pharext b/bin/pharext index 3444866c58ef3527513461b314254594386e6b6d..a6b0d4a7fe78400f52ea1eda2a0370b7d3fcf78c 100755 GIT binary patch delta 1056 zcmXw%drTBp6vprDEJAm28J5KrcE#D*7g~2$Y^>=c24B&w(f9y-Hg<)jOjvQVGojFG zY15`^|ERV{r3Gt@Bt}6a=8E_X8V$A*vqsur1f_+tHl?*DG_4J-^voSQ$=sXyo$s9U z-E*h!gz<8#u|3OSD4I*N9UrHG$?wSQYbh-)CWLe^8ts5~SCD~gMnZh4Rr#>W=}A|1G%d^Dyw1fsl;XSH_{ppHmPD*C=Wv7K31Y;7JXhbN*9cKNbc@GD<{1&4V;es||tVX04K z;2m@=-U#1>GWTqz+~bzuHFp*ZmZHC1GYj^?Kkh;XMiG4bbMyD;W+nr_r4!P!c;v8l z0;uy?8EnOaAA0oiWSHmGyCx7!6{iisYRLwzo?NCniB{@|PCKwx9t^s(87x8NPJ7R< zFyQqwJCl5KSwO%>yB{l?@yIVS@Drwgy6IsLddq`0w^`sZRhyW$^Ph*`V9gdkZ?+B9 zWAz=y3|{i;4vr)2zj#d6psOUJREHLnt8#5bjcPYAVAkttdl;Nk(Puu4c!Za)rtf%$TcOzrQEadi5r$pU?R zbhfGSNG6xl`LBuForWbc8s9f@F_?ZYANF;n(QUWu4KR^Pr;eT#21s@ZG<>hmKpRF! z)1jb0mmYa|zzBm$GyE`ap&yOa8c}1X^6*|B8YXRzJ?-M@U~(hR6~imNBCZ>Hr{P-LTTR9OYMx#lzt7WT*JqRLa-~@4s+42VEzvqz zQI$fE_Avu?e(4M<@q}EXRu)R(m0?lCqTj3d#ft4wMXcGbiY!B#CF&`3P4}h$eOc+V zRLn@JKO;axS2h~xtq(jBJzuh#>lAXhHqKf0SI4~N4+dJg4eJh{xp?)@wxacBygIUU I;fjU-0Z@8}T>t<8 delta 1016 zcmX9+ZAep57(UzXTz)jKA2*vi+wMMYrqdPLhpCw#MPVl8ioT$wqupA1nG;Pb3N*7~ zq;Kp;X&6zcMM(#d%AzQW3QLTL3W7eg$kc^Dq<@`z?vKL*&v~EcdEfV(kpbpIKQkDc zqIRyvaVf3ZC5Z?j$?NuengZD+J~4Z}|6qNV~WU3yad%laWXrV#=bG zPl%^|vN9RQ>{d!xd4$Hkc9p@1IfJJEHm{%;r?dzixI9q}r_IYKp=S}gld2EVkh^xJ zoqcMAwnuiT;E2rt4{R~46s;u7$OOyEV3uD>lIOu_i)N8LCK*@8 zgz?>@kZDx{s|ayC>GdCCVSs##GU^nudHL(|dpR(5qZlah)zy0BEgsP*HZsl~9V()2 z_F9xS2Z&Yo&y@>_DmmWWv_WiYkYv#+I~bgKeX9nJ^_ifj&j=6t4ioWOtm{gWH4)g^{8J69LIz^D2)p|8HIN(PAT4Nw z%1{h0YV$ETE%;PJ{qsg@7?^G4z!c<2hl?S*O-tL@b-Z6kDs(h&xTBRJ;z(S5^^pd5 z-uk4$m7$MOWPnC;qVT%9PAwkK+pmTpA!E29L3LA=YCL!9B%FIQQ~vHy4%f?bLtL08 LFM>7}Zz=u{9O7=( diff --git a/src/pharext/Installer.php b/src/pharext/Installer.php index a90eb28..29fe271 100644 --- a/src/pharext/Installer.php +++ b/src/pharext/Installer.php @@ -210,7 +210,7 @@ class Installer implements Command private function activate($temp) { if ($this->args->ini) { - $files = [realpath($this->args->ini)]; + $files = [$this->args->ini]; } else { $files = array_filter(array_map("trim", explode(",", php_ini_scanned_files()))); $files[] = php_ini_loaded_file(); diff --git a/src/pharext/Task/Activate.php b/src/pharext/Task/Activate.php index 3d7e05f..6a892e8 100644 --- a/src/pharext/Task/Activate.php +++ b/src/pharext/Task/Activate.php @@ -80,6 +80,9 @@ class Activate implements Task if ($verbose) { printf("Checking %s ...\n", $file); } + if (!file_exists($file)) { + throw new Exception(sprintf("INI file '%s' does not exist", $file)); + } $temp = new Tempfile("phpini"); foreach (file($file) as $line) { if (preg_match("/^\s*{$this->type}\s*=\s*[\"']?{$pattern}[\"']?\s*(;.*)?\$/", $line)) { -- 2.30.2