Release 1.1.4

Author: Eduard Muradov

Block/Adminhtml/System/Config/CliPhpPath.php

@@ -0,0 +1,38 @@
+<?php
+declare(strict_types=1);
+
+namespace Amasty\ImportExportCore\Block\Adminhtml\System\Config;
+
+use Amasty\ImportExportCore\Utils\CliPhpResolver;
+use Magento\Framework\Data\Form\Element\AbstractElement;
+use Magento\Framework\UrlInterface;
+use Magento\Config\Block\System\Config\Form\Field;
+use Magento\Backend\Block\Template\Context;
+
+class CliPhpPath extends Field
+{
+    /**
+     * @var CliPhpResolver
+     */
+    private $cliPhpResolver;
+
+    public function __construct(
+        Context $context,
+        CliPhpResolver $cliPhpResolver
+    ) {
+        parent::__construct($context);
+        $this->cliPhpResolver = $cliPhpResolver;
+    }
+
+    public function render(AbstractElement $element)
+    {
+        try {
+            $phpPath = $this->cliPhpResolver->getExecutablePath();
+        } catch (\Exception $e) {
+            $phpPath = '';
+        }
+        $element->setText($phpPath);
+
+        return parent::render($element);
+    }
+}

Utils/CliPhpResolver.php

@@ -4,13 +4,15 @@
 
 namespace Amasty\ImportExportCore\Utils;
 
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\Shell;
 use Symfony\Component\Process\PhpExecutableFinder;
 
 class CliPhpResolver
 {
-    private const PHP_EXECUTABLE_PATH = 'php_executable_path';
+    private const ENV_PHP_EXECUTABLE_PATH = 'php_executable_path';
+    private const CONFIG_PHP_EXECUTABLE_PATH = 'amasty_base/system/cli_php_path';
 
     private const VERSION_CHECK_REGEXP = '/PHP [\d\.\+a-z-]+ \(cli\)/';
 
@@ -29,19 +31,26 @@ class CliPhpResolver
      */
     private $shell;
 
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $configProvider;
+
     /**
      * @var string
      */
     private $executablePath;
 
     public function __construct(
         DeploymentConfig $deploymentConfig,
+        ScopeConfigInterface $configProvider,
         PhpExecutableFinder $executableFinder,
         Shell $shell
     ) {
         $this->deploymentConfig = $deploymentConfig;
         $this->executableFinder = $executableFinder;
         $this->shell = $shell;
+        $this->configProvider = $configProvider;
     }
 
     /**
@@ -62,7 +71,8 @@ public function getExecutablePath(): string
     private function resolvePhpExecutable()
     {
         $pathCandidates = [
-            $this->deploymentConfig->get(self::PHP_EXECUTABLE_PATH),
+            $this->configProvider->getValue(self::CONFIG_PHP_EXECUTABLE_PATH),
+            $this->deploymentConfig->get(self::ENV_PHP_EXECUTABLE_PATH),
             $this->executableFinder->find()
         ];
 

Utils/OptionsProcessor.php

@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Amasty\ImportExportCore\Utils;
+
+class OptionsProcessor
+{
+    public function process(array $options, bool $allowValueIsArray = true): array
+    {
+        $preparedOptions = [];
+
+        foreach ($options as $option) {
+            if (!is_array($option)) {
+                continue;
+            }
+
+            if ($this->isValid($option, $allowValueIsArray)) {
+                $option['value'] = !is_array($option['value'])
+                    ? (string)$option['value']
+                    : $option['value'];
+
+                $preparedOptions[] = $option;
+            } else {
+                array_push($preparedOptions, ...$this->process($option));
+            }
+        }
+
+        return $preparedOptions;
+    }
+
+    private function isValid(array $option, bool $allowValueIsArray): bool
+    {
+        return isset($option['value'])
+            && ($allowValueIsArray || !is_array($option['value']));
+    }
+}

composer.json

@@ -5,10 +5,8 @@
         "php": ">=7.3"
     },
     "type": "magento2-module",
-    "version": "1.1.3",
-    "license": [
-        "Commercial"
-    ],
+    "version": "1.1.4",
+    "license": "proprietary",
     "autoload": {
         "files": [
             "registration.php"