MAGETWO-49633: [GITHUB] Forked PHP threads in Magento must use strictly same PHP executable used for running original entry point magento#3482

- changed Cron to find current php needed if possible
- corrected Cron web entry point behavior so both CLI and web entry point Cron behavior is consistent

Author: eddielau

app/code/Magento/Cron/Observer/ProcessCronQueueObserver.php

@@ -100,6 +100,11 @@ class ProcessCronQueueObserver implements ObserverInterface
      */
     protected $timezone;
 
+    /**
+     * @var \Symfony\Component\Process\PhpExecutableFinder
+     */
+    protected $phpExecutableFinder;
+
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param ScheduleFactory $scheduleFactory
@@ -109,6 +114,7 @@ class ProcessCronQueueObserver implements ObserverInterface
      * @param \Magento\Framework\App\Console\Request $request
      * @param \Magento\Framework\ShellInterface $shell
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $timezone
+     * @param \Symfony\Component\Process\PhpExecutableFinder $phpExecutableFinder
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -118,7 +124,8 @@ public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Framework\App\Console\Request $request,
         \Magento\Framework\ShellInterface $shell,
-        \Magento\Framework\Stdlib\DateTime\TimezoneInterface $timezone
+        \Magento\Framework\Stdlib\DateTime\TimezoneInterface $timezone,
+        \Symfony\Component\Process\PhpExecutableFinder $phpExecutableFinder
     ) {
         $this->_objectManager = $objectManager;
         $this->_scheduleFactory = $scheduleFactory;
@@ -128,6 +135,7 @@ public function __construct(
         $this->_request = $request;
         $this->_shell = $shell;
         $this->timezone = $timezone;
+        $this->phpExecutableFinder = $phpExecutableFinder;
     }
 
     /**
@@ -147,6 +155,8 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         $currentTime = $this->timezone->scopeTimeStamp();
         $jobGroupsRoot = $this->_config->getJobs();
 
+        $phpPath = $this->phpExecutableFinder->find() ?: 'php';
+
         foreach ($jobGroupsRoot as $groupId => $jobsRoot) {
             if ($this->_request->getParam('group') !== null
                 && $this->_request->getParam('group') !== '\'' . ($groupId) . '\''
@@ -160,7 +170,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
                     ) == 1
                 )) {
                 $this->_shell->execute(
-                    'php %s cron:run --group=' . $groupId . ' --' . CLI::INPUT_KEY_BOOTSTRAP . '='
+                    $phpPath . ' %s cron:run --group=' . $groupId . ' --' . CLI::INPUT_KEY_BOOTSTRAP . '='
                     . self::STANDALONE_PROCESS_STARTED . '=1',
                     [
                         BP . '/bin/magento'

app/code/Magento/Cron/Test/Unit/Observer/ProcessCronQueueObserverTest.php

@@ -110,6 +110,8 @@ public function setUp()
 
         $this->timezone = $this->getMock('Magento\Framework\Stdlib\DateTime\TimezoneInterface');
         $this->timezone->expects($this->any())->method('scopeTimeStamp')->will($this->returnValue(time()));
+        $phpExecutableFinder = $this->getMock('Symfony\Component\Process\PhpExecutableFinder', [], [], '', false);
+        $phpExecutableFinder->expects($this->any())->method('find')->willReturn('php');
         $this->_observer = new ProcessCronQueueObserver(
             $this->_objectManager,
             $this->_scheduleFactory,
@@ -118,7 +120,8 @@ public function setUp()
             $this->_scopeConfig,
             $this->_request,
             $this->_shell,
-            $this->timezone
+            $this->timezone,
+            $phpExecutableFinder
         );
     }
 

pub/cron.php

@@ -20,9 +20,6 @@
 }
 
 try {
-    if (empty($opt['group'])) {
-        $opt['group'] = 'default';
-    }
     foreach ($opt as $key => $value) {
         $opt[$key] = escapeshellarg($value);
     }