#102 - env_path setting overrides the PATH within shellWhich(). convertString does better cleaning up temp files

Author: stackpr

src/Configuration/ConfigurationDefaults.php

@@ -16,7 +16,7 @@ public function getAllConverters() {
   }
 
   public function __construct(&$settings) {
-    $settings = array(
+    $settings = array_replace(array(
       // Ubuntu 12.04 LTS:
       //   /tmp
       //   Linux
@@ -28,16 +28,18 @@ public function __construct(&$settings) {
       'temp_dir' => sys_get_temp_dir(),
       'operating_system' => php_uname('s'),
       'operating_system_version' => php_uname('r'),
-    );
+      // Override the default $PATH environmental variable.
+      'env_path' => NULL,
+    ), (array) $settings);
 
     // Attempt to get better OS information.
     // lsb_release is available on Ubun
     if ($settings['operating_system'] === 'Linux') {
       $lsb = trim(`which lsb_release`);
       if ($lsb !== '') {
         $lsb = escapeshellarg($lsb);
-        $settings['operating_system'] = trim(`$lsb        -is`);
-        $settings['operating_system_version'] = trim(`$lsb        -rs`);
+        $settings['operating_system'] = trim(`$lsb          -is`);
+        $settings['operating_system_version'] = trim(`$lsb          -rs`);
       }
     }
     elseif ($settings['operating_system'] === 'Windows NT') {

src/Engine/EngineBase.php

@@ -128,12 +128,19 @@ public function convertString($source, &$destination) {
 
     // Convert the string.
     file_put_contents($s_path, $source);
-    $this->convertFile($s_path, $d_path);
-    $destination = file_get_contents($d_path);
-
-    // Remove the files.
-    unlink($s_path);
-    unlink($d_path);
+    try {
+      $this->convertFile($s_path, $d_path);
+      $destination = file_get_contents($d_path);
+
+      // Remove the files.
+      unlink($s_path);
+      unlink($d_path);
+    } catch (\Exception $e) {
+      // Remove the files.
+      unlink($s_path);
+      unlink($d_path);
+      throw $e;
+    }
 
     return $this;
   }
@@ -267,13 +274,25 @@ public function shellWhich($command) {
       return $cache[$command];
     }
 
-    // Look in the bin folder (symlinks work fine).
+    // Look in the bin folder for FileConverter-provided bins (symlinks work fine).
     $bin = realpath(__DIR__ . '/../../bin/' . $command);
     if ($bin !== FALSE && is_executable($bin)) {
       $cache[$command] = $bin;
       return $bin;
     }
 
+    // Look for overrides to the env_path
+    $dirs = $this->converter->getSetting('env_path');
+    if (isset($dirs) && strlen($dirs) > 1) {
+      foreach (explode(':', $dirs) as $dir) {
+        $bin = realpath("$dir/$command");
+        if ($bin !== FALSE && is_executable($bin)) {
+          $cache[$command] = $bin;
+          return $bin;
+        }
+      }
+    }
+
     // Use the which/where command to locate the binary.
     $which = preg_match('@Win@', $this->settings['operating_system']) ? 'where'
       : 'which';