diff --git a/config/config.yml b/config/config.yml index c4ce5c3977..65a3bcf5be 100644 --- a/config/config.yml +++ b/config/config.yml @@ -121,7 +121,7 @@ oro_distribution: oro_require_js: build_path: "js/oro.min.js" - building_timeout: 3600 + build_timeout: 3600 build: preserveLicenseComments: true diff --git a/var/OroRequirements.php b/var/OroRequirements.php index 7fc209e89f..3d02fccdc0 100644 --- a/var/OroRequirements.php +++ b/var/OroRequirements.php @@ -4,7 +4,6 @@ require_once __DIR__ . '/../var/SymfonyRequirements.php'; use Oro\Bundle\AssetBundle\NodeJsVersionChecker; -use Oro\Bundle\InstallerBundle\Process\PhpExecutableFinder; use Oro\Bundle\AssetBundle\NodeJsExecutableFinder; use Symfony\Component\Intl\Intl; @@ -174,21 +173,6 @@ class_exists('COM'), ); } - // Web installer specific checks - if ('cli' !== PHP_SAPI) { - $output = $this->checkCliRequirements(); - - $requirement = new CliRequirement( - !$output, - 'Requirements validation for PHP CLI', - 'If you have multiple PHP versions installed, you need to configure ORO_PHP_PATH variable with PHP binary path used by web server' - ); - - $requirement->setOutput($output); - - $this->add($requirement); - } - $baseDir = realpath(__DIR__ . '/..'); $mem = $this->getBytes(ini_get('memory_limit')); @@ -307,8 +291,7 @@ public function getMandatoryRequirements() $this->getRequirements(), function ($requirement) { return !($requirement instanceof PhpIniRequirement) - && !($requirement instanceof OroRequirement) - && !($requirement instanceof CliRequirement); + && !($requirement instanceof OroRequirement); } ); } @@ -343,19 +326,6 @@ function ($requirement) { ); } - /** - * @return array - */ - public function getCliRequirements() - { - return array_filter( - $this->getRequirements(), - function ($requirement) { - return $requirement instanceof CliRequirement; - } - ); - } - /** * @param string $val * @return int @@ -448,47 +418,8 @@ protected function checkFileNameLength() return $fileLength >= 242; } - - /** - * @return null|string - */ - protected function checkCliRequirements() - { - $finder = new PhpExecutableFinder(); - $command = sprintf( - '%s %soro-check.php', - $finder->find(), - __DIR__ . DIRECTORY_SEPARATOR - ); - - return shell_exec($command); - } } class OroRequirement extends Requirement { } - -class CliRequirement extends Requirement -{ - /** - * @var string - */ - protected $output; - - /** - * @return string - */ - public function getOutput() - { - return $this->output; - } - - /** - * @param string $output - */ - public function setOutput($output) - { - $this->output = $output; - } -} diff --git a/var/oro-check.php b/var/oro-check.php deleted file mode 100644 index 891ad354d3..0000000000 --- a/var/oro-check.php +++ /dev/null @@ -1,13 +0,0 @@ -getRequirements() as $requirement) { - /** @var Requirement $requirement */ - if (!$requirement->isFulfilled()) { - echo $requirement->getTestMessage() . "\n"; - } -}