adapt BDD tests for new interpolation style

[nominatim.git] / lib-php / Shell.php

diff --git a/lib-php/Shell.php b/lib-php/Shell.php
index 72f90735e9763e798cb354155e8b077b37666f7e..4be13235ebd3d73ab9bcd44ec6207bce9bf72b3a 100644 (file)
--- a/lib-php/Shell.php
+++ b/lib-php/Shell.php
@@ -1,4 +1,12 @@
 <?php
 <?php

+/**
+ * SPDX-License-Identifier: GPL-2.0-only
+ *
+ * This file is part of Nominatim. (https://nominatim.org)
+ *
+ * Copyright (C) 2022 by the Nominatim developer community.
+ * For a full list of authors see the git log.
+ */

 
 namespace Nominatim;
 
 
 namespace Nominatim;
 


@@ -33,7 +41,9 @@ class Shell
     public function addEnvPair($sKey, $sVal)
     {
         if (isset($sKey) && $sKey && isset($sVal)) {
     public function addEnvPair($sKey, $sVal)
     {
         if (isset($sKey) && $sKey && isset($sVal)) {

-            if (!isset($this->aEnv)) $this->aEnv = $_ENV;
+            if (!isset($this->aEnv)) {
+                $this->aEnv = $_ENV;
+            }

             $this->aEnv = array_merge($this->aEnv, array($sKey => $sVal), $_ENV);
         }
         return $this;
             $this->aEnv = array_merge($this->aEnv, array($sKey => $sVal), $_ENV);
         }
         return $this;


@@ -48,7 +58,7 @@ class Shell
         return join(' ', $aEscaped);
     }
 
         return join(' ', $aEscaped);
     }
 

-    public function run()
+    public function run($bExitOnFail = false)

     {
         $sCmd = $this->escapedCmd();
         // $aEnv does not need escaping, proc_open seems to handle it fine
     {
         $sCmd = $this->escapedCmd();
         // $aEnv does not need escaping, proc_open seems to handle it fine


@@ -67,14 +77,16 @@ class Shell
         fclose($aPipes[0]); // no stdin
 
         $iStat = proc_close($hProc);
         fclose($aPipes[0]); // no stdin
 
         $iStat = proc_close($hProc);

-        return $iStat;
-    }

 
 

+        if ($iStat != 0 && $bExitOnFail) {
+            exit($iStat);
+        }

 
 

+        return $iStat;
+    }

 
     private function escapeParam($sParam)
     {
 
     private function escapeParam($sParam)
     {

-        if (preg_match('/^-*\w+$/', $sParam)) return $sParam;
-        return escapeshellarg($sParam);
+        return (preg_match('/^-*\w+$/', $sParam)) ? $sParam : escapeshellarg($sParam);

     }
 }
     }
 }