Merge pull request #6822 from laboro/fix/CRM-4214

CRM-4214: MailChimp performance investigation

src/Oro/Bundle/CronBundle/Job/Daemon.php

@@ -4,7 +4,7 @@
 
 use Symfony\Component\Process\Process;
 
-use Symfony\Component\Process\PhpExecutableFinder;
+use Oro\Bundle\InstallerBundle\Process\PhpExecutableFinder;
 
 class Daemon
 {

src/Oro/Bundle/DistributionBundle/Script/Runner.php

@@ -9,7 +9,7 @@
 use Symfony\Component\Finder\SplFileInfo;
 use Symfony\Component\Process\Exception\ProcessFailedException;
 use Symfony\Component\Process\Process;
-use Symfony\Component\Process\PhpExecutableFinder;
+use Oro\Bundle\InstallerBundle\Process\PhpExecutableFinder;
 
 class Runner
 {

src/Oro/Bundle/EntityConfigBundle/Tools/CommandExecutor.php

@@ -8,7 +8,7 @@
 use Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException;
 use Symfony\Component\Process\Process;
 use Symfony\Component\Process\ProcessBuilder;
-use Symfony\Component\Process\PhpExecutableFinder;
+use Oro\Bundle\InstallerBundle\Process\PhpExecutableFinder;
 
 use Oro\Bundle\CacheBundle\Manager\OroDataCacheManager;
 

src/Oro/Bundle/InstallerBundle/CommandExecutor.php

@@ -8,7 +8,7 @@
 use Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException;
 use Symfony\Component\Process\Process;
 use Symfony\Component\Process\ProcessBuilder;
-use Symfony\Component\Process\PhpExecutableFinder;
+use Oro\Bundle\InstallerBundle\Process\PhpExecutableFinder;
 
 use Oro\Bundle\CacheBundle\Manager\OroDataCacheManager;
 

src/Oro/Bundle/InstallerBundle/Process/PhpExecutableFinder.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace Oro\Bundle\InstallerBundle\Process;
+
+use Symfony\Component\Process\PhpExecutableFinder as BasePhpExecutableFinder;
+
+/**
+ * @deprecated since 1.9 use PHP_PATH instead
+ *
+ * @see \Symfony\Component\Process\PhpExecutableFinder
+ */
+class PhpExecutableFinder
+{
+    /** @var BasePhpExecutableFinder */
+    protected $finder;
+
+    public function __construct()
+    {
+        $this->finder = new BasePhpExecutableFinder();
+    }
+
+    /**
+     * @see \Symfony\Component\Process\PhpExecutableFinder::find
+     */
+    public function find($includeArgs = true)
+    {
+        $php = getenv('ORO_PHP_PATH');
+        if ($php && is_executable($php)) {
+            return $php;
+        }
+
+        return $this->finder->find($includeArgs);
+    }
+}